Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -2473,7 +2473,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroupId, null);
 
-		if(!VipGroupStatusEnum.PROGRESS.equals(vipGroup.getStatus())&&classGroup.getExpectStudentNum()>1){
+		if(classGroup.getExpectStudentNum()>1
+				&&(VipGroupStatusEnum.APPLYING.equals(vipGroup.getStatus())
+				||VipGroupStatusEnum.APPLYING_END.equals(vipGroup.getStatus())
+				||VipGroupStatusEnum.NOT_START.equals(vipGroup.getStatus())
+				||VipGroupStatusEnum.FINISHED.equals(vipGroup.getStatus())
+				||VipGroupStatusEnum.CANCEL.equals(vipGroup.getStatus()))){
 			throw new BizException("VIP课程组尚未成立，无法添加学员，请走学员购买流程!");
 		}