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 }