From 70a3f590265f0fac66bf611826d0fb2e7d113097 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 7 Feb 2020 10:17:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E8=A5=BF=E5=95=86=E5=9F=8E=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E9=85=8D=E9=80=81=E8=B0=83=E5=BA=A6=E5=8F=AA=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E8=BE=BE=E8=BE=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/scheduler/defsch/defsch.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 5af23c02d..223377492 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -705,7 +705,11 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
 		if (order.DeliveryFlag & model.OrderDeliveryFlagMaskScheduleDisabled) == 0 {
 			if savedOrderInfo.retryCount <= maxWaybillRetryCount {
 				savedOrderInfo.isNeedCreate3rdWaybill = true
-				if _, err = s.CreateWaybillOnProviders4SavedOrder(jxcontext.AdminCtx, savedOrderInfo, nil, savedOrderInfo.GetWaybillVendorIDs(), false, maxDeliveryFee); err == nil {
+				excludeVendorIDs := savedOrderInfo.GetWaybillVendorIDs()
+				if order.VendorID == model.VendorIDJX {
+					excludeVendorIDs = append(excludeVendorIDs, model.VendorIDMTPS)
+				}
+				if _, err = s.CreateWaybillOnProviders4SavedOrder(jxcontext.AdminCtx, savedOrderInfo, nil, excludeVendorIDs, false, maxDeliveryFee); err == nil {
 					savedOrderInfo.retryCount++
 				}
 			} else {