|
@@ -510,6 +510,19 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
studentRegistration.setMusicGroupStatus(ClassGroupStudentStatusEnum.NORMAL);
|
|
|
studentRegistrationDao.update(studentRegistration);
|
|
|
|
|
|
+ //获取当前月
|
|
|
+ Integer month = Integer.parseInt(DateUtil.getMonth(nowDate));
|
|
|
+ //获取下次缴费月份
|
|
|
+ List<MusicGroupPaymentCalender> musicGroupPaymentCalenders = musicGroupPaymentCalenderDao.findByMusicGroupId(studentRegistration.getMusicGroupId());
|
|
|
+ List<Integer> months = musicGroupPaymentCalenders.stream().map(e -> e.getPaymentMonth()).collect(Collectors.toList());
|
|
|
+ for (int i = 0; i < months.size(); i++) {
|
|
|
+ if (months.get(i).equals(month)) {
|
|
|
+ month = i == months.size() - 1 ? months.get(0) : months.get(i + 1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ Calendar calendar = Calendar.getInstance();
|
|
|
+ calendar.add(Calendar.MONTH, month);
|
|
|
+
|
|
|
//加入缴费周期
|
|
|
MusicGroupStudentFee musicGroupStudentFee = new MusicGroupStudentFee();
|
|
|
musicGroupStudentFee.setMusicGroupId(studentRegistration.getMusicGroupId());
|
|
@@ -517,6 +530,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
musicGroupStudentFee.setCourseFee(musicOneSubjectClassPlan.getFee());
|
|
|
musicGroupStudentFee.setCreateTime(nowDate);
|
|
|
musicGroupStudentFee.setUpdateTime(nowDate);
|
|
|
+ musicGroupStudentFee.setNextPaymentDate(DateUtil.getFirstDayOfMonth(calendar.getTime()));
|
|
|
musicGroupStudentFee.setLatestPaidTime(nowDate);
|
|
|
musicGroupStudentFee.setSubjectId(studentRegistration.getActualSubjectId());
|
|
|
musicGroupStudentFee.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED);
|