From 76d18173481e13b7aa04b55e7768575b561a2aef Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 1 Aug 2019 19:51:40 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=8A=A0=E5=B0=8F=E8=B4=B9=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/defsch/defsch.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 759ddecd5..6cd79d984 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -46,8 +46,9 @@ const ( time2Schedule3rdCarrierKey = "waitminute4mt" dingShiDaAheadTime = 30 * time.Minute // 定时达订单开始召唤配送的提前时间 - minAddWaybillTipMinute = 15 // 最少开始加小费分钟（距离拣货完成） - addWaybillTipGap = 10 // 加一元小费间隔的分钟数 + minAddWaybillTipMinute = 20 // 最少开始加小费分钟（距离拣货完成） + addWaybillTipGap = 15 // 加一元小费间隔的分钟数 + baseWaybillFee = 600 // 基本运费 ) const ( @@ -1017,7 +1018,7 @@ func (s *DefScheduler) getWaybillTip(savedOrderInfo *WatchOrderInfo) (tipFee int } func (s *DefScheduler) getMaxDeliveryFee(savedOrderInfo *WatchOrderInfo) (maxDeliveryFee int64) { - maxDeliveryFee = 400 + savedOrderInfo.order.DistanceFreightMoney + s.getWaybillTip(savedOrderInfo) + maxDeliveryFee = baseWaybillFee + savedOrderInfo.order.DistanceFreightMoney + s.getWaybillTip(savedOrderInfo) return maxDeliveryFee }