From 58e0d121bbff02d1191cdffb06b0b5e05576cd30 Mon Sep 17 00:00:00 2001
From: hokli <2629910752@qq.com>
Date: Thu, 4 Sep 2025 15:40:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E4=BB=BB=E5=8A=A1-=E4=B8=BB?=
 =?UTF-8?q?=E6=92=AD=E5=91=A8=E5=A5=96=E5=8A=B1=E6=80=BB=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../guild/GuildMemberWeekLevelRewardV2Service.java        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberWeekLevelRewardV2Service.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberWeekLevelRewardV2Service.java
index 45ea07671..38b033b0f 100644
--- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberWeekLevelRewardV2Service.java
+++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberWeekLevelRewardV2Service.java
@@ -149,6 +149,7 @@ public class GuildMemberWeekLevelRewardV2Service extends ServiceImpl<GuildMember
         String curLevelName = "-" , preLevelName = "-";
 
         BigDecimal preLevelMaxNum = BigDecimal.ZERO;
+        BigDecimal thisLevelMaxNum = BigDecimal.ZERO;
         BigDecimal remainUserProcess = userProcess;
 
         Long receiveGuildMemberId = userProcessMap.getOrDefault(levelRField, 0L).longValue();
@@ -189,6 +190,8 @@ public class GuildMemberWeekLevelRewardV2Service extends ServiceImpl<GuildMember
                 break;
             }
 
+            thisLevelMaxNum = thisLevelMaxNum.add(levelReward.getProcessNum());
+
             GuildMemberWeekLevelRewardItemVo itemVo = new GuildMemberWeekLevelRewardItemVo();
             itemVo.setId(id);
             itemVo.setLevel(levelReward.getLevel());
@@ -196,7 +199,7 @@ public class GuildMemberWeekLevelRewardV2Service extends ServiceImpl<GuildMember
             itemVo.setPreLevel(preLevel);
             itemVo.setPreLevelName(preLevelName);
             itemVo.setProcessNum(processNum);
-            itemVo.setMaxNum(levelReward.getProcessNum());
+            itemVo.setMaxNum(thisLevelMaxNum);
             itemVo.setPreMaxNum(preLevelMaxNum);
             itemVo.setRewardNum(levelReward.getRewardNum());
             itemVo.setStatus(status);
@@ -216,6 +219,7 @@ public class GuildMemberWeekLevelRewardV2Service extends ServiceImpl<GuildMember
 
             preLevelName = levelReward.getLevelName();
             preLevel = levelReward.getLevel();
+            preLevelMaxNum = preLevelMaxNum.add(levelReward.getProcessNum());
         }
 
         if (CollectionUtils.isEmpty(vo.getItemList())) {
@@ -240,7 +244,7 @@ public class GuildMemberWeekLevelRewardV2Service extends ServiceImpl<GuildMember
         vo.setPreLevelName(curLevelReward.getPreLevelName());
         vo.setPreMaxNum(curLevelReward.getPreMaxNum());
         vo.setCurLevel(curLevelReward.getLevel());
-        vo.setProcessNum(curLevelReward.getProcessNum());
+        vo.setProcessNum(userProcess.compareTo(thisLevelMaxNum) > 0? thisLevelMaxNum: userProcess);
         vo.setMaxNum(curLevelReward.getMaxNum());
 
         return vo;