From a490541ccb2fe24c7c2608f55c9e30c0a0cd479d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 7 Jan 2025 13:20:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=87=86=E7=A1=AE=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sqx/modules/app/dao/UserDao.java |  2 +-
 .../app/service/impl/UserServiceImpl.java     | 22 ++++++++++++++-----
 src/main/resources/mapper/app/UserDao.xml     | 17 +-------------
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/sqx/modules/app/dao/UserDao.java b/src/main/java/com/sqx/modules/app/dao/UserDao.java
index 037fe2eb..cfc39a54 100644
--- a/src/main/java/com/sqx/modules/app/dao/UserDao.java
+++ b/src/main/java/com/sqx/modules/app/dao/UserDao.java
@@ -35,7 +35,7 @@ public interface UserDao extends BaseMapper<UserEntity> {
 
     int insertUser(UserEntity userEntity);
 
-    List<UserEntity> selectInviteUserList(String userName,String phone);
+    List<UserEntity> selectInviteUserList();
 
     int selectUserOnLineCount(String qdCode);
 
diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
index 728645d4..2cc55344 100644
--- a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
@@ -1523,19 +1523,31 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
 
     @Override
     public Result selectInviteUserList(Integer page, Integer limit, String userName, String phone) {
+        LambdaQueryWrapper<UserEntity> queryWrapper = new LambdaQueryWrapper<>();
+        if(StrUtil.isNotBlank(userName)) {
+            queryWrapper.like(UserEntity::getUserName, userName);
+        }
+
+        if (StrUtil.isNotBlank(phone)) {
+            queryWrapper.like(UserEntity::getPhone, phone);
+        }
+        queryWrapper.orderByDesc(UserEntity::getCreateTime);
         PageHelper.startPage(page,limit);
-        List<UserEntity> userEntities = baseMapper.selectInviteUserList(userName, phone);
-        if (!userEntities.isEmpty()) {
-            Set<Long> userIdList = userEntities.stream().map(UserEntity::getUserId).collect(Collectors.toSet());
+        List<UserEntity> userEntityList = list(queryWrapper);
+
+        Map<Long, Integer> countInfoMap = baseMapper.selectInviteUserList().stream().collect(Collectors.toMap(UserEntity::getUserId, UserEntity::getCounts));
+        if (!userEntityList.isEmpty()) {
+            Set<Long> userIdList = userEntityList.stream().map(UserEntity::getUserId).collect(Collectors.toSet());
             Map<Long, UserMoney> infoMap = userMoneyService.list(new LambdaQueryWrapper<UserMoney>()
                             .in(UserMoney::getUserId, userIdList))
                     .stream().collect(Collectors.toMap(UserMoney::getUserId, item -> item));
-            userEntities.forEach(item -> {
+            userEntityList.forEach(item -> {
                 UserMoney userMoney = infoMap.get(item.getUserId());
                 item.setMoney(userMoney == null ? BigDecimal.ZERO : userMoney.getInviteIncomeMoney());
+                item.setCounts(countInfoMap.get(item.getUserId()));
             });
         }
-        return Result.success().put("data", PageUtils.page(new PageInfo<>(userEntities),true));
+        return Result.success().put("data", PageUtils.page(new PageInfo<>(userEntityList),true));
     }
 
     @Override
diff --git a/src/main/resources/mapper/app/UserDao.xml b/src/main/resources/mapper/app/UserDao.xml
index 17f4d683..7c05619b 100644
--- a/src/main/resources/mapper/app/UserDao.xml
+++ b/src/main/resources/mapper/app/UserDao.xml
@@ -299,22 +299,7 @@
 
 
     <select id="selectInviteUserList" resultType="com.sqx.modules.app.entity.UserEntity">
-        SELECT
-        u.*,
-        IFNULL( b.counts, 0 ) AS counts,
-        0 AS money
-        FROM
-        tb_user u
-        LEFT JOIN ( SELECT inviter_code, COUNT(*) AS counts FROM tb_user u1 GROUP BY inviter_code ) AS b ON u.invitation_code = b.inviter_code
-        WHERE
-        1 = 1
-        <if test="userName!=null and userName!=''">
-            and user_name like concat('%',#{userName},'%')
-        </if>
-        <if test="phone!=null and phone!=''">
-            and phone like concat('%',#{phone},'%')
-        </if>
-        order by money desc,counts desc
+        SELECT any_value(user_id) as userId, COUNT(*) AS counts FROM tb_user GROUP BY inviter_code order by counts desc
     </select>
 
     <select id="selectUserOnLineCount" resultType="Integer">

From cf232586dc34ddcac993982d2d595199a0ba1c63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 7 Jan 2025 13:23:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=AE=9E=E5=90=8D?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81rediskey?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/sqx/common/utils/ApiAccessLimitUtil.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/sqx/common/utils/ApiAccessLimitUtil.java b/src/main/java/com/sqx/common/utils/ApiAccessLimitUtil.java
index 5b5dc62d..48bab6b4 100644
--- a/src/main/java/com/sqx/common/utils/ApiAccessLimitUtil.java
+++ b/src/main/java/com/sqx/common/utils/ApiAccessLimitUtil.java
@@ -137,7 +137,7 @@ public class ApiAccessLimitUtil {
     }
 
     public static boolean getCertAuthIsAccessAllowed(String id, String key, Integer count) {
-        String redisKey = generateRedisKey(key, id);
+        String redisKey = "app:updateLimit:auth:" + key + ":" + id;
         Object countObj = redisUtils.get(redisKey);
         if (countObj == null) {
             return true;
@@ -146,7 +146,7 @@ public class ApiAccessLimitUtil {
     }
 
     public static void setCertAuthIsAccessAllowed(String id, String key, Integer count, String timeFormat) {
-        String redisKey = generateRedisKey(key, id);
+        String redisKey = "app:updateLimit:auth:" + key + ":" + id;
         Object countObj = redisUtils.get(redisKey);
         if (countObj == null) {
             long expireAt;