Merge branch 'feature/0822_logoff' into develop-new

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -428,9 +428,13 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
         // todo: 暂时不上
         try {
             HttpResponseResult<List<String>> check = adminFeignService.accountLogoffCheck(phone);
+            if (!check.getStatus()) {
+                throw new BizException("数据检查失败");
+            }
             List<String> errMsg = check.getData();
             if (!CollectionUtils.isEmpty(errMsg)) {
                 logOff.setMessage(errMsg);
+                return HttpResponseResult.succeed(logOff);
             }
         } catch (Exception e) {
             throw new BizException("数据检查失败");

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysUserServiceImpl.java

@@ -266,7 +266,7 @@ public class SysUserServiceImpl implements SysUserService {
                 .count();
 
         if (course > 0 || videoCourse > 0) {
-            errMsg.add("存在进行中的课程");
+            errMsg.add("存在进行中的直播课、陪练课、琴房课，未下架的视频课");
         }
 
         Teacher teacher = teacherService.getById(userId);
@@ -282,7 +282,7 @@ public class SysUserServiceImpl implements SysUserService {
                 Collection<ImGroup> imGroups = imGroupService.listByIds(groupIdList);
                 long orgGroups = imGroups.stream().filter(next -> ImGroupType.ORG.equals(next.getType())).count();
                 if (orgGroups > 0) {
-                    errMsg.add("账户为机构群群主、需要庄毅群主或解散群聊");
+                    errMsg.add("账户为机构群群主、需要转移群主或解散群聊");
                 }
             }