1

zyy

2025-11-14 ed74442294092ea3f8c29467ae8de3071852e8be

1

 trading-order-admin/src/main/java/com/yami/trading/admin/controller/auth/UserAuthController.java

@@ -109,6 +109,7 @@
            realNameAuthDto.setIdFrontImg(Constants.IMAGES_HTTP+realNameAuthRecord.getIdFrontImg());
            realNameAuthDto.setIdBackImg(Constants.IMAGES_HTTP+realNameAuthRecord.getIdBackImg());
            realNameAuthDto.setHandheldPhoto(Constants.IMAGES_HTTP+realNameAuthRecord.getHandheldPhoto());
            realNameAuthDto.setPhone(realNameAuthRecord.getPhone());
        }
        return Result.succeed(realNameAuthDto, "查询成功");
    }
@@ -143,6 +144,11 @@
        if(StringUtils.isNotEmpty(dto.getHandheldPhoto())) {
            realNameAuthRecord.setHandheldPhoto(dto.getHandheldPhoto());
        }
        if(StringUtils.isNotEmpty(dto.getPhone())) {
            realNameAuthRecord.setPhone(dto.getPhone());
        }


        User user= userService.getById(realNameAuthRecord.getUserId());
        Log log = new Log();
        log.setCategory(Constants.LOG_CATEGORY_OPERATION);

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

@@ -73,7 +73,7 @@

        Page<UserDataDto> page = new Page(model.getCurrent(), model.getSize());
        userService.listUserAndRecom(page, roleNames, model.getUserCode(), model.getUserName(), model.getLastIp(),
                permissionFacade.getOwnerUserIds(), model.getUserMail(), model.getUserMobile());
                permissionFacade.getOwnerUserIds(), model.getUserMail(), model.getUserMobile(), model.getRecomUserName());
        for (UserDataDto userDataDto : page.getRecords()) {
            userDataDto.setOnline(userService.isOnline(userDataDto.getUserId()));
//            userDataDto.setLoginAuthority(userDataDto.getStatus() == 1);

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

@@ -16,6 +16,9 @@
    @ApiModelProperty("用户名")
    private  String  userName;

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

    @ApiModelProperty("userCode")
    private  String  userCode;

 trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiRealNameAuthContoller.java

@@ -84,10 +84,10 @@
            throw new YamiShopBindException("实名姓名长度超过50");
        }

        String authcode = identifyingCodeTimeWindowService.getAuthCode(model.getPhone());
        /*String authcode = identifyingCodeTimeWindowService.getAuthCode(model.getPhone());
        if (authcode == null || !authcode.equals(model.getCode())) {
            throw new YamiShopBindException("验证码不正确");
        }
        }*/

        Date now = new Date();
        BeanUtils.copyProperties(model, realNameAuthRecord);

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

@@ -38,6 +38,9 @@
     */
    @ApiModelProperty("实名姓名")
    private String name;

    @ApiModelProperty("实名手机号")
    private String phone;
    /**
     * 证件正面照
     */

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

@@ -34,6 +34,9 @@
    @ApiModelProperty("账户类型")
    private String rolename;

    @ApiModelProperty("USDT账户余额")
    private  BigDecimal money;

    /**
     * USDT账户余额
     */

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

@@ -32,7 +32,9 @@

   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,
                                      @Param("userMail")   String userMail,  @Param("userMobile")  String userMobile);
                                      @Param("userMail")   String userMail,  @Param("userMobile")  String userMobile,
                                      @Param("recomUserName") String recomUserName);


    Page<AgentUserDto> getAgentAllStatistics(Page page,@Param("userName") String userName,@Param("children")
                                             List<String> children);

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

@@ -150,9 +150,9 @@
    }

    @Override
    public Page<UserDataDto> listUserAndRecom(Page page, List<String> roleNames, String userCode, String userName, String lastIp, List<String> checkedList, String userMail, String userMobile) {
    public Page<UserDataDto> listUserAndRecom(Page page, List<String> roleNames, String userCode, String userName, String lastIp, List<String> checkedList, String userMail, String userMobile, String recomUserName) {
        return baseMapper.listUserAndRecom(page, roleNames, userCode,
                userName, lastIp, checkedList, userMail, userMobile);
                userName, lastIp, checkedList, userMail, userMobile, recomUserName);
    }

    @Override

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

@@ -132,7 +132,7 @@
     */
    Page<UserDataDto> listUserAndRecom(Page page,  List<String> roleNames, String userCode, String userName,
                                      String lastIp,List<String> checkedList,
                                       String userMail,String userMobile);
                                       String userMail,String userMobile, String recomUserName);

    void  updateAgent(String userId,boolean operaAuthority,boolean loginAuthority);
    User findUserByUserCode(String userCode);

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

@@ -95,9 +95,10 @@

    <select id="listUserAndRecom" resultType="com.yami.trading.bean.user.dto.UserDataDto">

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


        where 1=1 and u.role_name in
        <foreach collection="roleNames" separator="," index="index" open="(" close=")" item="r">
@@ -129,6 +130,10 @@
        <if test="lastIp!=null and lastIp!=''">
            and u.user_lastip=#{lastIp}
        </if>

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