From cdf32a86cba5761ee0f490cf78dd1d04a53a6fae Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Tue, 13 Oct 2026 05:15:37 -0400 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=86=BB=E7=BB=93=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/system/domain/Apps.java | 28 +++++++++++++++++++ .../com/ruoyi/system/domain/AppsPlus.java | 26 +++++++++++++++++ .../system/service/impl/AppsServiceImpl.java | 3 ++ .../resources/mapper/system/AppsMapper.xml | 12 +++++++- 4 files changed, 68 insertions(+), 1 deletion(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Apps.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Apps.java index 3f241f6..83dffaa 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Apps.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Apps.java @@ -61,6 +61,14 @@ public class Apps extends BaseEntity @Excel(name = "usdt账号金额") private BigDecimal usdtBalance; + /** USDT冻结余额 */ + @Excel(name = "USDT冻结余额") + private BigDecimal usdtFrozenBalance; + + /** TRX冻结余额 */ + @Excel(name = "TRX冻结余额") + private BigDecimal trxFrozenBalance; + /** 公钥 */ @Excel(name = "公钥") private String publicKey; @@ -183,6 +191,24 @@ public class Apps extends BaseEntity { return usdtBalance; } + public void setUsdtFrozenBalance(BigDecimal usdtFrozenBalance) + { + this.usdtFrozenBalance = usdtFrozenBalance; + } + + public BigDecimal getUsdtFrozenBalance() + { + return usdtFrozenBalance; + } + public void setTrxFrozenBalance(BigDecimal trxFrozenBalance) + { + this.trxFrozenBalance = trxFrozenBalance; + } + + public BigDecimal getTrxFrozenBalance() + { + return trxFrozenBalance; + } public void setPublicKey(String publicKey) { this.publicKey = publicKey; @@ -269,6 +295,8 @@ public class Apps extends BaseEntity .append("deletedAt", getDeletedAt()) .append("trxBalance", getTrxBalance()) .append("usdtBalance", getUsdtBalance()) + .append("usdtFrozenBalance", getUsdtFrozenBalance()) + .append("trxFrozenBalance", getTrxFrozenBalance()) .append("publicKey", getPublicKey()) .append("privateKey", "") .append("creditLimit", getCreditLimit()) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/AppsPlus.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/AppsPlus.java index d832cff..8660560 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/AppsPlus.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/AppsPlus.java @@ -54,6 +54,12 @@ public class AppsPlus implements Serializable /** usdt账号 */ @Excel(name = "usdt账号金额") private BigDecimal usdtBalance; + /** USDT冻结余额 */ + @Excel(name = "USDT冻结余额") + private BigDecimal usdtFrozenBalance; + /** TRX冻结余额 */ + @Excel(name = "TRX冻结余额") + private BigDecimal trxFrozenBalance; /** 公钥 */ @Excel(name = "公钥") private String publicKey; @@ -168,6 +174,24 @@ public class AppsPlus implements Serializable { return usdtBalance; } + public void setUsdtFrozenBalance(BigDecimal usdtFrozenBalance) + { + this.usdtFrozenBalance = usdtFrozenBalance; + } + + public BigDecimal getUsdtFrozenBalance() + { + return usdtFrozenBalance; + } + public void setTrxFrozenBalance(BigDecimal trxFrozenBalance) + { + this.trxFrozenBalance = trxFrozenBalance; + } + + public BigDecimal getTrxFrozenBalance() + { + return trxFrozenBalance; + } public void setPublicKey(String publicKey) { this.publicKey = publicKey; @@ -254,6 +278,8 @@ public class AppsPlus implements Serializable .append("deletedAt", getDeletedAt()) .append("trxBalance", getTrxBalance()) .append("usdtBalance", getUsdtBalance()) + .append("usdtFrozenBalance", getUsdtFrozenBalance()) + .append("trxFrozenBalance", getTrxFrozenBalance()) .append("publicKey", getPublicKey()) .append("privateKey", "") .append("creditLimit", getCreditLimit()) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppsServiceImpl.java index c63bfb2..5368647 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppsServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppsServiceImpl.java @@ -320,6 +320,9 @@ public class AppsServiceImpl extends ServiceImpl implement if (apps.getStatus() == null) apps.setStatus(1); if (apps.getTrxBalance() == null) apps.setTrxBalance(BigDecimal.ZERO); if (apps.getUsdtBalance() == null) apps.setUsdtBalance(BigDecimal.ZERO); + // 冻结余额只能由后续账务流程变更,创建接口不接受客户端指定的初始值。 + apps.setUsdtFrozenBalance(BigDecimal.ZERO); + apps.setTrxFrozenBalance(BigDecimal.ZERO); if (apps.getCreditLimit() == null) apps.setCreditLimit(BigDecimal.ZERO); // 公私钥只允许系统生成,忽略请求中传入的任何密钥字段。 AppKeyPairResult keyPair = generateKeyPair(); diff --git a/ruoyi-system/src/main/resources/mapper/system/AppsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AppsMapper.xml index 0387bab..8576373 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AppsMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AppsMapper.xml @@ -15,6 +15,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -26,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, user_id, name, description, status, created_at, updated_at, deleted_at, trx_balance, usdt_balance, public_key, private_key, credit_limit, google_sub, google_email, google_name, google_picture, dist_token_address from apps + select id, user_id, name, description, status, created_at, updated_at, deleted_at, trx_balance, usdt_balance, usdt_frozen_balance, trx_frozen_balance, public_key, private_key, credit_limit, google_sub, google_email, google_name, google_picture, dist_token_address from apps