From 9c8a54334dad7d071a58c3fbb434060b4de995cb Mon Sep 17 00:00:00 2001
From: "DESKTOP-C3M45P4\\dengdan" <dengdan@elex-tech.com>
Date: Mon, 21 Sep 2026 15:20:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=97=A5=E7=B4=AF=E5=85=85=E7=BA=BF?=
 =?UTF-8?q?=E4=B8=8B=E6=B4=BB=E5=8A=A8=E6=94=B9=E4=B8=BA=E6=AF=8F=E6=97=A5?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activityLogic/GmActivityLogic.java        | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java
index f6c8fcccc..dc1aecb2e 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java
@@ -223,17 +223,17 @@ public class GmActivityLogic implements IEventHandler {
                 gmActivity.putMissionMap(arbMission.getId(), gmMission);
             }
 
-            // 领取完 全部奖励后重置活动
-            long count = gmActivity.getMissionMap().values().stream().filter(v -> v.getState() == 1).count();
-//            LOGGER.info("单日累充，第二步，userid：{}, 活动id：{}， 完成度对比：{}-{}", user.getId(),gmActivity.getId(),gmMissionList.size(),count);
-            if (count > 0 && gmMissionList.size() == count){
-                // 重置活动对象
-                gmActivity.setMissionMap(new HashMap<>());
-                // 减去满级金额
-                num-=gmMissionList.get(gmMissionList.size()-1).getRechargeNum();
-                verify = true;
-                LOGGER.info("单日累充，自动重置，userid：{}, 活动id：{}， 剩余金额：{}", user.getId(),gmActivity.getId(),num);
-            }
+            // 领取完 全部奖励后重置活动(最新版本不重置)
+//            long count = gmActivity.getMissionMap().values().stream().filter(v -> v.getState() == 1).count();
+////            LOGGER.info("单日累充，第二步，userid：{}, 活动id：{}， 完成度对比：{}-{}", user.getId(),gmActivity.getId(),gmMissionList.size(),count);
+//            if (count > 0 && gmMissionList.size() == count){
+//                // 重置活动对象
+//                gmActivity.setMissionMap(new HashMap<>());
+//                // 减去满级金额
+//                num-=gmMissionList.get(gmMissionList.size()-1).getRechargeNum();
+//                verify = true;
+//                LOGGER.info("单日累充，自动重置，userid：{}, 活动id：{}， 剩余金额：{}", user.getId(),gmActivity.getId(),num);
+//            }
         }
         while (verify);
         gmActivity.setValue(num);