Merge branch 'KA-2.0.41-爱马哥预订单开发-zxh' into master-amg-pre

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

@@ -573,7 +573,7 @@ public class OrderServiceImpl implements Orderservice {
             newShoppingCartClearDto.setOperationType(1);
             // fisherman 清楚 爱马哥蛋糕预定 类型购物车 bizType = 7
             newShoppingCartClearDto.setBizType(orderBean.getBizType());
-            shoppingCartClient.clearShoppingCart(newShoppingCartClearDto);
+            //shoppingCartClient.clearShoppingCart(newShoppingCartClearDto);
 
             /**
                 主要 根据 ShoppingCartNewServiceImpl   次要 ShoppingCartMallServiceImpl

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/GetValidateProductInfoDto.java

@@ -41,6 +41,11 @@ public class GetValidateProductInfoDto {
      */
     private String channel;
 
+    /**
+     * 业务类型 7-预定单  爱马哥蛋糕预定场景使用(2.0.41迭代 1032929)
+     */
+    private Integer bizType;
+
     @Data
     public static class ProductInfo {
         /**

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -2887,7 +2887,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         // 返回构造对象
         PremiumExchangeResponseVo premiumExchangeResponseVo = new PremiumExchangeResponseVo();
         premiumExchangeResponseVo.setResultCode(ActivityResultCodeEnum.NON_PARTICIPATE.getCode());
-        List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCart(partnerId, storeId, userId, request.getSessionId(), null, shoppingCartBaseService,null);
+        List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCart(partnerId, storeId, userId, request.getSessionId(), null, shoppingCartBaseService,bizType);
         if (grayPush(partnerId, storeId, "2")) {
             // 当couponCode不为空时，需参与价格计算
             ArrayList<CalculationSharingDiscountRequestDto.CalculationDiscountCoupon> coupons = new ArrayList<>();
@@ -2961,6 +2961,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         getProductInfoDto.setStoreId(storeId);
         getProductInfoDto.setChannel(menuType);
         getProductInfoDto.setProductIds(spuIds);
+        getProductInfoDto.setBizType(bizType);
         ValidateProductInfosDto productInfosDto = storeItemClient.validateShopContainProduct(getProductInfoDto);
         if (!Objects.equals(productInfosDto.getErrcode(), Integer.valueOf(ResponseResult.SUCCESS.getCode()))
                 || productInfosDto.getData() == null