moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

公会-usd档位

Browse Source
This commit is contained in:
khalil
2025-07-24 16:20:27 +08:00
committed by hokli
parent f43645ea76
commit b3a8ea400c
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/CurrencyEnum.java
View File

@@ -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),
;

14
accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/guild/GuildUsdOperateTypeEnum.java
View File

@@ -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),

3
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdOperateService.java
View File

@@ -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<Integer> 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);

1
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdToRechargeUserLimitService.java
View File

@@ -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;