This commit is contained in:
richboo111
2022-12-28 11:31:19 +08:00
parent 9272233bac
commit 9d98ebd71c
2 changed files with 0 additions and 17 deletions

View File

@@ -1005,15 +1005,11 @@ func (s *DefScheduler) solutionJdsOrder(bill *model.Waybill) (err error) {
}
func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2Keep *model.Waybill, cancelReasonID int, cancelReason string) (err error) {
globals.SugarLogger.Debugf("savedOrderInfo.waybills=======%s,len(savedOrderInfo.waybills)====%d", utils.Format4Output(savedOrderInfo.waybills, false), len(savedOrderInfo.waybills))
for _, v := range savedOrderInfo.waybills {
globals.SugarLogger.Debugf("我在这里")
if v.Status < model.WaybillStatusEndBegin &&
!model.IsWaybillPlatformOwn(v) &&
(bill2Keep == nil || !(v.WaybillVendorID == bill2Keep.WaybillVendorID && v.VendorWaybillID == bill2Keep.VendorWaybillID)) {
globals.SugarLogger.Debugf("cancelOtherWaybills v=======%s", utils.Format4Output(v, false))
err2 := s.CancelWaybill(v, cancelReasonID, cancelReason)
globals.SugarLogger.Debugf("DefScheduler cancelOtherWaybills err2=======%v", err2)
if err2 == nil {
// 在这里就从map里删除而不是等收到运单结束事件才删除可避免不必要的重复取消第二次取消还会失败
s.removeWaybillFromMap(savedOrderInfo, v.WaybillVendorID)
@@ -1028,7 +1024,6 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2
}
}
globals.SugarLogger.Debugf("cancelOtherWaybills last err=========%v", err)
return err
}