|
@@ -2535,6 +2535,18 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
classGroupStudentMappers.add(classGroupStudentMapper);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ Integer currentStudentNum = classGroupStudentMapperDao.countClassGroupStudentNum(classGroup.getId());
|
|
|
+ if((!vipGroup.getStatus().equals(VipGroupStatusEnum.FINISHED)
|
|
|
+ ||!vipGroup.getStatus().equals(VipGroupStatusEnum.CANCEL))
|
|
|
+ &¤tStudentNum.compareTo(classGroup.getExpectStudentNum())>=0){
|
|
|
+ vipGroup.setStatus(VipGroupStatusEnum.PROGRESS);
|
|
|
+ vipGroupDao.update(vipGroup);
|
|
|
+ }
|
|
|
+ classGroup.setStudentNum(currentStudentNum);
|
|
|
+ classGroup.setDelFlag(0);
|
|
|
+ classGroupDao.update(classGroup);
|
|
|
+
|
|
|
imGroupMemberList.add(new ImGroupMember(studentId.toString()));
|
|
|
}
|
|
|
|
|
@@ -2710,6 +2722,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
vipGroup.setStatus(VipGroupStatusEnum.PROGRESS);
|
|
|
vipGroupDao.update(vipGroup);
|
|
|
}
|
|
|
+ classGroup.setStudentNum(currentStudentNum);
|
|
|
classGroup.setDelFlag(0);
|
|
|
classGroupDao.update(classGroup);
|
|
|
classGroupService.updateClassGroupInfo(classGroup.getId());
|