Merge branch 'feature/20200513_爱马哥兼容' into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml

assortment-ordercenter-sdk/readme.md

@@ -35,4 +35,9 @@
 | 1.5.5-SNAPSHOT | 返回售后单创建时间 | wuping | 2020-04-27 |
 | 1.5.6-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |
 | 1.3.7.RELEASE | 放开常用方法修饰符 | 李小二 | 2020-04-27 |
-| 1.6.5-SNAPSHOT | 创建订单增加appid字段 | wuping | 2020-05-08 |
\ No newline at end of file
+| 1.6.5-SNAPSHOT | 创建订单增加appid字段 | wuping | 2020-05-08 |
+| 1.3.8.RELEASE | 配送费时间金额 | 胡超 | 2020-05-11 |
+| 1.3.9.RELEASE | 发送pos消息中心新增字段 | 侯书虎 | 2020-05-11 |
+| 1.4.0.RELEASE | ES查询优化预约单提醒优化 | 海波 | 2020-05-11 |
+| 1.4.1.RELEASE | 返回储值卡支付订单支付金额 | 李小二 | 2020-05-11 |
+| 1.4.2.RELEASE | 申请退款切取消接口新增超时时间字段 | 伍平 | 2020-05-12 |
\ No newline at end of file

order-application-service/pom.xml

@@ -97,6 +97,11 @@
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>
+            <artifactId>order-management</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.freemud</groupId>
             <artifactId>monitor-tools</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
@@ -320,12 +325,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-payment-sdk</artifactId>
-            <version>2.5.2-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.freemud</groupId>
-            <artifactId>order-management</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>2.5.2-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.apache.rocketmq</groupId>

order-management/src/main/java/cn/freemud/management/adapter/MessagePushAdapter.java

@@ -41,7 +41,7 @@ public class MessagePushAdapter {
         PushMessageNoticeDto pushMessageNoticeDto = new PushMessageNoticeDto();
         pushMessageNoticeDto.setPartnerId(order.getCompanyId());
         pushMessageNoticeDto.setStoreId(order.getShopId());
-        pushMessageNoticeDto.setTargetId(order.getUserId());
+        pushMessageNoticeDto.setTargetId(null);
         pushMessageNoticeDto.setTargetType(2);
         pushMessageNoticeDto.setCmd(MessageCenterCmdType.JIEDAN_DAYIN_TIXING.getCmd());
         pushMessageNoticeDto.setTtl(0);

order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java

@@ -72,7 +72,8 @@ public class OrderManagerAdapter {
         //查询订单
         QueryOrdersResponse.DataBean.OrderBean orderBean = orderBaseService.getByOrderCode(request.getOrderId());
         /*****兼容爱马哥，送出即完成start******/
-        if (!OldOrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
+        if (OldOrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
+            request.setOperator(OperateType.ORDER_AFFIRM.getOpType());
             return orderAffirm(request, orderBean);
         }
         /*****容爱马哥，送出即完成end******/

ordercenter-sdk/pom.xml

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

ordercenter-sdk/readme.md

@@ -21,4 +21,5 @@
 | 1.3.4-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |
 | 1.2.2.RELEASE | ES查询增加异常单状态 | 李小二 | 2020-04-27 |
 | 1.2.3.RELEASE | 配送费实际金额 | 胡超 | 2020-05-11 |
-| 1.2.4.RELEASE | 发送pos消息中心新增字段 | 侯书虎 | 2020-05-11 |
\ No newline at end of file
+| 1.2.4.RELEASE | 发送pos消息中心新增字段 | 侯书虎 | 2020-05-11 |
+| 1.2.5.RELEASE | 取消接口新增超时时间字段 | wuping | 2020-05-12 |
\ No newline at end of file