update

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

@@ -892,26 +892,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
             //当前乐团报名是否赠送乐团网管课
 
-            MusicGroupPaymentCalenderDetail calenderDetail = musicGroupPaymentCalenderDetailDao.findByOrderNo(studentPaymentOrder.getOrderNo());
-            MusicGroupPaymentCalender calender = musicGroupPaymentCalenderService.get(calenderDetail.getMusicGroupPaymentCalenderId());
             MusicGroupStudentFee musicGroupStudentFee = musicGroupStudentFeeDao.findByUser(studentRegistration.getUserId(), studentRegistration.getMusicGroupId());
-            if(calender.getIsGiveMusicNetwork()){
-                //赠送网管课
-                musicGroupStudentFee.setRemainNetworkClassTimes(musicGroupStudentFee.getRemainNetworkClassTimes() + 1);
-            }
-            //更新学生的缴费记录状态
-            calenderDetail.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED);
-            calenderDetail.setActualAmount(calenderDetail.getExpectAmount());
-            calenderDetail.setPayTime(nowDate);
-            calenderDetail.setUpdateTime(nowDate);
-            musicGroupPaymentCalenderDetailDao.update(calenderDetail);
-
-            //更新实际缴费人数
-            Integer actualNum = calender.getActualNum() == null ? 0 : calender.getActualNum();
-            calender.setActualNum(actualNum + 1);
-            calender.setUpdateTime(nowDate);
-            musicGroupPaymentCalenderDao.update(calender);
-
             //进行中乐团加入学生缴费
             if (studentRegistration.getTemporaryCourseFee() != null) {
                 //关闭待支付订单
@@ -972,6 +953,15 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
             //缴费详情 calender detail
             MusicGroupPaymentCalender musicGroupRegCalender = musicGroupPaymentCalenderService.findByMusicGroupRegCalender(musicGroup.getId());
+            if(musicGroupRegCalender.getIsGiveMusicNetwork()){
+                //赠送网管课
+                musicGroupStudentFee.setRemainNetworkClassTimes(musicGroupStudentFee.getRemainNetworkClassTimes() + 1);
+            }
+            //更新实际缴费人数
+            Integer actualNum = musicGroupRegCalender.getActualNum() == null ? 0 : musicGroupRegCalender.getActualNum();
+            musicGroupRegCalender.setActualNum(actualNum + 1);
+            musicGroupRegCalender.setUpdateTime(nowDate);
+            musicGroupPaymentCalenderDao.update(musicGroupRegCalender);
             MusicGroupPaymentCalenderDetail musicGroupPaymentCalenderDetail = new MusicGroupPaymentCalenderDetail();
             musicGroupPaymentCalenderDetail.setMusicGroupPaymentCalenderId(musicGroupRegCalender.getId());
             musicGroupPaymentCalenderDetail.setUserId(studentPaymentOrder.getUserId());