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

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

@@ -977,6 +977,11 @@ 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 {
statusTime := order.StatusTime
if order.BusinessType != model.BusinessTypeImmediate {
statusTime = order.PickDeadline
}
if !utils.IsTimeZero(statusTime) {
startTime := order.StatusTime.Add(minAddWaybillTipMinute * time.Minute) startTime := order.StatusTime.Add(minAddWaybillTipMinute * time.Minute)
if order.DeliveryFlag&model.OrderDeliveryFlagMaskAutoPickup != 0 { if order.DeliveryFlag&model.OrderDeliveryFlagMaskAutoPickup != 0 {
startTime = startTime.Add(5 * time.Minute) startTime = startTime.Add(5 * time.Minute)
@@ -990,6 +995,7 @@ func (s *DefScheduler) getWaybillTip(order *model.GoodsOrder) (tipFee int64) {
} }
} }
} }
}
return tipFee return tipFee
} }