|
@@ -4582,6 +4582,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
SysConfig practiceCourseSalaryConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_COURSE_SALARY);
|
|
|
BigDecimal teacherSalary = new BigDecimal(practiceCourseSalaryConfig.getParanValue());
|
|
|
for (CourseScheduleTeacherSalary courseScheduleTeacherSalary : courseScheduleTeacherSalaries) {
|
|
|
+ courseScheduleTeacherSalary.setUserId(teacherId);
|
|
|
if(teacherSalary.compareTo(courseScheduleTeacherSalary.getExpectSalary())==0){
|
|
|
continue;
|
|
|
}
|
|
@@ -4589,7 +4590,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
if(teacherDefaultPracticeGroupSalaries == null || teacherDefaultPracticeGroupSalaries.size() == 0){
|
|
|
throw new BizException("请设置老师默认课酬");
|
|
|
}
|
|
|
- courseScheduleTeacherSalary.setUserId(teacherId);
|
|
|
courseScheduleTeacherSalary.setExpectSalary(teacherDefaultPracticeGroupSalaries.get(0).getMainTeacherSalary());
|
|
|
}
|
|
|
courseScheduleTeacherSalaryDao.batchUpdate(courseScheduleTeacherSalaries);
|
|
@@ -4687,6 +4687,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
List<Long> courseIds = groupNotStartCourses.stream().map(CourseSchedule::getId).collect(Collectors.toList());
|
|
|
List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries = courseScheduleTeacherSalaryDao.findByCourseSchedules(courseIds);
|
|
|
for (CourseScheduleTeacherSalary courseScheduleTeacherSalary : courseScheduleTeacherSalaries) {
|
|
|
+ courseScheduleTeacherSalary.setUserId(teacherId);
|
|
|
if(teacherSalary.compareTo(courseScheduleTeacherSalary.getExpectSalary())==0){
|
|
|
continue;
|
|
|
}
|
|
@@ -4694,7 +4695,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
if(teacherDefaultPracticeGroupSalaries == null || teacherDefaultPracticeGroupSalaries.size() == 0){
|
|
|
throw new BizException("请设置老师默认课酬");
|
|
|
}
|
|
|
- courseScheduleTeacherSalary.setUserId(teacherId);
|
|
|
courseScheduleTeacherSalary.setExpectSalary(teacherDefaultPracticeGroupSalaries.get(0).getMainTeacherSalary());
|
|
|
}
|
|
|
courseScheduleTeacherSalaryDao.batchUpdate(courseScheduleTeacherSalaries);
|