Merge branch 'doubleEleven2020'

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

@@ -398,7 +398,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             boolean flag = false;
             for (int i = 1; i <= 10; i++) {
                 chargeInfo = sporadicChargeInfoDao.get(sporadicPayDto.getSporadicId());
-                if (chargeInfo.getMaxNum() >= chargeInfo.getPaidNum()) {
+                if (chargeInfo.getMaxNum() <= chargeInfo.getPaidNum()) {
                     throw new BizException("活动人数暂时已满，请稍后再试");
                 }
                 chargeInfo.setPaidNum(chargeInfo.getPaidNum() + 1);

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

@@ -93,6 +93,10 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
         //课程形态
         Map<String, Object> courseForm = JSON.parseObject(musicGroup.getCourseForm(), Map.class);
 
+        //新的课程形态10.27
+
+
+
         //乐团计划及收费信息
         MusicGroupSubjectPlan musicOneSubjectClassPlan = this.getMusicOneSubjectClassPlan(musicGroupId, subjectId);