From ffc43990ef472ddef4ad075acb4fd0b9ae6a8e0f Mon Sep 17 00:00:00 2001
From: khalil <842328916@qq.com>
Date: Thu, 4 Sep 2025 16:30:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E6=92=AD=E5=91=A8=E5=A5=96=E5=8A=B1-?=
 =?UTF-8?q?=E5=9C=A8=E9=BA=A6=E6=97=B6=E9=95=BF-=E5=90=8E=E5=8F=B0-?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=BF=9B=E5=BA=A6=E8=AE=A1=E7=AE=97=E5=8F=AF?=
 =?UTF-8?q?=E9=A2=86=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GuildMemberWeekLevelRewardRecordAdminService.java | 11 +++++++++--
 .../GuildMemberWeekLevelRewardAdminController.java    |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/GuildMemberWeekLevelRewardRecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/GuildMemberWeekLevelRewardRecordAdminService.java
index bbee020b5..28dfc4505 100644
--- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/GuildMemberWeekLevelRewardRecordAdminService.java
+++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/GuildMemberWeekLevelRewardRecordAdminService.java
@@ -139,14 +139,19 @@ public class GuildMemberWeekLevelRewardRecordAdminService {
             BigDecimal rewardNum = BigDecimal.ZERO;
             BigDecimal bonusRewardNum = BigDecimal.ZERO;
             BigDecimal receiverdNum = BigDecimal.ZERO;
+
+            BigDecimal preMaxNum = BigDecimal.ZERO;
+
             for (GuildMemberWeekLevelReward rewardItem: weekLevelRewardList){
                 String key = String.join("_", po.getId().toString(), rewardItem.getLevel().toString());
                 Byte status = weekMap.getOrDefault(key, Constant.status.delete).byteValue();
+                BigDecimal thisMaxNum = preMaxNum.add(rewardItem.getProcessNum());
+
                 if (Constant.status.invalid.equals(status)) {
                     level = rewardItem.getLevelName();
                     rewardNum = rewardNum.add(rewardItem.getRewardNum());
                     receiverdNum = receiverdNum.add(rewardItem.getRewardNum());
-                } else if (Constant.status.valid.equals(status)) {
+                } else if (processNum.compareTo(thisMaxNum) >= 0) {
                     level = rewardItem.getLevelName();
                     rewardNum = rewardNum.add(rewardItem.getRewardNum());
                 } else {
@@ -158,9 +163,11 @@ public class GuildMemberWeekLevelRewardRecordAdminService {
                 if (Constant.status.invalid.equals(bonusStatus)) {
                     bonusRewardNum = rewardNum.add(rewardItem.getBonusNum());
                     receiverdNum = receiverdNum.add(rewardItem.getBonusNum());
-                } else if (Constant.status.valid.equals(bonusStatus)) {
+                } else if (bonusProcessNum.compareTo(rewardItem.getMicValidDay()) >= 0) {
                     bonusRewardNum = rewardNum.add(rewardItem.getBonusNum());
                 }
+
+                preMaxNum = thisMaxNum;
             }
 
             vo.setLevel(level);
diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/GuildMemberWeekLevelRewardAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/GuildMemberWeekLevelRewardAdminController.java
index 1aa0e375b..742713a92 100644
--- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/GuildMemberWeekLevelRewardAdminController.java
+++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/GuildMemberWeekLevelRewardAdminController.java
@@ -39,7 +39,7 @@ public class GuildMemberWeekLevelRewardAdminController {
     public BusiResult<List<GuildDateCycleVo>> listDateCycle(){
         List<GuildDateCycleVo> voList = new ArrayList<>();
         Date now = new Date();
-        for (int i = 0; i < 8; i++) {
+        for (int i = 0; i < 4; i++) {
             Date date = DateTimeUtil.addDays(now, i * -7);
             Date monday = DateTimeUtil.getMonday(date, 0, 0, 0);
             Date sunday = DateTimeUtil.getSunday(date, 23, 59, 59);