From 1008fa8790bfd8f57eb26e94ae24333fdfbee3b1 Mon Sep 17 00:00:00 2001
From: ma <1062634917@qq.com>
Date: Mon, 26 Apr 2021 16:18:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E6=89=BE=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=92=8C=E7=99=BB=E5=BD=95=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E7=9A=84=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E6=A0=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ccsens/tall/bean/vo/UserVo.java |  2 ++
 .../com/ccsens/tall/persist/dao/SysUserDao.java   |  7 +++++++
 .../com/ccsens/tall/service/UserInfoService.java  |  3 +++
 tall/src/main/resources/mapper_dao/SysUserDao.xml | 15 +++++++++++++++
 4 files changed, 27 insertions(+)

diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/UserVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/UserVo.java
index d2ed5e45..ce1f6005 100644
--- a/tall/src/main/java/com/ccsens/tall/bean/vo/UserVo.java
+++ b/tall/src/main/java/com/ccsens/tall/bean/vo/UserVo.java
@@ -144,6 +144,8 @@ public class UserVo {
         private Date createdAt;
         @ApiModelProperty("空间使用情况")
         private Interspace interspace;
+        @ApiModelProperty("WxInfo")
+        private WxInfo wxInfo;
         @ApiModelProperty("标签信息")
         private List<LabelVo.SelectLabel> labelList;
     }
diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/SysUserDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/SysUserDao.java
index 344526b9..c6b688e7 100644
--- a/tall/src/main/java/com/ccsens/tall/persist/dao/SysUserDao.java
+++ b/tall/src/main/java/com/ccsens/tall/persist/dao/SysUserDao.java
@@ -61,4 +61,11 @@ public interface SysUserDao extends SysUserMapper {
      * @return
      */
     UserVo.TokenBean getTokenBeanByUserId(Long userId);
+
+    /**
+     * 查找用户wxInfo中的信息
+     * @param currentUserId 当前用户id
+     * @return UserVo.WxInfo
+     */
+    UserVo.WxInfo selectWxInfo(@Param("userId") Long currentUserId);
 }
diff --git a/tall/src/main/java/com/ccsens/tall/service/UserInfoService.java b/tall/src/main/java/com/ccsens/tall/service/UserInfoService.java
index 61855606..1cd54e20 100644
--- a/tall/src/main/java/com/ccsens/tall/service/UserInfoService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/UserInfoService.java
@@ -195,6 +195,9 @@ public class UserInfoService implements IUserInfoService{
             //获取空间使用信息
             UserVo.Interspace interspace = sysUserDao.selectInterspace(currentUserId);
             selectUserInfo.setInterspace(interspace);
+            //封装wxInfo
+            UserVo.WxInfo wxInfo = sysUserDao.selectWxInfo(currentUserId);
+            selectUserInfo.setWxInfo(wxInfo);
         }
 
         return selectUserInfo;
diff --git a/tall/src/main/resources/mapper_dao/SysUserDao.xml b/tall/src/main/resources/mapper_dao/SysUserDao.xml
index d917ade3..c884fb86 100644
--- a/tall/src/main/resources/mapper_dao/SysUserDao.xml
+++ b/tall/src/main/resources/mapper_dao/SysUserDao.xml
@@ -198,4 +198,19 @@
             AND
             rec_status = 0
     </select>
+
+    <select id="selectWxInfo" resultType="com.ccsens.tall.bean.vo.UserVo$WxInfo">
+        SELECT
+            u.city As city,
+            u.country AS country,
+            u.avatar_url As headImgUrl,
+            u.`language` As `language`,
+            u.nickname AS nickname,
+            u.province AS province,
+            u.gender AS sex
+        FROM
+            t_sys_user AS u
+        WHERE
+            id = #{userId}
+    </select>
 </mapper>
\ No newline at end of file