diff --git a/business/scheduler/defsch/defsch.go b/business/scheduler/defsch/defsch.go
index aef417e11..5c3d8cec4 100644
--- a/business/scheduler/defsch/defsch.go
+++ b/business/scheduler/defsch/defsch.go
@@ -547,6 +547,10 @@ func (s *DefScheduler) resetTimer(savedOrderInfo *WatchOrderInfo, bill *model.Wa
 			s.stopTimer(savedOrderInfo)
 		}
 		if config != nil && config.TimeoutAction != nil && config.TimerType != scheduler.TimerTypeByPass {
+			// 对于自动拣货，以订单中的设置为准
+			if statusType == scheduler.TimerStatusTypeOrder && status == model.OrderStatusAccepted && savedOrderInfo.autoPickupTimeoutMinute > 1 {
+				config.Timeout = time.Duration(savedOrderInfo.autoPickupTimeoutMinute) * time.Minute
+			}
 			var timeout time.Duration
 			switch config.TimerType {
 			case scheduler.TimerTypeBaseNow:
@@ -561,10 +565,6 @@ func (s *DefScheduler) resetTimer(savedOrderInfo *WatchOrderInfo, bill *model.Wa
 			default:
 				panic("TimerType is wrong!!!")
 			}
-			// 对于自动拣货，以订单中的设置为准
-			if statusType == scheduler.TimerStatusTypeOrder && status == model.OrderStatusAccepted && savedOrderInfo.autoPickupTimeoutMinute > 1 {
-				timeout = time.Duration(savedOrderInfo.autoPickupTimeoutMinute) * time.Minute
-			}
 			if config.TimeoutGap != 0 {
 				timeout += time.Duration(rand.Int31n(int32(config.TimeoutGap))) * time.Second
 			}