Merge branch 'feature/20201123-添加美团点评渠道' into develop

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

@@ -41,7 +41,6 @@ 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);

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

@@ -11,7 +11,7 @@ public enum OrderSource {
     SAAS("saas", "saas点餐"),
     ALIPAY("alipay", "支付宝"),
     EBAI("ebwm", "饿百外卖"),
-    MTDP("mtdp", "美团点评");
+    DPZHCT("dpzhct", "美团点评智慧餐厅");
     private String source;
     private String sourceName;
 

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

@@ -31,7 +31,7 @@ public class OrderBeanFactory {
         }
         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.MTDP.getSource().equals(source)){
+                || OrderSource.DPZHCT.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

@@ -34,8 +34,8 @@ public enum OrderClientType {
     DIANPING(21, "美团点评"),
     KOUBEI(22, "口碑"),
     SAASMALL(23, "微商城"),
+    DPZHCT(24, "美团点评智慧餐厅"),
     FMWD(25, "非码微店"),
-    MTDP(27, "美团点评"),
     PARKING(99 , "农工商停车"),
     FU_YOU(100 , "富有"),
     ;