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

- fk

Browse Source
This commit is contained in:
gazebo
2019-06-10 14:36:44 +08:00
parent 909455763f
commit 16adf91b90
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -840,14 +840,17 @@ func (s *DefScheduler) mergeOrderStatusConfig(savedOrderInfo *WatchOrderInfo, st
} }
} }
} else { // 有最后拣货时间，反推 } else { // 有最后拣货时间，反推
aHead := time2AutoPickupAhead + second2AutoPickupGap*time.Second timeout := order.PickDeadline.Sub(time.Now()) - (time2AutoPickupAhead + second2AutoPickupGap*time.Second)
realSecond2AutoPickupGap := second2AutoPickupGap realSecond2AutoPickupGap := second2AutoPickupGap
if realSecond2AutoPickupGap > int(aHead/time.Second) { if realSecond2AutoPickupGap > int(timeout/time.Second) {
realSecond2AutoPickupGap = int(aHead / time.Second) realSecond2AutoPickupGap = int(timeout / time.Second)
if realSecond2AutoPickupGap < 0 {
realSecond2AutoPickupGap = 0
}
} }
vendorActionParams = &partner.StatusActionParams{ vendorActionParams = &partner.StatusActionParams{
TimerType: partner.TimerTypeBaseNow, TimerType: partner.TimerTypeBaseNow,
Timeout: order.PickDeadline.Sub(time.Now()) - aHead, Timeout: timeout,
TimeoutGap: realSecond2AutoPickupGap, TimeoutGap: realSecond2AutoPickupGap,
} }
} }