From 14a8c58239fd1e597e820c15bebbaea9fa81733e Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 13 Mar 2019 15:22:18 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=A4=84=E7=90=86=E5=90=8C=E4=B8=80?= =?UTF-8?q?=E8=BF=90=E5=8D=95=E9=87=8D=E5=A4=8D=E6=8E=A5=E5=8D=95=E6=83=85?= =?UTF-8?q?=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/defsch/defsch.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index b5e19607e..c563ca295 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -357,7 +357,9 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo 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, isBillAlreadyCandidate) + if !isBillAlreadyCandidate || !s.isWaybillCourierSame(savedOrderInfo, bill) { + weixinmsg.NotifyWaybillStatus(bill, order, isBillAlreadyCandidate) + } } } case model.WaybillStatusAcceptCanceled: @@ -458,6 +460,10 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo return err } +func (s *DefScheduler) isWaybillCourierSame(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) bool { + return savedOrderInfo.waybills[bill.WaybillVendorID] != nil && savedOrderInfo.waybills[bill.WaybillVendorID].CourierMobile == bill.CourierMobile +} + func (s *DefScheduler) addWaybill2Map(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) { if _, ok := savedOrderInfo.waybills[bill.WaybillVendorID]; ok { if !s.IsOrderPlatformWaybill(bill) { // 购买平台重复发相同号的新运单是正常的，京东就是