From f8ff11d4f9cabdb5d8bc83d9fff9875fd8b8e277 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 30 Nov 2018 14:01:13 +0800 Subject: [PATCH] - ignore exceed fee when deliveryType is StoreDeliveryTypeByStore --- business/jxcallback/scheduler/defsch/defsch.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index bab5f2589..bc85668fe 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -490,7 +490,7 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf handlerInfo := partner.GetDeliveryPlatformFromVendorID(vendorID) if handlerInfo != nil && handlerInfo.Use4CreateWaybill && savedOrderInfo.waybills[vendorID] == nil && (excludeBill == nil || vendorID != excludeBill.WaybillVendorID) { if _, err = s.CreateWaybill(vendorID, order, func(deliveryFee, addFee int64) error { - if addFee > maxAddFee { + if savedOrderInfo.storeDeliveryType != scheduler.StoreDeliveryTypeByStore && addFee > maxAddFee { db := orm.NewOrm() globals.SugarLogger.Infof("CreateWaybill orderID:%s addFee exceeded too much, it's %d", order.VendorOrderID, addFee)