From 3bffb1921fd18584dcf40908f2b703570e24b709 Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 30 Jul 2019 17:55:50 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=B9=B3=E5=8F=B0=EF=BC=88=E9=92=88?= =?UTF-8?q?=E5=AF=B9=E9=A5=BF=E7=99=BE=EF=BC=89=E8=BF=90=E5=8D=95=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E6=97=B6=EF=BC=8C=E8=AE=BE=E7=BD=AE=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E8=BF=90=E5=8D=95TIMER=EF=BC=88=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=E6=98=AF=E6=9C=89=E8=BF=99=E4=B8=AA=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E7=9A=84=EF=BC=8C=E4=BF=AE=E5=A4=8DBUG=EF=BC=8CresetTimer?= =?UTF-8?q?=E6=97=B6=E6=B2=A1=E6=9C=89=E4=BC=A0bill=E8=BF=9B=E5=8E=BB?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/defsch/defsch.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 1e78c2cb3..28cf3ccff 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -492,7 +492,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo case model.WaybillStatusCanceled, model.WaybillStatusFailed: s.removeWaybillFromMap(savedOrderInfo, bill.WaybillVendorID) if s.isBillCandidate(order, bill) || order.WaybillVendorID == model.VendorIDUnknown { - s.resetTimer(savedOrderInfo, nil, isPending) + s.resetTimer(savedOrderInfo, bill, isPending) if !isPending { if model.IsOrderHaveWaybill(order) { s.updateOrderByBill(order, nil, true) @@ -773,9 +773,13 @@ func (s *DefScheduler) resetTimer(savedOrderInfo *WatchOrderInfo, bill *model.Wa }, jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID)) }) } - globals.SugarLogger.Debugf("resetTimer, orderID:%s, status:%d, timeout:%v", order.VendorOrderID, status, timeout) + globals.SugarLogger.Debugf("resetTimer, orderID:%s, statusType:%d, status:%d, timeout:%v", order.VendorOrderID, statusType, status, timeout) } + } else { + globals.SugarLogger.Debugf("resetTimer bypass2, orderID:%s statusType:%d status:%v, config:%s", order.VendorOrderID, statusType, status, utils.Format4Output(config, true)) } + } else { + globals.SugarLogger.Debugf("resetTimer bypass1, orderID:%s statusType:%d status:%v", order.VendorOrderID, statusType, status) } }