Merge branch 'master' into develop

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -135,6 +135,7 @@ public class OrderSdkAdapter {
         request.setDeliveryContactInfoList(deliveryContactInfoList);
         //保存门店渠道信息
         request.setOrderExtended(requestVO.getOrderExtended());
+        request.setOrderTask(requestVO.getOrderTask());
 
         return request;
     }

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

 package com.freemud.sdk.api.assortment.order.request.order;
 
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
+import com.freemud.application.sdk.api.ordercenter.request.create.OrderTaskReq;
 import com.freemud.application.sdk.api.promotioncenter.request.promotion.ActivityUpdateStockRequest;
 import com.freemud.sdk.api.assortment.order.config.BaseConfig;
 import com.freemud.sdk.api.assortment.order.enums.*;
@@ -120,6 +121,9 @@ public class BaseCreateOrderRequest extends BaseConfig {
 
     private OrderExtendedReq orderExtended;
 
+    //预订单任务
+    private OrderTaskReq orderTask;
+
     /**
      * 促销活动扣减库存
      */

call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -54,10 +54,6 @@ public class OrderCallBackMQService {
 
     @Autowired
     private OrderDistributionService orderDistributionService;
-    @Autowired
-    private RedisCache redisCache;
-    @Autowired
-    private AssortmentOpenPlatformWxappManager openPlatformWxappManager;
 
     public void sendOrderMQ(OrderCallBackRequestVo body) {
         //发送订单回调

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java

@@ -205,4 +205,7 @@ public class CreateOrderRequest extends BaseRequest {
     //订单扩展信息 （门店渠道信息）
     private OrderExtendedReq orderExtended;
 
+    //预订单任务
+    private OrderTaskReq orderTask;
+
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/OrderTaskReq.java

+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: OrderTaskReq
+ * @Package com.freemud.application.sdk.api.ordercenter.request.create
+ * @Description:
+ * @author: ping.wu
+ * @date: 2019/11/26 10:40
+ * @version V1.0
+ * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+package com.freemud.application.sdk.api.ordercenter.request.create;
+
+import lombok.Data;
+
+@Data
+public class OrderTaskReq {
+
+    //处理时间
+    private String processingTime;
+
+    //任务时间（显示用）
+    private String taskTime;
+
+    //任务类型：1预约单 (OrderType设置为2预约堂食，4预约外送，6预约自取 默认为预约单)
+    private Integer taskType;
+
+}

push-order-service/pom.xml

@@ -108,11 +108,11 @@
             <groupId>cn.freemud.commons</groupId>
             <artifactId>commons-redis</artifactId>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
             <version>2.7.4.RELEASE</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>membercenter-sdk</artifactId>
@@ -133,7 +133,7 @@
             <artifactId>sdk-common-base</artifactId>
             <version>1.2.RELEASE</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
             <version>6.4.2.RELEASE</version>
@@ -143,7 +143,7 @@
                     <artifactId>sdk-common-base</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>com.ctrip.framework.apollo</groupId>
             <artifactId>apollo-client</artifactId>

push-order-service/src/main/java/cn/freemud/config/PreReleaseBeanConfig.java

@@ -7,7 +7,6 @@ import com.freemud.application.sdk.api.membercenter.config.MemberCenterPropertie
 import com.freemud.application.sdk.api.membercenter.config.MemberExtendProperties;
 import com.freemud.application.sdk.api.membercenter.config.MemberPropertyProperties;
 import com.freemud.application.sdk.api.membercenter.config.MermberScoreProperties;
-import com.freemud.application.sdk.api.ordercenter.old.config.OldOrderCenterProperties;
 import com.freemud.application.sdk.api.storecenter.config.StoreCenterProperties;
 import com.freemud.application.sdk.api.util.BaseRequestUtils;
 import com.freemud.application.sdk.api.util.RestTemplateUtils;
@@ -74,11 +73,6 @@ public class PreReleaseBeanConfig {
         return RestTemplateUtils.getRestTemplateByType(map);
     }
 
-    @Profile({"pre-release"})
-    @Bean(name = "oldOrderRestTemplate")
-    public RestTemplate devOldOrderRestTemplate(@Autowired OldOrderCenterProperties properties) {
-        return BaseRequestUtils.getRestTemplate(properties.getRetryTimes(), properties.getConnectTimeOut(), properties.getReadTimeOut());
-    }
 
 
 }