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

- 在美团运单遗漏新运单消息时也能正确清除运单创建标志

Browse Source
This commit is contained in:
gazebo
2019-05-16 11:28:30 +08:00
parent cbc1a4fb88
commit 3a3691f429
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -385,8 +385,11 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime) s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
} }
} }
order.DeliveryFlag &= ^model.WaybillVendorID2Mask(bill.WaybillVendorID) flag2Clear := model.WaybillVendorID2Mask(bill.WaybillVendorID)
err = partner.CurOrderManager.UpdateOrderStatusAndFlag(order) if order.DeliveryFlag&flag2Clear != 0 {
order.DeliveryFlag &= ^flag2Clear
err = partner.CurOrderManager.UpdateOrderStatusAndFlag(order)
}
} }
// 只有购物平台的新运单消息才会启动抢单TIMER // 只有购物平台的新运单消息才会启动抢单TIMER
if model.IsWaybillPlatformOwn(bill) { if model.IsWaybillPlatformOwn(bill) {
@@ -440,6 +443,11 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
weixinmsg.NotifyWaybillStatus(bill, order, isBillAlreadyCandidate) 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: case model.WaybillStatusAcceptCanceled:
if s.isBillCandidate(order, bill) { if s.isBillCandidate(order, bill) {