|
|
@@ -3,9 +3,7 @@ package com.ym.mec.biz.service.impl;
|
|
|
import static com.ym.mec.biz.dal.enums.GroupType.MUSIC;
|
|
|
import static com.ym.mec.biz.dal.enums.GroupType.PRACTICE;
|
|
|
import static com.ym.mec.biz.dal.enums.GroupType.VIP;
|
|
|
-import static com.ym.mec.biz.dal.enums.PracticeGroupType.CHARGE;
|
|
|
-import static com.ym.mec.biz.dal.enums.PracticeGroupType.FREE;
|
|
|
-import static com.ym.mec.biz.dal.enums.PracticeGroupType.TRIAL;
|
|
|
+import static com.ym.mec.biz.dal.enums.PracticeGroupType.*;
|
|
|
|
|
|
import java.lang.reflect.InvocationTargetException;
|
|
|
import java.math.BigDecimal;
|
|
|
@@ -4582,7 +4580,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
|
|
|
PracticeGroup practiceGroup = practiceGroupDao.get(Long.valueOf(oldCourseSchedule.getMusicGroupId()));
|
|
|
if(practiceGroup.getType() != TRIAL){
|
|
|
- if(practiceGroup.getType() != FREE){
|
|
|
+ if(CHARGE.equals(practiceGroup.getType())||COME_ON_PACKAGE.equals(practiceGroup.getType())){
|
|
|
List<TeacherDefaultPracticeGroupSalary> teacherDefaultPracticeGroupSalaries = teacherDefaultPracticeGroupSalaryDao.queryByUserId(teacherId);
|
|
|
if(teacherDefaultPracticeGroupSalaries == null || teacherDefaultPracticeGroupSalaries.size() == 0){
|
|
|
throw new BizException("请设置老师默认课酬");
|
|
|
@@ -4685,7 +4683,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
courseScheduleDao.batchUpdate(courseSchedules);
|
|
|
Set<Long> courseScheduleIds = courseSchedules.stream().map(e -> e.getId()).collect(Collectors.toSet());
|
|
|
if(practiceGroup.getType() != TRIAL){
|
|
|
- if(CHARGE == practiceGroup.getType()){
|
|
|
+ if(CHARGE == practiceGroup.getType() || COME_ON_PACKAGE.equals(practiceGroup.getType())){
|
|
|
List<TeacherDefaultPracticeGroupSalary> teacherDefaultPracticeGroupSalaries = teacherDefaultPracticeGroupSalaryDao.queryByUserId(teacherId);
|
|
|
if(teacherDefaultPracticeGroupSalaries == null || teacherDefaultPracticeGroupSalaries.size() == 0){
|
|
|
throw new BizException("请设置老师默认课酬");
|
Joburgess