|
@@ -95,12 +95,13 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
|
|
&& StringUtils.isBlank(degreeRegistration.getTheoryCert())) {
|
|
&& StringUtils.isBlank(degreeRegistration.getTheoryCert())) {
|
|
throw new BizException("报考级别为“" + chargeInfo.getTitle() + "”且乐理级别是“免考”时,必须上传证书");
|
|
throw new BizException("报考级别为“" + chargeInfo.getTitle() + "”且乐理级别是“免考”时,必须上传证书");
|
|
}
|
|
}
|
|
|
|
+ degreeRegistration.setLevel(chargeInfo.getTitle());
|
|
|
|
+ degreeRegistration.setMoney(chargeInfo.getAmount());
|
|
}else{
|
|
}else{
|
|
degreeRegistration.setMoney(BigDecimal.ZERO);
|
|
degreeRegistration.setMoney(BigDecimal.ZERO);
|
|
}
|
|
}
|
|
|
|
|
|
if(Objects.nonNull(degreeRegistration.getTheoryLevel())){
|
|
if(Objects.nonNull(degreeRegistration.getTheoryLevel())){
|
|
- degreeRegistration.setLevel(chargeInfo.getTitle());
|
|
|
|
degreeRegistration.setOrderNo(orderNo);
|
|
degreeRegistration.setOrderNo(orderNo);
|
|
BigDecimal theoryMoney = BigDecimal.ZERO;
|
|
BigDecimal theoryMoney = BigDecimal.ZERO;
|
|
switch (degreeRegistration.getTheoryLevel()) {
|
|
switch (degreeRegistration.getTheoryLevel()) {
|
|
@@ -128,7 +129,6 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
|
|
|
|
|
|
if(Objects.nonNull(degreeRegistration.getSporadicId())||Objects.nonNull(degreeRegistration.getTheoryLevel())){
|
|
if(Objects.nonNull(degreeRegistration.getSporadicId())||Objects.nonNull(degreeRegistration.getTheoryLevel())){
|
|
if (degree == null) {
|
|
if (degree == null) {
|
|
- degreeRegistration.setMoney(chargeInfo.getAmount());
|
|
|
|
degreeRegistration.setStatus(1);
|
|
degreeRegistration.setStatus(1);
|
|
degreeRegistration.setCreateTime(nowDate);
|
|
degreeRegistration.setCreateTime(nowDate);
|
|
degreeRegistration.setUpdateTime(nowDate);
|
|
degreeRegistration.setUpdateTime(nowDate);
|