- weixin msg added.

- elm sometimes have no delivery msg - elm sometimes delivery msg arrvied before finished pickup - the gap between finished pickup and first delivery msg is big
2018-07-20 18:10:14 +08:00
parent 6fc02ac6cd
commit da46c3396e
8 changed files with 302 additions and 94 deletions
--- a/business/scheduler/defsch/defsch.go
+++ b/business/scheduler/defsch/defsch.go
@@ -18,8 +18,8 @@ const (
 	defTime2Delivered                      = 1 * time.Hour     // 正常订单都是1小时达
 	defTime2Schedule3rdCarrier             = 330 * time.Second // 京东要求5分钟后才能转自送，保险起见，设置为5分半钟
 	time2Schedule3rdCarrierGap4OrderStatus = 3 * time.Minute   // 京东要求是运单状态为待抢单且超时5分钟，但为了防止没有运单事件，所以就拣货完成事件开始算，添加3分钟
-	defTime2AutoPickupMin                  = 25 * time.Minute
-	time2AutoPickupGap                     = 5 * time.Minute
+	defTime2AutoPickupMin                  = 10 * time.Minute
+	time2AutoPickupGap                     = 2 * time.Minute
 )

 type WatchOrderInfo struct {
@@ -72,25 +72,37 @@ func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder) (err error) {
 		order: order,
 	}
 	s.orderMap.Store(jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID), watchInfo)
