From 5d6eb06734ca03f1726617cda49a454afe7f4f84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Wed, 19 Aug 2020 12:08:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E9=97=A8=E5=BA=97=E8=87=AA=E9=80=81?= =?UTF-8?q?=E7=9A=84=E8=AE=A2=E5=8D=95=E6=89=8D=E4=B8=8D=E5=8F=91=E4=B8=89?= =?UTF-8?q?=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/defsch/defsch.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 22da7bbe9..8fada97a0 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -737,9 +737,12 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf // 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 order.VendorID == model.VendorIDMTWM || order.VendorID == model.VendorIDEBAI { + if order.DeliveryType != model.OrderDeliveryTypeStoreSelf { + excludeVendorIDs = append(excludeVendorIDs, model.VendorIDMTPS, model.VendorIDDada) + } } + if savedOrderInfo != nil { //TODO 2020-07-21 发单时间要在门店的营业时间内 if savedOrderInfo.storeDetail != nil {