From 8ee100c3cccaa47b175931e9ccd9f89a9c9e47bc Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 1 May 2019 13:42:21 +0800 Subject: [PATCH] =?UTF-8?q?!=20=E9=A5=BF=E7=99=BE=E8=BD=AC=E8=87=AA?= =?UTF-8?q?=E9=80=81=E7=9A=84=E6=97=B6=E6=9C=BA=E4=B8=8D=E5=A4=AA=E6=B8=85?= =?UTF-8?q?=E6=A5=9A=EF=BC=8C=E6=9A=82=E6=97=B6=E7=A6=81=E7=94=A8=E8=B6=85?= =?UTF-8?q?=E6=97=B6=E8=BD=AC=E8=87=AA=E9=80=81=EF=BC=8C=E5=9C=A8=E9=A5=BF?= =?UTF-8?q?=E7=99=BE=E8=BF=90=E5=8D=95=E5=8F=96=E6=B6=88=E6=97=B6=E8=BF=98?= =?UTF-8?q?=E6=98=AF=E4=BC=9A=E8=87=AA=E5=8A=A8=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/defsch/defsch.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index cd6953dad..ae5468212 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -200,7 +200,8 @@ func init() { Timeout: minute2Schedule3rdCarrier * time.Minute, }, TimeoutAction: func(savedOrderInfo *WatchOrderInfo) (err error) { - if savedOrderInfo.storeDeliveryType != scheduler.StoreDeliveryTypeByStore { // 非自配送商家使用 + // 饿百转自送的时机不太清楚，暂时禁用超时转自送，在饿百运单取消时还是会自动创建 + if savedOrderInfo.storeDeliveryType != scheduler.StoreDeliveryTypeByStore && savedOrderInfo.order.VendorID != model.VendorIDEBAI { // 非自配送商家使用 return sch.createWaybillOn3rdProviders(savedOrderInfo, nil) } return nil