Merge remote-tracking branch 'origin/jdshop' into jxact

2020-08-18 15:10:21 +08:00
parent 0b48fc2f9a ada56d6ab0
commit 9cd8f9fd14
4 changed files with 44 additions and 25 deletions
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -736,7 +736,10 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
 				// if order.VendorID == model.VendorIDJX {
 				// 	excludeVendorIDs = append(excludeVendorIDs, model.VendorIDMTPS)
 				// }
-
+				//TODO 2020-08-18 饿百美团订单暂时不自动发送三方
+				if order.VendorID == model.VendorIDEBAI || order.VendorID == model.VendorIDMTWM {
+					excludeVendorIDs = append(excludeVendorIDs, model.VendorIDMTPS, model.VendorIDDada)
+				}
 				if savedOrderInfo != nil {
 					//TODO 2020-07-21 发单时间要在门店的营业时间内
 					if savedOrderInfo.storeDetail != nil {