From 8431421bc58e9d7d262aca29fe1791c88f9dc387 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 27 Dec 2022 17:47:31 +0800 Subject: [PATCH 1/3] 1 --- business/jxcallback/scheduler/defsch/defsch.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index f22426130..c247e44ad 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -1086,16 +1086,19 @@ func (s *DefScheduler) swtich2SelfDeliverWithRetry(savedOrderInfo *WatchOrderInf // 这个函数这样写的原因是适应一些消息错序 func (s *DefScheduler) loadSavedOrderFromMap(status *model.OrderStatus, isForceLoad bool) *WatchOrderInfo { universalOrderID := jxutils.ComposeUniversalOrderID(status.RefVendorOrderID, status.RefVendorID) // 等于RefVendorOrderID + globals.SugarLogger.Debugf("status====%s,universalOrderID=========%s", utils.Format4Output(status, false), universalOrderID) var realSavedInfo *WatchOrderInfo if savedInfo, ok := s.orderMap.Load(universalOrderID); ok { realSavedInfo = savedInfo.(*WatchOrderInfo) + } else { realSavedInfo = NewWatchOrderInfo(nil) s.orderMap.StoreWithTimeout(universalOrderID, realSavedInfo, orderMapStoreMaxTime) } - globals.SugarLogger.Debugf("loadSavedOrderFromMap realSavedInfo===========%s", utils.Format4Output(realSavedInfo, false)) + globals.SugarLogger.Debugf("pre loadSavedOrderFromMap realSavedInfo===========%s", utils.Format4Output(realSavedInfo, false)) if isForceLoad { if order, err := partner.CurOrderManager.LoadOrder(status.RefVendorOrderID, status.RefVendorID); err == nil { + globals.SugarLogger.Debugf("isForceLoad order======%s", utils.Format4Output(order, false)) realSavedInfo.SetOrder(order) } else { realSavedInfo.SetOrder(&model.GoodsOrder{ @@ -1106,8 +1109,8 @@ func (s *DefScheduler) loadSavedOrderFromMap(status *model.OrderStatus, isForceL OrderCreatedAt: status.StatusTime, WaybillVendorID: model.VendorIDUnknown, }) + globals.SugarLogger.Debugf("after loadSavedOrderFromMap realSavedInfo=========%s", utils.Format4Output(realSavedInfo, false)) } - globals.SugarLogger.Debugf("loadSavedOrderFromMap realSavedInfo=========%s", utils.Format4Output(realSavedInfo, false)) } return realSavedInfo } From 3d147728bb6817264496b6c5be72c06b563460dd Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 27 Dec 2022 18:02:04 +0800 Subject: [PATCH 2/3] 1 --- business/jxcallback/scheduler/defsch/defsch.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index c247e44ad..5085bd41f 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -160,6 +160,7 @@ func (s *WatchOrderInfo) SetOrder(order *model.GoodsOrder) (retVal *model.GoodsO } s.order = order } + globals.SugarLogger.Debugf("SetOrder retval====%s", utils.Format4Output(retVal, false)) return retVal } From c0109865231faf7a922ea439c4e808959b5278b0 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 27 Dec 2022 18:15:50 +0800 Subject: [PATCH 3/3] 1 --- business/jxcallback/scheduler/defsch/defsch.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 5085bd41f..5261512bf 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -160,7 +160,7 @@ func (s *WatchOrderInfo) SetOrder(order *model.GoodsOrder) (retVal *model.GoodsO } s.order = order } - globals.SugarLogger.Debugf("SetOrder retval====%s", utils.Format4Output(retVal, false)) + globals.SugarLogger.Debugf("SetOrder s.order======%s ,retval====%s", utils.Format4Output(s.order, false), utils.Format4Output(retVal, false)) return retVal }