资金列表新增推荐人

zyy

2025-11-27 95ac81a1e33c5d20a14010a90088c6017f217ac4

资金列表新增推荐人

 trading-order-admin/src/main/java/com/yami/trading/admin/controller/agent/AgentController.java

@@ -124,7 +124,7 @@
        roleNames.add(Constants.SECURITY_ROLE_MEMBER);
        roleNames.add(Constants.SECURITY_ROLE_TEST);

        userService.listUser(page, roleNames, null, null, null,null, childs);
        userService.listUser(page, roleNames, null, null, null,null, childs, null);
        List<AgentDto> agentDtos = new ArrayList<>();
        for (UserDto userDto : page.getRecords()) {
            AgentDto agentDto = new AgentDto();

 trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserController.java

@@ -85,7 +85,7 @@
        }
        Page<UserDto> page = new Page(model.getCurrent(), model.getSize());
        userService.listUser(page, roleNames, model.getUserCode(), model.getUserName(), model.getUserMail(), model.getUserMobile(),
            permissionFacade.getOwnerUserIds());
            permissionFacade.getOwnerUserIds(), model.getRecomUserName());
        return Result.ok(page);
    }


 trading-order-admin/src/main/java/com/yami/trading/admin/model/UserListModel.java

@@ -29,4 +29,7 @@
     * 手机号码
     */
    private String userMobile;

    @ApiModelProperty("推荐人名")
    private  String  recomUserName;
}

 trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/UserDto.java

@@ -60,5 +60,7 @@
    @ApiModelProperty("注册时间")
    private Date createTime;//create_time  createTimeTs

    @ApiModelProperty("推荐人")
    private String recomUserName;

}

 trading-order-service/src/main/java/com/yami/trading/dao/user/UserMapper.java

@@ -28,7 +28,7 @@

    Page<UserDto> listUser(Page page,@Param("roleNames")  List<String> roleNames, @Param("userCode") String userCode,
                           @Param("userName") String userName,  @Param("userMail") String userMail,  @Param("userMobile") String userMobile,
                           @Param("checkedList") List<String> checkedList);
                           @Param("checkedList") List<String> checkedList, @Param("recomUserName") String recomUserName);

   Page<UserDataDto> listUserAndRecom(Page page,@Param("roleNames")  List<String> roleNames, @Param("userCode") String userCode,@Param("userName")   String userName,
                                      @Param("lastIp")   String lastIp,@Param("checkedList") List<String> checkedList,

 trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java

@@ -101,9 +101,9 @@

    @Override
    public Page<UserDto> listUser(Page page, List<String> roleNames, String userCode, String userName,
        String userMail, String userMobile, List<String> checkedList) {
        String userMail, String userMobile, List<String> checkedList, String recomUserName) {

        Page<UserDto> userDtoPage = baseMapper.listUser(page, roleNames, userCode, userName, userMail, userMobile, checkedList);
        Page<UserDto> userDtoPage = baseMapper.listUser(page, roleNames, userCode, userName, userMail, userMobile, checkedList, recomUserName);

        // 提现限制流水开启后，提现判断用的用户当前流水是使用UserData表的当日流水1还是使用Party表里的用户当前流水2
        String withdraw_limit_open_use_type = this.sysparaService.find("withdraw_limit_open_use_type").getSvalue();

 trading-order-service/src/main/java/com/yami/trading/service/user/UserService.java

@@ -119,7 +119,7 @@


    Page<UserDto> listUser(Page page, List<String> roleNames, String userCode, String userName,
        String userMail, String userMobile, List<String> checkedList);
        String userMail, String userMobile, List<String> checkedList, String recomUserName);

    /**
     * 获取基础数据

 trading-order-service/src/main/resources/mapper/UserMapper.xml

@@ -38,7 +38,9 @@

    <select id="listUser" resultType="com.yami.trading.bean.user.dto.UserDto">

        SELECT * FROM tz_user u LEFT JOIN tz_wallet w ON u.user_id=w.user_id
        SELECT u.*,w.money,r.user_name AS 'recomUserName' FROM tz_user u
        LEFT JOIN tz_wallet w ON u.user_id=w.user_id
        LEFT JOIN tz_user r ON u.user_recom=r.user_id

        where 1=1 and u.role_name in
        <foreach collection="roleNames" separator="," index="index" open="(" close=")" item="r">
@@ -50,7 +52,7 @@
        </if>

        <if test="userName!=null and userName!=''">
            and u.user_name=#{userName} or u.user_code=#{userName}
            and (u.user_name=#{userName} or u.user_code=#{userName})
        </if>

        <if test="userMail!=null and userMail!=''">
@@ -68,6 +70,9 @@
            </foreach>

        </if>
        <if test="recomUserName!=null and recomUserName!=''">
            and r.user_name like  CONCAT('%', #{recomUserName}, '%')
        </if>
        order by u.create_time desc
    </select>