update

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseScheduleStudentPayment.java

@@ -51,6 +51,8 @@ public class CourseScheduleStudentPayment implements Comparable<CourseScheduleSt
 
 	private String batchNo;
 
+	private String openPlayMidi;
+
 	public CourseScheduleStudentPayment() {
 	}
 
@@ -66,6 +68,14 @@ public class CourseScheduleStudentPayment implements Comparable<CourseScheduleSt
 		this.courseScheduleId = courseScheduleId;
 	}
 
+	public String getOpenPlayMidi() {
+		return openPlayMidi;
+	}
+
+	public void setOpenPlayMidi(String openPlayMidi) {
+		this.openPlayMidi = openPlayMidi;
+	}
+
 	public void setId(Long id){
 		this.id = id;
 	}

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

@@ -1879,7 +1879,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     }
                     courseSchedule.setTeacherId(teacherId);
                     courseSchedule.setActualTeacherId(teacherId);
-//                    courseScheduleDao.insert(courseSchedule);
+                    courseScheduleDao.insert(courseSchedule);
                     courseScheduleList.add(courseSchedule);
                     courseSchedules.add(courseSchedule);
 

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

@@ -313,6 +313,7 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 		MusicGroupStudentClassAdjust byBatchNo = musicGroupStudentClassAdjustDao.findByBatchNo(batchNo);
 		//获取提交的合班申请
 		MusicGroupStudentClassAdjust classAdjust = musicGroupStudentClassAdjustDao.findByBatchNo(batchNo);
+		List<CourseScheduleStudentPayment> courseScheduleStudentPayments = new ArrayList<>();
 		List<Long> courseIds = JSON.parseArray(classAdjust.getSubLockCourseIds(), Long.class);
 		for (Integer studentId : studentIds) {
 			//优先处理之前剩余的课程
@@ -326,6 +327,11 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 				if(studentPayments != null && studentPayments.size() >0 ){
 					List<CourseScheduleStudentPayment> payments = collect.get(courseSchedule.getId());
 					if(payments != null && payments.size() > 0){
+						//复制之前的数据
+						CourseScheduleStudentPayment scheduleStudentPayment = payments.get(0);
+						scheduleStudentPayment.setCourseScheduleId(courseSchedule.getId());
+						scheduleStudentPayment.setClassGroupId(courseSchedule.getClassGroupId());
+						scheduleStudentPayment.setOpenPlayMidi(null);
 
 					}
 				}