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

- don't cancel master waybill when received order delivered msg.

Browse Source
This commit is contained in:
gazebo
2018-08-13 11:59:07 +08:00
parent 41d2d4bce9
commit ff1d223933
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
business/scheduler/defsch/defsch.go
View File

@@ -221,12 +221,13 @@ func (s *DefScheduler) OnOrderStatusChanged(status *model.OrderStatus, isPending
if status.LockStatus == model.OrderStatusUnknown && status.Status > model.OrderStatusUnknown { // 只处理状态转换，一般消息不处理
s.resetTimer(savedOrderInfo, nil, isPending)
if status.Status >= model.OrderStatusEndBegin {
curWaybill := savedOrderInfo.waybills[savedOrderInfo.order.WaybillVendorID]
if status.Status == model.OrderStatusDelivered || status.Status == model.OrderStatusFinished {
if curWaybill := savedOrderInfo.waybills[savedOrderInfo.order.WaybillVendorID]; curWaybill != nil && curWaybill.WaybillVendorID != curWaybill.OrderVendorID {
globals.SugarLogger.Infof("OnOrderStatusChanged [运营]订单orderID:%s可能被手动点击送达，有可能导致当前有效运单:%s被非正常取消", status.VendorOrderID, curWaybill.VendorWaybillID)
if curWaybill != nil && curWaybill.WaybillVendorID != curWaybill.OrderVendorID {
globals.SugarLogger.Infof("OnOrderStatusChanged [运营]订单orderID:%s可能被手动点击送达，会对程序状态产生不利影响，请通知门店不要这样操作！", status.VendorOrderID)
}
}
s.cancelOtherWaybills(savedOrderInfo, nil)
s.cancelOtherWaybills(savedOrderInfo, curWaybill)
s.orderMap.Delete(jxutils.GetUniversalOrderIDFromOrderStatus(status))
}
} else if status.LockStatus != model.OrderStatusUnknown {