Merge branches 'feature/20210401_oms外卖渠道判断_wuping' and 'master' of…

Merge branches 'feature/20210401_oms外卖渠道判断_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

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

@@ -33,7 +33,7 @@ public enum OrderSourceType {
     BDWM("bdwm", "百度外卖", 16),
     IPINTUAN("ipintuan", "i拼团", 18),
     MEAL("meal", "i围餐", 19),
-    JUBAOPEN("jbp", "美团聚宝盆", 20),
+    JUBAOPEN("mtjbp", "美团聚宝盆", 20),
     DIANPING("dp", "美团点评", 21),
     KOUBEI("koubeiwaimai", "口碑外卖", 22),
     MALL("mall", "非码Mall", 23),
@@ -47,7 +47,6 @@ public enum OrderSourceType {
     parkingmanual("parkingmanual", "农工商停车手工录单", 98),
     PARKING("parking", "农工商停车", 99),
     SDG("sdg", "闪电购", 1000);
-
     private String code;
     private String desc;
     private Integer clientType;

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

 package cn.freemud.management.enums;
 
 public enum OrderSource {
-    BDWM("bdwm", "百度外卖"),
-    JDWM("jdwm", "京东到家"),
-    MTWM("mtwm", "美团外卖"),
+    BDWM("bdwm", "百度外卖"),//16
+    JDWM("jdwm", "京东到家"),//10
+    MTWM("mtwm", "美团外卖"),//11
     SDG("sdg", "闪电购"),
-    ELEME("eleme", "饿了么外卖"),
-    FMWD("fmwd", "非码微店"),
+    ELEME("eleme", "饿了么外卖"),//8
+    FMWD("fmwd", "非码微店"),//25
     MALL("mall", "非码Mall"),
     SAAS("saas", "saas点餐"),
     ALIPAY("alipay", "支付宝"),
-    EBAI("ebwm", "饿百外卖"),
-    KOUBEI("koubeiwaimai", "口碑外卖"),
-    DPZHCT("dpzhct", "美团点评智慧餐厅");
+    EBAI("ebwm", "饿百外卖"),//9
+    KOUBEI("koubeiwaimai", "口碑外卖"),//22
+    DPZHCT("dpzhct", "美团点评智慧餐厅");//24
     private String source;
     private String sourceName;
 

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

@@ -11,6 +11,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 根据渠道获取渠道操作实体类
  */
@@ -20,19 +22,26 @@ public class OrderBeanFactory {
     @Value("${mccafe.partner.id}")
     private String macCafePartnerId;
 
+    @Value("#{'${o2o.orderClient}'.split(',')}")
+    private List<String> o2oOrderClients;
+
     @Autowired
     private ApplicationContext applicationContext;
 
     public OrderManagerService getOrderManagerService(QueryOrdersResponse.DataBean.OrderBean orderBean){
-        String source = orderBean.getSource();
+//        String source = orderBean.getSource();
+        String orderClient = orderBean.getOrderClient();
         String companyId = orderBean.getCompanyId();
         if (macCafePartnerId.equals(companyId)){
             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.KOUBEI.getSource().equals(source) || OrderSource.DPZHCT.getSource().equals(source)){
+//        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.KOUBEI.getSource().equals(source) || OrderSource.DPZHCT.getSource().equals(source)){
+//            return applicationContext.getBean(WaimaiOrderMangerServiceImpl.class);
+//        }
+        if (o2oOrderClients.contains(orderClient)){
             return applicationContext.getBean(WaimaiOrderMangerServiceImpl.class);
         }
         return applicationContext.getBean(SaasOrderMangerServiceImpl.class);