update:根据业务需求进行逻辑修改

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

@@ -1129,7 +1129,7 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 
 	@Override
 	public void subCourseConvert(List<CourseScheduleStudentPayment> studentPayments, Integer studentId,VipGroup vipGroup) {
-		studentPayments = studentPayments.stream().filter(e->e.getActualPrice().compareTo(ZERO) > 0).collect(Collectors.toList());
+		//studentPayments = studentPayments.stream().filter(e->e.getActualPrice().compareTo(ZERO) > 0).collect(Collectors.toList());
 		if(CollectionUtils.isEmpty(studentPayments)){
 			return;
 		}

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

@@ -3426,8 +3426,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			// 如果修改了老师、课程类型、课程时长、教学模式，需要修改课酬
 			if (!ListUtil.isEquals(oldTeacherIdList, newTeacherIdList)
 					|| !newCourseSchedule.getActualTeacherId().equals(oldCourseSchedule.getActualTeacherId())
-					|| newCourseSchedule.getType() != oldCourseSchedule.getType()
-					|| newCourseSchedule.getTeachMode() != oldCourseSchedule.getTeachMode() || oldMinutes != newMinutes) {
+					|| newCourseSchedule.getType() != oldCourseSchedule.getType() || oldMinutes != newMinutes) {
 
 //				Map<Integer, Teacher> teacherMap = null;
 				Map<Integer, Map<CourseScheduleType, TeacherDefaultMusicGroupSalary>> musicGroupSalaryMap = new HashMap<Integer, Map<CourseScheduleType, TeacherDefaultMusicGroupSalary>>();

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

@@ -3378,7 +3378,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             List<Long> csIds = groupNotFinishCourses.stream().map(CourseSchedule::getId).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(csIds)) {
                 courseScheduleTeacherSalaryDao.batchDeleteByCourseScheduleIds(csIds);
-                courseScheduleDao.batchDeleteCourseSchedules(csIds);
+                //courseScheduleDao.batchDeleteCourseSchedules(csIds);
+                courseScheduleDao.deleteMusicGroupCourseSchedulesWithStudent(csIds, studentId);
                 teacherAttendanceDao.batchDeleteByCourseSchedules(csIds);
             }
             vipGroupDao.update(vipGroup);