|
@@ -1150,7 +1150,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
|
|
|
BigDecimal ots = results.get("onlineTeacherSalary");
|
|
|
BigDecimal ofts = results.get("offlineTeacherSalary");
|
|
|
- if(!vipGroup.getStatus().equals(VipGroupStatusEnum.APPLYING)
|
|
|
+ if(Objects.nonNull(vipGroup.getStatus())&&!vipGroup.getStatus().equals(VipGroupStatusEnum.APPLYING)
|
|
|
&&!vipGroup.getStatus().equals(VipGroupStatusEnum.NOT_START)
|
|
|
&&!vipGroup.getStatus().equals(VipGroupStatusEnum.APPLYING_END)
|
|
|
&&normalStudentNum!=vipGroupCategory.getStudentNum()){
|