Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -488,11 +488,20 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 						courseScheduleTeacherSalary.setTeacherRole(cgtm.getTeacherRole());
 						courseScheduleTeacherSalary.setUserId(cgtm.getUserId());
 						if (type == CourseScheduleType.PRACTICE) {
-							BigDecimal salary = teacherPracticeSalaryMap.get(cgtm.getUserId());
-							if (salary == null) {
-								throw new BizException("请设置老师陪练课课酬");
+							PracticeGroup practiceGroup = practiceGroupDao.get(Long.parseLong(classGroup.getMusicGroupId()));
+							if(practiceGroup == null){
+								throw new BizException("课程组不存在");
+							}else if (practiceGroup.getBuyMonths() == null){
+								SysConfig practiceCourseSalaryConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_COURSE_SALARY);
+								BigDecimal teacherSalary = new BigDecimal(practiceCourseSalaryConfig.getParanValue());
+								courseScheduleTeacherSalary.setExpectSalary(teacherSalary);
+							}else {
+								BigDecimal salary = teacherPracticeSalaryMap.get(cgtm.getUserId());
+								if (salary == null) {
+									throw new BizException("请设置老师陪练课课酬");
+								}
+								courseScheduleTeacherSalary.setExpectSalary(salary);
 							}
-							courseScheduleTeacherSalary.setExpectSalary(salary);
 						} else if (type == CourseScheduleType.VIP) {
 
 						} else {
@@ -3823,7 +3832,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries = courseScheduleTeacherSalaryDao.findByCourseSchedule(courseScheduleId);
 			if(!CollectionUtils.isEmpty(courseScheduleTeacherSalaries)){
                 SysConfig practiceCourseSalaryConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_COURSE_SALARY);
-                BigDecimal teacherSalary = new BigDecimal(practiceCourseSalaryConfig.getParanValue());;
+                BigDecimal teacherSalary = new BigDecimal(practiceCourseSalaryConfig.getParanValue());
                 for (CourseScheduleTeacherSalary courseScheduleTeacherSalary : courseScheduleTeacherSalaries) {
                     courseScheduleTeacherSalary.setUserId(teacherId);
                     courseScheduleTeacherSalary.setExpectSalary(teacherSalary);