From d6922e31dc37c605a8cd793e614d65f0bd69a8fe Mon Sep 17 00:00:00 2001
From: mofung1 <2279254178@qq.com>
Date: Mon, 20 Mar 2023 14:12:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mdd/front/controller/UserController.java     |  8 ++++----
 .../java/com/mdd/front/service/IUserService.java     |  3 ++-
 .../com/mdd/front/service/impl/UserServiceImpl.java  | 12 +++++++++++-
 .../java/com/mdd/front/vo/users/UserCenterVo.java    |  3 +++
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/server/like-front/src/main/java/com/mdd/front/controller/UserController.java b/server/like-front/src/main/java/com/mdd/front/controller/UserController.java
index d405cf98..2550d89f 100644
--- a/server/like-front/src/main/java/com/mdd/front/controller/UserController.java
+++ b/server/like-front/src/main/java/com/mdd/front/controller/UserController.java
@@ -26,8 +26,9 @@ public class UserController {
     @ApiOperation(value="个人中心")
     public AjaxResult<UserCenterVo> center() {
         Integer userId = LikeFrontThreadLocal.getUserId();
+        Integer terminal = LikeFrontThreadLocal.getTerminal();
 
-        UserCenterVo vo = iUserService.center(userId);
+        UserCenterVo vo = iUserService.center(userId, terminal);
         return AjaxResult.success(vo);
     }
 
@@ -94,21 +95,20 @@ public class UserController {
         return AjaxResult.success();
     }
 
-
-
     @PostMapping("/bindMnp")
     @ApiOperation(value="绑定小程序")
     public AjaxResult<Object> bindMnp(@Validated @RequestBody UserBindWechatValidate BindMnpValidate) {
         Integer userId = LikeFrontThreadLocal.getUserId();
+
         iUserService.bindMnp(BindMnpValidate, userId);
         return AjaxResult.success();
     }
 
-
     @PostMapping("/bindOa")
     @ApiOperation(value="绑定微信公众号")
     public AjaxResult<Object> bindOa(@Validated @RequestBody UserBindWechatValidate BindOaValidate) {
         Integer userId = LikeFrontThreadLocal.getUserId();
+
         iUserService.bindOa(BindOaValidate, userId);
         return AjaxResult.success();
     }
diff --git a/server/like-front/src/main/java/com/mdd/front/service/IUserService.java b/server/like-front/src/main/java/com/mdd/front/service/IUserService.java
index 92305066..396a7297 100644
--- a/server/like-front/src/main/java/com/mdd/front/service/IUserService.java
+++ b/server/like-front/src/main/java/com/mdd/front/service/IUserService.java
@@ -14,9 +14,10 @@ public interface IUserService {
      *
      * @author fzr
      * @param userId 用户ID
+     * @param terminal 用户终端
      * @return UserCenterVo
      */
-    UserCenterVo center(Integer userId);
+    UserCenterVo center(Integer userId, Integer terminal);
 
     /**
      * 个人信息
diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java
index 43ecfbdb..ae9c78e0 100644
--- a/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java
+++ b/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java
@@ -51,7 +51,7 @@ public class UserServiceImpl implements IUserService {
      * @return UserCenterVo
      */
     @Override
-    public UserCenterVo center(Integer userId) {
+    public UserCenterVo center(Integer userId, Integer terminal) {
         User user = userMapper.selectOne(new QueryWrapper<User>()
                 .select("id,sn,avatar,real_name,nickname,username,mobile,is_new")
                 .eq("id", userId)
@@ -66,6 +66,16 @@ public class UserServiceImpl implements IUserService {
             vo.setAvatar(UrlUtils.toAbsoluteUrl(user.getAvatar()));
         }
 
+        vo.setIsBindWechat(false);
+        if (terminal.equals(ClientEnum.OA.getCode()) || terminal.equals(ClientEnum.MNP.getCode())) {
+            UserAuth userAuth = userAuthMapper.selectOne(new QueryWrapper<UserAuth>()
+                    .select("id,openid,terminal")
+                    .eq("user_id", userId)
+                    .eq("terminal", terminal)
+                    .last("limit 1"));
+            vo.setIsBindWechat(userAuth != null);
+        }
+
         return vo;
     }
 
diff --git a/server/like-front/src/main/java/com/mdd/front/vo/users/UserCenterVo.java b/server/like-front/src/main/java/com/mdd/front/vo/users/UserCenterVo.java
index bcbf9cba..5c5de49f 100644
--- a/server/like-front/src/main/java/com/mdd/front/vo/users/UserCenterVo.java
+++ b/server/like-front/src/main/java/com/mdd/front/vo/users/UserCenterVo.java
@@ -36,5 +36,8 @@ public class UserCenterVo implements Serializable {
     @ApiModelProperty(value = "是否新用户")
     private Integer isNew;
 
+    @ApiModelProperty(value = "是否绑定微信")
+    private Boolean isBindWechat;
+
 
 }