From 154fb35ea3083b021a94e621a1fbee0669236463 Mon Sep 17 00:00:00 2001
From: hokli <2629910752@qq.com>
Date: Fri, 19 Sep 2025 10:32:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8B=AC=E8=81=94=E4=BD=93-=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9Cfixed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/service/guild/GuildUsdOperateService.java   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdOperateService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdOperateService.java
index b158cf1df..a78183299 100644
--- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdOperateService.java
+++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdOperateService.java
@@ -35,7 +35,6 @@ import com.accompany.core.util.I18NMessageSourceUtil;
 import com.accompany.payment.service.RechargeUserService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.redisson.api.RBucket;
 import org.redisson.api.RMap;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,9 +52,9 @@ import java.util.List;
 import java.util.Optional;
 
 import static com.accompany.common.constant.Constant.ClanMode.GUILD_POLICY2;
+import static com.accompany.common.constant.Constant.GLOBAL_CODE;
 import static com.accompany.common.redis.RedisKey.guild_usd_to_recharge_num;
 import static com.accompany.common.redis.RedisKey.guild_usd_withdraw_num;
-import static com.accompany.common.constant.Constant.GLOBAL_CODE;
 
 @Service
 public class GuildUsdOperateService {
@@ -206,7 +205,7 @@ public class GuildUsdOperateService {
                 String cycleDate = zonedDateTime.with(DayOfWeek.MONDAY).format(DateTimeUtil.dateFormatter);
                 RMap<Long, Integer> usdToRechargeMap = usdToRechargeNum(cycleDate, partitionInfo.getId());
                 Integer toRechargeNum = usdToRechargeMap.get(uid);
-                if (toRechargeNum != null && toRechargeNum > limitToRechargeNum) {
+                if (toRechargeNum != null && toRechargeNum >= limitToRechargeNum) {
                     throw new ServiceException(BusiStatus.GUILD_USD_OPT_LIMIT);
                 }
                 usdToRechargeMap.addAndGet(uid, 1);
@@ -218,8 +217,8 @@ public class GuildUsdOperateService {
                 ZonedDateTime zonedDateTime = DateTimeUtil.convertWithZoneId(now, partitionInfo.getZoneId());
                 String cycleDate = zonedDateTime.with(DayOfWeek.MONDAY).format(DateTimeUtil.dateFormatter);
                 RMap<Long, Integer> withdrawNumMap = withdrawNum(cycleDate, partitionInfo.getId());
-                Integer withdrawNum = withdrawNumMap.addAndGet(uid, 1);
-                if (withdrawNum > limitWithdrawNum) {
+                Integer withdrawNum = withdrawNumMap.get(uid);
+                if (withdrawNum != null && withdrawNum >= limitWithdrawNum) {
                     throw new ServiceException(BusiStatus.GUILD_USD_OPT_LIMIT);
                 }
                 withdrawNumMap.addAndGet(uid, 1);