增加第三方接口-完善获取用户列表

userCenter_service/src/main/java/com/bjtdba/userCenter/dao/UserDao.java

@@ -40,7 +40,7 @@ public interface UserDao {
     void updateSpreadCount(int uid, int spread_count);
 
     List<UserEntity> getUserList(
-            @Param("phone") String phone,
+            @Param("account") String account,
             @Param("nickname") String nickname,
             @Param("uid") Long uid,
             @Param("status") Integer status,
@@ -49,7 +49,7 @@ public interface UserDao {
     );
 
     long getUserListCount(
-            @Param("phone") String phone,
+            @Param("account") String account,
             @Param("nickname") String nickname,
             @Param("uid") Long uid,
             @Param("status") Integer status

userCenter_service/src/main/java/com/bjtdba/userCenter/dto/request/GetUserListRequest.java

@@ -9,8 +9,8 @@ import javax.validation.constraints.Positive;
 @Getter
 @Setter
 public class GetUserListRequest {
-    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式错误")
-    private String phone;
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "账号格式错误")
+    private String account;
 
     private String nickname;
 

userCenter_service/src/main/java/com/bjtdba/userCenter/dto/response/common/UserDTO.java

@@ -10,16 +10,25 @@ import java.sql.Timestamp;
 @Setter
 public class UserDTO {
     private Long uid;
+    private String account;
+    private String realName;
     private String nickname;
+    private Long spreadUid;
     private String avatar;
     private String phone;
+    private BigDecimal score;
+    private BigDecimal brokeragePrice;
+    private BigDecimal repurchasePrice;
+    private Integer status;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Timestamp createTime;
-    private BigDecimal nowMoney;
-    private Integer status;
-    private String userType;
-    private Integer identity;
+    private Integer external;
+    private Integer externalId;
+    private Integer levelId;
+    private Integer userGroup;
     private BigDecimal contribute;
     private BigDecimal jingdou;
+    private BigDecimal vr;
+    private BigDecimal pv;
 }
 

userCenter_service/src/main/java/com/bjtdba/userCenter/service/impl/UserServiceImpl.java

@@ -67,7 +67,7 @@ public class UserServiceImpl  implements UserService {
 
         // 查询数据
         List<UserEntity> userEntityList = userDao.getUserList(
-                request.getPhone(),
+                request.getAccount(),
                 request.getNickname(),
                 request.getUid(),
                 request.getStatus(),
@@ -80,7 +80,7 @@ public class UserServiceImpl  implements UserService {
 
         // 查询总数
         long total = userDao.getUserListCount(
-                request.getPhone(),
+                request.getAccount(),
                 request.getNickname(),
                 request.getUid(),
                 request.getStatus()
@@ -106,16 +106,25 @@ public class UserServiceImpl  implements UserService {
     private UserDTO convertToBasicDTO(UserEntity userEntity) {
         UserDTO dto = new UserDTO();
         dto.setUid(userEntity.getUid());
+        dto.setAccount(userEntity.getAccount());
+        dto.setRealName(userEntity.getRealName());
         dto.setNickname(userEntity.getNickname());
+        dto.setSpreadUid(userEntity.getSpreadUid());
         dto.setAvatar(userEntity.getAvatar());
         dto.setPhone(userEntity.getPhone());
-        dto.setCreateTime(userEntity.getCreateTime());
-        dto.setNowMoney(userEntity.getNowMoney());
+        dto.setScore(userEntity.getScore());
+        dto.setBrokeragePrice(userEntity.getBrokeragePrice());
+        dto.setRepurchasePrice(userEntity.getRepurchasePrice());
         dto.setStatus(userEntity.getStatus());
-        dto.setUserType(userEntity.getUserType());
-        dto.setIdentity(userEntity.getIdentity());
+        dto.setCreateTime(userEntity.getCreateTime());
+        dto.setExternal(userEntity.getExternal());
+        dto.setExternalId(userEntity.getExternalId());
+        dto.setLevelId(userEntity.getLevelId());
+        dto.setUserGroup(userEntity.getUserGroup());
         dto.setContribute(userEntity.getContribute());
         dto.setJingdou(userEntity.getJingdou());
+        dto.setVr(userEntity.getVr());
+        dto.setPv(userEntity.getPv());
         return dto;
     }
 }

userCenter_service/src/main/resources/mapper/UserExternalMapper.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.bjtdba.userCenter.dao.UserDao">
+
+    <!-- 使用 autoMapping 自动映射未显式声明的字段 -->
+    <resultMap id="userResultMap" type="com.bjtdba.userCenter.entity.UserEntity" autoMapping="true">
+        <id column="uid" property="uid" />
+        <!-- 显式声明需要下划线转驼峰的字段 -->
+        <result column="real_name" property="realName" />
+        <result column="spread_uid" property="spreadUid" />
+        <result column="brokerage_price" property="brokeragePrice" />
+        <result column="repurchase_price" property="repurchasePrice" />
+        <result column="create_time" property="createTime" />
+        <result column="external_id" property="externalId" />
+        <result column="level_id" property="levelId" />
+        <result column="user_group" property="userGroup" />
+    </resultMap>
+
+    <sql id="baseColumn">
+                uid, account, real_name, nickname, spread_uid, avatar, phone, score,
+                brokerage_price, repurchase_price, status, create_time, external, external_id,
+                level_id, user_group, contribute, jingdou, vr, pv
+    </sql>
+
+    <sql id="queryCondition">
+        <where>
+            is_del = 0
+            <if test="account != null and account != ''">
+                AND account = #{account}
+            </if>
+            <if test="nickname != null and nickname != ''">
+                AND nickname LIKE CONCAT('%', #{nickname}, '%')
+            </if>
+            <if test="uid != null">
+                AND uid = #{uid}
+            </if>
+            <if test="status != null">
+                AND status = #{status}
+            </if>
+        </where>
+    </sql>
+
+    <!-- 关键修改：使用 resultMap 而不是 resultType -->
+    <select id="getUserList" resultMap="userResultMap">
+        SELECT <include refid="baseColumn"/>
+        FROM rrx_user
+        <include refid="queryCondition"/>
+        ORDER BY create_time DESC
+        LIMIT #{offset}, #{pageSize}
+    </select>
+
+    <select id="getUserListCount" resultType="long">
+        SELECT COUNT(uid)
+        FROM rrx_user
+        <include refid="queryCondition"/>
+    </select>
+</mapper>

userCenter_service/src/main/resources/mapper/UserMapper.xml

@@ -174,41 +174,4 @@
         </set>
         where uid=#{uid}
     </update>
-
-    <sql id="baseColumn">
-                uid, nickname, avatar, phone, create_time, now_money, status, user_type,
-                identity, contribute, jingdou
-    </sql>
-
-    <sql id="queryCondition">
-        <where>
-            is_del = 0
-            <if test="phone != null and phone != ''">
-                AND phone = #{phone}
-            </if>
-            <if test="nickname != null and nickname != ''">
-                AND nickname LIKE CONCAT('%', #{nickname}, '%')
-            </if>
-            <if test="uid != null">
-                AND uid = #{uid}
-            </if>
-            <if test="status != null">
-                AND status = #{status}
-            </if>
-        </where>
-    </sql>
-
-    <select id="getUserList" resultType="com.bjtdba.userCenter.entity.UserEntity">
-        SELECT <include refid="baseColumn"/>
-        FROM rrx_user
-        <include refid="queryCondition"/>
-        ORDER BY create_time DESC
-        LIMIT #{offset}, #{pageSize}
-    </select>
-
-    <select id="getUserListCount" resultType="long">
-        SELECT COUNT(uid)
-        FROM rrx_user
-        <include refid="queryCondition"/>
-    </select>
 </mapper>