商品券支持套餐

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

@@ -852,6 +852,7 @@ public class CouponServiceImpl implements CouponService {
                 comboProductTypeList.add(validateSkuProductType);
             }
             productType.setComboProductTypeList(comboProductTypeList);
+            productType.setIsCouponMarkUpSetMeal(1);
         }
         productType.setMemberDiscount(null);
         productType.setPrice(product.getFinalPrice().intValue());

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

@@ -1491,7 +1491,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             if (StringUtils.isBlank(couponCode)) {
                 this.addCalculationDiscountGoods(calculationDiscountGoodsList, cartGoods);
             } else {
-                CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, couponCode, menuType,null);
+                CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, couponCode, menuType,cartGoods);
                 CheckSpqInfoResponseDto checkSpqInfoResponseDto = null;
                 // fisherman 删除商品券导致 购物车显示商品名称 为换购券 券名称
                 boolean viewProductName = false;