From d9c4889ba26702f8cf63a5a16f0533ba4ee5a036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Tue, 21 Apr 2020 17:30:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AC=E5=94=A4=E4=B8=89=E6=96=B9=E9=85=8D?= =?UTF-8?q?=E9=80=81=E7=9A=84=E8=BF=90=E8=B4=B9=E4=B8=8A=E9=99=90=E5=A2=9E?= =?UTF-8?q?=E5=8A=A02=E5=9D=97?= 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 3bb952ccb..fdb6c32d6 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -59,6 +59,7 @@ const ( baseWaybillFee = 600 // 基本运费 ebaiCancelWaybillMaxFee = 1000 // 饿百取消运单最高运费,门店自送最高运费 maxJxStoreDeliveryFee = 2000 + baseWaybillAddFee = 200 //增加运费上限2块 ebaiCancelWaybillWarningMinute = 8 ) @@ -1196,7 +1197,7 @@ func getMaxDeliveryFee(order *model.GoodsOrder) (maxDeliveryFee int64) { if orderBaseFreightMoney == 0 { orderBaseFreightMoney = baseWaybillFee } - maxDeliveryFee = orderBaseFreightMoney + order.DistanceFreightMoney + getWaybillTip(order) + maxDeliveryFee = orderBaseFreightMoney + order.DistanceFreightMoney + getWaybillTip(order) + baseWaybillAddFee if maxDeliveryFee < ebaiCancelWaybillMaxFee && (order.VendorID == model.VendorIDEBAI || order.DeliveryType == model.OrderDeliveryTypeStoreSelf) {