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-27 17:08:29 +08:00
parent 7f74e9ea45
commit 81846cbb88
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1006,6 +1006,7 @@ func (s *DefScheduler) solutionJdsOrder(bill *model.Waybill) (err error) {
func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2Keep *model.Waybill, cancelReasonID int, cancelReason string) (err error) { func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2Keep *model.Waybill, cancelReasonID int, cancelReason string) (err error) {
for _, v := range savedOrderInfo.waybills { for _, v := range savedOrderInfo.waybills {
globals.SugarLogger.Debugf("我在这里")
if v.Status < model.WaybillStatusEndBegin && if v.Status < model.WaybillStatusEndBegin &&
!model.IsWaybillPlatformOwn(v) && !model.IsWaybillPlatformOwn(v) &&
(bill2Keep == nil || !(v.WaybillVendorID == bill2Keep.WaybillVendorID && v.VendorWaybillID == bill2Keep.VendorWaybillID)) { (bill2Keep == nil || !(v.WaybillVendorID == bill2Keep.WaybillVendorID && v.VendorWaybillID == bill2Keep.VendorWaybillID)) {
@@ -1026,6 +1027,7 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2
} }
} }
globals.SugarLogger.Debugf("cancelOtherWaybills last err=========%s", err)
return err return err
} }

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

@@ -421,6 +421,7 @@ func (s *DefScheduler) CancelAll3rdWaybills(ctx *jxcontext.Context, vendorOrderI
savedOrderInfo := s.loadSavedOrderByID(vendorOrderID, vendorID, true) savedOrderInfo := s.loadSavedOrderByID(vendorOrderID, vendorID, true)
globals.SugarLogger.Debugf("savedOrderInfo.order========%s", utils.Format4Output(savedOrderInfo.order, false)) globals.SugarLogger.Debugf("savedOrderInfo.order========%s", utils.Format4Output(savedOrderInfo.order, false))
if savedOrderInfo != nil { if savedOrderInfo != nil {
globals.SugarLogger.Debugf("进入s.cancelOtherWaybills")
err = s.cancelOtherWaybills(savedOrderInfo, nil, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive) err = s.cancelOtherWaybills(savedOrderInfo, nil, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive)
} else { } else {
err = scheduler.ErrCanNotFindOrder err = scheduler.ErrCanNotFindOrder