sunyu::update::!Objects.equals(cartGoods.getSkuId(),cartGoods.getSpuId())

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

@@ -1974,10 +1974,12 @@ public class ShoppingCartMCoffeeServiceImpl {
                     //如果购物车中存在月享卡，则将商品返回的卡券信息替换购物车中的卡券信息
                     replaceMonthCardInfo(valiadShopProductResult,cartGoods);
                     ProductTypeBeanDTO productType = valiadShopProductResult.getProductType();
-                    if(!Objects.equals(cartGoods.getSkuId(),cartGoods.getSpuId()) && ObjectUtils.equals(productType.getPid(), cartGoods.getSpuId())){
+                    if(ObjectUtils.equals(productType.getPid(), cartGoods.getSpuId())){
                         //多规格商品更新套餐价格为商品返回
-                        cartGoods.setFinalPrice(valiadShopProductResult.getProductType().getFinalPrice());
-                        cartGoods.setOriginalPrice(valiadShopProductResult.getProductType().getFinalPrice());
+                        if(!Objects.equals(cartGoods.getSkuId(),cartGoods.getSpuId())) {
+                            cartGoods.setFinalPrice(valiadShopProductResult.getProductType().getFinalPrice());
+                            cartGoods.setOriginalPrice(valiadShopProductResult.getProductType().getFinalPrice());
+                        }
                         Map<String,ProductTypeBeanDTO> subProductTypeMap = valiadShopProductResult.getSubProductTypeMap();
                         shoppingCartConvertAdapter.updateCartGoodsInfo(cartGoods, productType,subProductTypeMap);
                         break;