|
@@ -117,6 +117,8 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
|
|
|
degreeRegistration.setMoney(BigDecimal.ZERO);
|
|
|
}
|
|
|
|
|
|
+ List<String> courseInfos = new ArrayList<>();
|
|
|
+
|
|
|
if(StringUtils.isNotBlank(degreeRegistration.getTheoryLevel())){
|
|
|
degreeRegistration.setOrderNo(orderNo);
|
|
|
BigDecimal theoryMoney = BigDecimal.ZERO;
|
|
@@ -233,13 +235,19 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
|
|
|
BigDecimal courseTime = new BigDecimal(courseScheduleTypeIntegerEntry.getValue());
|
|
|
switch (courseScheduleTypeIntegerEntry.getKey()){
|
|
|
case VIP:
|
|
|
- additionCoursePrice = additionCoursePrice.add(vipUnitPrice.multiply(courseTime));
|
|
|
+ BigDecimal vipPrice = vipUnitPrice.multiply(courseTime);
|
|
|
+ additionCoursePrice = additionCoursePrice.add(vipPrice);
|
|
|
+ courseInfos.add((courseTime.multiply(new BigDecimal(12)))+"节VIP-1V1课程费用:" + vipPrice);
|
|
|
break;
|
|
|
case PRACTICE:
|
|
|
- additionCoursePrice = additionCoursePrice.add(practiceUnitPrice.multiply(courseTime));
|
|
|
+ BigDecimal practicePrice = practiceUnitPrice.multiply(courseTime);
|
|
|
+ additionCoursePrice = additionCoursePrice.add(practicePrice);
|
|
|
+ courseInfos.add((courseTime.multiply(new BigDecimal(12)))+"节1V1网管课课程费用:" + practicePrice);
|
|
|
break;
|
|
|
case HIGH:
|
|
|
- additionCoursePrice = additionCoursePrice.add(highUnitPrice.multiply(courseTime));
|
|
|
+ BigDecimal highPrice = highUnitPrice.multiply(courseTime);
|
|
|
+ additionCoursePrice = additionCoursePrice.add(highPrice);
|
|
|
+ courseInfos.add((courseTime.multiply(new BigDecimal(10)))+"节乐理课程费用:" + highPrice);
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
@@ -272,8 +280,9 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
|
|
|
studentPaymentOrder.setOrganId(degreeRegistration.getOrganId());
|
|
|
studentPaymentOrder.setRoutingOrganId(degreeRegistration.getOrganId());
|
|
|
if (degreeRegistration.getTheoryMoney().compareTo(BigDecimal.ZERO) > 0) {
|
|
|
- studentPaymentOrder.setMemo("乐理" + degreeRegistration.getTheoryLevel() + ",费用:" + degreeRegistration.getTheoryMoney());
|
|
|
+ courseInfos.add("乐理" + degreeRegistration.getTheoryLevel() + ",费用:" + degreeRegistration.getTheoryMoney());
|
|
|
}
|
|
|
+ studentPaymentOrder.setMemo(StringUtils.join(courseInfos, ","));
|
|
|
studentPaymentOrderService.insert(studentPaymentOrder);
|
|
|
studentPaymentOrder.setVersion(0);
|
|
|
|