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

- don't call SelfDeliverDelievering when waybill delivering msg came.

Browse Source
This commit is contained in:
gazebo
2018-07-28 22:40:49 +08:00
parent cbf72ac85d
commit 2dab1637fe
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/scheduler/defsch/defsch.go
View File

@@ -302,9 +302,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
case model.WaybillStatusDelivering: case model.WaybillStatusDelivering:
s.resetTimer(savedOrderInfo, scheduler.TimerStatusTypeWaybill, bill.Status, false) s.resetTimer(savedOrderInfo, scheduler.TimerStatusTypeWaybill, bill.Status, false)
if s.isBillCandidate(order, bill) { if s.isBillCandidate(order, bill) {
if order.VendorID != bill.WaybillVendorID && !isPending { // do nothing
s.SelfDeliverDelievering(order)
}
} else { } else {
// s.CancelWaybill(bill) // s.CancelWaybill(bill)
globals.SugarLogger.Warnf("OnWaybillStatusChanged Delivering order(%d, %s) bill(%d, %s), bill:%v shouldn't got here", order.WaybillVendorID, order.VendorWaybillID, bill.WaybillVendorID, bill.VendorWaybillID, bill) globals.SugarLogger.Warnf("OnWaybillStatusChanged Delivering order(%d, %s) bill(%d, %s), bill:%v shouldn't got here", order.WaybillVendorID, order.VendorWaybillID, bill.WaybillVendorID, bill.VendorWaybillID, bill)