Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa

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

@@ -964,8 +964,12 @@ public class ShoppingCartConvertAdapter {
                 Long comboxGoodsOriginalPrice = cartGoods.getProductComboList().stream().mapToLong(t -> t.getOriginalAmount()).sum();
                 Long groupGoodsOriginalPrice = cartGoods.getProductGroupList().stream().mapToLong(t -> t.getOriginalAmount()).sum();
                 Long groupGoodsFinalPrice = cartGoods.getProductGroupList().stream().mapToLong(t -> t.getFinalPrice()).sum();
-                cartGoods.setOriginalPrice(null != cartGoods.getOriginalPrice()? cartGoods.getOriginalPrice() :
+                if (isSetMealProduct && isSkuProduct) {
+                    cartGoods.setOriginalPrice(null != spuProduct.getFinalPrice() ? spuProduct.getFinalPrice() : comboxGoodsOriginalPrice);
+                }else{
+                    cartGoods.setOriginalPrice(null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() :
                             comboxGoodsOriginalPrice);
+                }
                 cartGoods.setOriginalAmount((cartGoods.getOriginalPrice()+groupGoodsOriginalPrice)* cartGoods.getQty());
                 //咨询商品服务，套餐售价取originalPrice
                 cartGoods.setFinalPrice(null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() :