From e12bb0a2dd9f3ad69174df9154487eb4104a9e4c Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Mon, 2 Aug 2021 16:06:27 +0800
Subject: [PATCH] aa

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

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 15c633c06..14a93fc63 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -822,7 +822,7 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
 				// 	excludeVendorIDs = append(excludeVendorIDs, model.VendorIDMTPS)
 				// }
 				//TODO 2020-08-18 饿百美团订单暂时不自动发送三方
-				if order.VendorID == model.VendorIDMTWM || order.VendorID == model.VendorIDEBAI {
+				if order.VendorID == model.VendorIDMTWM || order.VendorID == model.VendorIDEBAI || order.VendorID == model.VendorIDJD {
 					if order.DeliveryType != model.OrderDeliveryTypeStoreSelf {
 						excludeVendorIDs = append(excludeVendorIDs, waybillVendorIDs...)
 					}
@@ -853,11 +853,11 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
 
 				//TODO 2020-07-21 发单时间要在门店的营业时间内
 				var storeDetail *dao.StoreDetail
-				if savedOrderInfo.storeDetail != nil {
-					storeDetail = savedOrderInfo.storeDetail
-				} else {
-					storeDetail, err = dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, "")
-				}
+				//if savedOrderInfo.storeDetail != nil {
+				//	storeDetail = savedOrderInfo.storeDetail
+				//} else {
+				storeDetail, err = dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, "")
+				//}
 				if storeDetail != nil {
 					globals.SugarLogger.Debugf("三方运单门店营业时间范围 ：time1 %v ,time2 %v", storeDetail.OpenTime1, storeDetail.CloseTime1)
 					if storeDetail.OpenTime1 != 0 && storeDetail.CloseTime1 != 0 {