Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -816,7 +816,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         Set<Integer> disableApplyWeekNum = new HashSet<>();
 
         TeacherFreeTime teacherFreeTime=teacherFreeTimeDao.findTeacherFreeTime(teacherId);
-        int maxTeacherCourses=80;
+        Integer maxTeacherCourses=null;
         int holiday=0;
         if(Objects.nonNull(teacherFreeTime)){
             if(Objects.nonNull(teacherFreeTime.getTotalTimes())){
@@ -872,7 +872,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 practiceCourseNum+=1;
                 courseWeekNum = courseCalendar.get(Calendar.WEEK_OF_YEAR);
             }
-            if(practiceCourseNum>=maxTeacherCourses){
+            if(Objects.nonNull(maxTeacherCourses)&&practiceCourseNum>=maxTeacherCourses){
                 disableApplyWeekNum.add(courseWeekNum);
             }
             if (courseCalendar.get(Calendar.WEEK_OF_YEAR) != courseWeekNum) {
@@ -1567,10 +1567,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             return result;
         }
 
-
-
         TeacherFreeTime teacherFreeTime=teacherFreeTimeDao.findTeacherFreeTime(practiceGroup.getUserId());
-        int maxTeacherCourses=80;
+        Integer maxTeacherCourses=null;
         if(Objects.nonNull(teacherFreeTime)){
             if(Objects.nonNull(teacherFreeTime.getTotalTimes())){
                 maxTeacherCourses=teacherFreeTime.getTotalTimes();
@@ -1580,7 +1578,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         Date monday1 = DateUtil.getWeekDayWithDate(allCourseDates.get(0), Calendar.MONDAY);
         Date sunday1 = DateUtil.getWeekDayWithDate(allCourseDates.get(0), Calendar.SUNDAY);
         int tp1 = courseScheduleDao.countTeacherPracticeCourse(practiceGroup.getUserId(), monday1, sunday1);
-        if(tp1>=maxTeacherCourses){
+        if(Objects.nonNull(maxTeacherCourses)&&tp1>=maxTeacherCourses){
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             result.put("status", "TEACHER_PRACTICE_REPEAT");
             result.put("info", "抱歉啦，当前所选时段组合，「" + teacher.getRealName() +"」老师已被预约，请重新选择时段或更换老师后重试。");
@@ -1590,7 +1588,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         Date monday2 = DateUtil.getWeekDayWithDate(allCourseDates.get(1), Calendar.MONDAY);
         Date sunday2 = DateUtil.getWeekDayWithDate(allCourseDates.get(1), Calendar.SUNDAY);
         int tp2 = courseScheduleDao.countTeacherPracticeCourse(practiceGroup.getUserId(), monday2, sunday2);
-        if(tp2>=maxTeacherCourses){
+        if(Objects.nonNull(maxTeacherCourses)&&tp2>=maxTeacherCourses){
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             result.put("status", "TEACHER_PRACTICE_REPEAT");
             result.put("info", "抱歉啦，当前所选时段组合，「" + teacher.getRealName() +"」老师已被预约，请重新选择时段或更换老师后重试。");
@@ -1600,7 +1598,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         Date monday3 = DateUtil.getWeekDayWithDate(allCourseDates.get(2), Calendar.MONDAY);
         Date sunday3 = DateUtil.getWeekDayWithDate(allCourseDates.get(2), Calendar.SUNDAY);
         int tp3 = courseScheduleDao.countTeacherPracticeCourse(practiceGroup.getUserId(), monday3, sunday3);
-        if(tp3>=maxTeacherCourses){
+        if(Objects.nonNull(maxTeacherCourses)&&tp3>=maxTeacherCourses){
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             result.put("status", "TEACHER_PRACTICE_REPEAT");
             result.put("info", "抱歉啦，当前所选时段组合，「" + teacher.getRealName() +"」老师已被预约，请重新选择时段或更换老师后重试。");
@@ -1610,7 +1608,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         Date monday4 = DateUtil.getWeekDayWithDate(allCourseDates.get(3), Calendar.MONDAY);
         Date sunday4 = DateUtil.getWeekDayWithDate(allCourseDates.get(3), Calendar.SUNDAY);
         int tp4 = courseScheduleDao.countTeacherPracticeCourse(practiceGroup.getUserId(), monday4, sunday4);
-        if(tp4>=maxTeacherCourses){
+        if(Objects.nonNull(maxTeacherCourses)&&tp4>=maxTeacherCourses){
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             result.put("status", "TEACHER_PRACTICE_REPEAT");
             result.put("info", "抱歉啦，当前所选时段组合，「" + teacher.getRealName() +"」老师已被预约，请重新选择时段或更换老师后重试。");