Merge branch 'online1' of http://git.dayaedu.com/yonge/mec into goods_organ

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

@@ -5864,6 +5864,19 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			return httpResponseResult;
 		}
 
+		//主课类型为基础技能课需要更新课酬
+		if (CourseSchedule.CourseScheduleType.HIGH_ONLINE.equals(courseMergeInfo.getType()) || CourseSchedule.CourseScheduleType.HIGH.equals(courseMergeInfo.getType())) {
+			List<CourseScheduleTeacherSalary> oldCourseSalaries = courseScheduleTeacherSalaryDao.findByCourseSchedule(courseMergeInfo.getId());
+			for (CourseScheduleTeacherSalary oldCourseSalary : oldCourseSalaries) {
+				//课酬调整后不能更新课酬
+				if(!oldCourseSalary.getEnableChangeSalary()){
+					continue;
+				}
+				courseScheduleTeacherSalaryService.createMusicGroupCourseTeacherSalary(null, courseMergeInfo, oldCourseSalary);
+				courseScheduleTeacherSalaryService.update(oldCourseSalary);
+			}
+		}
+
 		if (insertCourseScheduleModifyLogList.size() > 0) {
 			courseScheduleModifyLogDao.batchInsert(insertCourseScheduleModifyLogList);
 		}