|
@@ -1289,15 +1289,13 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
|
|
|
Map<CourseSchedule.CourseScheduleType, TeacherDefaultMusicGroupSalary> collect = teacherSalaryList.stream().collect(Collectors.toMap(TeacherDefaultMusicGroupSalary::getCourseScheduleType, teacherDefaultMusicGroupSalary -> teacherDefaultMusicGroupSalary));
|
|
|
|
|
|
- if(courseSchedule.getType() == CourseSchedule.CourseScheduleType.HIGH){
|
|
|
- courseSchedule.setType(CourseScheduleType.HIGH_ONLINE);
|
|
|
- }
|
|
|
-
|
|
|
- TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary = collect.get(courseSchedule.getType());
|
|
|
+ TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary =
|
|
|
+ collect.get(courseSchedule.getType()==CourseScheduleType.HIGH?CourseScheduleType.HIGH_ONLINE:courseSchedule.getType());
|
|
|
|
|
|
if (teacherDefaultMusicGroupSalary == null) {
|
|
|
Teacher teacher = teacherDao.get(courseScheduleTeacherSalary.getUserId());
|
|
|
- throw new BizException("请设置" + teacher.getRealName() + "老师的" + courseSchedule.getType().getMsg() + "课酬");
|
|
|
+ throw new BizException("请设置" + teacher.getRealName() + "老师的" +
|
|
|
+ (courseSchedule.getType()==CourseScheduleType.HIGH?CourseScheduleType.HIGH_ONLINE:courseSchedule.getType()).getMsg() + "课酬");
|
|
|
}
|
|
|
|
|
|
//对应基准课酬
|