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

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

@@ -1303,6 +1303,14 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     Map<CourseSchedule.CourseScheduleType, TeacherDefaultMusicGroupSalary> collect = teacherSalaryList.stream().collect(Collectors.toMap(TeacherDefaultMusicGroupSalary::getCourseScheduleType, teacherDefaultMusicGroupSalary -> teacherDefaultMusicGroupSalary));
 
                     TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary = collect.get(classGroup4MixDto.getCourseType());
+                    if(teacherDefaultMusicGroupSalary != null){
+						if (teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary() == null
+								|| teacherDefaultMusicGroupSalary.getAssistantTeacher90MinSalary() == null
+								|| teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() == null
+								|| teacherDefaultMusicGroupSalary.getMainTeacher90MinSalary() == null) {
+							throw new BizException("请设置老师默认课酬");
+						}
+                    }
 
                     //对应基准课酬
                     BigDecimal baseSalary = new BigDecimal(0), classTimeDuty = new BigDecimal(0);

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

@@ -803,7 +803,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         JSONObject allTeacherLeaveData = JSONObject.parseObject(allTeacherLeaveDataConfig.getParanValue());
         JSONObject organTeacherLeaveData = null;
         if (Objects.nonNull(allTeacherLeaveData)) {
-            organTeacherLeaveData = allTeacherLeaveData.getJSONObject(student.getOrganId().toString());
+            organTeacherLeaveData = allTeacherLeaveData.getJSONObject(teacher.getOrganId().toString());
         }
         if (Objects.isNull(organTeacherLeaveData)) {
             checkTeacherLeaveDate = false;
@@ -825,6 +825,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
         List<Date> enableApplyDates = getEnableApplyDates(applyStartDate, applyEndDate);
         List<CourseSchedule> allTeacherCourses = courseScheduleDao.findTeacherCoursesWithDateRange(teacherId, firstMonday, secondSunday);
+        allTeacherCourses.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
 
         Set<Integer> disableApplyWeekNum = new HashSet<>();
         List<CourseSchedule> applyDateRangeCourses = new ArrayList<>();
@@ -839,10 +840,10 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 applyDateRangeCourses.add(teacherCourse);
             }
             courseCalendar.setTime(teacherCourse.getClassDate());
-            if (practiceCourseNum>0 && courseCalendar.get(Calendar.DAY_OF_WEEK) == Calendar.MONDAY) {
-                if(practiceCourseNum>80){
-                    disableApplyWeekNum.add(courseWeekNum);
-                }
+            if(practiceCourseNum>80){
+                disableApplyWeekNum.add(courseWeekNum);
+            }
+            if (courseCalendar.get(Calendar.WEEK_OF_YEAR) != courseWeekNum) {
                 courseWeekNum = courseCalendar.get(Calendar.WEEK_OF_YEAR);
                 practiceCourseNum = 0;
             }
@@ -1001,7 +1002,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 backCourseSchedule.setEndClassTime(preCourseSchedule.getEndClassTime());
             }
             if (j == 0) {
-                for (Date enableApplyDate : enableApplyDates) {
+                for (Date enableApplyDate : tempEnableApplyDates) {
                     if (Objects.nonNull(firstClassTime) && DateUtil.isSameDay(enableApplyDate, firstClassTime)) {
                         continue;
                     }
@@ -1012,7 +1013,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 }
             }
             if (j == applyDateRangeCourses.size() - 1) {
-                for (Date enableApplyDate : enableApplyDates) {
+                for (Date enableApplyDate : tempEnableApplyDates) {
                     if (Objects.nonNull(firstClassTime) && DateUtil.isSameDay(enableApplyDate, firstClassTime)) {
                         continue;
                     }
@@ -1799,7 +1800,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         List<SimpleUserDto> enableApplyTeachers = getEnableApplyTeachers(practiceGroup.getStudentId(), practiceGroup.getSubjectId());
         Set<Integer> enableApplyTeacherIds = enableApplyTeachers.stream().map(SimpleUserDto::getUserId).collect(Collectors.toSet());
         if(!enableApplyTeacherIds.contains(practiceGroup.getUserId())){
-            throw new BizException("预约失败，老师选择错误，请重试。");
+            throw new BizException("预约失败，老师选择错误，请重试");
         }
 
         practiceGroup.setOrganId(sysUser.getOrganId());

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -2269,13 +2269,14 @@
         FROM
           course_schedule_student_payment cssp
           LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
+          LEFT JOIN class_group cg ON cg.id_ = cssp.class_group_id_
           LEFT JOIN class_group_student_mapper cgsm ON cgsm.user_id_ = cssp.user_id_
           AND cssp.class_group_id_ = cgsm.class_group_id_
         WHERE
           ( cs.del_flag_ != 1 OR cs.del_flag_ IS NULL )
           AND cssp.user_id_ = #{userId}
           AND cgsm.status_ = 'NORMAL'
-          AND cs.type_ IN ('SINGLE','HIGH','VIP')
+          AND cg.type_ IN ('NORMAL','HIGH','VIP')
           AND cs.teacher_id_ IN
           <foreach collection="teacherIds" item="teacherId" open="(" close=")" separator=",">
               #{teacherId}