From d48b867dae5d2f63643092aec38c1702f965cb6b Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 6 Nov 2018 09:34:44 +0800 Subject: [PATCH] - resend weixin msg when courier changed. --- business/jxcallback/scheduler/defsch/defsch.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index d7413afc9..2e5bf65c4 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -355,14 +355,14 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo s.swtich2SelfDeliverWithRetry(savedOrderInfo, bill, 2, 10*time.Second) } } - if !isPending { - weixinmsg.NotifyWaybillStatus(bill, order) - } } else if !s.isBillCandidate(order, bill) && bill.WaybillVendorID != order.VendorID { // 发生这种情况的原因就是两个接单事件几乎同时到达（来不及取消），也算正常 s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime) globals.SugarLogger.Infof("OnWaybillStatusChanged Accepted orderID:%s got multiple bill:%v", order.VendorOrderID, bill) } + if s.isBillCandidate(order, bill) && order.WaybillVendorID != order.VendorID { + weixinmsg.NotifyWaybillStatus(bill, order) + } } case model.WaybillStatusAcceptCanceled: if s.isBillCandidate(order, bill) {