|
@@ -2967,7 +2967,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
}
|
|
|
|
|
|
if(CourseStatusEnum.OVER.equals(oldCourseSchedule.getStatus())&&newCourseSchedule.getStartClassTime().compareTo(date)<0){
|
|
|
- throw new BizException("调整无效");
|
|
|
+ throw new BizException("调整无效,已结束不能调整至已结束");
|
|
|
}
|
|
|
|
|
|
//课程是否已结算
|
|
@@ -3281,12 +3281,14 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
Map<CourseScheduleType, TeacherDefaultMusicGroupSalary> map = musicGroupSalaryMap.get(teacherId);
|
|
|
|
|
|
if (map == null) {
|
|
|
- throw new BizException("老师{}没有设置默认课酬,请先设置", teacherId);
|
|
|
+ SysUser user = sysUserFeignService.queryUserById(teacherId);
|
|
|
+ throw new BizException("老师{}[{}]没有设置默认课酬,请先设置", user.getRealName(), teacherId);
|
|
|
}
|
|
|
|
|
|
TeacherDefaultMusicGroupSalary tdms = map.get(newCourseSchedule.getType());
|
|
|
if (tdms == null) {
|
|
|
- throw new BizException("老师{}没有设置默认课酬,请先设置", teacherId);
|
|
|
+ SysUser user = sysUserFeignService.queryUserById(teacherId);
|
|
|
+ throw new BizException("老师{}[{}]没有设置默认课酬,请先设置", user.getRealName(), teacherId);
|
|
|
}
|
|
|
|
|
|
// 乐团结算方式
|