前置处理 订单完成的超时时间

https://www.tapd.cn/43862731/prong/stories/view/1143862731001044130

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseQueryOrderRequest.java

@@ -30,6 +30,11 @@ public class BaseQueryOrderRequest extends BaseConfig {
     private OrderType orderType;
 
     private Integer timeout;
+
+    /**
+     * 前置处理 timeout时间, 因为后面的代码调用sdk很多地方不兼容,
+     */
+    private Integer preTimeout;
     /**
      * 售后单code 新订单服务需要
      */

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

@@ -929,7 +929,11 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setDispatchTimeout(baseQueryOrderRequest.getDispatchTimeout());
         request.setPartnerId(baseQueryOrderRequest.getPartnerId());
         // 引入门店基础服务 查询自动制作完成配置时间
-        setTimeout(baseQueryOrderRequest,request);
+        if (Objects.nonNull(baseQueryOrderRequest.getPreTimeout())) {
+            request.setTimeout(baseQueryOrderRequest.getPreTimeout());
+        }else {
+            setTimeout(baseQueryOrderRequest,request);
+        }
         com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.acceptOrder(request, baseQueryOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }

order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java

@@ -80,7 +80,7 @@ public class SaasOrderHandle {
 
         orderSdkAdapter.convert2wmDeliveryTimeOut(orderConfirmRequest,this.wmDeliveryTimeOut);
         if (Objects.isNull(request.getTimeout())) {
-            orderConfirmRequest.setTimeout(request.getTimeout());
+            orderConfirmRequest.setPreTimeout(request.getTimeout());
         }
         //合阔pos 商户订单状态不自动扭转
         // 2021-07-07 合阔自动