From ce78518698e7d024ed8729fbd5a31b589cbe9af3 Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Fri, 23 Jan 2026 14:59:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=8E=8B0=E7=82=B9=E5=BF=AB?=
 =?UTF-8?q?=E7=85=A7=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/RankingRewardGrantCmdExe.java    | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/RankingRewardGrantCmdExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/RankingRewardGrantCmdExe.java
index 931d5176..b69d59e9 100644
--- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/RankingRewardGrantCmdExe.java
+++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/RankingRewardGrantCmdExe.java
@@ -66,7 +66,15 @@ public class RankingRewardGrantCmdExe {
             lastUserMap = lastSnapshot.getRankingUsers().stream()
                 .collect(Collectors.toMap(RankingRewardSnapshot.RankingUserSnapshot::getUserId, u -> u));
         }
-        
+
+        // 检查是否为星期一0点(活动重置时间)
+        if (isWeeklyReset()) {
+            log.info("星期一0点，活动重置，收回所有用户道具");
+            revokeAllUserRewards(lastUserMap);
+
+            return;
+        }
+
         processRewardChanges(currentRankMap, lastUserMap, activityConfig);
         
         saveNewSnapshot(activityType, origin, cycleKey, templateId, currentRankingUsers, activityConfig);
@@ -78,16 +86,6 @@ public class RankingRewardGrantCmdExe {
     private void processRewardChanges(Map<Integer, RankingUserData> currentRankMap,
                                      Map<Long, RankingRewardSnapshot.RankingUserSnapshot> lastUserMap,
                                      ActivityConfigVO activityConfig) {
-        
-        // 检查是否为星期一0点(活动重置时间)
-        if (isWeeklyReset()) {
-            log.info("星期一0点，活动重置，收回所有用户道具");
-            revokeAllUserRewards(lastUserMap);
-
-            lastUserMap.clear();  // 清空历史，使所有用户视为新用户重新发放
-            return;
-        }
-
         Set<Long> currentUserIds = currentRankMap.values().stream()
             .map(RankingUserData::getUserId)
             .collect(Collectors.toSet());