From 8b3977b10fc7ecee16a7cfec9737aee7d50c9c34 Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 15 Jan 2020 16:50:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=BF=90=E8=B4=B9=E5=B0=BD?= =?UTF-8?q?=E9=87=8F=E7=94=A8=E8=AE=A2=E5=8D=95=E7=9A=84=EF=BC=8C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=89=8D=E7=94=A8=E7=BC=BA=E7=9C=81=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/defsch/defsch.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 8178a542b..200244fc3 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -667,13 +667,13 @@ func (s *DefScheduler) removeWaybillFromMap(savedOrderInfo *WatchOrderInfo, wayb func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInfo, maxDeliveryFee int64, excludeBill *model.Waybill) (err error) { order := savedOrderInfo.order - globals.SugarLogger.Debugf("createWaybillOn3rdProviders, orderID:%s, status:%d, maxDeliveryFee:%d, excludeBill:%v", order.VendorOrderID, order.Status, maxDeliveryFee, excludeBill) if order.VendorID == model.VendorIDELM { return nil } if maxDeliveryFee == 0 { maxDeliveryFee = getMaxDeliveryFee(order) } + 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 { if savedOrderInfo.retryCount <= maxWaybillRetryCount { @@ -1155,9 +1155,14 @@ func getMaxDeliveryFee(order *model.GoodsOrder) (maxDeliveryFee int64) { if order.VendorID == model.VendorIDJX { maxDeliveryFee = maxJxStoreDeliveryFee } else { - maxDeliveryFee = baseWaybillFee + order.DistanceFreightMoney + getWaybillTip(order) + orderBaseFreightMoney := order.BaseFreightMoney + if orderBaseFreightMoney == 0 { + orderBaseFreightMoney = baseWaybillFee + } + maxDeliveryFee = orderBaseFreightMoney + order.DistanceFreightMoney + getWaybillTip(order) } if maxDeliveryFee < ebaiCancelWaybillMaxFee && + order.VendorID == model.VendorIDEBAI && order.DeliveryType == model.OrderDeliveryTypeStoreSelf { maxDeliveryFee = ebaiCancelWaybillMaxFee }