- timer changed (TimerTypeBaseExpectedDeliveredTime).

business/scheduler/defsch/defsch.go

@@ -360,11 +360,11 @@ func (s *DefScheduler) resetTimer(savedOrderInfo *WatchOrderInfo, statusType, st
 			case scheduler.TimerTypeBaseStatusTime:
 				timeout = order.StatusTime.Sub(time.Now()) + config.Timeout
 			case scheduler.TimerTypeBaseExpectedDeliveredTime:
-				expectedDeliveredTime := order.ExpectedDeliveredTime
-				if expectedDeliveredTime == utils.DefaultTimeValue { // 如果没有期望送达时间，则以订单创建时间加DefaultTimeValue来表示
-					expectedDeliveredTime = order.OrderCreatedAt.Add(time2Delivered)
+				statusTime := order.StatusTime
+				if order.BusinessType == model.BusinessTypeDingshida && order.ExpectedDeliveredTime != utils.DefaultTimeValue {
+					statusTime = order.ExpectedDeliveredTime.Add(-time2Delivered)
 				}
-				timeout = expectedDeliveredTime.Add(-config.Timeout).Sub(time.Now())
+				timeout = statusTime.Sub(time.Now()) + config.Timeout
 			default:
 				panic("TimerType is wrong!!!")
 			}

business/scheduler/scheduler.go

@@ -21,7 +21,7 @@ const (
 	TimerTypeByPass                    = 1
 	TimerTypeBaseNow                   = 2
 	TimerTypeBaseStatusTime            = 3
-	TimerTypeBaseExpectedDeliveredTime = 4 // 以expected delivery time倒推的时间（减去StatusActionConfig.Timeout）
+	TimerTypeBaseExpectedDeliveredTime = 4 // 如果是定时达，以expected delivery time倒推的时间当成statusTime（之后与TimerTypeBaseStatusTime一样），否则与TimerTypeBaseStatusTime相同
 )
 
 var (