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) {