Explorar o código

update 维修支付回调

周箭河 %!s(int64=5) %!d(string=hai) anos
pai
achega
5b61d4a825

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

@@ -642,6 +642,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
         String waringStr = "";
         for (ClassGroupTeachersDto classGroupAndTeacher : classGroupAndTeachers) {
+            //所有教师列表
+            List<Integer> teacherUserIds = classGroupAndTeacher.getClassGroupTeacherMapperList().stream().map(ClassGroupTeacherMapper::getUserId).collect(Collectors.toList());
+            List<Teacher> teachers = teacherDao.findByTeacherIds(teacherUserIds);
+            Map<Integer, Teacher> teacherMap = teachers.stream()
+                    .collect(Collectors.toMap(Teacher::getId, teacher -> teacher));
+
             Long studentNum = classGroupStudentNumMap.get(classGroupAndTeacher.getId());
             studentNum = Objects.isNull(studentNum) ? 0 : studentNum;
             if(classGroupAndTeacher.getType().equals(ClassGroupTypeEnum.HIGH_ONLINE) && (studentNum < 3 || studentNum > 5)){
@@ -661,14 +667,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 List<TeacherDefaultMusicGroupSalary> teacherSalaryByUserIdAndType = teacherDefaultMusicGroupSalaryService.getTeacherSalaryByUserIdAndType(classGroupTeacherMapper.getUserId(), courseType, type);
                 //老师课酬没有设置,设置成0
                 if (teacherSalaryByUserIdAndType == null || teacherSalaryByUserIdAndType.size() == 0) {
-                    TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary = new TeacherDefaultMusicGroupSalary();
-                    teacherDefaultMusicGroupSalary.setAssistantTeacher30MinSalary(zeroSalary);
-                    teacherDefaultMusicGroupSalary.setMainTeacher30MinSalary(zeroSalary);
-                    teacherDefaultMusicGroupSalary.setMainTeacher90MinSalary(zeroSalary);
-                    teacherDefaultMusicGroupSalary.setAssistantTeacher90MinSalary(zeroSalary);
-                    teacherDefaultMusicGroupSalary.setUserId(classGroupTeacherMapper.getUserId());
-                    teacherDefaultMusicGroupSalary.setCourseScheduleType(CourseSchedule.getCourseScheduleTypeByCode(courseType));
-                    teacherSalaryByUserIdAndType.add(teacherDefaultMusicGroupSalary);
+                    Teacher teacher = teacherMap.get(classGroupTeacherMapper.getUserId());
+                    throw new BizException("请设置"+teacher.getRealName()+"老师"+classGroupAndTeacher.getType().getMsg()+"课酬");
                 }
 
                 for (TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary : teacherSalaryByUserIdAndType) {