|
@@ -205,7 +205,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
|
|
|
}
|
|
|
if (teacherDefaultMusicGroupSalary == null) {
|
|
|
Teacher teacher = teacherMap.get(classGroupTeacherMapper.getUserId());
|
|
|
- throw new BizException("请设置"+teacher.getRealName()+"老师"+classGroupNoStartCourseSchedule.getType().getMsg()+"课酬");
|
|
|
+ throw new BizException("请设置"+teacher.getRealName()+"老师"+classGroupNoStartCourseSchedule.getType().getMsg()+"默认课酬");
|
|
|
}
|
|
|
|
|
|
//对应基准课酬
|
|
@@ -245,6 +245,9 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
|
|
|
salary = classGroupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalary.getMainTeacher90MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher90MinSalary();
|
|
|
}
|
|
|
}
|
|
|
+ if(StringUtils.isBlank(teacherDefaultMusicGroupSalary.getSalaryRuleJson())){
|
|
|
+ throw new BizException("请设置"+teacher.getRealName()+"老师"+classGroupNoStartCourseSchedule.getType().getMsg()+"默认课酬");
|
|
|
+ }
|
|
|
//线上小班课
|
|
|
if (classGroupNoStartCourseSchedule.getType().equals(CourseSchedule.CourseScheduleType.HIGH_ONLINE)) {
|
|
|
Integer studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(classGroupTeacherMapper.getClassGroupId());
|