diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/CurrencyEnum.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/CurrencyEnum.java index 20af0ad85..4cf3baeae 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/CurrencyEnum.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/CurrencyEnum.java @@ -11,9 +11,9 @@ import java.util.Optional; */ public enum CurrencyEnum { - DIAMOND((byte)1, "金币", 0.0000625), - CRYSTAL((byte)2, "水晶", 0.0001), - GOLD((byte)3, "钻石", 0.0001), + DIAMOND((byte)1, "金币", 0.00001667), + CRYSTAL((byte)2, "水晶", 0.00001667), + GOLD((byte)3, "钻石", 0.00001667), GUILD_USD((byte)4, "公会薪资", 1), GAME_USD((byte)5, "游戏薪资", 1), ; 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 302146a08..4c58064fc 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 @@ -15,15 +15,15 @@ import java.util.Set; public enum GuildUsdOperateTypeEnum { DIAMOND_WITHDRAW_USD(1, null, Set.of(GuildConstant.RoleType.OWNER, GuildConstant.RoleType.MANAGER, GuildConstant.RoleType.NORMAL), null, - false, CurrencyEnum.GOLD, CurrencyEnum.GUILD_USD, new BigDecimal("0.000625"), - BillObjTypeEnum.GUILD_DIAMOND_WITHDRAW_USD_OUT, BillObjTypeEnum.GUILD_DIAMOND_WITHDRAW_USD_IN),//1600:1 + false, CurrencyEnum.GOLD, CurrencyEnum.GUILD_USD, new BigDecimal("0.00001667"), + BillObjTypeEnum.GUILD_DIAMOND_WITHDRAW_USD_OUT, BillObjTypeEnum.GUILD_DIAMOND_WITHDRAW_USD_IN),//6000:1 USD_TO_PLATFORM(2, GuildConstant.UsdTab.PERSONAL, Set.of(GuildConstant.RoleType.OWNER, GuildConstant.RoleType.MANAGER, GuildConstant.RoleType.NORMAL), null, - true, CurrencyEnum.GUILD_USD, CurrencyEnum.DIAMOND, new BigDecimal("7250"), - BillObjTypeEnum.GUILD_USD_EXCHANGE_GOLD_OUT, BillObjTypeEnum.GUILD_USD_EXCHANGE_GOLD_IN),//1:1035 + true, CurrencyEnum.GUILD_USD, CurrencyEnum.DIAMOND, new BigDecimal("31000"), + BillObjTypeEnum.GUILD_USD_EXCHANGE_GOLD_OUT, BillObjTypeEnum.GUILD_USD_EXCHANGE_GOLD_IN),//1:31000 USD_TO_RECHARGE_USER(3, GuildConstant.UsdTab.PERSONAL, Set.of(GuildConstant.RoleType.OWNER, GuildConstant.RoleType.MANAGER, GuildConstant.RoleType.NORMAL), null, - true, CurrencyEnum.GUILD_USD, CurrencyEnum.DIAMOND, new BigDecimal("7000"), + true, CurrencyEnum.GUILD_USD, CurrencyEnum.DIAMOND, new BigDecimal("30000"), BillObjTypeEnum.GUILD_USD_TO_RECHARGE_USER_OUT, BillObjTypeEnum.GUILD_USD_TO_RECHARGE_USER_IN),//1:1000 USD_TO_GUILD_OWNER(4, GuildConstant.UsdTab.AGENT, Set.of(GuildConstant.RoleType.MANAGER, GuildConstant.RoleType.NORMAL), null, @@ -34,7 +34,7 @@ public enum GuildUsdOperateTypeEnum { // false, CurrencyEnum.GUILD_USD, null, null, // BillObjTypeEnum.GUILD_USD_TO_PLATFORM_OUT, null), - OWNER_USD_WITHDRAW(5, GuildConstant.UsdTab.AGENT, Set.of(GuildConstant.RoleType.OWNER), Set.of(1, 2), + OWNER_USD_WITHDRAW(5, GuildConstant.UsdTab.AGENT, Set.of(GuildConstant.RoleType.OWNER), Set.of(1, 2, 3), false, CurrencyEnum.GUILD_USD, null, null, BillObjTypeEnum.GUILD_USD_TO_PLATFORM_OUT, null), @@ -46,7 +46,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, 3), 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 23ee32904..75440d6e5 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 @@ -28,7 +28,6 @@ import com.accompany.core.model.Users; import com.accompany.core.service.partition.PartitionInfoService; import com.accompany.core.util.I18NMessageSourceUtil; import org.apache.commons.lang3.StringUtils; -import org.redisson.api.RBucket; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -117,7 +116,6 @@ public class GuildUsdOperateService { if (GUILD_POLICY2.equals(partitionInfo.getClanMode())) { throw new ServiceException(BusiStatus.FAMILY_PERMISSION_DENIED); } - RBucket guildUsdWithdrawLimit = null; if ((GuildUsdOperateTypeEnum.OWNER_USD_WITHDRAW.equals(typeEnum) || GuildUsdOperateTypeEnum.MEMBER_USD_WITHDRAW.equals(typeEnum)) && !envComponent.getDevOrNativeEnv()){ ZonedDateTime now = ZonedDateTime.now(ZoneId.of(partitionInfo.getZoneId())); @@ -126,7 +124,6 @@ public class GuildUsdOperateService { && !typeEnum.getDayOfMonthSet().contains(dayOfMonth)){ throw new ServiceException(BusiStatus.GUILD_USD_WITHDRAW_NOT_IN_TIME); } - } GuildUsdProdChannelVo channelVo = guildUsdChannelService.buildProdChannelByType(guildMember.getPartitionId(), typeEnum); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdToRechargeUserLimitService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdToRechargeUserLimitService.java index 0c826646b..a4dcd1959 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdToRechargeUserLimitService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdToRechargeUserLimitService.java @@ -55,6 +55,7 @@ public class GuildUsdToRechargeUserLimitService { if (null == targetUid || !rechargeUserService.isRechargeUser(targetUid)){ throw new ServiceException(BusiStatus.PARAMETERILLEGAL); } + //todo numberEveryDayLimit GuildUsdToRechargeUserLimitConfigDto configDto = getConfig().getByPartitionId(guildMember.getPartitionId()); if (null == configDto){ return;