sunyu::update::resolve conflicts

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

@@ -108,11 +108,10 @@ public class SetMealCalculation {
             }
 
 
-            Long amount = null != cartGoods.getFinalPrice() ? cartGoods.getFinalPrice()*cartGoods.getQty() + productGroupTotalAmount + materialPrice :
-                    productGroupTotalAmount + productComboTotalAmount + materialPrice;
             //如果是商品券商品，不重新计算套餐价格
             if (StringUtils.isEmpty(cartGoods.getCouponCode())) {
-                Long amount = null != cartGoods.getFinalPrice() ? cartGoods.getFinalPrice() * cartGoods.getQty() + productGroupTotalAmount + materialPrice :
+                Long amount = null != cartGoods.getFinalPrice() ?
+                        cartGoods.getFinalPrice() * cartGoods.getQty() + productGroupTotalAmount + materialPrice :
                         productGroupTotalAmount + productComboTotalAmount + materialPrice;
                 cartGoods.setAmount(amount);
             }