|
@@ -4579,12 +4579,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
}
|
|
|
salary = JSON.parseObject(teacherDefaultMusicGroupSalary.getSalaryRuleJson()).getBigDecimal(aLong + "");
|
|
|
} else if (courseSchedule.getType() == CourseScheduleType.HIGH) {
|
|
|
- TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalaryHigh = collect.get(CourseSchedule.CourseScheduleType.HIGH);
|
|
|
- if (Objects.isNull(teacherDefaultMusicGroupSalaryHigh)) {
|
|
|
- throw new BizException("请设置老师课酬");
|
|
|
- }
|
|
|
- salary = JSON.parseObject(teacherDefaultMusicGroupSalaryHigh.getSalaryRuleJson()).getBigDecimal(aLong + "");
|
|
|
- /*MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
|
|
|
+// TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalaryHigh = collect.get(CourseSchedule.CourseScheduleType.HIGH);
|
|
|
+// if (Objects.isNull(teacherDefaultMusicGroupSalaryHigh)) {
|
|
|
+// throw new BizException("请设置老师课酬");
|
|
|
+// }
|
|
|
+// salary = JSON.parseObject(teacherDefaultMusicGroupSalaryHigh.getSalaryRuleJson()).getBigDecimal(aLong + "");
|
|
|
+ MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
|
|
|
TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalaryHigh = collect.get(CourseSchedule.CourseScheduleType.HIGH);
|
|
|
if (Objects.isNull(teacherDefaultMusicGroupSalaryHigh)) {
|
|
|
throw new BizException("请设置老师课酬");
|
|
@@ -4596,7 +4596,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
if (Objects.isNull(salary)) {
|
|
|
throw new BizException("请设置老师课酬");
|
|
|
}
|
|
|
- salary = salary.multiply(new BigDecimal(aLong));*/
|
|
|
+ salary = salary.multiply(new BigDecimal(aLong));
|
|
|
}
|
|
|
if (Objects.isNull(salary)) {
|
|
|
throw new BizException("请设置老师课酬");
|