- 设置美团外卖的自动拣货时间为4分钟

business/jxcallback/scheduler/defsch/defsch.go

@@ -792,7 +792,6 @@ func (s *DefScheduler) handleAutoAcceptOrder(orderID string, vendorID int, userM
 }
 
 func (s *DefScheduler) mergeOrderStatusConfig(statusType, status int, purchaseVendorID int) (retVal *StatusActionConfig) {
-	vendorTimeout := partner.GetPurchasePlatformFromVendorID(purchaseVendorID).GetStatusActionTimeout(statusType, status)
 	s.locker.RLock()
 	defer func() {
 		s.locker.RUnlock()
@@ -802,11 +801,12 @@ func (s *DefScheduler) mergeOrderStatusConfig(statusType, status int, purchaseVe
 		return nil
 	}
 	retVal = &StatusActionConfig{}
-	if defConfig != nil {
-		*retVal = *defConfig
-	}
-	if vendorTimeout != 0 {
-		retVal.Timeout = vendorTimeout
+	*retVal = *defConfig
+	if vendorActionParams := partner.GetPurchasePlatformFromVendorID(purchaseVendorID).GetStatusActionTimeout(statusType, status); vendorActionParams != nil {
+		retVal.Timeout = vendorActionParams.Timeout
+		if vendorActionParams.TimeoutGap >= 0 {
+			retVal.TimeoutGap = vendorActionParams.TimeoutGap
+		}
 	}
 	return retVal
 }