提醒设置老师默认课酬

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

@@ -1646,11 +1646,14 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     if(teacherDefaultMusicGroupSalary == null){
                         throw new BizException("请设置"+teacher.getRealName()+"老师的"+classGroup4MixDto.getCourseType().getMsg()+"课酬");
                     }
-                    if ((teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary() == null
+                    if((classGroup4MixDto.getCourseType().equals(CourseSchedule.CourseScheduleType.HIGH_ONLINE) ||
+                            classGroup4MixDto.getCourseType().equals(CourseSchedule.CourseScheduleType.MUSIC_NETWORK))&&
+                            StringUtils.isBlank(teacherDefaultMusicGroupSalary.getSalaryRuleJson())){
+                        throw new BizException("请设置"+teacher.getRealName()+"老师的"+classGroup4MixDto.getCourseType().getMsg()+"课酬");
+                    }else if(teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary() == null
                             || teacherDefaultMusicGroupSalary.getAssistantTeacher90MinSalary() == null
                             || teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() == null
-                            || teacherDefaultMusicGroupSalary.getMainTeacher90MinSalary() == null)
-                            && teacherDefaultMusicGroupSalary.getSalaryRuleJson() == null) {
+                            || teacherDefaultMusicGroupSalary.getMainTeacher90MinSalary() == null) {
                         throw new BizException("请设置"+teacher.getRealName()+"老师的"+classGroup4MixDto.getCourseType().getMsg()+"课酬");
                     }
 
@@ -1949,10 +1952,25 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
                     TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary = collect.get(classGroup4MixDto.getCourseType());
 
+                    Teacher teacher = teacherMap.get(classGroupTeacherMapper.getUserId());
+                    if(teacherDefaultMusicGroupSalary == null){
+                        throw new BizException("请设置"+teacher.getRealName()+"老师的"+classGroup4MixDto.getCourseType().getMsg()+"课酬");
+                    }
+
+                    if((classGroup4MixDto.getCourseType().equals(CourseSchedule.CourseScheduleType.HIGH_ONLINE) ||
+                            classGroup4MixDto.getCourseType().equals(CourseSchedule.CourseScheduleType.MUSIC_NETWORK))&&
+                        StringUtils.isBlank(teacherDefaultMusicGroupSalary.getSalaryRuleJson())){
+                        throw new BizException("请设置"+teacher.getRealName()+"老师的"+classGroup4MixDto.getCourseType().getMsg()+"课酬");
+                    }else if(teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary() == null
+                            || teacherDefaultMusicGroupSalary.getAssistantTeacher90MinSalary() == null
+                            || teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() == null
+                            || teacherDefaultMusicGroupSalary.getMainTeacher90MinSalary() == null) {
+                        throw new BizException("请设置"+teacher.getRealName()+"老师的"+classGroup4MixDto.getCourseType().getMsg()+"课酬");
+                    }
+
                     //对应基准课酬
                     BigDecimal baseSalary = new BigDecimal(0), classTimeDuty = new BigDecimal(0);
 
-                    Teacher teacher = teacherMap.get(classGroupTeacherMapper.getUserId());
                     SalarySettlementTypeEnum settlementType = musicGroup.getSettlementType();
                     if(Objects.nonNull(teacher.getEntryDate())
                             &&(teacher.getEntryDate().after(entryDate)||teacher.getEntryDate().getTime()==entryDate.getTime())){
@@ -1994,9 +2012,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                             salary = classGroupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalary.getMainTeacher90MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher90MinSalary();
                         }
                     }
-                    if(StringUtils.isBlank(teacherDefaultMusicGroupSalary.getSalaryRuleJson())){
-                    	throw new BizException("请设置老师默认课酬");
-                    }
                     //线上小班课
                     if(classGroup4MixDto.getCourseType().equals(CourseSchedule.CourseScheduleType.HIGH_ONLINE)){
                         Integer studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(classGroupTeacherMapper.getClassGroupId());
@@ -2231,10 +2246,24 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
                     TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary = collect.get(classGroup4MixDto.getCourseType());
 
+                    Teacher teacher = teacherMap.get(classGroupTeacherMapper.getUserId());
+                    if(teacherDefaultMusicGroupSalary == null){
+                        throw new BizException("请设置"+teacher.getRealName()+"老师的"+classGroup4MixDto.getCourseType().getMsg()+"课酬");
+                    }
+                    if((classGroup4MixDto.getCourseType().equals(CourseSchedule.CourseScheduleType.HIGH_ONLINE) ||
+                            classGroup4MixDto.getCourseType().equals(CourseSchedule.CourseScheduleType.MUSIC_NETWORK))&&
+                            StringUtils.isBlank(teacherDefaultMusicGroupSalary.getSalaryRuleJson())){
+                        throw new BizException("请设置"+teacher.getRealName()+"老师的"+classGroup4MixDto.getCourseType().getMsg()+"课酬");
+                    }else if(teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary() == null
+                            || teacherDefaultMusicGroupSalary.getAssistantTeacher90MinSalary() == null
+                            || teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() == null
+                            || teacherDefaultMusicGroupSalary.getMainTeacher90MinSalary() == null) {
+                        throw new BizException("请设置"+teacher.getRealName()+"老师的"+classGroup4MixDto.getCourseType().getMsg()+"课酬");
+                    }
+
                     //对应基准课酬
                     BigDecimal baseSalary = new BigDecimal(0), classTimeDuty = new BigDecimal(0);
 
-                    Teacher teacher = teacherMap.get(classGroupTeacherMapper.getUserId());
                     SalarySettlementTypeEnum settlementType = musicGroup.getSettlementType();
                     if(Objects.nonNull(teacher.getEntryDate())
                             &&(teacher.getEntryDate().after(entryDate)||teacher.getEntryDate().getTime()==entryDate.getTime())){