|
@@ -183,8 +183,8 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
|
|
|
}
|
|
|
|
|
|
BigDecimal additionCoursePrice = new BigDecimal("0");
|
|
|
- if(Objects.nonNull(degreeRegistration.getAdditionCourseInfo())){
|
|
|
- Map<CourseSchedule.CourseScheduleType, Integer> additionCourseInfo = degreeRegistration.getAdditionCourseInfo();
|
|
|
+ Map<CourseSchedule.CourseScheduleType, Integer> additionCourseInfo = degreeRegistration.getAdditionCourseInfo();
|
|
|
+ if(additionCourseInfo != null && additionCourseInfo.size() > 0){
|
|
|
PracticeGroupSellPrice practiceGroupSellPrice = practiceGroupSellPriceDao.get(degreeRegistration.getOrganId());
|
|
|
if(Objects.isNull(practiceGroupSellPrice)){
|
|
|
throw new BizException("该分部暂未参与此活动");
|
|
@@ -305,8 +305,8 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
|
|
|
if(BigDecimal.ZERO.compareTo(additionCoursePrice)<0){
|
|
|
StudentPaymentOrderDetail studentPaymentOrderDetail = new StudentPaymentOrderDetail();
|
|
|
studentPaymentOrderDetail.setType(OrderDetailTypeEnum.DEGREE_REGISTRATION);
|
|
|
- if(Objects.nonNull(degreeRegistration.getAdditionCourseInfo())){
|
|
|
- studentPaymentOrderDetail.setGoodsIdList(JSON.toJSONString(degreeRegistration.getAdditionCourseInfo()));
|
|
|
+ if(additionCourseInfo != null && additionCourseInfo.size() > 0){
|
|
|
+ studentPaymentOrderDetail.setGoodsIdList(JSON.toJSONString(degreeRegistration.getAdditionCourseInfo()));
|
|
|
}
|
|
|
studentPaymentOrderDetail.setPrice(additionCoursePrice);
|
|
|
studentPaymentOrderDetail.setRemitFee(BigDecimal.ZERO);
|