配送自动扭转时间未设置，传默认值

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -860,6 +860,12 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         }
         StoreResponse.Configuration configuration = getStoreAutoConfiguration(baseQueryOrderRequest.getPartnerId(), baseQueryOrderRequest.getShopId(), baseQueryOrderRequest.getTrackingNo());
         if (configuration != null ) {
+            //deliveryFinishedAfterMinute:自建外卖订单，商家自配送xx分钟后，订单状态更改为【已完成】;
+            //appointAutoDeliveryTakeOrderWorkflowFinishTime: 预约自建外卖制作完成后自动流程时间 1:2小时;2:1小时;3:30分钟;4:15分钟;5:10分钟;6:5分钟;
+            if(configuration.getDeliveryFinishedAfterMinute() == null
+                    || configuration.getAppointAutoDeliveryTakeOrderWorkflowFinishTime() == null ){
+                timeOut = isTakeOut ? takeOutTimeOut : 120;
+            }
             if(configuration.getDeliveryFinishedAfterMinute()!=null && configuration.getDeliveryFinishedAfterMinute()>0){
                 timeOut = isTakeOut ? takeOutTimeOut
                                     //: AutoOrderConfigTime.getTime(configuration.getDeliveryFinishedAfterMinute().toString());
@@ -871,11 +877,11 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                                     : AutoOrderConfigTime.getTime(configuration.getAppointAutoDeliveryTakeOrderWorkflowFinishTime());
                 //request.setTimeout(AutoOrderConfigTime.getTime(configuration.getAppointAutoDeliveryTakeOrderWorkflowFinishTime()));
             }
-            request.setTimeout(timeOut);
-        }
-        else {
-            request.setTimeout((timeOut = isTakeOut ? takeOutTimeOut : 120));
+
+        }else {
+            timeOut = isTakeOut ? takeOutTimeOut : 120;
         }
+        request.setTimeout(timeOut);
 
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.directDelivery(request, baseQueryOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
@@ -1889,6 +1895,12 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             //外卖单  店外快递实时-3常规外送   店外快递预约-4预约外送
             // 重要的事情重复三遍 saas 实时外卖  预约外卖都是 按3个小时流转
             if (OrderType.GENERAL_EXPRESS.equals(baseQueryOrderRequest.getOrderType()) || OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType())) {
+                //deliveryProcessingAfterMinute:自建外卖订单-实时单，商家自配送，门店接单xx分钟后，订单状态变更为配送中;
+                //deliveryProcessingBeforeMinute: 自建外卖订单-预约单，商家自配送，预约商家前xx分钟，订单更改为配送中
+                if(configuration.getDeliveryProcessingAfterMinute() == null
+                        || configuration.getDeliveryProcessingBeforeMinute() == null ){
+                    timeout = isTakeOut ? takeOutTimeOut : 120;
+                }
                 //自配送外卖单接单后自动流程时间
                 if (configuration.getDeliveryProcessingAfterMinute()!=null && configuration.getDeliveryProcessingAfterMinute()>0) {
                     timeout = QueryDeliveryType.SELF.getCode().equals(baseQueryOrderRequest.getDeliveryType())