|
@@ -80,6 +80,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
private SysUserCashAccountDetailService sysUserCashAccountDetailService;
|
|
|
@Autowired
|
|
|
private SysUserCashAccountService sysUserCashAccountService;
|
|
|
+ @Autowired
|
|
|
+ private ClassGroupStudentMapperService classGroupStudentMapperService;
|
|
|
|
|
|
@Override
|
|
|
public BaseDAO<Long, StudentRegistration> getDAO() {
|
|
@@ -534,7 +536,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public StudentPaymentOrder updateApplyOrder(StudentPaymentOrder studentPaymentOrder) {
|
|
|
+ public StudentPaymentOrder updateApplyOrder(StudentPaymentOrder studentPaymentOrder) throws Exception {
|
|
|
//更新订单状态
|
|
|
studentPaymentOrderService.update(studentPaymentOrder);
|
|
|
Date nowDate = new Date();
|
|
@@ -549,6 +551,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
StudentPaymentOrder waitPayOrder = studentPaymentOrderService.findMusicGroupApplyOrderByStatus(studentRegistration.getUserId(), studentRegistration.getMusicGroupId(), DealStatusEnum.WAIT_PAY);
|
|
|
waitPayOrder.setStatus(DealStatusEnum.CLOSE);
|
|
|
studentPaymentOrderService.update(waitPayOrder);
|
|
|
+ //添加学生
|
|
|
+ classGroupStudentMapperService.addStudents(studentRegistration.getClassGroupId(),studentRegistration.getUserId().toString());
|
|
|
}
|
|
|
|
|
|
if (studentRegistration.getTemporaryCourseFee() == null) {
|
|
@@ -577,9 +581,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
musicGroupStudentFee.setSubjectId(studentRegistration.getActualSubjectId());
|
|
|
musicGroupStudentFee.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED);
|
|
|
musicGroupStudentFeeDao.insert(musicGroupStudentFee);
|
|
|
- studentRegistration.setTemporaryCourseFee(new BigDecimal(0));
|
|
|
}
|
|
|
|
|
|
+ studentRegistration.setTemporaryCourseFee(new BigDecimal(0));
|
|
|
studentRegistration.setPaymentStatus(PaymentStatusEnum.YES);
|
|
|
studentRegistration.setMusicGroupStatus(ClassGroupStudentStatusEnum.NORMAL);
|
|
|
studentRegistrationDao.update(studentRegistration);
|