获取乐团计划和乐器

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

@@ -110,6 +110,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
     @Autowired
     private MusicGroupPaymentStudentCourseDetailDao musicGroupPaymentStudentCourseDetailDao;
+    @Autowired
+    private MusicGroupPaymentCalenderCourseSettingsDao musicGroupPaymentCalenderCourseSettingsDao;
 
     @Override
     public BaseDAO<Long, StudentRegistration> getDAO() {
@@ -1057,16 +1059,12 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         musicGroupPaymentCalenderDetail.setUseInCourse(0);
         musicGroupPaymentCalenderDetailDao.insert(musicGroupPaymentCalenderDetail);
 
-        List<OrderDetailTypeEnum> orderDetailTypes = Arrays.asList(OrderDetailTypeEnum.values());
-        orderDetailTypes.remove(OrderDetailTypeEnum.MUSICAL);
-        orderDetailTypes.remove(OrderDetailTypeEnum.ACCESSORIES);
-        orderDetailTypes.remove(OrderDetailTypeEnum.TEACHING);
-        orderDetailTypes.remove(OrderDetailTypeEnum.OTHER);
-        orderDetailTypes.remove(OrderDetailTypeEnum.COURSE);
         List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailDao.getOrderDetailByType(studentPaymentOrder.getId(), orderDetailTypes);
 
         List<MusicGroupPaymentStudentCourseDetail> musicGroupPaymentStudentCourseDetails = new ArrayList<>();
 
+        List<MusicGroupPaymentCalenderCourseSettings> courseSettings = musicGroupPaymentCalenderCourseSettingsDao.getMusicGroupRegCalenderCourseSettings(musicGroupId);
+
 //        for (StudentPaymentOrderDetail orderDetail : orderDetails) {
 //            MusicGroupPaymentStudentCourseDetail musicGroupPaymentStudentCourseDetail = new MusicGroupPaymentStudentCourseDetail();
 //            musicGroupPaymentStudentCourseDetail.setCourseType(CourseSchedule.CourseScheduleType.valueOf(orderDetail.getType().getCode()));