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

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

@@ -2957,7 +2957,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
         if (musicGroup == null) {
-            throw new BizException("乐团 {} {} 不存在",musicGroupId,musicGroup.getName());
+            throw new BizException("乐团 {} 不存在",musicGroupId);
         }
         if (musicGroup.getStatus() == MusicGroupStatusEnum.CANCELED || musicGroup.getStatus() == MusicGroupStatusEnum.PAUSE) {
             throw new BizException("退团失败，乐团 {} {} 状态[已取消]或[已暂停]",musicGroupId,musicGroup.getName());

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

@@ -3159,13 +3159,13 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		}
 		VipGroup vipGroup = vipGroupDao.get(vipGroupId);
 		if(Objects.isNull(vipGroup)){
-			throw new BizException("指定的课程不存在");
+			throw new BizException("课程 {} 不存在",vipGroupId);
 		}
 		if(vipGroup.getStatus().equals(VipGroupStatusEnum.CANCEL)){
-			throw new BizException("不能对已停止的课程进行此操作");
+			throw new BizException("课程 {} {} 已停止",vipGroupId,vipGroup.getName());
 		}
 		if(vipGroup.getName().startsWith("考前辅导课")){
-			throw new BizException("当前课程类型不支持退学");
+			throw new BizException("课程 {} {} 不支持退学",vipGroupId,vipGroup.getName());
 		}
 
 		List<StudentApplyRefunds> studentApplyRefunds = studentApplyRefundsDao.findByGroupAndUser(vipGroupId.toString(), GroupType.VIP.getCode(), studentId);