From ff1d223933b75c1062d69c167acbebd84d28114f Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 13 Aug 2018 11:59:07 +0800
Subject: [PATCH] - don't cancel master waybill when received order delivered
 msg.

---
 business/scheduler/defsch/defsch.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/business/scheduler/defsch/defsch.go b/business/scheduler/defsch/defsch.go
index c8db69d70..bd93caf2c 100644
--- a/business/scheduler/defsch/defsch.go
+++ b/business/scheduler/defsch/defsch.go
@@ -221,12 +221,13 @@ func (s *DefScheduler) OnOrderStatusChanged(status *model.OrderStatus, isPending
 		if status.LockStatus == model.OrderStatusUnknown && status.Status > model.OrderStatusUnknown { // 只处理状态转换，一般消息不处理
 			s.resetTimer(savedOrderInfo, nil, isPending)
 			if status.Status >= model.OrderStatusEndBegin {
+				curWaybill := savedOrderInfo.waybills[savedOrderInfo.order.WaybillVendorID]
 				if status.Status == model.OrderStatusDelivered || status.Status == model.OrderStatusFinished {
-					if curWaybill := savedOrderInfo.waybills[savedOrderInfo.order.WaybillVendorID]; curWaybill != nil && curWaybill.WaybillVendorID != curWaybill.OrderVendorID {
-						globals.SugarLogger.Infof("OnOrderStatusChanged [运营]订单orderID:%s可能被手动点击送达，有可能导致当前有效运单:%s被非正常取消", status.VendorOrderID, curWaybill.VendorWaybillID)
+					if curWaybill != nil && curWaybill.WaybillVendorID != curWaybill.OrderVendorID {
+						globals.SugarLogger.Infof("OnOrderStatusChanged [运营]订单orderID:%s可能被手动点击送达，会对程序状态产生不利影响，请通知门店不要这样操作！", status.VendorOrderID)
 					}
 				}
-				s.cancelOtherWaybills(savedOrderInfo, nil)
+				s.cancelOtherWaybills(savedOrderInfo, curWaybill)
 				s.orderMap.Delete(jxutils.GetUniversalOrderIDFromOrderStatus(status))
 			}
 		} else if status.LockStatus != model.OrderStatusUnknown {