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:
邹宗楠
2022-03-31 16:08:03 +08:00
parent e733b1f096
commit 6c73976ca7
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -967,7 +967,6 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2
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)) {
globals.SugarLogger.Debugf("调用蜂鸟清楚数据=====================, orderID:%s, bill:%v", savedOrderInfo.order.VendorOrderID, bill2Keep)
err2 := s.CancelWaybill(v, cancelReasonID, cancelReason) err2 := s.CancelWaybill(v, cancelReasonID, cancelReason)
if err2 == nil { if err2 == nil {
// 在这里就从map里删除，而不是等收到运单结束事件才删除，可避免不必要的重复取消（第二次取消还会失败） // 在这里就从map里删除，而不是等收到运单结束事件才删除，可避免不必要的重复取消（第二次取消还会失败）
@@ -980,7 +979,6 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2
partner.CurOrderManager.OnOrderMsg(savedOrderInfo.order, "取消三方运单失败", err2.Error()) partner.CurOrderManager.OnOrderMsg(savedOrderInfo.order, "取消三方运单失败", err2.Error())
} }
} }
globals.SugarLogger.Debugf("未调用蜂鸟清楚数据==============, orderID:%s, bill:%v", savedOrderInfo.order.VendorOrderID, bill2Keep)
} }
return err return err