- change wait time to 60 minuts before create 3rd waybill.

- fix bug about OrderDeliveryFlagMaskScheduleDisabled.

business/jxcallback/scheduler/defsch/defsch.go

@@ -20,7 +20,7 @@ import (
 
 const (
 	time2Delivered          = 1 * time.Hour    // 正常从下单到送达的时间。
-	time2Schedule3rdCarrier = 330 * time.Hour // 京东要求5分钟后才能转自送，保险起见，设置为5分半钟
+	time2Schedule3rdCarrier = 60 * time.Minute // 京东要求5分钟后才能转自送，保险起见，设置为5分半钟
 	// time2Schedule3rdCarrierGap4OrderStatus = 3 * time.Minute   // 京东要求是运单状态为待抢单且超时5分钟，但为了防止没有运单事件，所以就拣货完成事件开始算，添加3分钟
 	time2AutoPickupMin = 15 * time.Minute
 	time2AutoPickupGap = 5 * 60 //随机5分钟
@@ -247,9 +247,7 @@ func (s *DefScheduler) OnOrderStatusChanged(status *model.OrderStatus, isPending
 						globals.SugarLogger.Infof("OnOrderStatusChanged [运营2]订单orderID:%s可能被手动点击送达，会对程序状态产生不利影响，请通知门店不要这样操作！", status.VendorOrderID)
 					}
 				}
-				if (savedOrderInfo.order.DeliveryFlag & model.OrderDeliveryFlagMaskScheduleDisabled) == 0 {
 				s.cancelOtherWaybills(savedOrderInfo, curWaybill, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrOrderAlreadyFinished)
-				}
 				s.orderMap.Delete(jxutils.GetUniversalOrderIDFromOrderStatus(status))
 			}
 		} else if status.LockStatus != model.OrderStatusUnknown {
@@ -268,17 +266,17 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 		// todo 当前收到的事件顺序有时是乱的，不能严格限制，暂时放开
 		// if order.Status < model.OrderStatusFinishedPickup || order.Status > model.OrderStatusEndBegin { // 如果当前order状态是不应该出现运单状态
 		// 	globals.SugarLogger.Infof("OnWaybillStatusChanged orderID:%s status:%s is not suitable for waybill", order.VendorOrderID, model.OrderStatusName[order.Status])
-		// 	s.CancelWaybill(bill)
+		// 	s.ProxyCancelWaybill(order, bill)
 		// 	s.stopTimer(savedOrderInfo)
 		// 	s.orderMap.Delete(jxutils.GetUniversalOrderIDFromOrderStatus(model.Order2Status(order)))
 		// 	return nil
 		// }
-		if (order.DeliveryFlag & model.OrderDeliveryFlagMaskScheduleDisabled) == 0 { // 如果被停止调度，整个不动作
+		// if (order.DeliveryFlag & model.OrderDeliveryFlagMaskScheduleDisabled) == 0 { // 如果被停止调度，整个不动作
 		if bill.Status == model.WaybillStatusNew {
 			s.addWaybill2Map(savedOrderInfo, bill)
 			if !isPending {
 				if order.Status > model.OrderStatusEndBegin {
-						s.CancelWaybill(bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
+					s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
 				} else if order.WaybillVendorID != model.VendorIDUnknown {
 					globals.SugarLogger.Debugf("OnWaybillStatusChanged multiple waybill created, bill:%v", bill)
 					if order.VendorID == bill.WaybillVendorID { // 是购物平台运单
@@ -286,7 +284,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 							globals.SugarLogger.Infof("OnWaybillStatusChanged bill:%v purchase platform bill came later than others, strange!!!", bill)
 							oldBill := savedOrderInfo.waybills[order.WaybillVendorID]
 							if oldBill != nil {
-									s.CancelWaybill(oldBill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
+								s.ProxyCancelWaybill(order, oldBill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
 							} else {
 								globals.SugarLogger.Warnf("OnWaybillStatusChanged bill:%v, oldBill is null, strange!!!", bill)
 							}
@@ -294,7 +292,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 						bill.WaybillVendorID = model.VendorIDUnknown
 						s.updateOrderByBill(order, bill, false)
 					} else {
-							s.CancelWaybill(bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
+						s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
 					}
 				}
 			}
@@ -328,7 +326,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 						}
 					} else if !s.isBillCandidate(order, bill) && bill.WaybillVendorID != order.VendorID {
 						// 发生这种情况的原因就是两个接单事件几乎同时到达（来不及取消），也算正常
-							s.CancelWaybill(bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
+						s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
 						globals.SugarLogger.Infof("OnWaybillStatusChanged Accepted orderID:%s got multiple bill:%v", order.VendorOrderID, bill)
 					}
 				}
@@ -342,14 +340,14 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 						s.createWaybillOn3rdProviders(savedOrderInfo, bill)
 					}
 				} else if order.WaybillVendorID != model.VendorIDUnknown {
-						s.CancelWaybill(bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
+					s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
 					globals.SugarLogger.Warnf("OnWaybillStatusChanged AcceptCanceled orderID:%s got multiple bill:%v, order details:%v", order.VendorOrderID, bill, order)
 				}
 			case model.WaybillStatusCourierArrived: // do nothing
 				s.resetTimer(savedOrderInfo, bill, isPending)
 				if s.isBillCandidate(order, bill) {
 				} else {
-						// s.CancelWaybill(bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
+					// s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
 					globals.SugarLogger.Infof("OnWaybillStatusChanged CourierArrived order(%d, %s) bill(%d, %s), bill:%v shouldn't get here", order.WaybillVendorID, order.VendorWaybillID, bill.WaybillVendorID, bill.VendorWaybillID, bill)
 				}
 			case model.WaybillStatusFailed: // todo WaybillStatusFailed理解成订单整个失败了，不需要再尝试创建运单了，注意这里应该加个zabbix日志的报警
@@ -384,7 +382,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 				if s.isBillCandidate(order, bill) {
 					// do nothing
 				} else {
-						// s.CancelWaybill(bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
+					// s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
 					globals.SugarLogger.Infof("OnWaybillStatusChanged Delivering order(%d, %s) bill(%d, %s), bill:%v shouldn't get here", order.WaybillVendorID, order.VendorWaybillID, bill.WaybillVendorID, bill.VendorWaybillID, bill)
 				}
 			case model.WaybillStatusDelivered:
@@ -410,7 +408,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 				}
 			}
 		}
-		}
+		// }
 	}
 	return err
 }
