Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-22 a8d4353d8e0bd40a10b2c1eb0c437de9780b8c5e

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java

@@ -309,7 +309,7 @@
        switch (buyType){
            case 1:
                if (byId.getMonthlyCardDiscountStart()!=null&&(now.isAfter(byId.getMonthlyCardDiscountStart())&&now.isBefore(byId.getMonthlyCardDiscountEnd()))){
                    payMoney = byId.getMonthlyCard().multiply(byId.getMonthlyCardDiscount());
                    payMoney = byId.getMonthlyCard().multiply(byId.getMonthlyCardDiscount().divide(new BigDecimal(10)));
                    discountMoney = byId.getMonthlyCard().subtract(payMoney);
                    discount = byId.getMonthlyCardDiscount();
                }else {
@@ -318,7 +318,7 @@
                break;
                case 2:
                    if (byId.getSeasonCardDiscountStart()!=null&&(now.isAfter(byId.getSeasonCardDiscountStart())&&now.isBefore(byId.getSeasonCardDiscountEnd()))){
                        payMoney = byId.getSeasonCard().multiply(byId.getSeasonCardDiscount());
                        payMoney = byId.getSeasonCard().multiply(byId.getSeasonCardDiscount().divide(new BigDecimal(10)));
                        discountMoney = byId.getSeasonCard().subtract(payMoney);
                        discount = byId.getSeasonCardDiscount();
                    }else {
@@ -327,7 +327,7 @@
                break;
            case 3:
                if (byId.getAnnualCardDiscountStart()!=null&&(now.isAfter(byId.getAnnualCardDiscountStart())&&now.isBefore(byId.getAnnualCardDiscountEnd()))){
                    payMoney = byId.getAnnualCard().multiply(byId.getAnnualCardDiscount());
                    payMoney = byId.getAnnualCard().multiply(byId.getAnnualCardDiscount().divide(new BigDecimal(10)));
                    discountMoney = byId.getAnnualCard().subtract(payMoney);
                    discount = byId.getAnnualCardDiscount();
                }else {