- refactor

- load pending orders, fixed bug.

business/scheduler/defsch/defsch.go

@@ -20,6 +20,7 @@ const (
 	time2Schedule3rdCarrierGap4OrderStatus = 3 * time.Minute   // 京东要求是运单状态为待抢单且超时5分钟，但为了防止没有运单事件，所以就拣货完成事件开始算，添加3分钟
 	time2AutoPickupMin                     = 15 * time.Minute
 	time2AutoPickupGap                     = 5 * time.Minute
+	minTimeout                             = 10 * time.Second // timer的最小时间，这样写的上的是在load pending orders，让延迟的事件有机会执行
 )
 
 type WatchOrderInfo struct {
@@ -74,9 +75,6 @@ func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder) (err error) {
 	}
 	s.orderMap.Store(jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID), watchInfo)
 	s.resetTimer(watchInfo, model.OrderStatusNew, order.OrderCreatedAt, 0)
-	if order.Status > model.OrderStatusNew {
-		return s.OnOrderStatusChanged(model.Order2Status(order))
-	}
 	return err
 }
 
@@ -122,7 +120,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill) (err error) {
 			if bill.Status == model.WaybillStatusNew {
 				if bill.OrderVendorID == bill.WaybillVendorID {
 					if savedOrderInfo.timerStatus == model.OrderStatusFinishedPickup { // 如果当前TIMER还是OrderStatusFinishedPickup（在OnOrderStatusChanged中设置的），则重置
-						s.resetTimer(savedOrderInfo, model.OrderStatusFinishedPickup, bill.WaybillCreatedAt, 0)
+						s.resetTimer(savedOrderInfo, model.OrderStatusFinishedPickup, bill.StatusTime, 0)
 					} else if savedOrderInfo.timerStatus != 0 {
 						globals.SugarLogger.Infof("OnWaybillStatusChanged met other timer, status:%d", savedOrderInfo.timerStatus)
 					}
@@ -292,7 +290,7 @@ func (s *DefScheduler) resetTimer(savedOrderInfo *WatchOrderInfo, status int, be
 		s.stopTimer(savedOrderInfo)
 		config := s.mergeOrderStatusConfig(status, s.GetPurchasePlatformFromVendorID(savedOrderInfo.order.VendorID).GetStatusActionConfig(status))
 		if config != nil && config.TimeoutAction != nil {
-			timeout := jxutils.GetRealTimeout(beginTime, config.Timeout) + gap
+			timeout := jxutils.GetRealTimeout(beginTime, config.Timeout, minTimeout) + gap
 			globals.SugarLogger.Debugf("resetTimer timeout:%v, orderid:%v", timeout, savedOrderInfo.order.VendorOrderID)
 			savedOrderInfo.timerStatus = status
 			savedOrderInfo.timer = time.AfterFunc(timeout, func() {