准备重构订单调度定时器

2019-11-23 15:36:17 +08:00
parent 78a26364c0
commit 42e348e59a
2 changed files with 122 additions and 3 deletions
--- a/business/jxcallback/scheduler/defsch/defsch_ext.go
+++ b/business/jxcallback/scheduler/defsch/defsch_ext.go
@@ -226,9 +226,7 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor

 			var timeoutSecond int
 			if savedOrderInfo := s.loadSavedOrderByID(vendorOrderID, vendorID, false); savedOrderInfo != nil {
-				if savedOrderInfo.timerStatusType == scheduler.TimerStatusTypeWaybill && savedOrderInfo.timerStatus == model.WaybillStatusNew {
-					timeoutSecond = int(savedOrderInfo.timerTime.Sub(time.Now()) / time.Second)
-				}
+				timeoutSecond = savedOrderInfo.GetCreateWaybillTimeout()
 			}
 			for _, storeCourier := range storeCourierList {
 				var feeInfo *partner.WaybillFeeInfo