liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

基础运费尽量用订单的，没有才用缺省值

Browse Source
This commit is contained in:
gazebo
2020-01-15 16:50:03 +08:00
parent 299bfce603
commit 8b3977b10f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -667,13 +667,13 @@ func (s *DefScheduler) removeWaybillFromMap(savedOrderInfo *WatchOrderInfo, wayb
func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInfo, maxDeliveryFee int64, excludeBill *model.Waybill) (err error) { func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInfo, maxDeliveryFee int64, excludeBill *model.Waybill) (err error) {
order := savedOrderInfo.order 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 { if order.VendorID == model.VendorIDELM {
return nil return nil
} }
if maxDeliveryFee == 0 { if maxDeliveryFee == 0 {
maxDeliveryFee = getMaxDeliveryFee(order) 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 err = s.canOrderCreateWaybillNormally(order); err == nil {
if (order.DeliveryFlag & model.OrderDeliveryFlagMaskScheduleDisabled) == 0 { if (order.DeliveryFlag & model.OrderDeliveryFlagMaskScheduleDisabled) == 0 {
if savedOrderInfo.retryCount <= maxWaybillRetryCount { if savedOrderInfo.retryCount <= maxWaybillRetryCount {
@@ -1155,9 +1155,14 @@ func getMaxDeliveryFee(order *model.GoodsOrder) (maxDeliveryFee int64) {
if order.VendorID == model.VendorIDJX { if order.VendorID == model.VendorIDJX {
maxDeliveryFee = maxJxStoreDeliveryFee maxDeliveryFee = maxJxStoreDeliveryFee
} else { } else {
maxDeliveryFee = baseWaybillFee + order.DistanceFreightMoney + getWaybillTip(order) orderBaseFreightMoney := order.BaseFreightMoney
if orderBaseFreightMoney == 0 {
orderBaseFreightMoney = baseWaybillFee
}
maxDeliveryFee = orderBaseFreightMoney + order.DistanceFreightMoney + getWaybillTip(order)
} }
if maxDeliveryFee < ebaiCancelWaybillMaxFee && if maxDeliveryFee < ebaiCancelWaybillMaxFee &&
order.VendorID == model.VendorIDEBAI &&
order.DeliveryType == model.OrderDeliveryTypeStoreSelf { order.DeliveryType == model.OrderDeliveryTypeStoreSelf {
maxDeliveryFee = ebaiCancelWaybillMaxFee maxDeliveryFee = ebaiCancelWaybillMaxFee
} }