From 3a3691f429188db96469400d740f566a1a2e8c05 Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 16 May 2019 11:28:30 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=9C=A8=E7=BE=8E=E5=9B=A2=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E9=81=97=E6=BC=8F=E6=96=B0=E8=BF=90=E5=8D=95=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=97=B6=E4=B9=9F=E8=83=BD=E6=AD=A3=E7=A1=AE=E6=B8=85?= =?UTF-8?q?=E9=99=A4=E8=BF=90=E5=8D=95=E5=88=9B=E5=BB=BA=E6=A0=87=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/defsch/defsch.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index fc964fa1f..898d1f4e2 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -385,8 +385,11 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime) } } - order.DeliveryFlag &= ^model.WaybillVendorID2Mask(bill.WaybillVendorID) - err = partner.CurOrderManager.UpdateOrderStatusAndFlag(order) + flag2Clear := model.WaybillVendorID2Mask(bill.WaybillVendorID) + if order.DeliveryFlag&flag2Clear != 0 { + order.DeliveryFlag &= ^flag2Clear + err = partner.CurOrderManager.UpdateOrderStatusAndFlag(order) + } } // 只有购物平台的新运单消息才会启动抢单TIMER if model.IsWaybillPlatformOwn(bill) { @@ -440,6 +443,11 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo weixinmsg.NotifyWaybillStatus(bill, order, isBillAlreadyCandidate) }) } + flag2Clear := model.WaybillVendorID2Mask(bill.WaybillVendorID) + if order.DeliveryFlag&flag2Clear != 0 { + order.DeliveryFlag &= ^flag2Clear + err = partner.CurOrderManager.UpdateOrderStatusAndFlag(order) + } } case model.WaybillStatusAcceptCanceled: if s.isBillCandidate(order, bill) {