diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/guild/GuildUsdOperateTypeEnum.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/guild/GuildUsdOperateTypeEnum.java index 1836880ff..5a9294b65 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/guild/GuildUsdOperateTypeEnum.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/guild/GuildUsdOperateTypeEnum.java @@ -47,7 +47,7 @@ public enum GuildUsdOperateTypeEnum { false, null, CurrencyEnum.GUILD_USD, null, null, BillObjTypeEnum.GUILD_USD_TO_PLATFORM_IN), - MEMBER_USD_WITHDRAW(8, GuildConstant.UsdTab.AGENT, Set.of(GuildConstant.RoleType.MANAGER, GuildConstant.RoleType.NORMAL), null, + MEMBER_USD_WITHDRAW(8, GuildConstant.UsdTab.AGENT, Set.of(GuildConstant.RoleType.MANAGER, GuildConstant.RoleType.NORMAL), Set.of(1, 2), false, CurrencyEnum.GUILD_USD, null, null, BillObjTypeEnum.GUILD_USD_TO_PLATFORM_OUT, null), 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 38f94225c..801142c60 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 @@ -157,9 +157,7 @@ public class GuildUsdOperateService { if ((GuildUsdOperateTypeEnum.OWNER_USD_WITHDRAW.equals(typeEnum) || GuildUsdOperateTypeEnum.MEMBER_USD_WITHDRAW.equals(typeEnum)) && !envComponent.getDevOrNativeEnv()){ ZonedDateTime now = ZonedDateTime.now(ZoneId.of(partitionInfo.getZoneId())); - if ((PartitionEnum.ENGLISH2.getId() == partitionInfo.getId() && GuildUsdOperateTypeEnum.OWNER_USD_WITHDRAW.equals(typeEnum)) - || (PartitionEnum.SOVIET.getId() == partitionInfo.getId() && - (GuildUsdOperateTypeEnum.MEMBER_USD_WITHDRAW.equals(typeEnum) || GuildUsdOperateTypeEnum.OWNER_USD_WITHDRAW.equals(typeEnum)))) { + if (PartitionEnum.ENGLISH2.getId() == partitionInfo.getId() || PartitionEnum.SOVIET.getId() == partitionInfo.getId()) { //skip } else { Integer dayOfMonth = now.getDayOfMonth();