|
@@ -389,6 +389,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
public Integer insertStudent(StudentRegistration studentRegistration) throws Exception {
|
|
|
StudentRegistration phoneAndMusicGroupId = studentRegistrationDao.getByPhoneAndMusicGroupId(studentRegistration.getMusicGroupId(), studentRegistration.getParentsPhone());
|
|
|
if (phoneAndMusicGroupId != null) {
|
|
@@ -421,8 +422,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
userId = sysUser.getId();
|
|
|
}
|
|
|
studentRegistration.setUserId(userId);
|
|
|
+ studentRegistration.setPaymentStatus(PaymentStatusEnum.YES);
|
|
|
+ studentRegistration.setMusicGroupStatus(ClassGroupStudentStatusEnum.NORMAL);
|
|
|
//学生报名表
|
|
|
- studentRegistrationDao.insert(studentRegistration);
|
|
|
+ studentRegistrationDao.insertBasic(studentRegistration);
|
|
|
//增加报名学生数
|
|
|
musicGroupSubjectPlanService.addApplyStudentNum(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId(),1);
|
|
|
if (studentRegistration.getClassGroupId() != null) {
|
|
@@ -482,6 +485,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
public StudentPaymentOrder updateApplyOrder(StudentPaymentOrder studentPaymentOrder) {
|
|
|
//更新订单状态
|
|
|
studentPaymentOrderService.update(studentPaymentOrder);
|
|
@@ -558,11 +562,16 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
|
|
|
@Override
|
|
|
public List<StudentRegistration> findStudentListByUserIdList(String musicGroupId, List<Integer> userIdList) {
|
|
|
- return studentRegistrationDao.findStudentListByUserIdList(musicGroupId, userIdList);
|
|
|
+ return studentRegistrationDao.findStudentListByUserIdList(musicGroupId, StringUtils.join(userIdList,","));
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public int openPayment(String ids) {
|
|
|
return studentRegistrationDao.batchOpenPay(ids, PaymentStatusEnum.OPEN);
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public List<StudentRegistration> queryStudentByMusicGroupId(String musicGroupId) {
|
|
|
+ return studentRegistrationDao.queryStudentByMusicGroupId(musicGroupId);
|
|
|
+ }
|
|
|
}
|