浏览代码

HIGH课酬还原,线上的基础技能课需要配置课酬规则,但是线下的都没有配置

zouxuan 2 年之前
父节点
当前提交
0df64b77bd
共有 1 个文件被更改,包括 7 次插入7 次删除
  1. 7 7
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

+ 7 - 7
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -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("请设置老师课酬");