diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index e5a94b7c4..5a8afa469 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -339,7 +339,7 @@ func (s *DefScheduler) OnOrderStatusChanged(order *model.GoodsOrder, status *mod s.stopTimer(savedOrderInfo) } if !isPending { - if status.Status == model.OrderStatusFinishedPickup { + if status.Status == model.OrderStatusFinishedPickup || status.Status == model.OrderStatusCanceled { msghub.OnFinishedPickup(savedOrderInfo.order) } else if status.Status == model.OrderStatusApplyCancel || //model.IsOrderLockStatus(status.Status) || status.Status == model.OrderStatusApplyFailedGetGoods || //model.IsOrderUnlockStatus(status.Status) || diff --git a/business/msghub/msghub.go b/business/msghub/msghub.go index ded5374c4..5a14d84a4 100644 --- a/business/msghub/msghub.go +++ b/business/msghub/msghub.go @@ -18,7 +18,7 @@ const ( ServerMsgPing = "ping" ServerMsgNewOrder = "newOrder" - ServerMsgFinishedPickup = "finishedPickup" + ServerMsgFinishedPickup = "finishedPickup" // 此消息当前当成刷新订单列表及状态来使用,并不是拣货 ServerMsgKeyOrderStatusChanged = "keyOrderStatusChanged" // 重要订单状态变化 ServerMsgNewWait4ApproveAfsOrder = "newWait4ApproveAfsOrder"