-	s.resetTimer(model.OrderStatusNew, watchInfo, 0)
+	s.resetTimer(watchInfo, model.OrderStatusNew, order.OrderCreatedAt, 0)
 	return err
 }

 func (s *DefScheduler) OnOrderStatusChanged(status *model.OrderStatus) (err error) {
-	globals.SugarLogger.Debugf("OnOrderStatusChanged, status:%v", status)
-	if savedOrderInfo := s.loadWatchOrderFromMap(status.VendorOrderID, status.VendorID); savedOrderInfo != nil {
-		if status.Status > model.OrderStatusUnknown && status.Status < model.OrderStatusEndBegin {
+	if status.Status > model.OrderStatusUnknown {
+		globals.SugarLogger.Debugf("OnOrderStatusChanged, status:%v", status)
+		if savedOrderInfo := s.loadWatchOrderFromMap(status.VendorOrderID, status.VendorID); savedOrderInfo != nil {
 			s.updateOrderByStatus(savedOrderInfo.order, status)
-			gap := 0 * time.Second
-			if status.Status == model.OrderStatusAccepted {
-				gap = time.Duration(rand.Int63n(int64(time2AutoPickupGap)))
-			} else if status.Status == model.OrderStatusFinishedPickup {
-				gap = time2Schedule3rdCarrierGap4OrderStatus
+			if status.Status > model.OrderStatusUnknown && status.Status < model.OrderStatusEndBegin {
+				if !(status.Status == model.OrderStatusFinishedPickup && len(savedOrderInfo.waybills) > 0) { //饿了么还观察到运单消息早于拣货完成消息
+					gap := 0 * time.Second
+					beginTime := status.StatusTime
+					if status.Status == model.OrderStatusNew {
+						beginTime = time.Now()
+					} else if status.Status == model.OrderStatusAccepted {
+						gap = time.Duration(rand.Int63n(int64(time2AutoPickupGap)))
+						beginTime = s.getBeginTime4LatestPickup(savedOrderInfo.order)
+					} else if status.Status == model.OrderStatusFinishedPickup {
+						// 召唤三方配送
+						// 正常应该是只依赖于购物平台的第一个运单消息，但饿了么有观察到极少数情况下没有此事件，所以还是需要在这里加个保险的TIMER来驱动运单调度
+						gap = time2Schedule3rdCarrierGap4OrderStatus
+					}
+					s.resetTimer(savedOrderInfo, status.Status, beginTime, gap)
+				}
+			} else {
+				s.stopTimer(savedOrderInfo)
+				s.orderMap.Delete(jxutils.GetUniversalOrderIDFromOrderStatus(status))
 			}
-			s.resetTimer(status.Status, savedOrderInfo, gap)
 		} else {
-			s.stopTimer(savedOrderInfo)
-			s.orderMap.Delete(jxutils.GetUniversalOrderIDFromOrderStatus(status))
+			err = scheduler.ErrCanNotFindOrder
 		}
 	}
 	return err
@@ -98,60 +110,65 @@ func (s *DefScheduler) OnOrderStatusChanged(status *model.OrderStatus) (err erro

 // 以下是运单
 func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill) (err error) {
-	globals.SugarLogger.Debugf("OnWaybillStatusChanged, bill:%v", bill)
-	if savedOrderInfo := s.loadWatchOrderFromMap(bill.VendorOrderID, bill.OrderVendorID); savedOrderInfo != nil {
-		s.addWaybill2Map(savedOrderInfo, bill) // 这样写的原因是因为调试时，程度从中途运行，没有接受到WaybillStatusNew事件
-		if bill.Status == model.WaybillStatusNew {
-			if bill.OrderVendorID == bill.WaybillVendorID {
-				if savedOrderInfo.timerStatus == model.OrderStatusFinishedPickup {
-					s.resetTimer(model.OrderStatusFinishedPickup, savedOrderInfo, 0)
-				} else {
-					globals.SugarLogger.Infof("OnWaybillStatusChanged met other timer, status:%d", savedOrderInfo.timerStatus)
+	if bill.Status > model.WaybillStatusUnknown {
+		globals.SugarLogger.Debugf("OnWaybillStatusChanged, bill:%v", bill)
+		if savedOrderInfo := s.loadWatchOrderFromMap(bill.VendorOrderID, bill.OrderVendorID); savedOrderInfo != nil {
+			s.addWaybill2Map(savedOrderInfo, bill) // 这样写的原因是因为调试时，程度从中途运行，没有接受到WaybillStatusNew事件
+			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)
+					} else {
+						globals.SugarLogger.Infof("OnWaybillStatusChanged met other timer, status:%d", savedOrderInfo.timerStatus)
+					}
 				}
-			}
-			if savedOrderInfo.order.WaybillVendorID != model.VendorIDUnknown {
-				globals.SugarLogger.Infof("OnWaybillStatusChanged multiple waybill created, bill:%v", bill)
-				if bill.WaybillVendorID != bill.WaybillVendorID {
-					s.GetDeliveryPlatformFromVendorID(bill.WaybillVendorID).CancelWaybill(bill)
+				if savedOrderInfo.order.WaybillVendorID != model.VendorIDUnknown {
+					globals.SugarLogger.Infof("OnWaybillStatusChanged multiple waybill created, bill:%v", bill)
+					if bill.WaybillVendorID != bill.WaybillVendorID {
+						s.GetDeliveryPlatformFromVendorID(bill.WaybillVendorID).CancelWaybill(bill)
+					}
+				}
+			} else {
+				switch bill.Status {
+				case model.WaybillStatusAccepted:
+					s.stopTimer(savedOrderInfo) // todo 这里应该另外启动一个TIMER
+					s.cancelOtherWaybills(savedOrderInfo, bill)
+
+					s.CurOrderManager.UpdateWaybillVendorID(bill)
+					savedOrderInfo.order.WaybillVendorID = bill.WaybillVendorID
+				case model.WaybillStatusAcceptCanceled:
+					if savedOrderInfo.order.WaybillVendorID == bill.WaybillVendorID {
+						s.createWaybillOn3rdProviders(savedOrderInfo.order, bill)
+
+						bill.WaybillVendorID = model.VendorIDUnknown
+						s.CurOrderManager.UpdateWaybillVendorID(bill)
+						savedOrderInfo.order.WaybillVendorID = bill.WaybillVendorID
+					}
+				case model.WaybillStatusCanceled, model.WaybillStatusFailed:
+					s.removeWaybillFromMap(savedOrderInfo, bill)
+					if savedOrderInfo.order.WaybillVendorID == bill.WaybillVendorID {
+						s.createWaybillOn3rdProviders(savedOrderInfo.order, nil)
+
+						bill.WaybillVendorID = model.VendorIDUnknown
+						s.CurOrderManager.UpdateWaybillVendorID(bill)
+						savedOrderInfo.order.WaybillVendorID = bill.WaybillVendorID
+					}
+				case model.WaybillStatusDelivering:
+					if savedOrderInfo.order.VendorID != bill.WaybillVendorID {
+						s.GetPurchasePlatformFromVendorID(bill.OrderVendorID).SelfDeliverDelievering(savedOrderInfo.order)
+					}
+				case model.WaybillStatusDelivered:
+					if savedOrderInfo.order.VendorID != bill.WaybillVendorID {
+						s.GetPurchasePlatformFromVendorID(bill.OrderVendorID).SelfDeliverDelievered(savedOrderInfo.order)
+					}
+					s.removeWaybillFromMap(savedOrderInfo, bill)
 				}
 			}
 		} else {
-			switch bill.Status {
-			case model.WaybillStatusAccepted:
-				s.stopTimer(savedOrderInfo) // todo 这里应该另外启动一个TIMER
-				s.cancelOtherWaybills(savedOrderInfo, bill)
-
-				s.CurOrderManager.UpdateWaybillVendorID(bill)
-				savedOrderInfo.order.WaybillVendorID = bill.WaybillVendorID
-			case model.WaybillStatusAcceptCanceled:
-				s.createWaybillOn3rdProviders(savedOrderInfo.order, bill)
-				if savedOrderInfo.order.WaybillVendorID == bill.WaybillVendorID {
-					bill.WaybillVendorID = model.VendorIDUnknown
-					s.CurOrderManager.UpdateWaybillVendorID(bill)
-					savedOrderInfo.order.WaybillVendorID = bill.WaybillVendorID
-				}
-			case model.WaybillStatusCanceled, model.WaybillStatusFailed:
-				s.removeWaybillFromMap(savedOrderInfo, bill)
-				if savedOrderInfo.order.WaybillVendorID == bill.WaybillVendorID {
-					s.createWaybillOn3rdProviders(savedOrderInfo.order, nil)
-
-					bill.WaybillVendorID = model.VendorIDUnknown
-					s.CurOrderManager.UpdateWaybillVendorID(bill)
-					savedOrderInfo.order.WaybillVendorID = bill.WaybillVendorID
-				}
-			case model.WaybillStatusDelivering:
-				if savedOrderInfo.order.VendorID != bill.WaybillVendorID {
-					s.GetPurchasePlatformFromVendorID(bill.OrderVendorID).SelfDeliverDelievering(savedOrderInfo.order)
-				}
-			case model.WaybillStatusDelivered:
-				if savedOrderInfo.order.VendorID != bill.WaybillVendorID {
-					s.GetPurchasePlatformFromVendorID(bill.OrderVendorID).SelfDeliverDelievered(savedOrderInfo.order)
-				}
-				s.removeWaybillFromMap(savedOrderInfo, bill)
-			}
+			err = scheduler.ErrCanNotFindOrder
 		}
 	}
-	return nil
+	return err
 }

 func (s *DefScheduler) addWaybill2Map(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) {
@@ -165,6 +182,15 @@ func (s *DefScheduler) addWaybill2Map(savedOrderInfo *WatchOrderInfo, bill *mode
 	savedOrderInfo.waybills = append(savedOrderInfo.waybills, bill)
 }

+func (s *DefScheduler) removeWaybillFromMap(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) {
+	for k, v := range savedOrderInfo.waybills {
+		if v.VendorWaybillID == bill.VendorWaybillID && v.WaybillVendorID == bill.WaybillVendorID {
+			savedOrderInfo.waybills = append(savedOrderInfo.waybills[0:k], savedOrderInfo.waybills[k+1:]...)
+			break
+		}
+	}
+}
+
 func (s *DefScheduler) createWaybillOn3rdProviders(order *model.GoodsOrder, excludeBill *model.Waybill) (err error) {
 	globals.SugarLogger.Debugf("createWaybillOn3rdProviders, order:%v", order)
 	successCount := 0
@@ -224,26 +250,11 @@ func (s *DefScheduler) loadWatchOrderFromMap(vendorOrderID string, vendorID int)
 	return realSavedInfo
 }

-func (s *DefScheduler) removeWaybillFromMap(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) {
-	if savedOrderInfo == nil {
-		savedOrderInfo = s.loadWatchOrderFromMap(bill.VendorOrderID, bill.OrderVendorID)
-	}
-	if savedOrderInfo != nil {
-		for k, v := range savedOrderInfo.waybills {
-			if v.VendorWaybillID == bill.VendorWaybillID && v.WaybillVendorID == bill.WaybillVendorID {
-				savedOrderInfo.waybills = append(savedOrderInfo.waybills[0:k], savedOrderInfo.waybills[k+1:]...)
-				break
-			}
-		}
-	}
-}
-
-func (s *DefScheduler) getLatestPickupTimeout(order *model.GoodsOrder, configTimeout time.Duration) (retVal time.Duration) {
-	beginTime := order.StatusTime
+func (s *DefScheduler) getBeginTime4LatestPickup(order *model.GoodsOrder) (retVal time.Time) {
 	if order.ExpectedDeliveredTime != utils.DefaultTimeValue {
-		beginTime = order.ExpectedDeliveredTime.Add(-defTime2Delivered)
+		return order.ExpectedDeliveredTime.Add(-defTime2Delivered)
 	}
-	return jxutils.GetRealTimeout(beginTime, configTimeout)
+	return order.StatusTime
 }

 func (s *DefScheduler) stopTimer(savedOrderInfo *WatchOrderInfo) {
@@ -253,24 +264,17 @@ func (s *DefScheduler) stopTimer(savedOrderInfo *WatchOrderInfo) {
 	}
 }

-func (s *DefScheduler) resetTimer(status int, savedOrderInfo *WatchOrderInfo, gap time.Duration) {
+func (s *DefScheduler) resetTimer(savedOrderInfo *WatchOrderInfo, status int, beginTime time.Time, gap time.Duration) {
 	globals.SugarLogger.Debugf("resetTimer status:%v, orderid:%v", status, savedOrderInfo.order.VendorOrderID)
 	s.stopTimer(savedOrderInfo)
 	config := s.mergeOrderStatusConfig(status, s.GetPurchasePlatformFromVendorID(savedOrderInfo.order.VendorID).GetStatusActionConfig(status))
 	if config != nil && config.TimeoutAction != nil {
-		var timeout time.Duration
-		if status == model.OrderStatusNew {
-			timeout = config.Timeout // 绝对值
-		} else if status == model.OrderStatusAccepted {
-			timeout = s.getLatestPickupTimeout(savedOrderInfo.order, config.Timeout)
-		} else {
-			timeout = jxutils.GetRealTimeout(savedOrderInfo.order.StatusTime, config.Timeout)
-		}
-		timeout += gap
+		timeout := jxutils.GetRealTimeout(beginTime, config.Timeout) + gap
 		globals.SugarLogger.Debugf("resetTimer timeout:%v, orderid:%v", timeout, savedOrderInfo.order.VendorOrderID)
 		savedOrderInfo.timerStatus = status
 		savedOrderInfo.timer = time.AfterFunc(timeout, func() {
 			config.TimeoutAction(savedOrderInfo.order)
+			savedOrderInfo.timerStatus = 0
 		})
 	}
 }
--- a/business/scheduler/scheduler.go
+++ b/business/scheduler/scheduler.go
@@ -15,6 +15,8 @@ var (
 var (
 	ErrStatusIsNotOKForOperation     = errors.New("当前状态操作无效")
 	ErrCanNotCreateAtLeastOneWaybill = errors.New("一个运单都不能创建")
+	ErrCanNotFindOrder               = errors.New("不能找到订单（一般是由于事件错序）")
+	ErrCanNotFindWaybill             = errors.New("不能找到运单（一般是由于事件错序）")
 )

 type StatusActionConfig struct {