From d74eed1b69d61e6a0e427d46a3d1c27d7719b81d Mon Sep 17 00:00:00 2001 From: suyl <770236076@qq.com> Date: Mon, 17 May 2021 14:27:06 +0800 Subject: [PATCH] aa --- business/jxcallback/scheduler/defsch/defsch.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 9cccf5920..e5dccbb6f 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -331,6 +331,10 @@ func init() { // 饿百转自送的时机不太清楚，暂时禁用超时转自送，在饿百运单取消时还是会自动创建 // 非自配送商家使用 order := savedOrderInfo.order + globals.SugarLogger.Debugf("waybill timer: %v", utils.Format4Output(order, true)) + globals.SugarLogger.Debugf("waybill timer 1: %v", model.IsOrderDeliveryByPlatform(order)) + globals.SugarLogger.Debugf("waybill timer 2: %v", isOrderCanSwitch2SelfDeliver(order)) + globals.SugarLogger.Debugf("waybill timer 3: %v", savedOrderInfo.isDeliveryCompetition) return order.VendorID != model.VendorIDEBAI && order.VendorID == bill.WaybillVendorID && savedOrderInfo.isDeliveryCompetition && @@ -988,8 +992,10 @@ func (s *DefScheduler) loadSavedOrderFromMap(status *model.OrderStatus, isForceL universalOrderID := jxutils.ComposeUniversalOrderID(status.RefVendorOrderID, status.RefVendorID) var realSavedInfo *WatchOrderInfo if savedInfo, ok := s.orderMap.Load(universalOrderID); ok { + globals.SugarLogger.Debugf("loadSavedOrderFromMap step 1") realSavedInfo = savedInfo.(*WatchOrderInfo) } else { + globals.SugarLogger.Debugf("loadSavedOrderFromMap step 2") realSavedInfo = NewWatchOrderInfo(nil) s.orderMap.StoreWithTimeout(universalOrderID, realSavedInfo, orderMapStoreMaxTime) } @@ -1039,7 +1045,8 @@ func (s *DefScheduler) resetTimer(savedOrderInfo *WatchOrderInfo, bill *model.Wa } if config != nil && config.TimeoutAction != nil && config.TimerType != partner.TimerTypeByPass { - globals.SugarLogger.Debugf("CallShouldSetTimer : order : %v, waybill: %v", utils.Format4Output(savedOrderInfo, true), utils.Format4Output(bill, true)) + globals.SugarLogger.Debugf("CallShouldSetTimer : savedOrderInfo : %v, %v", savedOrderInfo, savedOrderInfo.isNeedCreate3rdWaybill) + globals.SugarLogger.Debugf("CallShouldSetTimer : order : %v, waybill: %v", utils.Format4Output(savedOrderInfo.order, true), utils.Format4Output(bill, true)) if config.CallShouldSetTimer(savedOrderInfo, bill) { timeout := config.GetRefTimeout(statusTime, order.OrderCreatedAt) if config.TimeoutGap != 0 {