From 16adf91b9041925c294cb65959f5670a978ac57d Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 10 Jun 2019 14:36:44 +0800 Subject: [PATCH] - fk --- business/jxcallback/scheduler/defsch/defsch.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 5bd0eba17..e8e610d62 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -840,14 +840,17 @@ func (s *DefScheduler) mergeOrderStatusConfig(savedOrderInfo *WatchOrderInfo, st } } } else { // 有最后拣货时间，反推 - aHead := time2AutoPickupAhead + second2AutoPickupGap*time.Second + timeout := order.PickDeadline.Sub(time.Now()) - (time2AutoPickupAhead + second2AutoPickupGap*time.Second) realSecond2AutoPickupGap := second2AutoPickupGap - if realSecond2AutoPickupGap > int(aHead/time.Second) { - realSecond2AutoPickupGap = int(aHead / time.Second) + if realSecond2AutoPickupGap > int(timeout/time.Second) { + realSecond2AutoPickupGap = int(timeout / time.Second) + if realSecond2AutoPickupGap < 0 { + realSecond2AutoPickupGap = 0 + } } vendorActionParams = &partner.StatusActionParams{ TimerType: partner.TimerTypeBaseNow, - Timeout: order.PickDeadline.Sub(time.Now()) - aHead, + Timeout: timeout, TimeoutGap: realSecond2AutoPickupGap, } }