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

- 除了OrderStatusUnknown与OrderStatusMsg，在addOrderStatus中都会装载订单

Browse Source
This commit is contained in:
gazebo
2019-04-23 10:31:18 +08:00
parent 102966d01f
commit f382128f60
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -350,7 +350,7 @@ func (c *OrderManager) addOrderStatus(orderStatus *model.OrderStatus, db *dao.Da
db = dao.GetDB() db = dao.GetDB()
} }
isDuplicated, err = addOrderOrWaybillStatus(orderStatus, db) isDuplicated, err = addOrderOrWaybillStatus(orderStatus, db)
if err == nil && !isDuplicated && model.IsOrderImportantStatus(orderStatus.Status) { if err == nil && !isDuplicated && (orderStatus.Status != model.OrderStatusUnknown && orderStatus.Status != model.OrderStatusMsg) {
order = &model.GoodsOrder{ order = &model.GoodsOrder{
VendorOrderID: orderStatus.VendorOrderID, VendorOrderID: orderStatus.VendorOrderID,
VendorID: orderStatus.VendorID, VendorID: orderStatus.VendorID,

2
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -242,7 +242,7 @@ func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool) (err
// todo 这个接口应该可以直接传order的，因为在OrderManager中每次都生成了 // todo 这个接口应该可以直接传order的，因为在OrderManager中每次都生成了
func (s *DefScheduler) OnOrderStatusChanged(order *model.GoodsOrder, status *model.OrderStatus, isPending bool) (err error) { func (s *DefScheduler) OnOrderStatusChanged(order *model.GoodsOrder, status *model.OrderStatus, isPending bool) (err error) {
if order == nil { if order == nil && (status.Status != model.OrderStatusUnknown && status.Status != model.OrderStatusMsg) {
globals.SugarLogger.Warnf("OnOrderStatusChanged order is nil, status:%s", utils.Format4Output(status, true)) globals.SugarLogger.Warnf("OnOrderStatusChanged order is nil, status:%s", utils.Format4Output(status, true))
} }
if status.LockStatus != model.OrderStatusUnknown || (status.Status > model.OrderStatusMsg && status.Status != model.OrderStatusUnknown) { if status.LockStatus != model.OrderStatusUnknown || (status.Status > model.OrderStatusMsg && status.Status != model.OrderStatusUnknown) {