From 758fa7e5222b764901e69e4da597e7909d861a18 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 13:33:46 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-account/src/main/resources/mapper/account/WithdrawalRequestsMapper.xml | 4 ++--
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java | 6 +++++-
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/WithQuery.java | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
index 3839d5e..32bb927 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
@@ -134,7 +134,11 @@
@GetMapping("/user/list")
@ApiOperation(value = "积分管理-用户积分明细(必传用户id)", tags = "后台")
public R<Page<UserPoint>> userlist(UserPoint userPoint) {
- Page<UserPoint> page = userPointService.lambdaQuery().eq(UserPoint::getAppUserId, userPoint.getAppUserId()).orderByDesc(UserPoint::getCreateTime).page(Page.of(userPoint.getPageNum(), userPoint.getPageSize()));
+ Page<UserPoint> page = userPointService.lambdaQuery()
+ .eq(UserPoint::getType, userPoint.getType())
+ .eq(UserPoint::getAppUserId, userPoint.getAppUserId())
+ .orderByDesc(UserPoint::getCreateTime)
+ .page(Page.of(userPoint.getPageNum(), userPoint.getPageSize()));
for (UserPoint record : page.getRecords()) {
int i = record.getHistoricalPoint() - record.getBalance();
if (i>0){
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/WithQuery.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/WithQuery.java
index 5acba8a..60acc1f 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/WithQuery.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/WithQuery.java
@@ -8,7 +8,7 @@
@Data
public class WithQuery {
@ApiModelProperty("用户名称")
- private String name;
+ private String userName;
@ApiModelProperty("电话")
private String phone;
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/WithdrawalRequestsMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/WithdrawalRequestsMapper.xml
index 7f913d7..6991416 100644
--- a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/WithdrawalRequestsMapper.xml
+++ b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/WithdrawalRequestsMapper.xml
@@ -26,8 +26,8 @@
<if test="withQuery.phone != null and withQuery.phone != ''">
AND t2.phone LIKE concat('%',#{withQuery.phone},'%')
</if>
- <if test="withQuery.name != null and withQuery.name != ''">
- AND t2.phone LIKE concat('%',#{withQuery.name},'%')
+ <if test="withQuery.userName != null and withQuery.userName != ''">
+ AND t2.name LIKE concat('%',#{withQuery.userName},'%')
</if>
order by t1.create_time desc
</select>
--
Gitblit v1.7.1