From 4244a7def1712764966bb842256c5229077a438c Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 31 Jul 2019 15:43:57 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=AE=9A=E6=97=B6=E8=BE=BE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=9A=82=E6=97=B6=E7=A6=81=E7=94=A8=E5=8A=A0=E5=B0=8F?= =?UTF-8?q?=E8=B4=B9?= 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 30e8ef220..c780356ca 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -1020,7 +1020,8 @@ func (s *DefScheduler) handleWaybillTip(savedOrderInfo *WatchOrderInfo) { order2 := savedOrderInfo.order if order, err := partner.CurOrderManager.LoadOrder(order2.VendorOrderID, order2.VendorID); err == nil { if order.Status == model.OrderStatusFinishedPickup && - order.DeliveryFlag&model.OrderDeliveryFlagMaskScheduleDisabled == 0 { + order.DeliveryFlag&model.OrderDeliveryFlagMaskScheduleDisabled == 0 && + order.BusinessType == model.BusinessTypeImmediate { if !savedOrderInfo.isAddWaybillTipDisabled { if tipFee := s.getWaybillTip(order); tipFee > 0 { if handler, ok := partner.GetPurchasePlatformFromVendorID(order.VendorID).(partner.IUpdateWaybillTip); ok && handler != nil {