sunyu::update::evm套餐价格计算bug修复

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

@@ -92,12 +92,6 @@ public class SetMealCalculation {
                 }
             }
 
-            //如果是商品券商品，不重新计算套餐价格
-            if (StringUtils.isEmpty(cartGoods.getCouponCode())) {
-                Long amount = null != cartGoods.getFinalPrice() ? cartGoods.getFinalPrice() * cartGoods.getQty() + productGroupTotalAmount + materialPrice :
-                        productGroupTotalAmount + productComboTotalAmount + materialPrice;
-                cartGoods.setAmount(amount);
-            }
             //套餐可选商品加料
             if(CollectionUtils.isNotEmpty(cartGoods.getProductGroupList())){
                 for (CartGoods.ComboxGoods comboxGoods : cartGoods.getProductGroupList()){
@@ -113,6 +107,12 @@ public class SetMealCalculation {
                 }
             }
 
+            //如果是商品券商品，不重新计算套餐价格
+            if (StringUtils.isEmpty(cartGoods.getCouponCode())) {
+                Long amount = null != cartGoods.getFinalPrice() ? cartGoods.getFinalPrice() * cartGoods.getQty() + productGroupTotalAmount + materialPrice :
+                        productGroupTotalAmount + productComboTotalAmount + materialPrice;
+                cartGoods.setAmount(amount);
+            }
             Long comboOriginalPriceAmount = null != cartGoods.getOriginalAmount() ? cartGoods.getOriginalAmount() :
                     productComboTotalAmount;
             cartGoods.setOriginalAmount(productGroupTotalAmount + comboOriginalPriceAmount + materialPrice);