Browse Source

1、vip课休学到退学班级人数更新

Joburgess 5 years ago
parent
commit
0d01c10376

+ 12 - 12
mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -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))
-                        &&currentStudentNum.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))
+					&&currentStudentNum.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()]);
 				// 创建群组
 				// 创建群组