|
@@ -1541,6 +1541,10 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
if(studentRegistration == null || studentRegistration.getPaymentStatus() != PaymentStatusEnum.YES){
|
|
|
throw new BizException("请走报名缴费流程");
|
|
|
}
|
|
|
+ MusicGroupPaymentCalenderDetail userLastCalenderDetail = musicGroupPaymentCalenderDetailDao.getUserLastCalenderDetail(musicGroupId, userId);
|
|
|
+ if(userLastCalenderDetail == null){
|
|
|
+ throw new BizException("当前续费时间已截止,请联系指导老师");
|
|
|
+ }
|
|
|
|
|
|
//判断是否是续费
|
|
|
/*List<StudentPaymentOrder> orderList = studentPaymentOrderDao.queryByCondition(GroupType.MUSIC, musicGroupId, userId, DealStatusEnum.SUCCESS);
|
|
@@ -1555,7 +1559,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
|
|
|
BigDecimal amount = musicGroupStudentFee.getCourseFee();
|
|
|
if (amount == null || amount.doubleValue() == 0) {
|
|
|
- amount = musicGroupStudentFee.getCourseFee();
|
|
|
+ amount = userLastCalenderDetail.getExpectAmount();
|
|
|
}
|
|
|
|
|
|
Date date = new Date();
|
|
@@ -1610,11 +1614,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
musicGroupStudentFee.setRemainNetworkClassTimes(getRemainNetworkClassTimes+1);
|
|
|
// musicGroupStudentFee.setNextPaymentDate(musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId, musicGroupStudentFee.getNextPaymentDate(), musicGroupStudentFee));
|
|
|
musicGroupStudentFeeDao.update(musicGroupStudentFee);
|
|
|
- //更新学生的缴费记录状态
|
|
|
- MusicGroupPaymentCalenderDetail userLastCalenderDetail = musicGroupPaymentCalenderDetailDao.getUserLastCalenderDetail(musicGroupId, userId);
|
|
|
- if(userLastCalenderDetail == null){
|
|
|
- throw new BizException("学生没有续费中的记录");
|
|
|
- }
|
|
|
+
|
|
|
//更新学生的缴费记录状态
|
|
|
userLastCalenderDetail.setPaymentStatus(PaymentStatus.PAID_COMPLETED);
|
|
|
userLastCalenderDetail.setActualAmount(userLastCalenderDetail.getExpectAmount());
|