- 确保TimeoutGap不会导致TIMER超时

2019-06-10 14:21:19 +08:00
parent 763cc047ba
commit 976fa522e7
1 changed files with 7 additions and 2 deletions
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -840,10 +840,15 @@ func (s *DefScheduler) mergeOrderStatusConfig(savedOrderInfo *WatchOrderInfo, st
 					}
 				}
 			} else { // 有最后拣货时间，反推
+				aHead := time2AutoPickupAhead + second2AutoPickupGap*time.Second
+				realSecond2AutoPickupGap := second2AutoPickupGap
+				if realSecond2AutoPickupGap > int(aHead/time.Second) {
+					realSecond2AutoPickupGap = int(aHead / time.Second)
+				}
 				vendorActionParams = &partner.StatusActionParams{
 					TimerType:  partner.TimerTypeBaseNow,
-					Timeout:    order.PickDeadline.Sub(time.Now()) - time2AutoPickupAhead - second2AutoPickupGap*time.Second,
-					TimeoutGap: second2AutoPickupGap,
+					Timeout:    order.PickDeadline.Sub(time.Now()) - aHead,
+					TimeoutGap: realSecond2AutoPickupGap,
 				}
 			}
 		}