|
@@ -279,10 +279,10 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
|
|
|
}
|
|
|
studentPaymentOrder.setOrganId(degreeRegistration.getOrganId());
|
|
|
studentPaymentOrder.setRoutingOrganId(degreeRegistration.getOrganId());
|
|
|
- if(BigDecimal.ZERO.compareTo(degreeRegistration.getMoney())<0){
|
|
|
+ if(Objects.nonNull(degreeRegistration.getSporadicId())){
|
|
|
courseInfos.add("乐器" + degreeRegistration.getLevel() + ",费用:" + degreeRegistration.getMoney());
|
|
|
}
|
|
|
- if (degreeRegistration.getTheoryMoney().compareTo(BigDecimal.ZERO) > 0) {
|
|
|
+ if (StringUtils.isNotBlank(degreeRegistration.getTheoryLevel())) {
|
|
|
courseInfos.add("乐理" + degreeRegistration.getTheoryLevel() + ",费用:" + degreeRegistration.getTheoryMoney());
|
|
|
}
|
|
|
studentPaymentOrder.setMemo(StringUtils.join(courseInfos, ","));
|