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

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

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -240,7 +240,9 @@ public class OrderSdkAdapter {
         // 双重判断,防止前端乱传参搞事情
         if (Objects.nonNull(bizType) && BizTypeEnum.ADVANCE_ORDER.getBizType().compareTo(bizType) == 0) {
             request.setBizType(BizTypeEnum.ADVANCE_ORDER.getBizType());
-        } else {
+        }else if (Objects.nonNull(bizType) && BizTypeEnum.MALL.getBizType().compareTo(bizType) == 0) {
+            request.setBizType(BizTypeEnum.MALL.getBizType());
+        }else {
             // 20210730之前 默认设置为1
             request.setBizType(CommonConstant.INTEGER_ONE);
         }

order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java

@@ -277,6 +277,8 @@ public class MallOrderServiceImpl implements MallOrderService {
             baseCreateOrderRequest = getProductCustomerCode(baseCreateOrderRequest);
             //保存门店渠道信息
             baseCreateOrderRequest.setOrderExtended(orderExtendedReq);
+            baseCreateOrderRequest.setMarketingType(MarketTypeEnum.ORDER.getIndex().byteValue());
+            baseCreateOrderRequest.setBizType(BizTypeEnum.MALL.getBizType());
             OrderClientType orderClient = OrderClientType.SAAS;
             if (ChannelEnum.TYPE_2.getCode().equals(userLoginInfoDto.getChannel())) {
                 orderClient = OrderClientType.ALIPAY;