套餐价格重新计算

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

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