liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
richboo111
2022-12-28 17:23:50 +08:00
parent a5cfdbd874
commit 1061c0a43a
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -1084,11 +1084,12 @@ func (s *DefScheduler) loadSavedOrderFromMap(status *model.OrderStatus, isForceL
var realSavedInfo *WatchOrderInfo var realSavedInfo *WatchOrderInfo
if savedInfo, ok := s.orderMap.Load(universalOrderID); ok { if savedInfo, ok := s.orderMap.Load(universalOrderID); ok {
realSavedInfo = savedInfo.(*WatchOrderInfo) realSavedInfo = savedInfo.(*WatchOrderInfo)
globals.SugarLogger.Debugf("loadSavedOrderFromMap savedInfo=%s", utils.Format4Output(savedInfo, false))
} else { } else {
realSavedInfo = NewWatchOrderInfo(nil) realSavedInfo = NewWatchOrderInfo(nil)
s.orderMap.StoreWithTimeout(universalOrderID, realSavedInfo, orderMapStoreMaxTime) s.orderMap.StoreWithTimeout(universalOrderID, realSavedInfo, orderMapStoreMaxTime)
} }
if isForceLoad { if isForceLoad {
if order, err := partner.CurOrderManager.LoadOrder(status.RefVendorOrderID, status.RefVendorID); err == nil { if order, err := partner.CurOrderManager.LoadOrder(status.RefVendorOrderID, status.RefVendorID); err == nil {
realSavedInfo.SetOrder(order) realSavedInfo.SetOrder(order)

3
business/jxcallback/scheduler/defsch/defsch_ext.go
View File

@@ -418,6 +418,9 @@ func (s *DefScheduler) CancelAll3rdWaybills(ctx *jxcontext.Context, vendorOrderI
err = func() (err error) { err = func() (err error) {
// 取消三方运单,取消各平台单号信息,间隔一段时间后定时任务重新调度 // 取消三方运单,取消各平台单号信息,间隔一段时间后定时任务重新调度
savedOrderInfo := s.loadSavedOrderByID(vendorOrderID, vendorID, true) savedOrderInfo := s.loadSavedOrderByID(vendorOrderID, vendorID, true)
if vendorID == model.VendorIDDD {
globals.SugarLogger.Debugf("CancelAll3rdWaybills savedOrderInfo=%s", utils.Format4Output(savedOrderInfo, false))
}
if savedOrderInfo != nil { if savedOrderInfo != nil {
err = s.cancelOtherWaybills(savedOrderInfo, nil, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive) err = s.cancelOtherWaybills(savedOrderInfo, nil, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive)
} else { } else {