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

- 修复订单取消消息发送的bug

Browse Source
This commit is contained in:
gazebo
2019-09-18 13:50:13 +08:00
parent cef2b9e1e6
commit 88f1976f61
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -366,6 +366,9 @@ func (s *DefScheduler) OnOrderStatusChanged(order *model.GoodsOrder, status *mod
} }
if !isPending { if !isPending {
if status.Status == model.OrderStatusFinishedPickup || status.Status == model.OrderStatusCanceled { if status.Status == model.OrderStatusFinishedPickup || status.Status == model.OrderStatusCanceled {
if status.Status == model.OrderStatusCanceled {
s.notifyOrderCanceled(savedOrderInfo.order)
}
msghub.OnFinishedPickup(savedOrderInfo.order) msghub.OnFinishedPickup(savedOrderInfo.order)
} else if status.Status == model.OrderStatusApplyCancel || //model.IsOrderLockStatus(status.Status) || } else if status.Status == model.OrderStatusApplyCancel || //model.IsOrderLockStatus(status.Status) ||
status.Status == model.OrderStatusApplyFailedGetGoods || //model.IsOrderUnlockStatus(status.Status) || status.Status == model.OrderStatusApplyFailedGetGoods || //model.IsOrderUnlockStatus(status.Status) ||
@@ -373,8 +376,6 @@ func (s *DefScheduler) OnOrderStatusChanged(order *model.GoodsOrder, status *mod
status.Status == model.OrderStatusDeliverFailed { status.Status == model.OrderStatusDeliverFailed {
if status.Status == model.OrderStatusApplyCancel { if status.Status == model.OrderStatusApplyCancel {
s.notifyUserApplyCancel(savedOrderInfo.order, status.Remark) s.notifyUserApplyCancel(savedOrderInfo.order, status.Remark)
} else if status.Status == model.OrderStatusCanceled {
s.notifyOrderCanceled(savedOrderInfo.order)
} }
msghub.OnKeyOrderStatusChanged(savedOrderInfo.order) msghub.OnKeyOrderStatusChanged(savedOrderInfo.order)
} }