添加打桩

This commit is contained in:
邹宗楠
2022-03-08 15:28:41 +08:00
parent ed57a99447
commit 2238d24bcb
3 changed files with 4 additions and 1 deletions

View File

@@ -958,7 +958,9 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2
if v.Status < model.WaybillStatusEndBegin &&
!model.IsWaybillPlatformOwn(v) &&
(bill2Keep == nil || !(v.WaybillVendorID == bill2Keep.WaybillVendorID && v.VendorWaybillID == bill2Keep.VendorWaybillID)) {
globals.SugarLogger.Info("===========================================1")
err2 := s.CancelWaybill(v, cancelReasonID, cancelReason)
globals.SugarLogger.Info("===========================================2", err)
if err2 == nil {
// 在这里就从map里删除而不是等收到运单结束事件才删除可避免不必要的重复取消第二次取消还会失败
s.removeWaybillFromMap(savedOrderInfo, v.WaybillVendorID)
@@ -971,6 +973,7 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2
}
}
}
globals.SugarLogger.Info("===========================================3", err)
return err
}