From c516124eff7f705e3b4ecf63abadfa4321de231d Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Mon, 19 Oct 2026 04:42:18 -0400 Subject: [PATCH] =?UTF-8?q?address=E5=92=8CUSDTmanage/address=20token?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=8F=82=E8=80=83?= =?UTF-8?q?=E5=BD=92=E9=9B=86=E4=BB=BB=E5=8A=A1=E9=A1=B5=E9=9D=A2=E5=B8=83?= =?UTF-8?q?=E5=B1=80=E5=92=8C=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=E3=80=82=20=20=E5=95=86?= =?UTF-8?q?=E6=88=B7=E5=92=8C=E7=AE=A1=E7=90=86=E5=91=98=E9=83=BD=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=88=A0=E9=99=A4=E5=92=8C=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E5=95=86=E6=88=B7=E7=9A=84=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=AF=B9=E5=9C=B0=E5=9D=80=E7=9A=84=E5=90=84?= =?UTF-8?q?=E7=A7=8D=E9=87=91=E9=A2=9D=E6=93=8D=E4=BD=9C=EF=BC=8C=E5=8F=AA?= =?UTF-8?q?=E4=BF=9D=E7=95=99=E5=88=B7=E6=96=B0=E9=93=BE=E4=B8=8A=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/wallet-address-management.md | 21 +++++++ .../controller/WalletAddressController.java | 34 ++++++++--- .../system/mapper/WalletAddressMapper.java | 3 + .../mapper/system/WalletAddressMapper.xml | 23 +++++++- .../WalletAddressPermissionTest.java | 57 +++++++++++++++++++ 5 files changed, 127 insertions(+), 11 deletions(-) create mode 100644 docs/wallet-address-management.md create mode 100644 ruoyi-system/src/test/java/com/ruoyi/system/controller/WalletAddressPermissionTest.java diff --git a/docs/wallet-address-management.md b/docs/wallet-address-management.md new file mode 100644 index 0000000..020e0cf --- /dev/null +++ b/docs/wallet-address-management.md @@ -0,0 +1,21 @@ +# 地址管理统计与商户只读详情 + +管理员和商户地址列表提供总地址、启用地址、USDT/TRX余额及可用能量、带宽汇总。统计使用数据库最新快照,不表示查询时刻的链上余额;用户可在钱包详情点击“刷新链上数据”更新对应快照。 + +## 管理端统计接口 + +- 管理员:`GET /system/address/statistics`,权限 `system:address:list`。 +- 商户:`GET /system/address/user/statistics`,权限 `system:address:user-list`,服务端强制使用当前用户ID。 +- 入参复用地址列表的筛选字段,包括 `token`、`status`、`appId`、`userId`、`walletUserName`。商户传入的 `userId` 不生效。 +- 响应 `data`:`total`、`enabled`、`usdtBalance`、`trxBalance`、`energy`、`bandwidth`。余额和资源合计返回字符串以保留精度。 +- 列表和统计共享 SQL 条件,排除软删除记录,并保持既有的已分配钱包范围(`wallet_user_name is not null`),不包含未分配地址池。 + +## 操作与权限 + +两个列表移除修改、删除按钮及对应页面处理方法;已有新增入口和管理员导出保留。此页面调整不移除其他内部模块使用的服务方法,也不删除历史记录。 + +商户详情继续展示余额、账户、质押和代理信息,仅保留链上快照刷新操作,不显示资源估算、转账、质押、取消质押、代理、取消代理和广播。 + +上述资金及资源操作接口和估算接口要求独立 `system:address:operate` 权限;普通商户 `system:address:user-query` 不再授权这些接口。管理员操作角色如需执行,必须已有该权限。链上查询和代理详情继续允许查看权限,并执行钱包归属校验。 + +无需数据库结构或菜单迁移脚本。部署需同步更新前后端。 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/WalletAddressController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/WalletAddressController.java index 796b669..63ea857 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/WalletAddressController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/WalletAddressController.java @@ -40,6 +40,24 @@ import com.ruoyi.system.domain.vo.WalletOperationRequest; public class WalletAddressController extends BaseController { @Autowired private IWalletAddressService walletAddressService; + + @Autowired + private com.ruoyi.system.mapper.WalletAddressMapper walletAddressMapper; + + /** 统计数据库钱包快照,不额外触发链上请求;复用列表权限和筛选条件。 */ + @PreAuthorize("@ss.hasPermi('system:address:list')") + @GetMapping("/statistics") + public AjaxResult statistics(WalletAddress filter) { + return AjaxResult.success(walletAddressMapper.selectWalletStatistics(filter)); + } + + /** 商户统计在服务端强制指定用户,不能使用请求中的 userId 扩大范围。 */ + @PreAuthorize("@ss.hasPermi('system:address:user-list')") + @GetMapping("/user/statistics") + public AjaxResult userStatistics(WalletAddress filter) { + filter.setUserId(SecurityUtils.getUserId()); + return AjaxResult.success(walletAddressMapper.selectWalletStatistics(filter)); + } @Autowired private WalletSigningService walletSigningService; @Autowired @@ -104,7 +122,7 @@ public class WalletAddressController extends BaseController { } /** 计算操作所需能量、带宽、安全冗余及预计燃烧的 TRX。 */ - @PreAuthorize("@ss.hasPermi('system:address:query') or @ss.hasPermi('system:address:user-query')") + @PreAuthorize("@ss.hasPermi('system:address:operate')") @PostMapping("/operations/{type}/estimate") public AjaxResult estimate(@PathVariable("type") String type, @RequestBody WalletOperationRequest request) { @@ -113,7 +131,7 @@ public class WalletAddressController extends BaseController { return AjaxResult.success(walletOperationEstimateService.estimate(type, wallet, request)); } - @PreAuthorize("@ss.hasPermi('system:address:operate') or @ss.hasPermi('system:address:user-query')") + @PreAuthorize("@ss.hasPermi('system:address:operate')") @PostMapping("/operations/transfer-trx") public AjaxResult transferTrx(@RequestBody WalletOperationRequest request) { final WalletAddressPlus wallet = requireWallet(request); @@ -124,7 +142,7 @@ public class WalletAddressController extends BaseController { tron.trxTrans(api, current.getToken(), request.getToAddress().trim(), request.getAmount())); } - @PreAuthorize("@ss.hasPermi('system:address:operate') or @ss.hasPermi('system:address:user-query')") + @PreAuthorize("@ss.hasPermi('system:address:operate')") @PostMapping("/operations/transfer-usdt") public AjaxResult transferUsdt(@RequestBody WalletOperationRequest request) { final WalletAddressPlus wallet = requireWallet(request); @@ -136,7 +154,7 @@ public class WalletAddressController extends BaseController { request.getAmount().toPlainString())); } - @PreAuthorize("@ss.hasPermi('system:address:operate') or @ss.hasPermi('system:address:user-query')") + @PreAuthorize("@ss.hasPermi('system:address:operate')") @PostMapping("/operations/stake") public AjaxResult stake(@RequestBody WalletOperationRequest request) { final WalletAddressPlus wallet = requireWallet(request); @@ -147,7 +165,7 @@ public class WalletAddressController extends BaseController { tron.stakeTrxBalance(api, current.getToken(), request.getAmount(), request.getResourceCode())); } - @PreAuthorize("@ss.hasPermi('system:address:operate') or @ss.hasPermi('system:address:user-query')") + @PreAuthorize("@ss.hasPermi('system:address:operate')") @PostMapping("/operations/unstake") public AjaxResult unstake(@RequestBody WalletOperationRequest request) { final WalletAddressPlus wallet = requireWallet(request); @@ -158,7 +176,7 @@ public class WalletAddressController extends BaseController { tron.unstakeTrxBalance(api, current.getToken(), request.getAmount(), request.getResourceCode())); } - @PreAuthorize("@ss.hasPermi('system:address:operate') or @ss.hasPermi('system:address:user-query')") + @PreAuthorize("@ss.hasPermi('system:address:operate')") @PostMapping("/operations/delegate") public AjaxResult delegate(@RequestBody WalletOperationRequest request) { final WalletAddressPlus wallet = requireWallet(request); @@ -175,7 +193,7 @@ public class WalletAddressController extends BaseController { request.getAmount(), request.getResourceCode())); } - @PreAuthorize("@ss.hasPermi('system:address:operate') or @ss.hasPermi('system:address:user-query')") + @PreAuthorize("@ss.hasPermi('system:address:operate')") @PostMapping("/operations/undelegate") public AjaxResult undelegate(@RequestBody WalletOperationRequest request) { final WalletAddressPlus wallet = requireWallet(request); @@ -188,7 +206,7 @@ public class WalletAddressController extends BaseController { request.getAmount(), request.getResourceCode())); } - @PreAuthorize("@ss.hasPermi('system:address:operate') or @ss.hasPermi('system:address:user-query')") + @PreAuthorize("@ss.hasPermi('system:address:operate')") @PostMapping("/operations/cancel-unstake") public AjaxResult cancelUnstake(@RequestBody WalletOperationRequest request) { final WalletAddressPlus wallet = requireWallet(request); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WalletAddressMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WalletAddressMapper.java index 0bb73fd..4cf5563 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WalletAddressMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WalletAddressMapper.java @@ -15,6 +15,9 @@ import com.ruoyi.system.domain.WalletAddressPlus; */ public interface WalletAddressMapper extends BaseMapper { + /** 按钱包列表相同条件聚合快照,余额保持 DECIMAL 精度且不受分页影响。 */ + java.util.Map selectWalletStatistics(WalletAddress filter); + /** * 查询钱包 * diff --git a/ruoyi-system/src/main/resources/mapper/system/WalletAddressMapper.xml b/ruoyi-system/src/main/resources/mapper/system/WalletAddressMapper.xml index 0079486..4185a7d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/WalletAddressMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/WalletAddressMapper.xml @@ -59,9 +59,9 @@ 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, 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 - + + + order by created_at desc, id desc + + +