diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 50b86a75d..3712983eb 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -267,7 +267,11 @@ func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db *dao } else { isDuplicated = true order.DuplicatedCount++ - db.Db.Update(order, "DuplicatedCount") + if order.Status == model.OrderStatusCanceled || order.Status == model.OrderStatusFinished { + db.Db.Update(order, "DuplicatedCount", "Status") + } else { + db.Db.Update(order, "DuplicatedCount") + } baseapi.SugarLogger.Infof("saveOrder duplicated orderid:%s msg received", order.VendorOrderID) } } diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index f34241334..d519d086b 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -996,7 +996,9 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in missingOrderList = append(missingOrderList, pair) } } else { - + if time.Now().Sub(goodsOrder.ExpectedDeliveredTime).Hours() >= 5 { + missingOrderList = append(missingOrderList, pair) + } } } }