@@ -493,10 +491,11 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
 
 func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2Keep *model.Waybill, cancelReasonID int, cancelReason string) (err error) {
 	globals.SugarLogger.Debugf("cancelOtherWaybills, orderID:%s, bill:%v", savedOrderInfo.order.VendorOrderID, bill2Keep)
+	if (savedOrderInfo.order.DeliveryFlag & model.OrderDeliveryFlagMaskScheduleDisabled) == 0 {
 		toBeDeleted := []*model.Waybill{}
 		for _, v := range savedOrderInfo.waybills {
 			if (v.OrderVendorID != v.WaybillVendorID) && (bill2Keep == nil || !(v.WaybillVendorID == bill2Keep.WaybillVendorID && v.VendorWaybillID == bill2Keep.VendorWaybillID)) {
-			err2 := s.CancelWaybill(v, cancelReasonID, cancelReason)
+				err2 := s.ProxyCancelWaybill(savedOrderInfo.order, v, cancelReasonID, cancelReason)
 				if err2 == nil {
 					toBeDeleted = append(toBeDeleted, v)
 				}
@@ -509,6 +508,9 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2
 		for _, v := range toBeDeleted {
 			s.removeWaybillFromMap(savedOrderInfo, v.WaybillVendorID)
 		}
+	} else {
+		globals.SugarLogger.Debugf("cancelOtherWaybills, orderID:%s, bill:%v stop schedule", savedOrderInfo.order.VendorOrderID, bill2Keep)
+	}
 	return err
 }
 
@@ -536,7 +538,7 @@ func (s *DefScheduler) swtich2SelfDeliverWithRetry(savedOrderInfo *WatchOrderInf
 					db := orm.NewOrm()
 					db.Insert(tmpLog)
 
-					if s.CancelWaybill(bill, partner.CancelWaybillReasonSwitch2SelfFailed, partner.CancelWaybillReasonStrSwitch2SelfFailed) == nil {
+					if s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonSwitch2SelfFailed, partner.CancelWaybillReasonStrSwitch2SelfFailed) == nil {
 						// 转自送失败的取消，要将订单中的运单状态更新
 						if s.isBillCandidate(order, bill) {
 							bill.WaybillVendorID = model.VendorIDUnknown
@@ -748,3 +750,12 @@ func (s *DefScheduler) autoPickupGood(order *model.GoodsOrder) (err error) {
 func (s *DefScheduler) isBillCandidate(order *model.GoodsOrder, bill *model.Waybill) bool {
 	return order.WaybillVendorID == bill.WaybillVendorID && order.VendorWaybillID == bill.VendorWaybillID
 }
+
+func (s *DefScheduler) ProxyCancelWaybill(order *model.GoodsOrder, bill *model.Waybill, cancelReasonID int, cancelReason string) (err error) {
+	globals.SugarLogger.Debugf("ProxyCancelWaybill orderID:%s", order.VendorOrderID)
+	if (order.DeliveryFlag & model.OrderDeliveryFlagMaskScheduleDisabled) == 0 {
+		return s.CancelWaybill(bill, cancelReasonID, cancelReason)
+	}
+	globals.SugarLogger.Debugf("ProxyCancelWaybill orderID:%s stop schedule, bypass CancelWaybill", order.VendorOrderID)
+	return nil
+}