From fee25bcd334f6934774a10d4fda231caadcb2a8c Mon Sep 17 00:00:00 2001 From: hokli <2629910752@qq.com> Date: Fri, 8 Aug 2025 14:42:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=9C=9F=E8=80=B3=E5=85=B6?= =?UTF-8?q?=E5=85=AC=E4=BC=9A=E7=BB=93=E7=AE=97=EF=BC=8C=E6=9A=82=E5=81=9C?= =?UTF-8?q?=E9=92=BB=E7=9F=B3=E5=85=91=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/exchange/GoldExchangeDiamondService.java | 5 ++++- .../com/accompany/scheduler/task/guild/GuildSettleTask.java | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/GoldExchangeDiamondService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/GoldExchangeDiamondService.java index e7df4c503..5fe683b0c 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/GoldExchangeDiamondService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/GoldExchangeDiamondService.java @@ -34,6 +34,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; import org.springframework.beans.factory.annotation.Autowired; @@ -41,7 +42,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.apache.commons.collections.CollectionUtils; import org.springframework.util.StringUtils; import java.io.IOException; @@ -112,6 +112,9 @@ public class GoldExchangeDiamondService { if (null == partitionInfo){ throw new AdminServiceException(BusiStatus.PARTITION_ERROR); } + if (PartitionEnum.TURKEY.getId() == partitionId) { + throw new ServiceException(BusiStatus.GOLD_EXCHANGE_DIAMOND_CLOSE); + } //屏蔽用户 if (CollectionUtils.isNotEmpty(configDto.getBlockUids()) && configDto.getBlockUids().contains(uid)){ throw new ServiceException(BusiStatus.GOLD_EXCHANGE_DIAMOND_CLOSE); diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/guild/GuildSettleTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/guild/GuildSettleTask.java index 64d89d81b..6cc1866a0 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/guild/GuildSettleTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/guild/GuildSettleTask.java @@ -32,7 +32,7 @@ public class GuildSettleTask { @Scheduled(cron = "0 10 0 1 * ?", zone = "Etc/GMT-3") public void monthRankTaskAll2() { Date date = new Date(); - List partitionEnumList = List.of(PartitionEnum.ARAB, PartitionEnum.TURKEY); + List partitionEnumList = List.of(PartitionEnum.ARAB); for (PartitionEnum partitionEnum : partitionEnumList) { try { DateTime lastMonth = DateUtil.offsetMonth(date, -1); @@ -57,7 +57,7 @@ public class GuildSettleTask { @Scheduled(cron = "0 10 0 16 * ?", zone = "Etc/GMT-3") public void monthRankTask() { Date date = new Date(); - List partitionEnumList = List.of(PartitionEnum.ARAB, PartitionEnum.TURKEY); + List partitionEnumList = List.of(PartitionEnum.ARAB); for (PartitionEnum partitionEnum : partitionEnumList) { try { DateTime beginTime = DateUtil.beginOfMonth(date);