|
@@ -3302,13 +3302,13 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
ts.setExpectSalary(salary);
|
|
|
}
|
|
|
//基础技能提高课
|
|
|
- if (newCourseSchedule.getType() == CourseScheduleType.HIGH) {
|
|
|
+ /*if (newCourseSchedule.getType() == CourseScheduleType.HIGH) {
|
|
|
BigDecimal salary = ts.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? tdms.getMainTeacher30MinSalary() : tdms.getAssistantTeacher30MinSalary();
|
|
|
if (StringUtils.equals(settlementType, "GRADIENT_SALARY")) {
|
|
|
salary = ts.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? tdms.getMainTeacher90MinSalary() : tdms.getAssistantTeacher90MinSalary();
|
|
|
}
|
|
|
ts.setExpectSalary(salary);
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
if((newCourseSchedule.getType() == CourseScheduleType.HIGH_ONLINE ||
|
|
|
newCourseSchedule.getType().equals(CourseSchedule.CourseScheduleType.MUSIC_NETWORK)) &&
|
|
@@ -3318,8 +3318,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
}
|
|
|
|
|
|
//线上小班课
|
|
|
- if(newCourseSchedule.getType() == CourseScheduleType.HIGH_ONLINE || newCourseSchedule.getType() == CourseScheduleType.MUSIC_NETWORK){
|
|
|
+ if(newCourseSchedule.getType() == CourseScheduleType.HIGH_ONLINE || newCourseSchedule.getType() == CourseScheduleType.MUSIC_NETWORK || newCourseSchedule.getType() == CourseScheduleType.HIGH){
|
|
|
Integer studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(ts.getClassGroupId());
|
|
|
+ if (studentNum > 5) {
|
|
|
+ studentNum = 5;
|
|
|
+ }
|
|
|
BigDecimal salary = JSON.parseObject(tdms.getSalaryRuleJson()).getBigDecimal(studentNum.toString());
|
|
|
if(Objects.isNull(salary)){
|
|
|
throw new BizException("请设置老师默认课酬");
|