diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/WalletAddress.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/WalletAddress.java index 8284388..4d6367f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/WalletAddress.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/WalletAddress.java @@ -129,6 +129,14 @@ public class WalletAddress extends BaseEntity @Excel(name = "带宽质押的trx数量-不含代理") private Long bandwidthStakedTrxNum; + /** 质押带宽中当前仍可代理的TRX数量 */ + @Excel(name = "带宽质押中可代理的TRX数量") + private Long bandwidthStakedDelegatedNum; + + /** 质押能量中当前仍可代理的TRX数量 */ + @Excel(name = "能量质押中可代理的TRX数量") + private Long energyStakedDelegatedNum; + /** 可投票数 */ @Excel(name = "可投票数") private Long voteNum; @@ -396,6 +404,24 @@ public class WalletAddress extends BaseEntity { return bandwidthStakedTrxNum; } + public void setBandwidthStakedDelegatedNum(Long bandwidthStakedDelegatedNum) + { + this.bandwidthStakedDelegatedNum = bandwidthStakedDelegatedNum; + } + + public Long getBandwidthStakedDelegatedNum() + { + return bandwidthStakedDelegatedNum; + } + public void setEnergyStakedDelegatedNum(Long energyStakedDelegatedNum) + { + this.energyStakedDelegatedNum = energyStakedDelegatedNum; + } + + public Long getEnergyStakedDelegatedNum() + { + return energyStakedDelegatedNum; + } public void setVoteNum(Long voteNum) { this.voteNum = voteNum; @@ -481,6 +507,8 @@ public class WalletAddress extends BaseEntity .append("stakedTrxNum", getStakedTrxNum()) .append("energyStakedTrxNum", getEnergyStakedTrxNum()) .append("bandwidthStakedTrxNum", getBandwidthStakedTrxNum()) + .append("bandwidthStakedDelegatedNum", getBandwidthStakedDelegatedNum()) + .append("energyStakedDelegatedNum", getEnergyStakedDelegatedNum()) .append("voteNum", getVoteNum()) .append("votedNum", getVotedNum()) .append("bandwidthStakedNum", getBandwidthStakedNum()) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/WalletAddressPlus.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/WalletAddressPlus.java index a0db4bb..3b87693 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/WalletAddressPlus.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/WalletAddressPlus.java @@ -105,6 +105,12 @@ public class WalletAddressPlus implements Serializable /** 带宽质押的trx数量-不含代理 */ @Excel(name = "带宽质押的trx数量-不含代理") private Long bandwidthStakedTrxNum; + /** 质押带宽中当前仍可代理的TRX数量 */ + @Excel(name = "带宽质押中可代理的TRX数量") + private Long bandwidthStakedDelegatedNum; + /** 质押能量中当前仍可代理的TRX数量 */ + @Excel(name = "能量质押中可代理的TRX数量") + private Long energyStakedDelegatedNum; /** 可投票数 */ @Excel(name = "可投票数") private Long voteNum; @@ -367,6 +373,24 @@ public class WalletAddressPlus implements Serializable { return bandwidthStakedTrxNum; } + public void setBandwidthStakedDelegatedNum(Long bandwidthStakedDelegatedNum) + { + this.bandwidthStakedDelegatedNum = bandwidthStakedDelegatedNum; + } + + public Long getBandwidthStakedDelegatedNum() + { + return bandwidthStakedDelegatedNum; + } + public void setEnergyStakedDelegatedNum(Long energyStakedDelegatedNum) + { + this.energyStakedDelegatedNum = energyStakedDelegatedNum; + } + + public Long getEnergyStakedDelegatedNum() + { + return energyStakedDelegatedNum; + } public void setVoteNum(Long voteNum) { this.voteNum = voteNum; @@ -452,6 +476,8 @@ public class WalletAddressPlus implements Serializable .append("stakedTrxNum", getStakedTrxNum()) .append("energyStakedTrxNum", getEnergyStakedTrxNum()) .append("bandwidthStakedTrxNum", getBandwidthStakedTrxNum()) + .append("bandwidthStakedDelegatedNum", getBandwidthStakedDelegatedNum()) + .append("energyStakedDelegatedNum", getEnergyStakedDelegatedNum()) .append("voteNum", getVoteNum()) .append("votedNum", getVotedNum()) .append("bandwidthStakedNum", getBandwidthStakedNum()) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITronService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITronService.java index b994e3a..d85075d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITronService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITronService.java @@ -104,6 +104,19 @@ public interface ITronService { */ BigDecimal stakedTrxBalance(ApiWrapper api,String ownerAddr, int resourceCode); + /** + * 查询 Stake 2.0 质押中当前仍可代理的 TRX 数量。 + * 链上 getCanDelegatedMaxSize 返回 SUN,本方法统一换算为 TRX。 + */ + default BigDecimal availableDelegatedStakedTrxBalance(ApiWrapper api, String ownerAddr, + int resourceCode) { + if (resourceCode != 0 && resourceCode != 1) { + throw new IllegalArgumentException("resourceCode只能为0(带宽)或1(能量)"); + } + long availableSun = Math.max(0L, api.getCanDelegatedMaxSize(ownerAddr, resourceCode)); + return BigDecimal.valueOf(availableSun).movePointLeft(6); + } + /** * 获取别人质押的trx的数量-代理的 * @param ownerAddr diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WalletAddressServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WalletAddressServiceImpl.java index 25034b3..b10ea21 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WalletAddressServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WalletAddressServiceImpl.java @@ -101,6 +101,10 @@ public class WalletAddressServiceImpl extends ServiceImpl + + @@ -54,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, token, status, created_at, updated_at, deleted_at, app_id, user_id, wallet_user_name, token_index, usdt_balance, trx_balance, energy_num, energy_all_num, energy_used_num, bandwidth_num, delegated_energy_trx_num, delegated_energy_value, acquired_delegated_energy_trx_num, acquired_delegated_energy_value, delegated_bandwidth_trx_num, delegated_bandwidth_value, acquired_delegated_bandwidth_trx_num, acquired_delegated_bandwidth_value, staked_trx_num, energy_staked_trx_num, bandwidth_staked_trx_num, vote_num, voted_num, bandwidth_staked_num, bandwidth_staked_all_num, bandwidth_free_num, bandwidth_free_all_num from wallet_address + select id, token, status, created_at, updated_at, deleted_at, app_id, user_id, wallet_user_name, token_index, usdt_balance, trx_balance, energy_num, energy_all_num, energy_used_num, bandwidth_num, delegated_energy_trx_num, delegated_energy_value, acquired_delegated_energy_trx_num, acquired_delegated_energy_value, delegated_bandwidth_trx_num, delegated_bandwidth_value, acquired_delegated_bandwidth_trx_num, acquired_delegated_bandwidth_value, staked_trx_num, energy_staked_trx_num, bandwidth_staked_trx_num, bandwidth_staked_delegated_num, energy_staked_delegated_num, vote_num, voted_num, bandwidth_staked_num, bandwidth_staked_all_num, bandwidth_free_num, bandwidth_free_all_num from wallet_address