From 34edcda30c9b4f6367cfa1bb0fa7dc0b73d3904c Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Thu, 28 Mar 2019 13:40:47 +0800
Subject: [PATCH] - fk

---
 .../jxcallback/scheduler/defsch/defsch.go     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index cbbf40b32..9d13d0564 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -810,8 +810,8 @@ func (s *DefScheduler) mergeOrderStatusConfig(order *model.GoodsOrder, statusTyp
 	retVal = &StatusActionConfig{}
 	*retVal = *defConfig
 
+	var vendorActionParams *partner.StatusActionParams
 	if model.IsOrderSolid(order) {
-		var vendorActionParams *partner.StatusActionParams
 		if order.BusinessType != model.BusinessTypeImmediate {
 			if jxutils.IsTimeEmpty(order.ExpectedDeliveredTime) {
 				globals.SugarLogger.Warnf("mergeOrderStatusConfig orderID:%s 非立即达订单没有预计送达时间, orderDetail:%s", order.VendorOrderID, utils.Format4Output(order, false))
@@ -829,17 +829,17 @@ func (s *DefScheduler) mergeOrderStatusConfig(order *model.GoodsOrder, statusTyp
 				}
 			}
 		}
-		if vendorActionParams == nil {
-			vendorActionParams = partner.GetPurchasePlatformFromVendorID(purchaseVendorID).GetStatusActionTimeout(order, statusType, status)
+	}
+	if vendorActionParams == nil {
+		vendorActionParams = partner.GetPurchasePlatformFromVendorID(purchaseVendorID).GetStatusActionTimeout(order, statusType, status)
+	}
+	if vendorActionParams != nil {
+		retVal.Timeout = vendorActionParams.Timeout
+		if vendorActionParams.TimeoutGap >= 0 {
+			retVal.TimeoutGap = vendorActionParams.TimeoutGap
 		}
-		if vendorActionParams != nil {
-			retVal.Timeout = vendorActionParams.Timeout
-			if vendorActionParams.TimeoutGap >= 0 {
-				retVal.TimeoutGap = vendorActionParams.TimeoutGap
-			}
-			if vendorActionParams.TimerType != partner.TimerTypeNoOverride {
-				retVal.TimerType = vendorActionParams.TimerType
-			}
+		if vendorActionParams.TimerType != partner.TimerTypeNoOverride {
+			retVal.TimerType = vendorActionParams.TimerType
 		}
 	}
 	return retVal