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-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -649,6 +649,13 @@ public class OrderAdapter {
         } else if (OrderChannelType.SAASMALL.getCode().equals(channelType)) {
             orderClients = Arrays.asList(OrderClientType.SAAS.getIndex(),OrderClientType.ALIPAY.getIndex());
             bizTypes.add(BizTypeEnum.MALL.getBizType());
+            if(Objects.equals(MarketTypeEnum.GROUPB.getIndex(),queryOrderDto.getMarketingType())){
+                queryOrdersDto.setMarketingType(MarketTypeEnum.GROUPB.getIndex());
+            }
+            //以前参数定义，商城marketingType传1
+            if(Objects.equals(1,queryOrderDto.getMarketingType())){
+                queryOrdersDto.setMarketingType(MarketTypeEnum.ORDER.getIndex());
+            }
         } else if (OrderChannelType.APP.getCode().equals(channelType)) {
             orderClients.add(OrderClientType.APP.getIndex());
             bizTypes = Arrays.asList(BizTypeEnum.ORDINARY.getBizType(), BizTypeEnum.SALE_COUPON.getBizType());

order-application-service/src/main/java/cn/freemud/adapter/SpellGroupOrderAdapter.java

@@ -88,7 +88,6 @@ public class SpellGroupOrderAdapter {
         createOrderRequest.setExpressChannelCode("");
         createOrderRequest.setExpressNo("");
         createOrderRequest.setCanRefund(true);
-        createOrderRequest.setBizType(1);
         createOrderRequest.setSuspendState((byte) 0);
         createOrderRequest.setSuspendDesc("");
         createOrderRequest.setOperator(userLoginInfoDto.getNickName());