From b83ae626eff9202fe0f13055e6df20d028d79f11 Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Mon, 25 May 2026 14:26:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=A4=E5=B0=94=E9=82=A6=E8=8A=82=E6=8E=92?=
 =?UTF-8?q?=E8=A1=8C=E6=A6=9C=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 8d3c56838ce080d526cd0e20cddbe7ae4532b1ea)
---
 .../activity/query/RankingListQryExe.java     | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/RankingListQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/RankingListQryExe.java
index 3a0cb1d2..216532dc 100644
--- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/RankingListQryExe.java
+++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/RankingListQryExe.java
@@ -66,12 +66,7 @@ public class RankingListQryExe {
         }
 
       // 查询排行榜列表
-        String regionId = cmd.getRegionId() != null ? cmd.getRegionId()
-                : (cmd.getReqUserId() != null ? userRegionGateway.getRegionId(cmd.getReqUserId()) : null);
-        // 邀请活动特殊处理
-        if (activityType == RankingActivityType.INVITE) {
-            regionId = "OTHER";
-        }
+        String regionId = resolveRegionId(cmd, activityType);
 
         List<RankingActivityRecord> records = rankingActivityGateway.getRankingList(
             cmd.getReqSysOrigin().getOrigin(),
@@ -152,7 +147,23 @@ public class RankingListQryExe {
         return result;
     }
 
-  private Set<Long> getUserIds(List<RankingActivityRecord> records) {
+    /**
+     * 解析 regionId：不分区类型返回 null，邀请活动固定 OTHER，其余按用户地区
+     */
+    private String resolveRegionId(RankingListQueryCmd cmd, RankingActivityType activityType) {
+        if (activityType.isNoPartition()) {
+            return null;
+        }
+        if (activityType == RankingActivityType.INVITE) {
+            return "OTHER";
+        }
+        if (cmd.getRegionId() != null) {
+            return cmd.getRegionId();
+        }
+        return cmd.getReqUserId() != null ? userRegionGateway.getRegionId(cmd.getReqUserId()) : null;
+    }
+
+    private Set<Long> getUserIds(List<RankingActivityRecord> records) {
     return records.stream().map(RankingActivityRecord::getUserId).collect(Collectors.toSet());
   }