|
@@ -3535,7 +3535,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
bigDecimal = new BigDecimal(0);
|
|
|
}
|
|
|
|
|
|
- if(vipGroupCategory.getStudentNum() <= 1){
|
|
|
+ if(vipGroupCategory == null || vipGroupCategory.getStudentNum() <= 1){
|
|
|
bigDecimal = bigDecimal.multiply(new BigDecimal(0.8)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
|
|
|
}else{
|
|
|
bigDecimal = bigDecimal.multiply(new BigDecimal(0.7)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
|
|
@@ -3548,7 +3548,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
if(Objects.nonNull(studentPaymentOrder)){
|
|
|
BigDecimal suplusCourseOriginalFee = studentPaymentOrder.getActualAmount().add(studentPaymentOrder.getBalancePaymentAmount());
|
|
|
result.put("suplusCourseOriginalFee", suplusCourseOriginalFee);
|
|
|
- if(vipGroupCategory.getStudentNum() <= 1){
|
|
|
+ if(vipGroupCategory == null || vipGroupCategory.getStudentNum() <= 1){
|
|
|
result.put("suplusCourseFee", suplusCourseOriginalFee.multiply(new BigDecimal(0.8)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP));
|
|
|
}else{
|
|
|
result.put("suplusCourseFee", suplusCourseOriginalFee.multiply(new BigDecimal(0.7)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP));
|