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
2019-07-31 13:49:56 +08:00
parent 7251a2008d
commit 8ad7f9fa3b
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -977,16 +977,22 @@ func (s *DefScheduler) autoPickupGood(savedOrderInfo *WatchOrderInfo) (err error
func (s *DefScheduler) getWaybillTip(order *model.GoodsOrder) (tipFee int64) { func (s *DefScheduler) getWaybillTip(order *model.GoodsOrder) (tipFee int64) {
if order.Status == model.OrderStatusFinishedPickup { if order.Status == model.OrderStatusFinishedPickup {
startTime := order.StatusTime.Add(minAddWaybillTipMinute * time.Minute) statusTime := order.StatusTime
if order.DeliveryFlag&model.OrderDeliveryFlagMaskAutoPickup != 0 { if order.BusinessType != model.BusinessTypeImmediate {
startTime = startTime.Add(5 * time.Minute) statusTime = order.PickDeadline
} }
timeGap1 := time.Now().Sub(startTime) if !utils.IsTimeZero(statusTime) {
if timeGap1 > 0 { startTime := order.StatusTime.Add(minAddWaybillTipMinute * time.Minute)
timeGap := int64(timeGap1/(5*time.Minute)) + 1 if order.DeliveryFlag&model.OrderDeliveryFlagMaskAutoPickup != 0 {
tipFee = timeGap * 100 startTime = startTime.Add(5 * time.Minute)
if tipFee > 600 { }
tipFee = 600 timeGap1 := time.Now().Sub(startTime)
if timeGap1 > 0 {
timeGap := int64(timeGap1/(5*time.Minute)) + 1
tipFee = timeGap * 100
if tipFee > 600 {
tipFee = 600
}
} }
} }
} }