套餐价格问题

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartMccafeAdapter.java

@@ -70,7 +70,7 @@ public class ShoppingCartMccafeAdapter {
             cartGoodsDetailDto.setSpuName(comboxGoods.getSpuName());
             cartGoodsDetailDto.setSkuId(comboxGoods.getGoodsId());
             cartGoodsDetailDto.setSkuName(StringUtils.isEmpty(comboxGoods.getSkuName()) ? comboxGoods.getSpuName() : comboxGoods.getSkuName());
-            cartGoodsDetailDto.setOriginalPrice(comboxGoods.getOriginalPrice());
+            cartGoodsDetailDto.setOriginalPrice(comboxGoods.getFinalPrice());
             cartGoodsDetailDto.setPicture(comboxGoods.getPic());
             int qty = comboxGoods.getQty() * cartGoods.getQty();
             cartGoodsDetailDto.setQty(qty);
@@ -150,7 +150,7 @@ public class ShoppingCartMccafeAdapter {
         cartGoodsDetailDto.setSpuName(cartGoods.getSpuName());
         cartGoodsDetailDto.setSkuId(StringUtils.isEmpty(cartGoods.getSkuId()) ? cartGoods.getSpuId() : cartGoods.getSkuId());
         cartGoodsDetailDto.setSkuName(StringUtils.isEmpty(cartGoods.getSkuName()) ? cartGoods.getSpuName() : cartGoods.getSkuName());
-        cartGoodsDetailDto.setOriginalPrice(cartGoods.getOriginalPrice());
+        cartGoodsDetailDto.setOriginalPrice(cartGoods.getFinalPrice());
 //        cartGoodsDetailDto.setTotalDiscountAmount(0);
         cartGoodsDetailDto.setSalePrice(cartGoods.getFinalPrice());
         cartGoodsDetailDto.setPicture(cartGoods.getPic());

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

@@ -1792,7 +1792,7 @@ public class ShoppingCartMCoffeeServiceImpl {
                                                     ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo, List<CartGoods> cartGoodsList) {
 
         //筛选数量不为0商品
-        cartGoodsList = cartGoodsList.stream().filter(cartGoods -> cartGoods.getQty() != 0).collect(Collectors.toList());
+        cartGoodsList = cartGoodsList.stream().filter(cartGoods -> cartGoods.getQty() != 0 && !StringUtils.equals("9999",cartGoods.getSkuId())).collect(Collectors.toList());
 
         //筛选非加购商品--加价购商品不校验是否在菜单，不调用validateShopProduct
         List<CartGoods> checkGoods = cartGoodsList.stream().filter(cartGoods -> cartGoods.getGoodsType() != GoodsTypeEnum.REDUCE_PRICE_GOODS.getGoodsType()).collect(Collectors.toList());