From c2519be865f51c756fe8091f3ae387ac909f71fe Mon Sep 17 00:00:00 2001 From: gazebo Date: Sat, 1 Feb 2020 12:09:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E9=85=8D=E9=80=81=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E4=B9=9F=E8=A6=81=E6=A3=80=E6=9F=A5isDeliveryCompetition?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/defsch/defsch.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 407a23f7c..5af23c02d 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -292,7 +292,7 @@ func init() { return sch.createWaybillOn3rdProviders(savedOrderInfo, 0, nil) }, ShouldSetTimer: func(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) bool { - return model.IsOrderDeliveryByStore(savedOrderInfo.order) // 自配送商家使用 + return savedOrderInfo.isDeliveryCompetition && model.IsOrderDeliveryByStore(savedOrderInfo.order) // 自配送商家使用 }, }, }, @@ -697,6 +697,9 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf if maxDeliveryFee == 0 { maxDeliveryFee = getMaxDeliveryFee(order) } + if !savedOrderInfo.isDeliveryCompetition { + globals.SugarLogger.Debugf("createWaybillOn3rdProviders orderID:%s门店没有设置配送竞争", order.VendorOrderID) + } globals.SugarLogger.Debugf("createWaybillOn3rdProviders, orderID:%s, status:%d, maxDeliveryFee:%d, excludeBill:%v", order.VendorOrderID, order.Status, maxDeliveryFee, excludeBill) if err = s.canOrderCreateWaybillNormally(order); err == nil { if (order.DeliveryFlag & model.OrderDeliveryFlagMaskScheduleDisabled) == 0 {