1、陪练课调整

2、付费陪练课

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

@@ -2516,20 +2516,16 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         for (int i = 0; i < allTeacherCourses.size(); i++) {
             CourseSchedule teacherCourse = allTeacherCourses.get(i);
             tempClassDateTime = LocalDateTime.ofInstant(teacherCourse.getClassDate().toInstant(), zoneId);
-            if (i == 0 && teacherCourse.getGroupType().equals(GroupType.PRACTICE)) {
-                practiceCourseNum += 1;
-                courseWeekNum = tempClassDateTime.get(weekFields.weekOfYear());
-            }
-            if (Objects.nonNull(maxTeacherCourses) && practiceCourseNum >= maxTeacherCourses) {
-                disableApplyWeekNum.add(courseWeekNum);
-            }
             if (tempClassDateTime.get(weekFields.weekOfYear()) != courseWeekNum) {
                 courseWeekNum = tempClassDateTime.get(weekFields.weekOfYear());
                 practiceCourseNum = 0;
-            }
-            if (teacherCourse.getGroupType().equals(GroupType.PRACTICE)) {
+                practiceCourseNum = 1;
+            }else if(teacherCourse.getGroupType().equals(GroupType.PRACTICE)){
                 practiceCourseNum += 1;
             }
+            if (Objects.nonNull(maxTeacherCourses) && practiceCourseNum >= maxTeacherCourses) {
+                disableApplyWeekNum.add(courseWeekNum);
+            }
         }
 
         if(disableApplyWeekNum.size()>2){
@@ -2557,7 +2553,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
         if(disableApplyWeekNum.contains(applyEndDateWeekNum)){
             LocalDateTime applyEndMonDay = applyEndDateTime.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
-            while (applyEndMonDay.compareTo(applyEndDateTime)<=0){
+            while (applyEndMonDay.compareTo(applyEndDateTime)<0){
                 weekNumApplyTimesMap.remove(applyEndMonDay.getDayOfWeek().getValue());
                 applyEndMonDay = applyEndMonDay.plusDays(1);
             }