修改乐器的打折金额

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -299,24 +299,26 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             throw new BizException("订单金额异常");
         }
 
-        //重试避免人数过多频繁冲突
-        boolean flag = false;
-        for (int i = 1; i <= 10; i++) {
-            chargeInfo = sporadicChargeInfoDao.get(sporadicPayDto.getSporadicId());
-            if (chargeInfo.getMaxNum() != null && chargeInfo.getMaxNum() <= chargeInfo.getPaidNum()) {
-                throw new BizException("活动人数暂时已满，请稍后再试");
+        if(chargeInfo.getMaxNum() != null) {
+            //重试避免人数过多频繁冲突
+            boolean flag = false;
+            for (int i = 1; i <= 10; i++) {
+                chargeInfo = sporadicChargeInfoDao.get(sporadicPayDto.getSporadicId());
+                if (chargeInfo.getMaxNum() <= chargeInfo.getPaidNum()) {
+                    throw new BizException("活动人数暂时已满，请稍后再试");
+                }
+                chargeInfo.setPaidNum(chargeInfo.getPaidNum() + 1);
+                chargeInfo.setUpdateTime(new Date());
+                int update = sporadicChargeInfoDao.update(chargeInfo);
+                if (update > 0) {
+                    flag = true;
+                    break;
+                }
             }
-            chargeInfo.setPaidNum(chargeInfo.getPaidNum() + 1);
-            chargeInfo.setUpdateTime(new Date());
-            int update = sporadicChargeInfoDao.update(chargeInfo);
-            if (update > 0) {
-                flag = true;
-                break;
+            if (!flag) {
+                throw new BizException("活动火爆，请稍后再试");
             }
         }
-        if (!flag) {
-            throw new BizException("活动火爆，请稍后再试");
-        }
 
         OrderTypeEnum type = OrderTypeEnum.SPORADIC;
         if (chargeInfo.getChargeType().equals(SporadicChargeTypeEnum.DOUBLE_ELEVEN2020)) {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SporadicChargeInfoImpl.java

@@ -139,7 +139,7 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
             return true;
         }
         if (studentPaymentOrder.getStatus() == DealStatusEnum.CLOSE || studentPaymentOrder.getStatus() == DealStatusEnum.FAILED) {
-            if (info.getPaidNum() > 0) {
+            if (info.getMaxNum() != null && info.getPaidNum() > 0) {
                 //重试避免人数过多频繁冲突
                 boolean flag = false;
                 for (int i = 1; i <= 10; i++) {