Merge branch 'feature/0613-opt' into develop-new

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

@@ -224,6 +224,8 @@ public interface SysUserService extends BaseService<Long, SysUser> {
 
     HttpResponseResult<List<String>> logoffByPhone(String phone);
 
+    HttpResponseResult<List<String>> logoffCheckByPhone(String phone);
+
 
     void updateStudentHideFlag(Long userId, int hideFlag);
 }

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

@@ -461,6 +461,19 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
     }
 
     @Override
+    public HttpResponseResult<List<String>> logoffCheckByPhone(String phone) {
+        HttpResponseResult<List<String>> check = adminFeignService.accountLogoffCheck(phone);
+        if (check == null) {
+            throw new BizException("数据检查失败");
+        }
+        List<String> errMsg = check.getData();
+        if (!CollectionUtils.isEmpty(errMsg)) {
+            return HttpResponseResult.failed(500, errMsg, "存在未处理事项");
+        }
+        return HttpResponseResult.succeed();
+    }
+
+    @Override
     public void updateStudentHideFlag(Long userId, int hideFlag) {
         sysUserDao.updateStudentHideFlag(userId, hideFlag);
     }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -455,6 +455,17 @@ public class UserController extends BaseController {
 //        sysUserService.logoffById(sysUser.getId());
     }
 
+    @ApiOperation(value = "用户注销账号校验")
+    @GetMapping(value = "/logoffCheck")
+    public HttpResponseResult<List<String>> logoffCheck() {
+        AuthUser authUser = SecurityUtils.getUser();
+        SysUser sysUser = sysUserService.get(authUser.getUserId());
+        if (sysUser == null) {
+            return failed("用户不存在");
+        }
+        return sysUserService.logoffCheckByPhone(sysUser.getPhone());
+    }
+
     @ApiOperation(value = "刷新token")
     @PostMapping(value = "/refreshImToken")
     public Object refreshImToken() {