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-08 17:57:53 +08:00
parent 53fccce223
commit a904ebfee5
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -368,13 +368,21 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
} }
s.updateOrderByBill(order, bill, false) s.updateOrderByBill(order, bill, false)
s.cancelOtherWaybillsCheckOrderDeliveryFlag(savedOrderInfo, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime) s.cancelOtherWaybillsCheckOrderDeliveryFlag(savedOrderInfo, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
if !s.IsOrderPlatformWaybill(bill) && savedOrderInfo.storeDeliveryType != scheduler.StoreDeliveryTypeByStore {
s.swtich2SelfDeliverWithRetry(savedOrderInfo, bill, 2, 10*time.Second) if s.IsOrderPlatformWaybill(bill) {
} else if s.IsSpecialOrderPlatformWaybill(bill) { // 强制将订单状态置为配送中?
s.SelfDeliverDelivering(savedOrderInfo.order, bill.CourierMobile) order.Status = model.OrderStatusDelivering
utils.CallFuncAsync(func() { partner.CurOrderManager.UpdateOrderStatusAndFlag(order)
weixinmsg.NotifyWaybillStatus(bill, order, isBillAlreadyCandidate) } else {
}) if savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore ||
s.IsSpecialOrderPlatformWaybill(bill) {
s.SelfDeliverDelivering(savedOrderInfo.order, bill.CourierMobile)
utils.CallFuncAsync(func() {
weixinmsg.NotifyWaybillStatus(bill, order, isBillAlreadyCandidate)
})
} else {
s.swtich2SelfDeliverWithRetry(savedOrderInfo, bill, 2, 10*time.Second)
}
} }
} else if !s.isBillCandidate(order, bill) && bill.WaybillVendorID != order.VendorID { } else if !s.isBillCandidate(order, bill) && bill.WaybillVendorID != order.VendorID {
// 发生这种情况的原因就是两个接单事件几乎同时到达（来不及取消），也算正常 // 发生这种情况的原因就是两个接单事件几乎同时到达（来不及取消），也算正常