fix:saas外卖判断

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

@@ -861,19 +861,19 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         StoreResponse.Configuration configuration = getStoreAutoConfiguration(baseQueryOrderRequest.getPartnerId(), baseQueryOrderRequest.getShopId(), baseQueryOrderRequest.getTrackingNo());
         if (configuration != null ) {
             if(StringUtils.isNotEmpty(configuration.getAutoDeliveryTakeOrderWorkflowFinishTime())){
-                timeOut = isTakeOut ? AutoOrderConfigTime.getTime(configuration.getAutoDeliveryTakeOrderWorkflowFinishTime())
-                                    : takeOutTimeOut;
+                timeOut = isTakeOut ? takeOutTimeOut
+                                    : AutoOrderConfigTime.getTime(configuration.getAutoDeliveryTakeOrderWorkflowFinishTime());
                 //request.setTimeout(timeOut);
             }
             if(StringUtils.isNotEmpty(baseQueryOrderRequest.getExpectTime()) && StringUtils.isNotEmpty(configuration.getAppointAutoDeliveryTakeOrderWorkflowFinishTime())){
-                timeOut = isTakeOut ? AutoOrderConfigTime.getTime(configuration.getAppointAutoDeliveryTakeOrderWorkflowFinishTime())
-                                    : takeOutTimeOut;
+                timeOut = isTakeOut ? takeOutTimeOut
+                                    : AutoOrderConfigTime.getTime(configuration.getAppointAutoDeliveryTakeOrderWorkflowFinishTime());
                 //request.setTimeout(AutoOrderConfigTime.getTime(configuration.getAppointAutoDeliveryTakeOrderWorkflowFinishTime()));
             }
             request.setTimeout(timeOut);
         }
         else {
-            request.setTimeout(timeOut = isTakeOut ? takeOutTimeOut : 120);
+            request.setTimeout((timeOut = isTakeOut ? takeOutTimeOut : 120));
         }
 
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.directDelivery(request, baseQueryOrderRequest.getTrackingNo());