From 517f42efcd7cc9583920b5a2dfd0d2a8dcb6580c Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 8 Mar 2019 20:38:01 +0800 Subject: [PATCH] - don't warning when got strange WaybillStatusAcceptCanceled if isPending in OnWaybillStatusChanged --- business/jxcallback/scheduler/defsch/defsch.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index e98b784a4..b5e19607e 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -372,7 +372,9 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo } } else if order.WaybillVendorID != model.VendorIDUnknown { s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime) - globals.SugarLogger.Warnf("OnWaybillStatusChanged AcceptCanceled orderID:%s got multiple bill:%v, order details:%v", order.VendorOrderID, bill, order) + if !isPending { + globals.SugarLogger.Warnf("OnWaybillStatusChanged AcceptCanceled orderID:%s got multiple bill:%v, order details:%v", order.VendorOrderID, bill, order) + } } case model.WaybillStatusCourierArrived: // do nothing s.resetTimer(savedOrderInfo, bill, isPending)