代码拆分，预约单提醒时间区分外卖自提下期上

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

@@ -1403,10 +1403,10 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                 || OrderType.RESERVED_DINE_IN.equals(baseQueryOrderRequest.getOrderType())
                 || OrderType.RESERVED_SELF_PICKUP.equals(baseQueryOrderRequest.getOrderType())){
             //外卖预约单
-            if(OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType()) &&
-                    configuration != null && configuration.getDeliveryOrderWarnTime() != null){
-                orderWarnTime = configuration.getDeliveryOrderWarnTime();
-            }
+//            if(OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType()) &&
+//                    configuration != null && configuration.getDeliveryOrderWarnTime() != null){
+//                orderWarnTime = configuration.getDeliveryOrderWarnTime();
+//            }
             OrderTaskReq orderTask = new OrderTaskReq();
             orderTask.setTaskType(3);
             Date processingDate = DateUtil.addMinutes(DateUtil.convert2Date(baseQueryOrderRequest.getExpectTime(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS), -getMinTime(orderWarnTime));

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.4.9.RELEASE</version>
+            <version>1.5.0.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

order-management/pom.xml

@@ -52,7 +52,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.4.8.RELEASE</version>
+            <version>1.5.0.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

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

@@ -83,7 +83,7 @@ public class SaasOrderHandle {
      * @return
      */
     public BaseResponse orderDelivery(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
-        BaseQueryOrderRequest orderDeliveryRequest = orderSdkAdapter.getOrderDeliveryRequest(request.getOperator(), orderBean);
+        BaseQueryOrderRequest orderDeliveryRequest = orderSdkAdapter.getOrderConfirmRequest(request.getOperator(), orderBean);
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderSend(orderDeliveryRequest);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
             throw new OrderServiceException(ResponseResult.DELIVERY_FAIL);
@@ -99,7 +99,7 @@ public class SaasOrderHandle {
      * @return
      */
     public BaseResponse orderAffirm(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
-        BaseQueryOrderRequest orderAffirmRequest = orderSdkAdapter.getOrderDeliveryRequest(request.getOperator(), orderBean);
+        BaseQueryOrderRequest orderAffirmRequest = orderSdkAdapter.getOrderConfirmRequest(request.getOperator(), orderBean);
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderAffirm(orderAffirmRequest);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
             throw new OrderServiceException(ResponseResult.AFFIRM_ORDER_FAIL);