From 2dab1637fe1d5761de79d1ecd61a3d5b2bb6da91 Mon Sep 17 00:00:00 2001 From: gazebo Date: Sat, 28 Jul 2018 22:40:49 +0800 Subject: [PATCH] - don't call SelfDeliverDelievering when waybill delivering msg came. --- business/scheduler/defsch/defsch.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/business/scheduler/defsch/defsch.go b/business/scheduler/defsch/defsch.go index 952b3d336..c7f289e28 100644 --- a/business/scheduler/defsch/defsch.go +++ b/business/scheduler/defsch/defsch.go @@ -302,9 +302,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo case model.WaybillStatusDelivering: s.resetTimer(savedOrderInfo, scheduler.TimerStatusTypeWaybill, bill.Status, false) if s.isBillCandidate(order, bill) { - if order.VendorID != bill.WaybillVendorID && !isPending { - s.SelfDeliverDelievering(order) - } + // do nothing } else { // 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)