套餐价格问题

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

@@ -1060,7 +1060,7 @@ public class ShoppingCartConvertAdapter {
                 cartGoods.setOriginalPrice(null != spuProduct.getOriginalPrice()? spuProduct.getOriginalPrice() : 0);
                 cartGoods.setOriginalAmount(cartGoods.getOriginalPrice()* cartGoods.getQty());
                 //咨询商品服务，套餐售价取originalPrice
-                cartGoods.setFinalPrice(null != spuProduct.getOriginalPrice() ? spuProduct.getOriginalPrice() : 0);
+                cartGoods.setFinalPrice(null != spuProduct.getFinalPrice() ? spuProduct.getFinalPrice() : 0);
                 cartGoods.setAmount(cartGoods.getFinalPrice() * cartGoods.getQty());
             } else {
                 newOrigOriginalPrice = isSkuProduct ? skuProduct.getFinalPrice() : spuProduct.getFinalPrice();
@@ -1068,7 +1068,7 @@ public class ShoppingCartConvertAdapter {
                 cartGoods.setOriginalAmount(newOrigOriginalPrice * cartGoods.getQty());
                 cartGoods.setAmount(newOrigOriginalPrice * cartGoods.getQty());
                 //咨询商品服务，套餐售价取originalPrice
-                cartGoods.setFinalPrice(isSkuProduct ? skuProduct.getOriginalPrice() : spuProduct.getFinalPrice());
+                cartGoods.setFinalPrice(isSkuProduct ? skuProduct.getFinalPrice() : spuProduct.getFinalPrice());
             }
             cartGoods.setWeight(isSkuProduct ? skuProduct.getWeight() : spuProduct.getWeight());
             cartGoods.setUnit(isSkuProduct ? skuProduct.getUnit() : spuProduct.getUnit());

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

@@ -1928,14 +1928,11 @@ public class ShoppingCartMCoffeeServiceImpl {
                             }
                             if (PRODUCT_PRICE_CHANGE == validaProduct.getCode()) {
                                 changePriceSpu.add(spuName);
-                                List<ProductTypeBeanDTO> productList =
-                                        validateResult.getFailureList().stream().map(ValiadShopProductResult::getProductType).collect(Collectors.toList());
-                                shoppingCartConvertAdapter.updateCartGoodsInfoForMCoffee(cartGoods, productList);
+                                shoppingCartConvertAdapter.updateCartGoodsInfo(cartGoods, validaProduct.getProductType(), validaProduct.getSubProductTypeMap());
                             }
                             if (PRODUCT_GROUP_PRICE_CHANGE == validaProduct.getCode()) {
                                 changePriceSpu.add(spuName);
-                                List<ProductTypeBeanDTO> productList = validateResult.getFailureList().stream().map(ValiadShopProductResult::getProductType).collect(Collectors.toList());
-                                shoppingCartConvertAdapter.updateCartGoodsInfoForMCoffee(cartGoods, productList);
+                                shoppingCartConvertAdapter.updateCartGoodsInfo(cartGoods, validaProduct.getProductType(), validaProduct.getSubProductTypeMap());
                             }
                             if (PRODUCT_GROUP_EMPTY == validaProduct.getCode()) {
                                 cartGoodsStates.setHasInvalidGoods(true);