From 290cf00edb56b2851a8fc4e4fd5ec2ab853fb825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Wed, 7 Jun 2023 17:49:57 +0800
Subject: [PATCH] 1

---
 .../jxcallback/scheduler/defsch/defsch.go     | 78 +++++++++----------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 87ec17a96..6f7ecd66a 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -946,45 +946,45 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
 				if err == nil && err2 == nil {
 					// 1.检查门店三方配送配置,达达>蜂鸟>美团>顺丰>uu
 					// excludeVendorIDs 包括上面已经发送的平台id
-					storeCourierList, err := dao.GetStoreCourierList2(dao.GetDB(), []int{jxutils.GetSaleStoreIDFromOrder(order)}, nil, model.StoreStatusOpened, []int{model.StoreAuditStatusOnline, model.StoreAuditStatusUpdated})
-					excludeVendorIDsMap := make(map[int]int, 0) // 被排除的配送
-					for _, v := range excludeVendorIDs {
-						excludeVendorIDsMap[v] = model.YES
-					}
-
-					vendorID := 0
-					for _, v := range storeCourierList {
-						if excludeVendorIDsMap[v.VendorID] == model.YES {
-							continue
-						}
-						if v.VendorID == model.VendorIDDada {
-							excludeVendorIDs = []int{model.VendorIDFengNiao, model.VendorIDMTPS, model.VendorIDUUPT, model.VendorIDSFPS}
-							vendorID = v.VendorID
-							break
-						}
-						if v.VendorID == model.VendorIDFengNiao {
-							excludeVendorIDs = []int{model.VendorIDDada, model.VendorIDMTPS, model.VendorIDUUPT, model.VendorIDSFPS}
-							vendorID = v.VendorID
-							break
-						}
-						if v.VendorID == model.VendorIDMTPS {
-							excludeVendorIDs = []int{model.VendorIDDada, model.VendorIDFengNiao, model.VendorIDUUPT, model.VendorIDSFPS}
-							vendorID = v.VendorID
-							break
-						}
-						if v.VendorID == model.VendorIDUUPT {
-							excludeVendorIDs = []int{model.VendorIDDada, model.VendorIDMTPS, model.VendorIDFengNiao, model.VendorIDSFPS}
-							vendorID = v.VendorID
-							break
-						}
-						if v.VendorID == model.VendorIDSFPS {
-							excludeVendorIDs = []int{model.VendorIDDada, model.VendorIDMTPS, model.VendorIDUUPT, model.VendorIDFengNiao}
-							vendorID = v.VendorID
-							break
-						}
-					}
-
-					partner.CurOrderManager.OnOrderMsg(order, fmt.Sprintf("发起自动创建三方运单,目标创建运单平台[%s],排除平台[%s]", jxutils.GetVendorName(vendorID), utils.Format4Output(excludeVendorIDs, false)), err.Error())
+					//storeCourierList, err := dao.GetStoreCourierList2(dao.GetDB(), []int{jxutils.GetSaleStoreIDFromOrder(order)}, nil, model.StoreStatusOpened, []int{model.StoreAuditStatusOnline, model.StoreAuditStatusUpdated})
+					//excludeVendorIDsMap := make(map[int]int, 0) // 被排除的配送
+					//for _, v := range excludeVendorIDs {
+					//	excludeVendorIDsMap[v] = model.YES
+					//}
+					//
+					//vendorID := 0
+					//for _, v := range storeCourierList {
+					//	if excludeVendorIDsMap[v.VendorID] == model.YES {
+					//		continue
+					//	}
+					//	if v.VendorID == model.VendorIDDada {
+					//		excludeVendorIDs = []int{model.VendorIDFengNiao, model.VendorIDMTPS, model.VendorIDUUPT, model.VendorIDSFPS}
+					//		vendorID = v.VendorID
+					//		break
+					//	}
+					//	if v.VendorID == model.VendorIDFengNiao {
+					//		excludeVendorIDs = []int{model.VendorIDDada, model.VendorIDMTPS, model.VendorIDUUPT, model.VendorIDSFPS}
+					//		vendorID = v.VendorID
+					//		break
+					//	}
+					//	if v.VendorID == model.VendorIDMTPS {
+					//		excludeVendorIDs = []int{model.VendorIDDada, model.VendorIDFengNiao, model.VendorIDUUPT, model.VendorIDSFPS}
+					//		vendorID = v.VendorID
+					//		break
+					//	}
+					//	if v.VendorID == model.VendorIDUUPT {
+					//		excludeVendorIDs = []int{model.VendorIDDada, model.VendorIDMTPS, model.VendorIDFengNiao, model.VendorIDSFPS}
+					//		vendorID = v.VendorID
+					//		break
+					//	}
+					//	if v.VendorID == model.VendorIDSFPS {
+					//		excludeVendorIDs = []int{model.VendorIDDada, model.VendorIDMTPS, model.VendorIDUUPT, model.VendorIDFengNiao}
+					//		vendorID = v.VendorID
+					//		break
+					//	}
+					//}
+					//
+					//partner.CurOrderManager.OnOrderMsg(order, fmt.Sprintf("发起自动创建三方运单,目标创建运单平台[%s],排除平台[%s]", jxutils.GetVendorName(vendorID), utils.Format4Output(excludeVendorIDs, false)), err.Error())
 					if _, err = s.CreateWaybillOnProviders4SavedOrder(jxcontext.AdminCtx, savedOrderInfo, nil, excludeVendorIDs, false, maxDeliveryFee); err == nil {
 						savedOrderInfo.retryCount++
 					}