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

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

@@ -512,8 +512,8 @@ public class ShoppingCartConvertAdapter {
             if (ObjectUtils.equals(com.freemud.sdk.api.assortment.shoppingcart.constant.GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType(), cartGoods.getGoodsType())){
                 int price =
                         (null == cartGoods.getProductGroupList() ? 0 :
-                                cartGoods.getProductGroupList().stream().mapToInt(t -> (null == t.getFinalPrice() ? 0 : t.getFinalPrice().intValue()) * t.getQty()).sum())
-                                + cartGoods.getFinalPrice().intValue();
+                                cartGoods.getProductGroupList().stream().mapToInt(t -> (null == t.getOriginalPrice() ? 0 : t.getOriginalPrice().intValue()) * t.getQty()).sum())
+                                + cartGoods.getOriginalPrice().intValue();
                 productType.setPrice(price);
             }else{
                 productType.setPrice(cartGoods.getFinalPrice() == null ? 0 : cartGoods.getFinalPrice().intValue());
@@ -873,7 +873,7 @@ public class ShoppingCartConvertAdapter {
                         comboxGoodsOriginalPrice);
                 cartGoods.setOriginalAmount((cartGoods.getOriginalPrice()+groupGoodsOriginalPrice)* cartGoods.getQty());
                 //咨询商品服务，套餐售价取originalPrice
-                cartGoods.setFinalPrice(null != cartGoods.getFinalPrice() ? cartGoods.getFinalPrice() :
+                cartGoods.setFinalPrice(null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() :
                         comboxGoodsFinalPrice);
                 cartGoods.setAmount((cartGoods.getFinalPrice()+groupGoodsFinalPrice) * cartGoods.getQty());
             } else {
@@ -882,7 +882,7 @@ public class ShoppingCartConvertAdapter {
                 cartGoods.setOriginalAmount(newOrigOriginalPrice * cartGoods.getQty());
                 cartGoods.setAmount(newOrigOriginalPrice * cartGoods.getQty());
                 //咨询商品服务，套餐售价取originalPrice
-                cartGoods.setFinalPrice(isSkuProduct ? skuProduct.getFinalPrice() : spuProduct.getFinalPrice());
+                cartGoods.setFinalPrice(isSkuProduct ? skuProduct.getOriginalPrice() : spuProduct.getFinalPrice());
             }
             cartGoods.setWeight(isSkuProduct ? skuProduct.getWeight() : spuProduct.getWeight());
             cartGoods.setUnit(isSkuProduct ? skuProduct.getUnit() : spuProduct.getUnit());