Merge branches 'feature/20211209_订单业务类型改造_wuping' and 'qa' of…

Merge branches 'feature/20211209_订单业务类型改造_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -6,12 +6,14 @@ import cn.freemud.management.service.impl.McCafeMangerServiceImpl;
 import cn.freemud.management.service.impl.SaasOrderMangerServiceImpl;
 import cn.freemud.management.service.impl.WaimaiOrderMangerServiceImpl;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
+import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 根据渠道获取渠道操作实体类
@@ -47,7 +49,8 @@ public class OrderBeanFactory {
         if (o2oOrderClients.contains(orderClient)){
             return applicationContext.getBean(WaimaiOrderMangerServiceImpl.class);
         }
-        if (mallOrderClients.contains(orderClient)){
+        //微商城不能根据渠道，根据业务类型
+        if(Objects.equals(BizTypeEnum.MALL.getBizType(),orderBean.getBizType())){
             return applicationContext.getBean(MallOrderMangerServiceImpl.class);
         }