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

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/SetMealCalculation.java

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

@@ -638,7 +638,11 @@ public class ShoppingCartConvertAdapter {
             //更新当前商品行价格
             Long newOrigOriginalPrice = 0L;
             if (isSetMealProduct) {
+                if (null != cartGoods.getOriginalPrice()){
+                    newOrigOriginalPrice += cartGoods.getOriginalPrice();
+                }else{
                     newOrigOriginalPrice += cartGoods.getProductComboList().stream().mapToLong(t -> t.getOriginalAmount()).sum();
+                }
                 newOrigOriginalPrice += cartGoods.getProductGroupList().stream().mapToLong(t -> t.getOriginalAmount()).sum();
             } else {
                 newOrigOriginalPrice = isSkuProduct ? skuProduct.getFinalPrice() : spuProduct.getFinalPrice();
@@ -852,9 +856,18 @@ public class ShoppingCartConvertAdapter {
             //更新当前商品行价格
             Long newOrigOriginalPrice = 0L;
             if (isSetMealProduct) {
-                Long comboxGoodsOriginalPrice = cartGoods.getProductComboList().stream().mapToLong(t -> t.getOriginalAmount()).sum();
+                Long comboxGoodsFinalPrice = 0L;
+                Long comboxGoodsOriginalPrice = 0L;
+                if (null != cartGoods.getOriginalPrice()) {
+                    comboxGoodsOriginalPrice = cartGoods.getOriginalPrice();
+                    comboxGoodsFinalPrice = cartGoods.getFinalPrice();
+                }else {
+                    comboxGoodsOriginalPrice =
+                            cartGoods.getProductComboList().stream().mapToLong(t -> t.getOriginalAmount()).sum();
+                    comboxGoodsFinalPrice =
+                            cartGoods.getProductComboList().stream().mapToLong(t -> t.getFinalPrice()).sum();
+                }
                 Long groupGoodsOriginalPrice = cartGoods.getProductGroupList().stream().mapToLong(t -> t.getOriginalAmount()).sum();
-                Long comboxGoodsFinalPrice = cartGoods.getProductComboList().stream().mapToLong(t -> t.getFinalPrice()).sum();
                 Long groupGoodsFinalPrice = cartGoods.getProductGroupList().stream().mapToLong(t -> t.getFinalPrice()).sum();
                 cartGoods.setOriginalPrice(comboxGoodsOriginalPrice);
                 cartGoods.setOriginalAmount((comboxGoodsOriginalPrice+groupGoodsOriginalPrice)* cartGoods.getQty());

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

@@ -1370,7 +1370,8 @@ public class ShoppingCartMCoffeeServiceImpl {
 
         //超值加购商品赋值
         if (ObjectUtils.equals(GoodsTypeEnum.REDUCE_PRICE_GOODS.getGoodsType(), cartGoods.getGoodsType())
-                || ObjectUtils.equals(GoodsTypeEnum.COUPON_GOODS.getGoodsType(), cartGoods.getGoodsType())) {
+                || ObjectUtils.equals(GoodsTypeEnum.COUPON_GOODS.getGoodsType(), cartGoods.getGoodsType())
+                || Objects.equals(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType(), cartGoods.getGoodsType())) {
             cartGoods.setOriginalPrice(productBeanListSpuClass.get(0).getOriginalPrice());
             cartGoods.setFinalPrice(productBeanListSpuClass.get(0).getFinalPrice());
             cartGoods.setPackPrice(productBeanListSpuClass.get(0).getPackPrice());

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

@@ -87,10 +87,11 @@ public class SetMealCalculation {
                 }
             }
 
-            cartGoods.setOriginalAmount(productGroupTotalAmount + productComboTotalAmount + materialPrice);
-            cartGoods.setOriginalPrice(productComboTotalAmount);
+
             Long amount = null != cartGoods.getFinalPrice() ? cartGoods.getFinalPrice() + productGroupTotalAmount + materialPrice :
                     productGroupTotalAmount + productComboTotalAmount + materialPrice;
+            cartGoods.setOriginalAmount(productGroupTotalAmount + productComboTotalAmount + materialPrice);
+            cartGoods.setOriginalPrice(productComboTotalAmount);
             cartGoods.setAmount(amount);
             cartGoods.setFinalPrice(productComboTotalAmount);