marketingType非空判断添加

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

@@ -507,7 +507,7 @@ public class CheckOrder {
         requestDto.setPremiumExchangeActivity(createOrderVo.getPremiumExchangeActivity());
         // 若为拼单类型，购物车信息从新的拼单购物车获取 update by miaohui for 【ID1010972】 多人拼单
         cn.freemud.base.entity.BaseResponse<ShoppingCartGoodsDto> apportionResponse;
-        if (OrderMarketType.COLLAGE.getIndex() == createOrderVo.getMarketingType()) {
+        if (createOrderVo.getMarketingType() != null && OrderMarketType.COLLAGE.getIndex() == createOrderVo.getMarketingType()) {
             apportionResponse = shoppingCartClient.getCollageShoppingCartGoodsApportion(requestDto);
         } else {
             apportionResponse = shoppingCartClient.getShoppingCartGoodsApportionNew(requestDto);