Merge branches 'feature/20200515_自提-外卖预约单提醒时间区分_wuping' and 'qa' of…

Merge branches 'feature/20200515_自提-外卖预约单提醒时间区分_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	call-back-service/pom.xml
#	ordercenter-sdk/readme.md
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java

assortment-ordercenter-sdk/readme.md

@@ -59,4 +59,5 @@
 | 1.7.8-SNAPSHOT| 预约单接单后提醒时间区分外卖自提  | wuping | 2020-05-18 |
 | 1.5.1-RELEASE| 增加订单支付方式 | 海波 | 2020-05-25 |
 | 1.5.2-RELEASE| 新增订单完成时间时间戳 | 雷后领 | 2020-05-26 |
-| 1.8.9-SNAPSHOT | 用户订单和es综合查询接口新增订单业务类型集合 | wuping | 2020-06-01 |
+| 1.8.9-SNAPSHOT | 用户订单和es综合查询接口新增订单业务类型集合 | wuping | 2020-06-01 |
\ No newline at end of file
+| 1.5.3-RELEASE| 增加下游订单号 | 海波 | 2020-06-01 |
\ No newline at end of file

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

@@ -1424,10 +1424,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));

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.2.11.RELEASE</version>
+    <version>1.3.1.RELEASE</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -33,4 +33,5 @@
 | 1.2.10.RELEASE | 增加售后单任务 | wuping | 2020-05-21 |
 | 1.4.12-SNAPSHOT | 增加新接口：新增结算信息 | wuping | 2020-05-28 |
 | 1.4.13-SNAPSHOT | 用户订单和es综合查询接口新增订单业务类型集合 | wuping | 2020-06-01 |
-| 1.2.11.RELEASE | 增加订单支付方式 | 海波 | 2020-05-25 |
+| 1.2.11.RELEASE | 增加订单支付方式 | 海波 | 2020-05-25 |
\ No newline at end of file
+| 1.3.1.RELEASE | 增加下游订单号 | 海波 | 2020-06-01 |
\ No newline at end of file