获取乐团计划和乐器

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

@@ -843,13 +843,13 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         return classGroupStuList;
     }
 
-    @Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
-    public void updateCalender(Long calenderDetailId,Integer userId){
+    @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
+    public void updateCalender(Long calenderDetailId, Integer userId) {
         Date date = new Date();
         MusicGroupPaymentCalenderDetail calenderDetail = musicGroupPaymentCalenderDetailDao.get(calenderDetailId);
         MusicGroupPaymentCalender calender = musicGroupPaymentCalenderService.get(calenderDetail.getMusicGroupPaymentCalenderId());
         MusicGroupStudentFee musicGroupStudentFee = musicGroupStudentFeeDao.findByUser(userId, calender.getMusicGroupId());
-        if(calender.getIsGiveMusicNetwork()){
+        if (calender.getIsGiveMusicNetwork()) {
             //赠送网管课
             musicGroupStudentFee.setRemainNetworkClassTimes(musicGroupStudentFee.getRemainNetworkClassTimes() + 1);
         }
@@ -952,7 +952,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 sellOrderService.addOrderDetail2SellOrder(orderDetails, studentPaymentOrder, musicGroup);
             }
 
-            addCalenderDetail(studentPaymentOrder,studentRegistration);
+            addCalenderDetail(studentPaymentOrder, studentRegistration);
 
             //三方乐团不发送缴费通知
             if (musicGroup.getOwnershipType() != null && musicGroup.getOwnershipType() == CooperationOrgan.OwnershipType.OWN) {
@@ -1015,7 +1015,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     }
 
 
-    private boolean addCalenderDetail(StudentPaymentOrder studentPaymentOrder,StudentRegistration studentRegistration){
+    private boolean addCalenderDetail(StudentPaymentOrder studentPaymentOrder, StudentRegistration studentRegistration) {
         Date nowDate = new Date();
         MusicGroupStudentFee musicGroupStudentFee = new MusicGroupStudentFee();
         musicGroupStudentFee.setRemainNetworkClassTimes(0);
@@ -1030,7 +1030,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
         //缴费详情 calender detail
         MusicGroupPaymentCalender musicGroupRegCalender = musicGroupPaymentCalenderService.findByMusicGroupRegCalender(studentRegistration.getMusicGroupId());
-        if(musicGroupRegCalender.getIsGiveMusicNetwork()){
+        if (musicGroupRegCalender.getIsGiveMusicNetwork()) {
             //赠送网管课
             musicGroupStudentFee.setRemainNetworkClassTimes(musicGroupStudentFee.getRemainNetworkClassTimes() + 1);
         }
@@ -1059,29 +1059,27 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         musicGroupPaymentCalenderDetail.setUseInCourse(0);
         musicGroupPaymentCalenderDetailDao.insert(musicGroupPaymentCalenderDetail);
 
-        List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailDao.getOrderDetailByType(studentPaymentOrder.getId(), orderDetailTypes);
+        List<String> orderDetailTypes = studentPaymentOrderDetailDao.getOrderDetailType(studentPaymentOrder.getId());
 
         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()));
-//            musicGroupPaymentStudentCourseDetail.setCreateTime(nowDate);
-//            musicGroupPaymentStudentCourseDetail.setMusicGroupPaymentCalenderDetailId(musicGroupPaymentCalenderDetail.getId());
-//            musicGroupPaymentStudentCourseDetail.setTotalCourseMinutes(courseSettings.getCourseTotalMinuties());
-//            musicGroupPaymentStudentCourseDetail.setUpdateTime(date);
-//            musicGroupPaymentStudentCourseDetail.setUsedCourseMinutes(0);
-//            musicGroupPaymentStudentCourseDetail.setUserId(userId);
-//
-//            musicGroupPaymentStudentCourseDetails.add(musicGroupPaymentStudentCourseDetail);
-//        }
+        List<MusicGroupPaymentCalenderCourseSettings> courseSettings = musicGroupPaymentCalenderCourseSettingsDao.getMusicGroupRegCalenderCourseSettings(studentRegistration.getMusicGroupId());
+        for (MusicGroupPaymentCalenderCourseSettings courseSetting : courseSettings) {
+            if (!orderDetailTypes.contains(courseSetting.getCourseType().getCode())) continue;
+            MusicGroupPaymentStudentCourseDetail musicGroupPaymentStudentCourseDetail = new MusicGroupPaymentStudentCourseDetail();
+            musicGroupPaymentStudentCourseDetail.setCourseType(courseSetting.getCourseType());
+            musicGroupPaymentStudentCourseDetail.setCreateTime(nowDate);
+            musicGroupPaymentStudentCourseDetail.setMusicGroupPaymentCalenderDetailId(musicGroupPaymentCalenderDetail.getId());
+            musicGroupPaymentStudentCourseDetail.setTotalCourseMinutes(courseSetting.getCourseTotalMinuties());
+            musicGroupPaymentStudentCourseDetail.setUpdateTime(nowDate);
+            musicGroupPaymentStudentCourseDetail.setUsedCourseMinutes(0);
+            musicGroupPaymentStudentCourseDetail.setUserId(studentPaymentOrder.getUserId());
+            musicGroupPaymentStudentCourseDetails.add(musicGroupPaymentStudentCourseDetail);
+        }
 
         if (musicGroupPaymentStudentCourseDetails.size() > 0) {
             musicGroupPaymentStudentCourseDetailDao.batchInsert(musicGroupPaymentStudentCourseDetails);
         }
-
         return true;
     }