liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pr修改

Browse Source
This commit is contained in:
苏尹岚
2019-12-18 15:19:22 +08:00
parent 12a1a23ac1
commit 990f3a2da2
6 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/jxcallback/orderman/order.go
View File

@@ -267,11 +267,7 @@ func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db *dao
} else {
isDuplicated = true
order.DuplicatedCount++
if order.Status == model.OrderStatusCanceled || order.Status == model.OrderStatusFinished {
db.Db.Update(order, "DuplicatedCount", "Status")
} else {
db.Db.Update(order, "DuplicatedCount")
}
db.Db.Update(order, "DuplicatedCount")
baseapi.SugarLogger.Infof("saveOrder duplicated orderid:%s msg received", order.VendorOrderID)
}
}

10
business/jxcallback/orderman/orderman_ext.go
View File

@@ -23,6 +23,9 @@ import (
const (
maxLastHours = 7 * 24 // 最多只能查询7天内的订单数据
defLastHours = 2 * 24 // 缺省是两天内的订单
orderMixTimeImmediatelyArrive = 8
orderMixTimeDelayArrive = 5
)
type tWaybillExt struct {
@@ -992,11 +995,11 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in
} else {
if goodsOrder.Status != model.OrderStatusFinished && goodsOrder.Status != model.OrderStatusCanceled {
if goodsOrder.BusinessType == model.BusinessTypeImmediate {
if time.Now().Sub(goodsOrder.CreatedAt).Hours() >= 8 {
if time.Now().Sub(goodsOrder.CreatedAt).Hours() >= orderMixTimeImmediatelyArrive {
missingOrderList = append(missingOrderList, pair)
}
} else {
if time.Now().Sub(goodsOrder.ExpectedDeliveredTime).Hours() >= 5 {
if time.Now().Sub(goodsOrder.ExpectedDeliveredTime).Hours() >= orderMixTimeDelayArrive {
missingOrderList = append(missingOrderList, pair)
}
}
@@ -1010,6 +1013,9 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in
if handler := partner.GetPurchaseOrderHandlerFromVendorID(pair.VendorID); handler != nil {
order, err2 := handler.GetOrder(pair.VendorOrgCode, pair.VendorOrderID)
if err = err2; err == nil {
if order.Status == model.OrderStatusCanceled || order.Status == model.OrderStatusFinished {
err = c.UpdateOrderFields(order, []string{"Status"})
}
isDuplicated, err2 := c.SaveOrder(order, false, dao.GetDB())
if err2 == nil && !isDuplicated {
retVal = []int{1}