新增字段

This commit is contained in:
lu7213 committed 2026-10-11 23:56:56 -04:00
1 parent ffbacce650
commit b2ab430eb6
5 files changed
+82 -1

No files matched your search

@@ -129,6 +129,14 @@ public class WalletAddress extends BaseEntity
@Excel(name = "带宽质押的trx数量-不含代理") @Excel(name = "带宽质押的trx数量-不含代理")
private Long bandwidthStakedTrxNum; private Long bandwidthStakedTrxNum;
/** 质押带宽中当前仍可代理的TRX数量 */
@Excel(name = "带宽质押中可代理的TRX数量")
private Long bandwidthStakedDelegatedNum;
/** 质押能量中当前仍可代理的TRX数量 */
@Excel(name = "能量质押中可代理的TRX数量")
private Long energyStakedDelegatedNum;
/** 可投票数 */ /** 可投票数 */
@Excel(name = "可投票数") @Excel(name = "可投票数")
private Long voteNum; private Long voteNum;
@@ -396,6 +404,24 @@ public class WalletAddress extends BaseEntity
{ {
return bandwidthStakedTrxNum; 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) public void setVoteNum(Long voteNum)
{ {
this.voteNum = voteNum; this.voteNum = voteNum;
@@ -481,6 +507,8 @@ public class WalletAddress extends BaseEntity
.append("stakedTrxNum", getStakedTrxNum()) .append("stakedTrxNum", getStakedTrxNum())
.append("energyStakedTrxNum", getEnergyStakedTrxNum()) .append("energyStakedTrxNum", getEnergyStakedTrxNum())
.append("bandwidthStakedTrxNum", getBandwidthStakedTrxNum()) .append("bandwidthStakedTrxNum", getBandwidthStakedTrxNum())
.append("bandwidthStakedDelegatedNum", getBandwidthStakedDelegatedNum())
.append("energyStakedDelegatedNum", getEnergyStakedDelegatedNum())
.append("voteNum", getVoteNum()) .append("voteNum", getVoteNum())
.append("votedNum", getVotedNum()) .append("votedNum", getVotedNum())
.append("bandwidthStakedNum", getBandwidthStakedNum()) .append("bandwidthStakedNum", getBandwidthStakedNum())
@@ -105,6 +105,12 @@ public class WalletAddressPlus implements Serializable
/** 带宽质押的trx数量-不含代理 */ /** 带宽质押的trx数量-不含代理 */
@Excel(name = "带宽质押的trx数量-不含代理") @Excel(name = "带宽质押的trx数量-不含代理")
private Long bandwidthStakedTrxNum; private Long bandwidthStakedTrxNum;
/** 质押带宽中当前仍可代理的TRX数量 */
@Excel(name = "带宽质押中可代理的TRX数量")
private Long bandwidthStakedDelegatedNum;
/** 质押能量中当前仍可代理的TRX数量 */
@Excel(name = "能量质押中可代理的TRX数量")
private Long energyStakedDelegatedNum;
/** 可投票数 */ /** 可投票数 */
@Excel(name = "可投票数") @Excel(name = "可投票数")
private Long voteNum; private Long voteNum;
@@ -367,6 +373,24 @@ public class WalletAddressPlus implements Serializable
{ {
return bandwidthStakedTrxNum; 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) public void setVoteNum(Long voteNum)
{ {
this.voteNum = voteNum; this.voteNum = voteNum;
@@ -452,6 +476,8 @@ public class WalletAddressPlus implements Serializable
.append("stakedTrxNum", getStakedTrxNum()) .append("stakedTrxNum", getStakedTrxNum())
.append("energyStakedTrxNum", getEnergyStakedTrxNum()) .append("energyStakedTrxNum", getEnergyStakedTrxNum())
.append("bandwidthStakedTrxNum", getBandwidthStakedTrxNum()) .append("bandwidthStakedTrxNum", getBandwidthStakedTrxNum())
.append("bandwidthStakedDelegatedNum", getBandwidthStakedDelegatedNum())
.append("energyStakedDelegatedNum", getEnergyStakedDelegatedNum())
.append("voteNum", getVoteNum()) .append("voteNum", getVoteNum())
.append("votedNum", getVotedNum()) .append("votedNum", getVotedNum())
.append("bandwidthStakedNum", getBandwidthStakedNum()) .append("bandwidthStakedNum", getBandwidthStakedNum())
@@ -104,6 +104,19 @@ public interface ITronService {
*/ */
BigDecimal stakedTrxBalance(ApiWrapper api,String ownerAddr, int resourceCode); 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的数量-代理的 * 获取别人质押的trx的数量-代理的
* @param ownerAddr * @param ownerAddr
@@ -101,6 +101,10 @@ public class WalletAddressServiceImpl extends ServiceImpl<WalletAddressMapper, W
walletAddressPlus.setVotedNum(tronService.votedBalance(api, token).longValue()); walletAddressPlus.setVotedNum(tronService.votedBalance(api, token).longValue());
walletAddressPlus.setEnergyStakedTrxNum(tronService.stakedTrxBalance(api, token, 1).longValue()); walletAddressPlus.setEnergyStakedTrxNum(tronService.stakedTrxBalance(api, token, 1).longValue());
walletAddressPlus.setBandwidthStakedTrxNum(tronService.stakedTrxBalance(api, token, 0).longValue()); walletAddressPlus.setBandwidthStakedTrxNum(tronService.stakedTrxBalance(api, token, 0).longValue());
walletAddressPlus.setEnergyStakedDelegatedNum(
tronService.availableDelegatedStakedTrxBalance(api, token, 1).longValue());
walletAddressPlus.setBandwidthStakedDelegatedNum(
tronService.availableDelegatedStakedTrxBalance(api, token, 0).longValue());
walletAddressPlus.setStakedTrxNum(walletAddressPlus.getEnergyStakedTrxNum() walletAddressPlus.setStakedTrxNum(walletAddressPlus.getEnergyStakedTrxNum()
+ walletAddressPlus.getBandwidthStakedTrxNum()); + walletAddressPlus.getBandwidthStakedTrxNum());
walletAddressPlus.setVoteNum(tronService.voteBalance(api, token).longValue()); walletAddressPlus.setVoteNum(tronService.voteBalance(api, token).longValue());
@@ -32,6 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="stakedTrxNum" column="staked_trx_num" /> <result property="stakedTrxNum" column="staked_trx_num" />
<result property="energyStakedTrxNum" column="energy_staked_trx_num" /> <result property="energyStakedTrxNum" column="energy_staked_trx_num" />
<result property="bandwidthStakedTrxNum" column="bandwidth_staked_trx_num" /> <result property="bandwidthStakedTrxNum" column="bandwidth_staked_trx_num" />
<result property="bandwidthStakedDelegatedNum" column="bandwidth_staked_delegated_num" />
<result property="energyStakedDelegatedNum" column="energy_staked_delegated_num" />
<result property="voteNum" column="vote_num" /> <result property="voteNum" column="vote_num" />
<result property="votedNum" column="voted_num" /> <result property="votedNum" column="voted_num" />
<result property="bandwidthStakedNum" column="bandwidth_staked_num" /> <result property="bandwidthStakedNum" column="bandwidth_staked_num" />
@@ -54,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectWalletAddressVo"> <sql id="selectWalletAddressVo">
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
</sql> </sql>
<select id="selectWalletAddressList" parameterType="WalletAddress" resultMap="WalletAddressResult"> <select id="selectWalletAddressList" parameterType="WalletAddress" resultMap="WalletAddressResult">
@@ -86,6 +88,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="stakedTrxNum != null "> and staked_trx_num = #{stakedTrxNum}</if> <if test="stakedTrxNum != null "> and staked_trx_num = #{stakedTrxNum}</if>
<if test="energyStakedTrxNum != null "> and energy_staked_trx_num = #{energyStakedTrxNum}</if> <if test="energyStakedTrxNum != null "> and energy_staked_trx_num = #{energyStakedTrxNum}</if>
<if test="bandwidthStakedTrxNum != null "> and bandwidth_staked_trx_num = #{bandwidthStakedTrxNum}</if> <if test="bandwidthStakedTrxNum != null "> and bandwidth_staked_trx_num = #{bandwidthStakedTrxNum}</if>
<if test="bandwidthStakedDelegatedNum != null "> and bandwidth_staked_delegated_num = #{bandwidthStakedDelegatedNum}</if>
<if test="energyStakedDelegatedNum != null "> and energy_staked_delegated_num = #{energyStakedDelegatedNum}</if>
<if test="voteNum != null "> and vote_num = #{voteNum}</if> <if test="voteNum != null "> and vote_num = #{voteNum}</if>
<if test="votedNum != null "> and voted_num = #{votedNum}</if> <if test="votedNum != null "> and voted_num = #{votedNum}</if>
<if test="bandwidthStakedNum != null "> and bandwidth_staked_num = #{bandwidthStakedNum}</if> <if test="bandwidthStakedNum != null "> and bandwidth_staked_num = #{bandwidthStakedNum}</if>
@@ -172,6 +176,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="stakedTrxNum != null">staked_trx_num,</if> <if test="stakedTrxNum != null">staked_trx_num,</if>
<if test="energyStakedTrxNum != null">energy_staked_trx_num,</if> <if test="energyStakedTrxNum != null">energy_staked_trx_num,</if>
<if test="bandwidthStakedTrxNum != null">bandwidth_staked_trx_num,</if> <if test="bandwidthStakedTrxNum != null">bandwidth_staked_trx_num,</if>
<if test="bandwidthStakedDelegatedNum != null">bandwidth_staked_delegated_num,</if>
<if test="energyStakedDelegatedNum != null">energy_staked_delegated_num,</if>
<if test="voteNum != null">vote_num,</if> <if test="voteNum != null">vote_num,</if>
<if test="votedNum != null">voted_num,</if> <if test="votedNum != null">voted_num,</if>
<if test="bandwidthStakedNum != null">bandwidth_staked_num,</if> <if test="bandwidthStakedNum != null">bandwidth_staked_num,</if>
@@ -206,6 +212,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="stakedTrxNum != null">#{stakedTrxNum},</if> <if test="stakedTrxNum != null">#{stakedTrxNum},</if>
<if test="energyStakedTrxNum != null">#{energyStakedTrxNum},</if> <if test="energyStakedTrxNum != null">#{energyStakedTrxNum},</if>
<if test="bandwidthStakedTrxNum != null">#{bandwidthStakedTrxNum},</if> <if test="bandwidthStakedTrxNum != null">#{bandwidthStakedTrxNum},</if>
<if test="bandwidthStakedDelegatedNum != null">#{bandwidthStakedDelegatedNum},</if>
<if test="energyStakedDelegatedNum != null">#{energyStakedDelegatedNum},</if>
<if test="voteNum != null">#{voteNum},</if> <if test="voteNum != null">#{voteNum},</if>
<if test="votedNum != null">#{votedNum},</if> <if test="votedNum != null">#{votedNum},</if>
<if test="bandwidthStakedNum != null">#{bandwidthStakedNum},</if> <if test="bandwidthStakedNum != null">#{bandwidthStakedNum},</if>
@@ -244,6 +252,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="stakedTrxNum != null">staked_trx_num = #{stakedTrxNum},</if> <if test="stakedTrxNum != null">staked_trx_num = #{stakedTrxNum},</if>
<if test="energyStakedTrxNum != null">energy_staked_trx_num = #{energyStakedTrxNum},</if> <if test="energyStakedTrxNum != null">energy_staked_trx_num = #{energyStakedTrxNum},</if>
<if test="bandwidthStakedTrxNum != null">bandwidth_staked_trx_num = #{bandwidthStakedTrxNum},</if> <if test="bandwidthStakedTrxNum != null">bandwidth_staked_trx_num = #{bandwidthStakedTrxNum},</if>
<if test="bandwidthStakedDelegatedNum != null">bandwidth_staked_delegated_num = #{bandwidthStakedDelegatedNum},</if>
<if test="energyStakedDelegatedNum != null">energy_staked_delegated_num = #{energyStakedDelegatedNum},</if>
<if test="voteNum != null">vote_num = #{voteNum},</if> <if test="voteNum != null">vote_num = #{voteNum},</if>
<if test="votedNum != null">voted_num = #{votedNum},</if> <if test="votedNum != null">voted_num = #{votedNum},</if>
<if test="bandwidthStakedNum != null">bandwidth_staked_num = #{bandwidthStakedNum},</if> <if test="bandwidthStakedNum != null">bandwidth_staked_num = #{bandwidthStakedNum},</if>