|
@@ -52,6 +52,8 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
|
|
|
private SysConfigDao sysConfigDao;
|
|
|
@Autowired
|
|
|
private ExamRegistrationPaymentService examRegistrationPaymentService;
|
|
|
+ @Autowired
|
|
|
+ private OrganizationDao organizationDao;
|
|
|
|
|
|
@Override
|
|
|
public BaseDAO<Long, ExamRegistration> getDAO() {
|
|
@@ -71,6 +73,14 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
|
|
|
if (examSubjectSong == null) {
|
|
|
throw new BizException("请选择专业级别");
|
|
|
}
|
|
|
+
|
|
|
+ if(examRegistration.getOrganId() == null){
|
|
|
+ throw new BizException("机构id不能为空");
|
|
|
+ }
|
|
|
+ Organization organization = organizationDao.get(examRegistration.getOrganId());
|
|
|
+ if(organization == null){
|
|
|
+ throw new BizException("机构不存在");
|
|
|
+ }
|
|
|
Date nowDate = new Date();
|
|
|
String orderNo = idGeneratorService.generatorId("payment") + "";
|
|
|
|
|
@@ -85,9 +95,10 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
|
|
|
if (examMusicTheory != null) {
|
|
|
theoryLevelFee = examMusicTheory.getFee();
|
|
|
examRegistration.setExamMusicTheoryLevel(examMusicTheory.getLevel());
|
|
|
- amount.add(theoryLevelFee);
|
|
|
+ amount = amount.add(theoryLevelFee);
|
|
|
}
|
|
|
|
|
|
+ examRegistration.setTenantId(organization.getTenantId());
|
|
|
examRegistration.setStatus(StudentRegistrationStatusEnum.PAY_WAIT);
|
|
|
examRegistration.setLevelFee(examSubjectSong.getRegistrationFee());
|
|
|
examRegistration.setTheoryLevelFee(theoryLevelFee);
|