|
@@ -666,11 +666,18 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
}else if (practiceGroup.getType() == TRIAL){
|
|
|
courseScheduleTeacherSalary.setExpectSalary(new BigDecimal(0));
|
|
|
}else {
|
|
|
- BigDecimal salary = teacherPracticeSalaryMap.get(cgtm.getUserId());
|
|
|
- if (salary == null) {
|
|
|
- throw new BizException("请设置老师网管课课酬");
|
|
|
+ SysConfig practiceCourseSalaryConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_COURSE_SALARY);
|
|
|
+ BigDecimal freeTeacherSalary = new BigDecimal(practiceCourseSalaryConfig.getParanValue());
|
|
|
+
|
|
|
+ if(Objects.nonNull(oldCourseMainTeacherSalary)&&freeTeacherSalary.compareTo(oldCourseMainTeacherSalary.getExpectSalary())==0){
|
|
|
+ courseScheduleTeacherSalary.setExpectSalary(freeTeacherSalary);
|
|
|
+ }else{
|
|
|
+ BigDecimal salary = teacherPracticeSalaryMap.get(cgtm.getUserId());
|
|
|
+ if (salary == null) {
|
|
|
+ throw new BizException("请设置老师网管课课酬");
|
|
|
+ }
|
|
|
+ courseScheduleTeacherSalary.setExpectSalary(salary);
|
|
|
}
|
|
|
- courseScheduleTeacherSalary.setExpectSalary(salary);
|
|
|
}
|
|
|
} else if (type == CourseScheduleType.VIP) {
|
|
|
|