修改查找用户详细信息返回格式和登录返回用户信息的格式不一样

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;
     }

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);
 }

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;

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>