|
@@ -648,10 +648,14 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ if(CourseSchedule.CourseScheduleType.HIGH.equals(courseSchedule.getType())){
|
|
|
+ courseSchedule.setType(CourseSchedule.CourseScheduleType.HIGH_ONLINE);
|
|
|
+ }
|
|
|
+
|
|
|
//教师课酬
|
|
|
BigDecimal teacherSalary = new BigDecimal(0);
|
|
|
|
|
|
- if(CourseSchedule.CourseScheduleType.MUSIC_NETWORK.equals(courseSchedule.getType())||CourseSchedule.CourseScheduleType.HIGH_ONLINE.equals(courseSchedule.getType())||CourseSchedule.CourseScheduleType.HIGH.equals(courseSchedule.getType())){
|
|
|
+ if(CourseSchedule.CourseScheduleType.MUSIC_NETWORK.equals(courseSchedule.getType())||CourseSchedule.CourseScheduleType.HIGH_ONLINE.equals(courseSchedule.getType())){
|
|
|
//根据课程类型获取对应的默认课酬设置列表
|
|
|
List<TeacherDefaultMusicGroupSalary> teacherDefaultMusicGroupSalariesWithCourseType = teacherDefaultMusicGroupSalariesGroupByCourseType.get(courseSchedule.getType());
|
|
|
if (CollectionUtils.isEmpty(teacherDefaultMusicGroupSalariesWithCourseType)) {
|
|
@@ -667,6 +671,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
if(Objects.isNull(normalStudentNum)){
|
|
|
normalStudentNum = Long.valueOf(0);
|
|
|
}
|
|
|
+ if(normalStudentNum>5){
|
|
|
+ normalStudentNum=Long.valueOf(5);
|
|
|
+ }
|
|
|
if(Objects.nonNull(teacherDefaultMusicGroupSalaryWithTeacherId)&& org.apache.commons.lang3.StringUtils.isNoneBlank(teacherDefaultMusicGroupSalaryWithTeacherId.getSalaryRuleJson())){
|
|
|
JSONObject salaryRuleJsonObject = JSONObject.parseObject(teacherDefaultMusicGroupSalaryWithTeacherId.getSalaryRuleJson());
|
|
|
teacherSalary = salaryRuleJsonObject.getBigDecimal(normalStudentNum.toString());
|