Merge remote-tracking branch 'origin/qa' into qa

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OrderSourceType.java

@@ -41,6 +41,7 @@ public enum OrderSourceType {
     DPZHCT("dpzhct", "美团点评智慧餐厅", 24),
     FMWD("fmwd", "非码微店", 25),
     Y_POS("ypos", "非码云POS", 26),
+    MTDP("mtdp", "美团点评", 27),
     parkingmanual("parkingmanual", "农工商停车手工录单", 98),
     PARKING("parking", "农工商停车", 99),
     SDG("sdg", "闪电购", 1000);

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

@@ -151,7 +151,7 @@ public class OrderCallBackMQService {
 
     private OrderInfoReqs getOrderInfoReqs(OrderCallBackRequestVo body) {
         // 订单所有状态正常变化通知通知开放平台
-        if (!ObjectUtils.equals("1", body.getMsgType()) || body.getOperateType() == null || body.getOperateType() == 0) {
+        if ((!ObjectUtils.equals("1", body.getMsgType()) && !ObjectUtils.equals("3", body.getMsgType())) || body.getOperateType() == null || body.getOperateType() == 0) {
             return null;
         }
         OrderInfoReqs orderInfoReqs = null;

call-back-service/src/main/java/cn/freemud/entities/vo/OrderCallBackRequestVo.java

@@ -28,7 +28,7 @@ public class OrderCallBackRequestVo {
      * 2 未支付超时关单
      */
     private Integer delayMsgEventType;
-    //操作类型 0= 其他信息修改，1=订单正向操作，2=订单逆向操作
+    //操作类型 0= 其他信息修改，1=订单正向操作，2=订单逆向操作,3=通知消息
     private Integer operateType;
     //渠道编号
     private Integer orderClient;
@@ -47,6 +47,7 @@ public class OrderCallBackRequestVo {
      * 消息类型
      1.	1订单所有状态正常变化通知
      2.	2超时订单
+     3.	3通知
      */
     private String msgType;
 

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.2.7-SNAPSHOT</version>
+            <version>2.2.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

order-management/src/main/java/cn/freemud/management/enums/OrderSource.java

@@ -10,7 +10,8 @@ public enum OrderSource {
     MALL("mall", "非码Mall"),
     SAAS("saas", "saas点餐"),
     ALIPAY("alipay", "支付宝"),
-    EBAI("ebwm", "饿百外卖");
+    EBAI("ebwm", "饿百外卖"),
+    MTDP("mtdp", "美团点评");
     private String source;
     private String sourceName;
 

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

@@ -30,7 +30,8 @@ public class OrderBeanFactory {
             return  applicationContext.getBean(McCafeMangerServiceImpl.class);
         }
         if (OrderSource.BDWM.getSource().equals(source) || OrderSource.JDWM.getSource().equals(source)
-                || OrderSource.MTWM.getSource().equals(source) || OrderSource.ELEME.getSource().equals(source) || OrderSource.FMWD.getSource().equals(source) || OrderSource.EBAI.getSource().equals(source)){
+                || OrderSource.MTWM.getSource().equals(source) || OrderSource.ELEME.getSource().equals(source) || OrderSource.FMWD.getSource().equals(source) || OrderSource.EBAI.getSource().equals(source)
+                || OrderSource.MTDP.getSource().equals(source)){
             return applicationContext.getBean(WaimaiOrderMangerServiceImpl.class);
         }
         return applicationContext.getBean(SaasOrderMangerServiceImpl.class);

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/OrderClientType.java

@@ -35,6 +35,7 @@ public enum OrderClientType {
     KOUBEI(22, "口碑"),
     SAASMALL(23, "微商城"),
     FMWD(25, "非码微店"),
+    MTDP(27, "美团点评"),
     PARKING(99 , "农工商停车"),
     FU_YOU(100 , "富有"),
     ;