|
@@ -1530,6 +1530,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
classStudentMapperByUserIdAndClassGroupId.setStatus(ClassGroupStudentStatusEnum.QUIT);
|
|
|
classGroupStudentMapperDao.update(classStudentMapperByUserIdAndClassGroupId);
|
|
|
studentPauseInfoDao.deleteUserPauseInfoWithGroup(GroupType.VIP, vipGroupId.toString(), studentId);
|
|
|
+
|
|
|
+ classGroup.setStudentNum(classGroup.getStudentNum()-1);
|
|
|
+ classGroupDao.update(classGroup);
|
|
|
return;
|
|
|
}
|
|
|
if(Objects.isNull(amount)){
|
|
@@ -2701,7 +2704,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
VipGroupStatusEnum vipGroupStatus = vipGroup.getStatus();
|
|
|
|
|
|
Integer currentStudentNum = classGroupStudentMapperDao.countClassGroupStudentNum(classGroup.getId());
|
|
|
- if((!vipGroup.getStatus().equals(VipGroupStatusEnum.PAUSE)
|
|
|
+ if((!vipGroup.getStatus().equals(VipGroupStatusEnum.FINISHED)
|
|
|
||!vipGroup.getStatus().equals(VipGroupStatusEnum.CANCEL))
|
|
|
&¤tStudentNum.compareTo(classGroup.getExpectStudentNum())>=0){
|
|
|
vipGroup.setStatus(VipGroupStatusEnum.PROGRESS);
|