From ed74442294092ea3f8c29467ae8de3071852e8be Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 14 Nov 2025 17:06:01 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserDataController.java | 2 +-
trading-order-admin/src/main/java/com/yami/trading/admin/model/UserDataListModel.java | 3 +++
trading-order-admin/src/main/java/com/yami/trading/admin/controller/auth/UserAuthController.java | 6 ++++++
trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/RealNameAuthUpdateDto.java | 3 +++
trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/UserDataDto.java | 3 +++
trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java | 4 ++--
trading-order-service/src/main/java/com/yami/trading/service/user/UserService.java | 2 +-
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiRealNameAuthContoller.java | 4 ++--
trading-order-service/src/main/resources/mapper/UserMapper.xml | 11 ++++++++---
trading-order-service/src/main/java/com/yami/trading/dao/user/UserMapper.java | 4 +++-
10 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/auth/UserAuthController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/auth/UserAuthController.java
index 310899a..6e42f47 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/auth/UserAuthController.java
+++ b/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);
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserDataController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserDataController.java
index a6bc6a7..4750533 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserDataController.java
+++ b/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);
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/UserDataListModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/UserDataListModel.java
index d8fcb01..0bcf7b1 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/UserDataListModel.java
+++ b/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;
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiRealNameAuthContoller.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiRealNameAuthContoller.java
index 602ec6c..68762af 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiRealNameAuthContoller.java
+++ b/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);
diff --git a/trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/RealNameAuthUpdateDto.java b/trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/RealNameAuthUpdateDto.java
index 9b294d4..76200b3 100644
--- a/trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/RealNameAuthUpdateDto.java
+++ b/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;
/**
* 证件正面照
*/
diff --git a/trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/UserDataDto.java b/trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/UserDataDto.java
index 7c67304..e219d90 100644
--- a/trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/UserDataDto.java
+++ b/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账户余额
*/
diff --git a/trading-order-service/src/main/java/com/yami/trading/dao/user/UserMapper.java b/trading-order-service/src/main/java/com/yami/trading/dao/user/UserMapper.java
index 1046b82..8b9ceb5 100644
--- a/trading-order-service/src/main/java/com/yami/trading/dao/user/UserMapper.java
+++ b/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);
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
index 0aa1aa5..77c345c 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
+++ b/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
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/user/UserService.java b/trading-order-service/src/main/java/com/yami/trading/service/user/UserService.java
index bef7230..7742684 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/user/UserService.java
+++ b/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);
diff --git a/trading-order-service/src/main/resources/mapper/UserMapper.xml b/trading-order-service/src/main/resources/mapper/UserMapper.xml
index 87660d5..5a125be 100644
--- a/trading-order-service/src/main/resources/mapper/UserMapper.xml
+++ b/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>
--
Gitblit v1.9.3