From 77d6dce5491e4809e78b064dbff323143ece3090 Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 27 Mar 2019 16:34:16 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=AE=9A=E6=97=B6=E8=BE=BE=E7=9A=84?= =?UTF-8?q?=E6=8B=A3=E8=B4=A7=E5=AE=8C=E6=88=90=E5=AE=9A=E6=97=B6=E5=99=A8?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=AFTimerTypeBaseNow=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/defsch/defsch.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 884dfbc32..9da4ab600 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -809,6 +809,7 @@ func (s *DefScheduler) mergeOrderStatusConfig(order *model.GoodsOrder, statusTyp globals.SugarLogger.Warnf("mergeOrderStatusConfig orderID:%s 非立即达订单没有预计送达时间", order.VendorOrderID) } else { retVal.Timeout = order.ExpectedDeliveredTime.Sub(time.Now()) - dingShiDaAheadTime + retVal.TimerType = scheduler.TimerTypeBaseNow } } else if vendorActionParams := partner.GetPurchasePlatformFromVendorID(purchaseVendorID).GetStatusActionTimeout(order, statusType, status); vendorActionParams != nil { retVal.Timeout = vendorActionParams.Timeout