|
@@ -2535,24 +2535,24 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
classGroupStudentMappers.add(classGroupStudentMapper);
|
|
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()));
|
|
imGroupMemberList.add(new ImGroupMember(studentId.toString()));
|
|
}
|
|
}
|
|
|
|
|
|
if(!CollectionUtils.isEmpty(classGroupStudentMappers)){
|
|
if(!CollectionUtils.isEmpty(classGroupStudentMappers)){
|
|
classGroupStudentMapperDao.classGroupStudentsInsert(classGroupStudentMappers);
|
|
classGroupStudentMapperDao.classGroupStudentsInsert(classGroupStudentMappers);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ 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);
|
|
|
|
+
|
|
try {
|
|
try {
|
|
ImGroupMember[] imGroupMembers = imGroupMemberList.toArray(new ImGroupMember[imGroupMemberList.size()]);
|
|
ImGroupMember[] imGroupMembers = imGroupMemberList.toArray(new ImGroupMember[imGroupMemberList.size()]);
|
|
// 创建群组
|
|
// 创建群组
|