diff --git a/business/scheduler/defsch/defsch.go b/business/scheduler/defsch/defsch.go index cd2cea9e3..d21dc8cc6 100644 --- a/business/scheduler/defsch/defsch.go +++ b/business/scheduler/defsch/defsch.go @@ -222,8 +222,8 @@ func (s *DefScheduler) OnOrderStatusChanged(status *model.OrderStatus, isPending s.resetTimer(savedOrderInfo, nil, isPending) if status.Status >= model.OrderStatusEndBegin { if status.Status == model.OrderStatusDelivered || status.Status == model.OrderStatusFinished { - if curWaybill := savedOrderInfo.waybills[savedOrderInfo.order.WaybillVendorID]; curWaybill != nil { - globals.SugarLogger.Warnf("OnOrderStatusChanged [运营]订单orderID:%s可能被手动点击送达,有可能导致当前有效运单:%s被非正常取消", status.VendorOrderID, curWaybill.VendorWaybillID) + if curWaybill := savedOrderInfo.waybills[savedOrderInfo.order.WaybillVendorID]; curWaybill != nil && curWaybill.WaybillVendorID != curWaybill.OrderVendorID { + globals.SugarLogger.Info("OnOrderStatusChanged [运营]订单orderID:%s可能被手动点击送达,有可能导致当前有效运单:%s被非正常取消", status.VendorOrderID, curWaybill.VendorWaybillID) } } s.cancelOtherWaybills(savedOrderInfo, nil) @@ -417,7 +417,7 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf err = scheduler.ErrCanNotCreateAtLeastOneWaybill } } else { - globals.SugarLogger.Warnf("createWaybillOn3rdProviders [运营]同一订单orderID:%s尝试了%d次创建运单失败, 停止调度,如果还需要发单,请人工处理", order.VendorOrderID, savedOrderInfo.retryCount) + globals.SugarLogger.Infof("createWaybillOn3rdProviders [运营]同一订单orderID:%s尝试了%d次创建运单失败, 停止调度,如果还需要发单,请人工处理", order.VendorOrderID, savedOrderInfo.retryCount) tmpLog := &legacymodel.TempLog{ VendorOrderID: order.VendorOrderID,