套餐价格问题

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

@@ -1057,10 +1057,10 @@ public class ShoppingCartConvertAdapter {
             //更新当前商品行价格
             Long newOrigOriginalPrice = 0L;
             if (isSetMealProduct) {
-                cartGoods.setOriginalPrice(null != cartGoods.getOriginalPrice()? cartGoods.getOriginalPrice() : 0);
+                cartGoods.setOriginalPrice(null != spuProduct.getOriginalPrice()? spuProduct.getOriginalPrice() : 0);
                 cartGoods.setOriginalAmount(cartGoods.getOriginalPrice()* cartGoods.getQty());
                 //咨询商品服务，套餐售价取originalPrice
-                cartGoods.setFinalPrice(null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() : 0);
+                cartGoods.setFinalPrice(null != spuProduct.getOriginalPrice() ? spuProduct.getOriginalPrice() : 0);
                 cartGoods.setAmount(cartGoods.getFinalPrice() * cartGoods.getQty());
             } else {
                 newOrigOriginalPrice = isSkuProduct ? skuProduct.getFinalPrice() : spuProduct.getFinalPrice();

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

@@ -101,8 +101,6 @@ public class SetMealCalculation {
                 cartGoods.setAmount(cartGoods.getAmount() + materialPrice);
                 cartGoods.setOriginalAmount(cartGoods.getOriginalAmount() + materialPrice);
             }
-            cartGoods.setOriginalPrice(cartGoods.getOriginalPrice());
-            cartGoods.setFinalPrice(cartGoods.getFinalPrice());
 
             // 套餐（固定商品）现价
 //            String toastMsg = getTotalAmount(cartGoods, productGroupAmount, numberMap, goodsMap);