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

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

@@ -86,7 +86,8 @@ public class SetMealCalculation {
 
             cartGoods.setOriginalAmount(productGroupTotalAmount + productComboTotalAmount + materialPrice);
             cartGoods.setOriginalPrice(productComboTotalAmount);
-            cartGoods.setAmount(productGroupTotalAmount + productComboTotalAmount + materialPrice);
+            Long amount = null != cartGoods.getAmount() ? cartGoods.getAmount() : productGroupTotalAmount + productComboTotalAmount + materialPrice;
+            cartGoods.setAmount(amount);
             cartGoods.setFinalPrice(productComboTotalAmount);
 
             // 套餐（固定商品）现价