From fbc72b5b579dcc2f832e6949ae60a4bae9f1b9d4 Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Thu, 29 Oct 2026 19:52:51 -0400 Subject: [PATCH] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E8=BD=AC=E5=85=A5=201=20TRX?= =?UTF-8?q?=EF=BC=8C=E8=B4=B9=E7=94=A8=E4=B8=BA=E2=80=9C=E6=9C=AC=E9=87=91?= =?UTF-8?q?=E6=8A=98=E4=BB=B7=20USDT=20+=20=E5=9B=BA=E5=AE=9A=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E8=B4=B9=E2=80=9D=E3=80=82=20=E4=B8=8B=E5=8D=95?= =?UTF-8?q?=E5=86=BB=E7=BB=93=E8=B5=84=E9=87=91=EF=BC=8C=E9=93=BE=E4=B8=8A?= =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E7=A1=AE=E8=AE=A4=E5=90=8E=E6=89=A3=E6=AC=BE?= =?UTF-8?q?=E5=B9=B6=E8=AE=B0=E5=BD=95=E4=BE=9B=E5=BA=94=E5=95=86=E6=94=B6?= =?UTF-8?q?=E5=85=A5=E3=80=82=20=E6=94=AF=E6=8C=81=20NILE=E3=80=81?= =?UTF-8?q?=E4=B8=BB=E7=BD=91=E7=8B=AC=E7=AB=8B=E9=85=8D=E7=BD=AE=EF=BC=9B?= =?UTF-8?q?=E6=9C=AA=E7=9F=A5=E4=BA=A4=E6=98=93=E4=B8=8D=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E3=80=81=E4=B8=8D=E9=87=8D=E5=A4=8D=E6=9E=84=E5=BB=BA=E3=80=82?= =?UTF-8?q?=20=E5=B7=B2=E8=A1=A5=E5=85=85=E6=B8=85=E6=99=B0=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E3=80=81=E5=88=86=E9=98=B6=E6=AE=B5=E8=84=B1=E6=95=8F?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=92=8C=E5=B7=B2=E7=A1=AE=E8=AE=A4=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E5=93=88=E5=B8=8C=E5=B1=95=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/rental-address-onchain.md | 110 +++++++++++ docs/rental/implementation.md | 2 + docs/rental/schema-design.md | 2 + .../src/main/resources/application-rental.yml | 16 ++ .../com/ruoyi/system/domain/RentNode.java | 6 + .../com/ruoyi/system/domain/RentNodePlus.java | 6 + .../com/ruoyi/system/domain/RentOrder.java | 32 ++++ .../ruoyi/system/domain/RentOrderPlus.java | 32 ++++ .../system/rental/RentalApiController.java | 17 ++ .../com/ruoyi/system/rental/RentalChain.java | 31 +++ .../com/ruoyi/system/rental/RentalErrors.java | 2 + .../com/ruoyi/system/rental/RentalFunds.java | 6 + .../ruoyi/system/rental/RentalOnchain.java | 91 +++++++++ .../com/ruoyi/system/rental/RentalOrders.java | 80 ++++++++ .../ruoyi/system/rental/RentalQueries.java | 5 + .../com/ruoyi/system/rental/RentalSocket.java | 3 +- .../com/ruoyi/system/rental/RentalTasks.java | 80 +++++++- .../ruoyi/system/rental/RentalWorkers.java | 4 +- .../mapper/system/RentNodeMapper.xml | 5 +- .../mapper/system/RentOrderMapper.xml | 9 +- .../system/rental/RentalBusinessTest.java | 99 ++++++++++ .../system/rental/RentalOnchainTest.java | 177 ++++++++++++++++++ sql/rent_address_onchain_migration.sql | 27 +++ sql/rent_init.sql | 36 ++-- 24 files changed, 851 insertions(+), 27 deletions(-) create mode 100644 docs/rental-address-onchain.md create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalOnchain.java create mode 100644 ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalOnchainTest.java create mode 100644 sql/rent_address_onchain_migration.sql diff --git a/docs/rental-address-onchain.md b/docs/rental-address-onchain.md new file mode 100644 index 0000000..865fcf8 --- /dev/null +++ b/docs/rental-address-onchain.md @@ -0,0 +1,110 @@ +# 地址上链订单:固定转入 1 TRX + +## 业务与费用 + +用户在“我的套餐”或“我的订单”中的“地址上链”卡片输入网络、接收地址及应用凭证,获取报价后确认。即使没有资源套餐,也能创建地址上链订单。供应商通过原有 rent_node 及已证明所有权的 rent_wallet 执行,不需要供应商创建 rent_app。 + +订单类型为 `ADDRESS_ONCHAIN`;省略类型继续走原有 `RESOURCE_RENTAL` 资源租赁。两者使用同一签名、应用归属、商户单号幂等、账务、回调和查询机制。 + +每笔固定转出 **1 TRX = 1000000 SUN**。USDT 本金折价 = `ceil6(1 × trx-price-usdt)`;固定服务费 = `ceil6(service-fee-usdt)`;总金额为两者之和。示例汇率0.15、固定服务费0.05,总冻结0.200000 USDT。所有运算使用 BigDecimal,不使用浮点数。NILE 和 MAINNET 汇率、服务费分别配置,未配置不允许下单,不自动取另一网络价格。 + +这里固定服务费使用 USDT 配置,不是实际链上燃烧的 TRX。本金全额补偿供应商,只有服务费参与百分比分成。实际网络交易/激活费用由供应商承担,不能在执行后追加扣用户资金。运营定价时应覆盖激活成本;`fee-limit-sun` 是链上操作本地预算,不计入用户报价第二次收费,也不是原生TRX交易的协议硬上限。 + +### 供应商与平台分账 + +`platform-fee-percent` 表示平台占服务费的百分比,20表示20%,允许0至100、最多4位小数,两种网络必须分别显式配置。未配置时拒绝新单,不影响原订单幂等恢复。用户支付总额不因分成比例改变。 + +```text +平台收入 = round6(服务费 × platform-fee-percent / 100),四舍五入 +供应商服务收入 = 服务费 - 平台收入 +供应商净应收 = 1TRX折价本金 + 供应商服务收入 +用户支付总额 = 供应商净应收 + 平台收入 +``` + +例如本金0.150000、服务费0.050000 USDT、平台比例20:用户扣0.200000,供应商净得0.190000(本金0.150000+服务收入0.040000),平台得0.010000。比例0表示服务费全归供应商,100表示服务费全归平台,本金始终归供应商。只对平台份额舍入一次,供应商取差额,保证金额守恒。 + +下单保存 `supplier_amount=用户总额`、`supplier_fee_percent=平台百分比`、`supplier_fee_amount=平台收入`、`supplier_net_amount=供应商净应收`,完整报价保存到package_snapshot。历史订单不重算,同一商户单号重试使用原快照;客户端不可覆盖分成参数。资源租赁订单继续按原有套餐规则计算。 + +链上独立确认成功才在同一事务写CHARGE、SUPPLIER_EARN和SUPPLIER_FEE流水:先登记供应商毛收入,再扣平台份额并写入 `rent_ledger.delta_platform_fee`;供应商待结算余额只增加净额。平台收入不是用户可用余额,平台统计沿用平台流水汇总。重复确认不重复入账,失败/未知不会确认收入。结算使用净应收,不二次扣费;退款/冲正仍走现有审核流程,平台退费累计上限为订单快照supplier_fee_amount,不随当前配置变化。 + +已激活普通地址也允许收到1TRX;未激活地址会由TRX转账激活。合约地址由本地Agent拒绝;网络由请求明确指定,不通过地址推断。不要用主网地址格式相同误以为两个网络余额可以混用。 + +## 流程与失败处理 + +1. `/quote` 校验当前网络配置及地址,计算USDT报价,不冻结资金。 +2. `/create` 锁定应用,按 `app_id + merchant_order_no` 幂等,保存价格快照、冻结用户USDT可用余额。重试命中原单不重读价格、不再次冻结;`expected_amount` 不匹配拒绝。网络、接收者、订单类型变化拒绝复用原商户单号。 +3. 云端只选择当前在线、审核通过、钱包所有权已证明、明确声明 `transfer_enabled` 的供应节点。检查候选TRX余额,持有钱包TRX执行槽,签发 `TRANSFER_TRX` 原生任务。旧Agent未声明能力,不会收到转账任务。 +4. Agent确认 `RENT_TRANSFER_ENABLED=true`、总广播授权、同网络、本地钱包owner、固定1000000 SUN、接收者、余额、权限、当前带宽费率、未激活地址创建费及留存。构建单个TransferContract,独立检查原始protobuf与授权一致后本地签名,先加密落盘再广播。 +5. 云端在订单网络独立查交易与确认回执,核对交易类型、唯一合约、owner、to、1000000 SUN、授权时间及确认深度。节点自报SUCCESS/RESULT不能触发扣款。 +6. 独立确认成功后:冻结USDT扣除、生成供应商待结算收入、订单SUCCESS、回调SUCCESS。`reclaim_status=NOT_REQUIRED`,不产生租期或回收任务;供应商结算沿用现有结算功能。 +7. 明确未执行的拒绝或链上已证明失败:同一订单最多4次任务尝试且不超过派单截止;终结释放冻结。未派单超时取消。断线、超时、查不到交易及UNKNOWN都不能证明未执行:保留任务槽、冻结资金和原签名交易,不自动退款或改派。 + +Agent暂停后未签名任务会明确拒绝;已经签名的任务始终只查原txID或重播同一原交易。禁止删除任务日志、用新单号重复提交来处理未知结果。管理员可通过现有原交易补证操作核对原始转账,不能用人工改余额代替核验。 + +## 表设计与协同 + +| 表 | 本功能数据与职责 | +| --- | --- | +| rent_order | 新增order_type、transfer_sun、trx_price_usdt、principal_usdt、service_fee_usdt;package_id允许NULL,package_snapshot复用保存费用预算及完整报价;resource_type=TRX,资源数量/租期=0 | +| rent_node | 新增transfer_enabled,由认证SYNC_STATE同步能力及本地授权;默认0,旧Agent关闭 | +| rent_wallet | 复用节点关联、网络、所有权证明、状态;无需创建私钥字段,实时余额由RPC及Agent校验 | +| rent_task | task_type=TRANSFER_TRX,resource_type=TRX,delegate_sun复用保存固定转账本金1000000,换算额度/权重为0;钱包TRX执行槽隔离资源任务 | +| rent_transaction | 一任务一原交易,transaction_type=TRANSFER_TRX,amount_sun=1000000,保存独立确认区块、时间和证据;网络+txID唯一防重复认领 | +| rent_account / rent_ledger | USDT冻结、扣款、释放以及供应商收入均同事务入账,沿用不可变business_key去重 | +| rent_settlement / rent_settlement_item | 复用订单净应收来源及人工付款授权,包含本金折价和服务收入 | +| rent_app / rent_credential | 用户应用及APP签名凭证;供应商使用NODE凭证,与应用凭证隔离 | +| rent_webhook / rent_event | 复用回调重试、签名验签、操作与节点审计 | + +本功能不新增独立订单/账户表,避免两套余额与幂等。历史资源订单默认RESOURCE_RENTAL,委托及回收行为保持现有规则。 + +## 升级与配置 + +已有库执行 `sql/rent_address_onchain_migration.sql`,全新库用更新后的 `sql/rent_init.sql`。增量脚本支持重复执行;它不会删表、改历史金额或真实广播。升级期间停止租赁worker及Agent,先迁移,再部署云端和两个Agent,最后开启功能。 + +在application-rental.yml中已添加 `rental.address-onchain`: + +```yaml +rental: + address-onchain: + enabled: ${RENT_ADDRESS_ONCHAIN_ENABLED:false} + nile: + trx-price-usdt: ${RENT_ADDRESS_ONCHAIN_NILE_TRX_PRICE_USDT:} + service-fee-usdt: ${RENT_ADDRESS_ONCHAIN_NILE_FEE_USDT:} + platform-fee-percent: ${RENT_ADDRESS_ONCHAIN_NILE_PLATFORM_FEE_PERCENT:} + fee-limit-sun: ${RENT_ADDRESS_ONCHAIN_NILE_FEE_LIMIT_SUN:3000000} + mainnet: + trx-price-usdt: ${RENT_ADDRESS_ONCHAIN_MAINNET_TRX_PRICE_USDT:} + service-fee-usdt: ${RENT_ADDRESS_ONCHAIN_MAINNET_FEE_USDT:} + platform-fee-percent: ${RENT_ADDRESS_ONCHAIN_MAINNET_PLATFORM_FEE_PERCENT:} + fee-limit-sun: ${RENT_ADDRESS_ONCHAIN_MAINNET_FEE_LIMIT_SUN:3000000} +``` + +仅在计划使用的网络配置正汇率、非负服务费。供应商Agent新增 `RENT_TRANSFER_ENABLED=false`,明确同意转账后改为true并重新连接。`RENT_MAX_SUN`至少1000000;`RENT_MAX_FEE_SUN`不小于订单fee-limit-sun;余额覆盖转出本金、保守链上费用与`RENT_TRX_RETAIN_SUN`。这两个限额单位均为SUN。JavaFX每次启动仍默认关闭总广播,必须手动开启。 + +原有应用签名下单API即可使用,无需额外菜单权限。网页公开API文档访问 `/rental-api`,已经加入该类型示例。 + +## API 示例 + +`POST /api/rental/v1/quote`,请求头及HMAC签名与资源租赁一致: + +```json +{"order_type":"ADDRESS_ONCHAIN","network":"NILE","receiver_address":"TXYZopYRdj2D9XRtbG411XZZ3kM5VkAeBf"} +``` + +`POST /api/rental/v1/create`: + +```json +{"order_type":"ADDRESS_ONCHAIN","network":"NILE","receiver_address":"TXYZopYRdj2D9XRtbG411XZZ3kM5VkAeBf","merchant_order_no":"ADDR-DEMO-001","expected_amount":"0.200000"} +``` + +不得传入package_id、resource_type、resource_quantity、duration_seconds、transfer_sun。金额示例不是实际配置价格。query按merchant_order_no查询;响应及回调增加order_type、transfer_sun、principal_usdt、service_fee_usdt、transaction_id,金额单位USDT。transaction_id仅在云端独立确认转账后提供,确认前为空。回调接收方照旧验签、按event_no去重、仅在业务落库成功后返回正文ok。 + +## 日志排查 + +使用orderId、taskId、nodeId、network、txID串联云端及本地日志。云端打印冻结金额拆分、候选余额不足(DEBUG)、派单、节点事件、独立证明、扣款及明确失败。Node打印PREFLIGHT、预算、BUILT_PERSISTED、BROADCASTED/UNKNOWN;Java打印任务阶段、原交易恢复及RPC路径耗时。密钥、签名交易、API Secret、原始凭证帧和带认证信息的响应禁止打印。 + +## 验证记录(2026-10-29) + +追加服务费分账后,JDK8云端租赁测试95项通过,包含H2真实事务、唯一键、无套餐下单、重复冻结防护、分成边界及舍入守恒、历史快照不重算、平台单次入账、净额结算、UNKNOWN隔离和独立链上参数证明。公开API文档ESLint通过。此前Node Agent14项、Java17 Agent41项测试通过,Java Agent完成package构建,Vue模板编译及staging生产构建通过(现有3项无关API导出警告及2项包大小警告);此次分账未修改Agent。 + +本次未运行生产MySQL增量脚本、未部署、未连接真实钱包、未执行真实支付或链上广播;实际两网联调应在配置完成后进行。 diff --git a/docs/rental/implementation.md b/docs/rental/implementation.md index 3e4614d..b7eddc3 100644 --- a/docs/rental/implementation.md +++ b/docs/rental/implementation.md @@ -1,5 +1,7 @@ # 租赁模块三端实现与运行说明 +地址上链扩展(2026-10-29):已加入ADDRESS_ONCHAIN订单、两个Agent的固定1TRX转账、USDT折价计费及原交易恢复。部署需执行 `sql/rent_address_onchain_migration.sql`,配置两网报价并由供应商显式授权;详见 [地址上链实现与部署](../rental-address-onchain.md)。公开网页文档路径 `/rental-api` 同步更新。 + 供应商/租赁账户首页现为统计图表与运行监控看板,不嵌入业务操作菜单;接口、指标口径和可选索引升级见[角色统计看板](role-dashboard.md)。 用户套餐绑定增量:核心表新增 rent_user_package,管理员授权具体套餐版本;应用按 user_id 选择已绑定套餐,省略 package_id 自动选择默认。部署前执行增量表SQL并配置用户绑定,见 [用户套餐绑定与脚本](user-package-bindings.md)。历史订单和在途处理不受绑定变更影响。 diff --git a/docs/rental/schema-design.md b/docs/rental/schema-design.md index 4e8f71f..4fded6b 100644 --- a/docs/rental/schema-design.md +++ b/docs/rental/schema-design.md @@ -1,5 +1,7 @@ # 能量/带宽出租表结构与业务流程 V2.2 +2026-10-29扩展:新增地址上链订单ADDRESS_ONCHAIN,供应商固定转1TRX,用户USDT账户承担本金折价及服务费;复用订单、任务、交易及账务,新增字段和节点能力见 [地址上链完整设计与实现](../rental-address-onchain.md)。该类型不绑定套餐、不做资源换算、无租期及回收;原有资源租赁规则保持本基线。 + 2026-10-25增量:新增第17张表 rent_user_package,按系统用户绑定套餐与默认项;下单从应用user_id确定授权,见 [用户套餐绑定](user-package-bindings.md)。以下16表描述为原设计基线。 状态:V2.2设计基线;当前已新增后端、Vue及本地Node.js Agent实现,运行配置、接口与验证边界见[三端实现说明](implementation.md)。未执行现有数据库迁移或真实链上广播。当前权威 DDL 为 [rent_init.sql](../../sql/rent_init.sql),共16张表;历史设计复核见[业务复核与修正说明](business-review-v2.2.md),逐表说明见[table-functional-flows.md](table-functional-flows.md)。下文“本次仅设计”描述设计审查阶段,不替代当前实现记录。 diff --git a/ruoyi-admin/src/main/resources/application-rental.yml b/ruoyi-admin/src/main/resources/application-rental.yml index 2d8b3b5..f212c59 100644 --- a/ruoyi-admin/src/main/resources/application-rental.yml +++ b/ruoyi-admin/src/main/resources/application-rental.yml @@ -47,5 +47,21 @@ rental: nile: ${RENT_NILE_HISTORY:} mainnet: ${RENT_MAINNET_HISTORY:} deposit-address: + # 充值地址仅供USDT入金,与供应商转出1TRX的钱包无关。 nile: ${RENT_NILE_DEPOSIT:TSeHZVEWQaCcWQrxevbt9LQfb1YC53ww8a} mainnet: ${RENT_MAINNET_DEPOSIT:TSeHZVEWQaCcWQrxevbt9LQfb1YC53ww8a} + # 地址上链:固定转1TRX;本金折价+固定服务费从用户USDT账户冻结,确认后扣款。 + # 默认关闭;两个网络的价格必须分别填写,不自动使用外部行情或跨网络兜底。 + address-onchain: + enabled: ${RENT_ADDRESS_ONCHAIN_ENABLED:false} + nile: + trx-price-usdt: ${RENT_ADDRESS_ONCHAIN_NILE_TRX_PRICE_USDT:} + service-fee-usdt: ${RENT_ADDRESS_ONCHAIN_NILE_FEE_USDT:} + # 平台分成占服务费的百分比,0~100,最多4位小数;本金不参与分成,必须显式填写。 + platform-fee-percent: ${RENT_ADDRESS_ONCHAIN_NILE_PLATFORM_FEE_PERCENT:} + fee-limit-sun: ${RENT_ADDRESS_ONCHAIN_NILE_FEE_LIMIT_SUN:3000000} + mainnet: + trx-price-usdt: ${RENT_ADDRESS_ONCHAIN_MAINNET_TRX_PRICE_USDT:} + service-fee-usdt: ${RENT_ADDRESS_ONCHAIN_MAINNET_FEE_USDT:} + platform-fee-percent: ${RENT_ADDRESS_ONCHAIN_MAINNET_PLATFORM_FEE_PERCENT:} + fee-limit-sun: ${RENT_ADDRESS_ONCHAIN_MAINNET_FEE_LIMIT_SUN:3000000} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RentNode.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RentNode.java index 02e53af..703c0f0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RentNode.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RentNode.java @@ -17,6 +17,12 @@ public class RentNode extends BaseEntity { private static final long serialVersionUID = 1L; + /** 由认证Agent同步的固定1TRX转账能力,禁止HTTP表单自行声明。 */ + @lombok.Getter + @lombok.Setter + @com.fasterxml.jackson.annotation.JsonProperty(access = com.fasterxml.jackson.annotation.JsonProperty.Access.READ_ONLY) + private Integer transferEnabled; + /** 记录主键 */ private Long id; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RentNodePlus.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RentNodePlus.java index fa46a42..fa1618c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RentNodePlus.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RentNodePlus.java @@ -20,6 +20,12 @@ public class RentNodePlus implements Serializable { private static final long serialVersionUID = 1L; + /** 由认证Agent同步的固定1TRX转账能力,禁止HTTP表单自行声明。 */ + @lombok.Getter + @lombok.Setter + @com.fasterxml.jackson.annotation.JsonProperty(access = com.fasterxml.jackson.annotation.JsonProperty.Access.READ_ONLY) + private Integer transferEnabled; + /** 记录主键 */ private Long id; /** 供应商sys_user.user_id */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RentOrder.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RentOrder.java index 7135929..495b25d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RentOrder.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RentOrder.java @@ -18,6 +18,38 @@ public class RentOrder extends BaseEntity { private static final long serialVersionUID = 1L; + /** 订单分类及地址上链价格快照;只读展示,必须通过租赁事务入口创建,不能由CRUD表单定价。 */ + @lombok.Getter + @lombok.Setter + @com.fasterxml.jackson.annotation.JsonProperty(access = com.fasterxml.jackson.annotation.JsonProperty.Access.READ_ONLY) + @Excel(name = "订单类型") + private String orderType; + + /** 地址上链固定转账金额,单位SUN,非资源委托本金。 */ + @lombok.Getter + @lombok.Setter + @com.fasterxml.jackson.annotation.JsonProperty(access = com.fasterxml.jackson.annotation.JsonProperty.Access.READ_ONLY) + private Long transferSun; + + /** 创建时锁定的1TRX兑USDT汇率。 */ + @lombok.Getter + @lombok.Setter + @com.fasterxml.jackson.annotation.JsonProperty(access = com.fasterxml.jackson.annotation.JsonProperty.Access.READ_ONLY) + private BigDecimal trxPriceUsdt; + + /** 1TRX本金折价USDT,向上保留6位。 */ + @lombok.Getter + @lombok.Setter + @com.fasterxml.jackson.annotation.JsonProperty(access = com.fasterxml.jackson.annotation.JsonProperty.Access.READ_ONLY) + private BigDecimal principalUsdt; + + /** 当前网络固定服务费USDT,创建后不随配置变更。 */ + @lombok.Getter + @lombok.Setter + @com.fasterxml.jackson.annotation.JsonProperty(access = com.fasterxml.jackson.annotation.JsonProperty.Access.READ_ONLY) + private BigDecimal serviceFeeUsdt; + + /** 记录主键 */ private Long id; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RentOrderPlus.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RentOrderPlus.java index 30b521b..833b162 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RentOrderPlus.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RentOrderPlus.java @@ -21,6 +21,38 @@ public class RentOrderPlus implements Serializable { private static final long serialVersionUID = 1L; + /** 订单分类及地址上链价格快照;只读展示,必须通过租赁事务入口创建,不能由CRUD表单定价。 */ + @lombok.Getter + @lombok.Setter + @com.fasterxml.jackson.annotation.JsonProperty(access = com.fasterxml.jackson.annotation.JsonProperty.Access.READ_ONLY) + @Excel(name = "订单类型") + private String orderType; + + /** 地址上链固定转账金额,单位SUN,非资源委托本金。 */ + @lombok.Getter + @lombok.Setter + @com.fasterxml.jackson.annotation.JsonProperty(access = com.fasterxml.jackson.annotation.JsonProperty.Access.READ_ONLY) + private Long transferSun; + + /** 创建时锁定的1TRX兑USDT汇率。 */ + @lombok.Getter + @lombok.Setter + @com.fasterxml.jackson.annotation.JsonProperty(access = com.fasterxml.jackson.annotation.JsonProperty.Access.READ_ONLY) + private BigDecimal trxPriceUsdt; + + /** 1TRX本金折价USDT,向上保留6位。 */ + @lombok.Getter + @lombok.Setter + @com.fasterxml.jackson.annotation.JsonProperty(access = com.fasterxml.jackson.annotation.JsonProperty.Access.READ_ONLY) + private BigDecimal principalUsdt; + + /** 当前网络固定服务费USDT,创建后不随配置变更。 */ + @lombok.Getter + @lombok.Setter + @com.fasterxml.jackson.annotation.JsonProperty(access = com.fasterxml.jackson.annotation.JsonProperty.Access.READ_ONLY) + private BigDecimal serviceFeeUsdt; + + /** 记录主键 */ private Long id; /** 平台订单编号 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalApiController.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalApiController.java index d2d4845..bd667e6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalApiController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalApiController.java @@ -23,6 +23,8 @@ import static com.ruoyi.system.rental.RentalValues.*; @RestController @RequestMapping("/api/rental/v1") public class RentalApiController { + @org.springframework.beans.factory.annotation.Autowired + private RentalOnchain onchain; private final RentalIdentity identity; private final RentalStore store; private final RentalOrders orders; @@ -88,6 +90,16 @@ public class RentalApiController { } Map order; if ("quote".equals(operation)) { + if (RentalOnchain.isOrder(data)) { + Map price = onchain.quote(data); + // 对接方只需要用户应付金额;平台与供应商分账保留在内部订单快照及账务。 + price.remove("supplier_fee_percent"); + price.remove("supplier_fee_amount"); + price.remove("supplier_net_amount"); + return AjaxResult.success(price); + } + require(text(data, "order_type").isEmpty() || "RESOURCE_RENTAL".equals(text(data, "order_type")), + "不支持的订单类型"); RentalOrders.address(input(data, "receiver_address", 64)); if (!text(data, "notify_url").trim().isEmpty()) { RentalHttp.checkUrl(text(data, "notify_url").trim()); @@ -118,6 +130,11 @@ public class RentalApiController { map( "order_no", order.get("order_no"), + "order_type", order.get("order_type"), + "transaction_id", orders.confirmedTransferId(order), + "transfer_sun", order.get("transfer_sun"), + "principal_usdt", order.get("principal_usdt"), + "service_fee_usdt", order.get("service_fee_usdt"), "merchant_order_no", order.get("merchant_order_no"), "network", diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalChain.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalChain.java index 2dc0e11..0eb734a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalChain.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalChain.java @@ -208,6 +208,9 @@ public class RentalChain { require(contracts.size() == 1, "交易合约数量异常"); JsonNode contract = contracts.get(0); JsonNode value = contract.path("parameter").path("value"); + if (RentalOnchain.TASK_TYPE.equals(text(task, "task_type"))) { + return verifyOnchain(task, tx, receipt, contract, value, owner, receiver, height); + } String expected = "DELEGATE".equals(text(task, "task_type")) ? "DelegateResourceContract" @@ -298,6 +301,34 @@ public class RentalChain { return ApiWrapper.toHex(ApiWrapper.parseAddress(address)); } + /** 不信任节点 RESULT:在指定网络独立核对原生单合约、owner、to、固定金额及确认回执。 */ + private Map verifyOnchain(Map task, JsonNode tx, JsonNode receipt, + JsonNode contract, JsonNode value, String owner, String receiver, long height) { + long timestamp = tx.path("raw_data").path("timestamp").asLong(-1); + require(tx.path("txID").asText().equalsIgnoreCase(receipt.path("id").asText()) + && timestamp >= time(task.get("signed_at")).toEpochMilli() - 5000 + && timestamp <= time(task.get("deadline")).toEpochMilli(), + "转账不在任务授权时间内或回执哈希不符,保留冻结核对"); + require("TransferContract".equals(contract.path("type").asText()) + && contract.path("Permission_id").asInt(0) == 0 + && hexAddress(owner).equalsIgnoreCase(value.path("owner_address").asText()) + && hexAddress(receiver).equalsIgnoreCase(value.path("to_address").asText()) + && value.path("amount").asLong(-1) == RentalOnchain.TRANSFER_SUN + && number(task, "delegate_sun") == RentalOnchain.TRANSFER_SUN + && "TRX".equals(text(task, "resource_type")), "链上转账与固定1TRX任务不符"); + require(tx.path("ret").size() == 1 && receipt.path("blockTimeStamp").asLong() > 0, + "转账执行回执缺失,保留冻结资金"); + if (!"SUCCESS".equals(tx.path("ret").get(0).path("contractRet").asText())) { + return map("status", "FAILED"); + } + require(!"FAILED".equals(receipt.path("result").asText()), "回执状态冲突,需人工核对"); + log.info("地址上链证明通过 taskId={} network={} txId={} blockHeight={} transferSun={}", + task.get("id"), task.get("network"), tx.path("txID").asText(), height, RentalOnchain.TRANSFER_SUN); + return map("status", "CONFIRMED", "block_height", height, "block_time", + java.time.LocalDateTime.ofInstant(java.time.Instant.ofEpochMilli(receipt.path("blockTimeStamp").asLong()), + java.time.ZoneOffset.UTC)); + } + /** 自动充值定位唯一匹配日志;不信任支付平台传入的日志索引,兼用人工充值去重键。 */ public Map paymentTransfer(String network, String txId, String address, BigDecimal expected, long createdAt, long expiresAt) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalErrors.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalErrors.java index f99b895..d0f1f89 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalErrors.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalErrors.java @@ -13,11 +13,13 @@ public class RentalErrors { private static final org.slf4j.Logger LOG = org.slf4j.LoggerFactory.getLogger(RentalErrors.class); @ExceptionHandler(IllegalArgumentException.class) public AjaxResult invalid(IllegalArgumentException exception) { + LOG.warn("租赁参数或业务校验拒绝 diagnostic={}", RentalDiagnostics.describe(exception)); return AjaxResult.error(400, exception.getMessage()); } @ExceptionHandler(IllegalStateException.class) public AjaxResult state(IllegalStateException exception) { + LOG.warn("租赁运行状态待核对 diagnostic={}", RentalDiagnostics.describe(exception)); return AjaxResult.error(409, exception.getMessage()); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalFunds.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalFunds.java index 6f8298d..13de493 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalFunds.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalFunds.java @@ -10,6 +10,7 @@ import java.util.Map; /** 资金统一入口。所有余额变化与不可变流水同事务;不提供任意金额覆盖接口。 调用方先锁业务主记录,再按账户ID升序加锁,避免商户同时也是供应商时反向锁死。 */ @Service +@lombok.extern.slf4j.Slf4j public class RentalFunds { private final RentalStore store; @@ -197,6 +198,8 @@ public class RentalFunds { null, "供应商履约毛收入"); BigDecimal fee = amount(order, "supplier_fee_amount"); + // 使用下单快照,不在确认/重试时重新读取配置。地址上链的基数为服务费,资源租赁的基数为毛收入。 + // 此流水同时减少供应商待结算、增加平台手续费收入,不会对用户再次扣费。 post( supplier, "FEE:" + id, @@ -212,5 +215,8 @@ public class RentalFunds { null, "按订单锁定费率扣取手续费"); store.update("order", id, map("fund_status", "CHARGED")); + log.info("租赁确认记账 orderId={} orderType={} network={} supplierAccountId={} grossUsdt={} platformFeeUsdt={} supplierNetUsdt={}", + id, text(order, "order_type"), text(order, "network"), supplier, + order.get("supplier_amount"), fee, order.get("supplier_net_amount")); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalOnchain.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalOnchain.java new file mode 100644 index 0000000..507dcaa --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalOnchain.java @@ -0,0 +1,91 @@ +package com.ruoyi.system.rental; + +import static com.ruoyi.system.rental.RentalValues.*; + +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.Map; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; +import org.springframework.stereotype.Service; + +/** 地址上链定价:只允许转出固定 1 TRX,用户仅支付 USDT,不接受客户端汇率及金额覆盖。 */ +@Service +@lombok.extern.slf4j.Slf4j +public class RentalOnchain { + public static final String ORDER_TYPE = "ADDRESS_ONCHAIN"; + public static final String TASK_TYPE = "TRANSFER_TRX"; + public static final long TRANSFER_SUN = 1_000_000L; + + @Autowired + private Environment environment; + + public static boolean isOrder(Map row) { + return ORDER_TYPE.equals(text(row, "order_type")); + } + + /** 两种网络独立配置。缺失价格时关闭下单,不默认使用另一网络价格。 */ + public Map quote(Map request) { + require(environment.getProperty("rental.address-onchain.enabled", Boolean.class, false), + "地址上链功能尚未开启"); + String network = network(input(request, "network", 16)); + RentalOrders.address(input(request, "receiver_address", 64)); + // 避免用户误以为客户端传入的转账数量、资源及套餐会被执行。 + validateParameters(request); + String prefix = "rental.address-onchain." + network.toLowerCase(java.util.Locale.ROOT) + "."; + BigDecimal rate = decimal(environment.getProperty(prefix + "trx-price-usdt", "")); + BigDecimal serviceFee = decimal(environment.getProperty(prefix + "service-fee-usdt", "")); + require(rate.signum() > 0 && serviceFee.signum() >= 0, "地址上链汇率必须为正、服务费不能为负"); + BigDecimal principal = rate.setScale(6, RoundingMode.CEILING); + serviceFee = serviceFee.setScale(6, RoundingMode.CEILING); + // 仅服务费参与分成,本金完整补偿供应商;不从请求读取比例,防止客户端篡改。 + BigDecimal percent; + try { + percent = new BigDecimal(environment.getProperty(prefix + "platform-fee-percent", "")); + } catch (NumberFormatException ex) { + throw new IllegalArgumentException("请配置当前网络的地址上链平台分成百分比"); + } + require(percent.signum() >= 0 && percent.compareTo(new BigDecimal("100")) <= 0 + && percent.stripTrailingZeros().scale() <= 4, "平台分成百分比须为0至100,最多4位小数"); + // 平台金额只舍入一次;供应商使用减法取余,保证最小单位和总额严格守恒。 + BigDecimal platformFee = serviceFee.multiply(percent).movePointLeft(2).setScale(6, RoundingMode.HALF_UP); + BigDecimal supplierNet = principal.add(serviceFee).subtract(platformFee); + long budget; + try { + budget = Long.parseLong(environment.getProperty(prefix + "fee-limit-sun", "0")); + } catch (NumberFormatException ex) { + throw new IllegalArgumentException("地址上链链上费用预算配置无效"); + } + require(budget > 0, "地址上链链上费用预算未配置"); + log.info("地址上链分账报价 network={} platformPercent={} platformFeeUsdt={} supplierNetUsdt={}", + network, percent, platformFee, supplierNet); + log.info("地址上链报价 network={} transferSun={} principalUsdt={} serviceFeeUsdt={} totalUsdt={} feeLimitSun={}", + network, TRANSFER_SUN, principal, serviceFee, principal.add(serviceFee), budget); + return map("order_type", ORDER_TYPE, "network", network, "currency", "USDT", + "transfer_sun", TRANSFER_SUN, "trx_price_usdt", rate.toPlainString(), + "principal_usdt", principal.toPlainString(), "service_fee_usdt", serviceFee.toPlainString(), + "amount", principal.add(serviceFee).toPlainString(), "fee_limit_sun", budget, + "supplier_fee_percent", percent.toPlainString(), "supplier_fee_amount", platformFee.toPlainString(), + "supplier_net_amount", supplierNet.toPlainString()); + } + + /** 新单和幂等重试均拒绝可被误解为客户端可以控制转账数量的参数。 */ + static void validateParameters(Map request) { + for (String field : new String[] {"package_id", "resource_type", "resource_quantity", "duration_seconds", "transfer_sun", + "supplier_fee_percent", "supplier_fee_amount", "supplier_net_amount", "platform_fee_percent"}) { + require(!request.containsKey(field), "地址上链订单不接受参数:" + field); + } + } + + private static BigDecimal decimal(String value) { + try { + BigDecimal result = new BigDecimal(value); + require(result.precision() <= 24 && result.precision() - result.scale() <= 18 + && result.scale() >= 0 && result.scale() <= 12, + "地址上链价格精度超限"); + return result; + } catch (NumberFormatException ex) { + throw new IllegalArgumentException("请配置当前网络的地址上链汇率和服务费"); + } + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalOrders.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalOrders.java index 2b87a52..c902846 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalOrders.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalOrders.java @@ -14,7 +14,10 @@ import java.util.Map; /** 下单、冻结、取消与业务回调入队;外部接口与登录接口复用同一套事务规则。 */ @Service +@lombok.extern.slf4j.Slf4j public class RentalOrders { + @org.springframework.beans.factory.annotation.Autowired + private RentalOnchain onchain; private final RentalStore store; private final RentalFunds funds; private final ObjectMapper json; @@ -47,6 +50,13 @@ public class RentalOrders { address(receiver); Map existing = store.one( "SELECT * FROM rent_order WHERE app_id=? AND merchant_order_no=?", appId, merchant); + String orderType = text(request, "order_type"); + require(orderType.isEmpty() || "RESOURCE_RENTAL".equals(orderType) + || RentalOnchain.ORDER_TYPE.equals(orderType), "不支持的订单类型"); + if (RentalOnchain.isOrder(request)) { + return createOnchain(app, user, request, existing, merchant, receiver); + } + require(existing == null || !RentalOnchain.isOrder(existing), "同一商户订单号不能更改订单类型"); long packageId; if (request.containsKey("package_id") && !text(request, "package_id").isEmpty()) { packageId = number(request, "package_id"); @@ -179,6 +189,60 @@ public class RentalOrders { return store.get("order", id, false); } + /** 已由 create() 锁定应用行:同商户编号只能冻结一次,配置改价不影响原订单重试。 */ + private Map createOnchain(Map app, long user, + Map request, Map existing, String merchant, String receiver) { + RentalOnchain.validateParameters(request); + String network = network(input(request, "network", 16)); + String notify = text(request, "notify_url").trim(); + if (notify.isEmpty()) { + notify = text(app, "notify_url"); + } + if (!notify.isEmpty()) { + RentalHttp.checkUrl(notify); + } + String hash = RentalCrypto.sha256(encode(map("order_type", RentalOnchain.ORDER_TYPE, + "network", network, "receiver_address", receiver, "notify_url", notify))); + if (existing != null) { + require(RentalOnchain.isOrder(existing) && hash.equals(text(existing, "request_hash")), + "同一商户订单号参数不一致"); + log.info("地址上链幂等命中 orderId={} network={}", existing.get("id"), network); + return existing; + } + Map price = onchain.quote(request); + BigDecimal total = amount(price, "amount"); + if (request.containsKey("expected_amount")) { + require(total.compareTo(amount(request, "expected_amount")) == 0, "价格已变更,请重新报价"); + } + Map account = funds.account(user, network); + account = store.get("account", number(account, "id"), true); + require("ACTIVE".equals(text(account, "status")), "租赁资金账户已冻结"); + Map order = map("order_no", id("RO"), "app_id", app.get("id"), + "merchant_order_no", merchant, "request_hash", hash, "package_id", null, + "order_type", RentalOnchain.ORDER_TYPE, "billing_mode", "PER_ORDER", "network", network, + "receiver_address", receiver, "resource_type", "TRX", "resource_quantity", 0, + "target_resource_quantity", 0, "redundancy_percent", ZERO, "duration_seconds", 0, + "transfer_sun", RentalOnchain.TRANSFER_SUN, "trx_price_usdt", price.get("trx_price_usdt"), + "principal_usdt", price.get("principal_usdt"), "service_fee_usdt", price.get("service_fee_usdt"), + // 毛收入含本金和服务费;平台只从服务费分成,确认扣款时使用此不可变快照。 + "sale_amount", total, "supplier_amount", total, "supplier_fee_percent", price.get("supplier_fee_percent"), + "supplier_fee_amount", price.get("supplier_fee_amount"), "supplier_net_amount", price.get("supplier_net_amount"), + "package_snapshot", encode(price), + "status", "WAITING", "payer_account_id", account.get("id"), "fund_status", "HELD", + "dispatch_deadline", after(300), "reclaim_status", "NOT_REQUIRED", + "notify_url", notify.isEmpty() ? null : notify); + long orderId = store.insert("order", order); + order.put("id", orderId); + funds.hold(order); + log.info("地址上链分账已锁定 orderId={} platformPercent={} platformFeeUsdt={} supplierNetUsdt={}", + orderId, price.get("supplier_fee_percent"), price.get("supplier_fee_amount"), price.get("supplier_net_amount")); + store.event("ORDER", orderId, "CREATE", user, "地址上链:冻结1TRX折价及固定服务费USDT"); + log.info("地址上链订单已冻结 orderId={} userId={} network={} transferSun={} principalUsdt={} serviceFeeUsdt={} totalUsdt={}", + orderId, user, network, RentalOnchain.TRANSFER_SUN, price.get("principal_usdt"), + price.get("service_fee_usdt"), total); + return store.get("order", orderId, false); + } + public static void validatePackage(Map row) { network(text(row, "network")); resource(text(row, "resource_type")); @@ -261,6 +325,11 @@ public class RentalOrders { seq, "order_no", text(order, "order_no"), + "order_type", text(order, "order_type"), + "transaction_id", confirmedTransferId(order), + "transfer_sun", order.get("transfer_sun"), + "principal_usdt", order.get("principal_usdt"), + "service_fee_usdt", order.get("service_fee_usdt"), "merchant_order_no", text(order, "merchant_order_no"), "network", @@ -286,4 +355,15 @@ public class RentalOrders { throw new IllegalArgumentException("业务数据序列化失败"); } } + + /** 仅提供已独立确认的地址上链哈希,不把节点上报当作最终到账证明。 */ + public String confirmedTransferId(Map order) { + if (!RentalOnchain.isOrder(order)) { + return ""; + } + Map record = store.one("SELECT x.tx_id FROM rent_transaction x" + + " JOIN rent_task t ON t.id=x.task_id WHERE t.order_id=?" + + " AND t.task_type='TRANSFER_TRX' AND x.status='CONFIRMED' ORDER BY x.id LIMIT 1", order.get("id")); + return record == null ? "" : text(record, "tx_id"); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalQueries.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalQueries.java index 20659cf..abf021a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalQueries.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalQueries.java @@ -74,6 +74,11 @@ public class RentalQueries { args.add((page - 1) * 50); // 资金账户列表补充所属用户名;左连接保留关联用户缺失的账户,归属过滤仍使用账户的user_id。 String select = "r.*"; + if ("order".equals(type)) { + select += ", (SELECT x.tx_id FROM rent_transaction x JOIN rent_task t ON t.id=x.task_id" + + " WHERE t.order_id=r.id AND t.task_type='TRANSFER_TRX' AND x.status='CONFIRMED'" + + " ORDER BY x.id LIMIT 1) AS transaction_id"; + } String join = ""; if ("account".equals(type)) { select += ", u.user_name AS user_name"; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalSocket.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalSocket.java index cc453fc..401a018 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalSocket.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalSocket.java @@ -211,8 +211,9 @@ public class RentalSocket extends TextWebSocketHandler { if (c.ready) { store.execute( "UPDATE rent_node SET" - + " connection_status='ONLINE',version=version+1,updated_at=? WHERE" + + " connection_status='ONLINE',transfer_enabled=?,version=version+1,updated_at=? WHERE" + " id=? AND session_epoch=?", + Boolean.TRUE.equals(payload.get("transfer_enabled")) ? 1 : 0, now(), c.node, c.epoch); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalTasks.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalTasks.java index 53df2c0..b83e56e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalTasks.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalTasks.java @@ -11,6 +11,7 @@ import java.util.function.Supplier; /** 持久任务状态机。数据库事务仅修改事实,所有RPC在事务外完成。 UNKNOWN保留三个占位和冻结资金;租约、断线、超时均不是未执行证据。 */ @Service +@lombok.extern.slf4j.Slf4j public class RentalTasks { private final RentalStore store; private final RentalChain chain; @@ -78,6 +79,8 @@ public class RentalTasks { funds.release(row); store.update("order", orderId, map("status", "CANCELLED")); orders.webhook(row, "CANCELLED", "ORDER:" + orderId + ":CANCELLED"); + log.info("租赁未派单超时释放 orderId={} orderType={} releasedUsdt={}", + orderId, row.get("order_type"), row.get("sale_amount")); } return null; }); @@ -98,6 +101,12 @@ public class RentalTasks { if (owner.equals(text(initial, "receiver_address"))) { continue; } + if (RentalOnchain.isOrder(initial)) { + if (dispatchOnchain(initial, candidate)) { + return; + } + continue; + } if (chain.relation( text(initial, "network"), owner, @@ -209,6 +218,49 @@ public class RentalTasks { } } + /** TRX 任务独立占用钱包 TRX 执行槽,不占用质押资源,也不建立委托地址对及历史资源基线。 */ + private boolean dispatchOnchain(Map initial, Map candidate) { + Map advertised = store.get("node", number(candidate, "node_id"), false); + if (number(advertised, "transfer_enabled") != 1) { + log.debug("地址上链候选未授权转账 orderId={} nodeId={}", initial.get("id"), advertised.get("id")); + return false; + } + Map price; + try { + price = new com.fasterxml.jackson.databind.ObjectMapper().readValue(text(initial, "package_snapshot"), Map.class); + } catch (Exception ex) { + throw new IllegalArgumentException("地址上链费用快照损坏"); + } + // 仅作候选过滤,Agent 在签名前仍需重新检查余额、激活成本、费率及本地留存。 + long balance = chain.call(text(initial, "network"), "/wallet/getaccount", + map("address", text(candidate, "address"), "visible", true)).path("balance").asLong(); + if (balance < Math.addExact(RentalOnchain.TRANSFER_SUN, number(price, "fee_limit_sun"))) { + log.debug("地址上链候选余额不足 orderId={} walletId={} balanceSun={}", initial.get("id"), candidate.get("id"), balance); + return false; + } + return Boolean.TRUE.equals(tx(() -> { + Map order = store.get("order", number(initial, "id"), true); + Map wallet = store.get("wallet", number(candidate, "id"), true); + Map node = store.get("node", number(wallet, "node_id"), true); + if (!"WAITING".equals(text(order, "status")) || !time(order.get("dispatch_deadline")).isAfter(Instant.now()) + || !"ACTIVE".equals(text(wallet, "status")) || !"ACTIVE".equals(text(node, "status")) + || number(node, "transfer_enabled") != 1 || !"ONLINE".equals(text(node, "connection_status")) + || !time(node.get("heartbeat_expires_at")).isAfter(Instant.now()) + || store.one("SELECT id FROM rent_task WHERE wallet_id=? AND resource_type='TRX' AND wallet_execution_slot=1", + wallet.get("id")) != null) { + return false; + } + Map supplier = funds.account(number(node, "user_id"), text(order, "network")); + require("ACTIVE".equals(text(supplier, "status")), "供应商资金账户冻结"); + store.update("order", number(order, "id"), map("status", "EXECUTING", "wallet_id", wallet.get("id"), + "supplier_user_id", node.get("user_id"), "supplier_account_id", supplier.get("id"))); + createTask(order, wallet, RentalOnchain.TASK_TYPE, RentalOnchain.TRANSFER_SUN, 0, 0, null); + store.event("ORDER", number(order, "id"), "DISPATCH", 0, "固定1TRX转账,供应商获得本金补偿及服务费"); + log.info("地址上链派单 orderId={} walletId={} nodeId={} transferSun={}", order.get("id"), wallet.get("id"), node.get("id"), RentalOnchain.TRANSFER_SUN); + return true; + })); + } + private void createTask( Map order, Map wallet, @@ -236,7 +288,7 @@ public class RentalTasks { String taskNo = id("RT"), nonce = RentalCrypto.random(); long signed = System.currentTimeMillis(); java.time.LocalDateTime deadline = - "DELEGATE".equals(type) + !"RECLAIM".equals(type) ? java.time.LocalDateTime.ofInstant( time(order.get("dispatch_deadline")), java.time.ZoneOffset.UTC) : after(300); @@ -278,7 +330,7 @@ public class RentalTasks { "total_weight", Long.toString(weight), "baseline_sun", - "DELEGATE".equals(type) ? "0" : Long.toString(sun), + !"RECLAIM".equals(type) ? "0" : Long.toString(sun), "conversion_block_height", text(wallet, "snapshot_block_height"), "delegate_lock", @@ -323,7 +375,7 @@ public class RentalTasks { "conversion_at", now(), "estimated_resource_quantity", - quantity(sun, limit, weight), + RentalOnchain.TASK_TYPE.equals(type) ? 0 : quantity(sun, limit, weight), "attempt_no", attempt, "active_slot", @@ -494,7 +546,7 @@ public class RentalTasks { "amount_sun", task.get("delegate_sun"), "baseline_sun", - "DELEGATE".equals(text(task, "task_type")) + !"RECLAIM".equals(text(task, "task_type")) ? 0 : task.get("delegate_sun"), "status", @@ -512,7 +564,7 @@ public class RentalTasks { "UNKNOWN".equals(kind) ? "UNKNOWN" : "BROADCASTED", "next_check_at", now())); - if ("DELEGATE".equals(text(task, "task_type"))) { + if (!"RECLAIM".equals(text(task, "task_type"))) { store.update( "order", number(order, "id"), map("status", "VERIFYING")); } @@ -538,6 +590,8 @@ public class RentalTasks { nodeId, "reason", "已认证节点事件,成功仍须独立链上核验")); + log.info("节点任务事件 nodeId={} taskId={} orderId={} taskType={} event={} txPresent={}", + nodeId, taskId, order.get("id"), task.get("task_type"), kind, !text(report, "tx_id").isEmpty()); return null; }); } @@ -580,6 +634,18 @@ public class RentalTasks { fields.put("evidence", orders.encode(proof)); fields.put("confirmed_at", now()); store.update("transaction", number(record, "id"), fields); + if (RentalOnchain.TASK_TYPE.equals(text(current, "task_type"))) { + // 原生转账不存在租期与回收;确认到账后仅扣一次冻结款并生成供应商待结算收入。 + funds.charge(order); + store.update("task", taskId, map("status", "VERIFIED", "wallet_execution_slot", null)); + store.update("order", number(order, "id"), map("status", "SUCCESS", "reclaim_status", "NOT_REQUIRED", + "service_started_at", proof.get("block_time"), "error_code", null)); + orders.webhook(order, "SUCCESS", "ORDER:" + order.get("id") + ":SUCCESS"); + store.event("TASK", taskId, "CHAIN_CONFIRMED", 0, "独立核验固定1TRX转账并扣款,无回收任务"); + log.info("地址上链核验扣款完成 orderId={} taskId={} network={} txId={} blockHeight={} chargedUsdt={}", + order.get("id"), taskId, task.get("network"), record.get("tx_id"), proof.get("block_height"), order.get("sale_amount")); + return null; + } boolean delegate = "DELEGATE".equals(text(current, "task_type")); String prefix = text(current, "resource_type").toLowerCase(Locale.ROOT); Map barrier = @@ -679,7 +745,7 @@ public class RentalTasks { null, "reservation_status", delegate ? "RELEASED" : "NONE")); - if (delegate) { + if (delegate || RentalOnchain.TASK_TYPE.equals(text(task, "task_type"))) { boolean retry = number(task, "attempt_no") < 4 && time(order.get("dispatch_deadline")).isAfter(Instant.now()); @@ -704,6 +770,8 @@ public class RentalTasks { map("reclaim_status", "WAITING", "next_reclaim_at", after(60))); } store.event("TASK", taskId, "SAFE_FAILURE", 0, "明确拒绝未构建或链上确认失败;未知不走本分支"); + log.warn("任务明确失败 taskId={} orderId={} taskType={} state={} attempt={},仅明确失败允许释放或重派", + taskId, orderId, task.get("task_type"), state, task.get("attempt_no")); } public void recoverResource(long orderId) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalWorkers.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalWorkers.java index e07379b..56ae3a8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalWorkers.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalWorkers.java @@ -84,7 +84,7 @@ public class RentalWorkers { try { tasks.dispatch(dispatchCursor); } catch (Exception ex) { - LOG.warn("租赁订单调度待重试,orderId={}", dispatchCursor); + LOG.warn("租赁订单调度待重试 orderId={} diagnostic={}", dispatchCursor, RentalDiagnostics.describe(ex)); } } each( @@ -161,7 +161,7 @@ public class RentalWorkers { try { action.accept(id); } catch (Exception ex) { - LOG.warn("租赁后台核对暂未完成,recordId={},下轮继续;敏感异常不记录", id); + LOG.warn("租赁后台核对暂未完成 recordId={} diagnostic={},下轮继续保留原状态", id, RentalDiagnostics.describe(ex)); } } } diff --git a/ruoyi-system/src/main/resources/mapper/system/RentNodeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RentNodeMapper.xml index 3c26ff8..dcb4080 100644 --- a/ruoyi-system/src/main/resources/mapper/system/RentNodeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/RentNodeMapper.xml @@ -5,6 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -32,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, user_id, node_no, name, status, agent_version, heartbeat_at, connection_status, session_id, session_epoch, server_instance_id, connected_at, disconnected_at, heartbeat_interval_seconds, heartbeat_timeout_seconds, heartbeat_expires_at, last_client_sequence, created_by, approved_by, approved_at, remark, version, created_at, updated_at from rent_node + select transfer_enabled, id, user_id, node_no, name, status, agent_version, heartbeat_at, connection_status, session_id, session_epoch, server_instance_id, connected_at, disconnected_at, heartbeat_interval_seconds, heartbeat_timeout_seconds, heartbeat_expires_at, last_client_sequence, created_by, approved_by, approved_at, remark, version, created_at, updated_at from rent_node @@ -209,4 +214,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - \ No newline at end of file + diff --git a/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalBusinessTest.java b/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalBusinessTest.java index 367facb..cd9efa2 100644 --- a/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalBusinessTest.java +++ b/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalBusinessTest.java @@ -219,6 +219,18 @@ public class RentalBusinessTest { tx = new TransactionTemplate(new DataSourceTransactionManager(source)); funds = new RentalFunds(store); orders = new RentalOrders(store, funds, json); + RentalOnchain onchain = new RentalOnchain(); + org.springframework.core.env.StandardEnvironment environment = new org.springframework.core.env.StandardEnvironment(); + environment.getPropertySources().addFirst(new org.springframework.core.env.MapPropertySource("onchain-test", map( + "rental.address-onchain.enabled", "true", "rental.address-onchain.nile.trx-price-usdt", "0.1234567", + "rental.address-onchain.nile.service-fee-usdt", "0.05", "rental.address-onchain.nile.fee-limit-sun", "3000000", + "rental.address-onchain.nile.platform-fee-percent", "20"))); + java.lang.reflect.Field envField = RentalOnchain.class.getDeclaredField("environment"); + envField.setAccessible(true); + envField.set(onchain, environment); + java.lang.reflect.Field onchainField = RentalOrders.class.getDeclaredField("onchain"); + onchainField.setAccessible(true); + onchainField.set(orders, onchain); reviews = new RentalReviews(store, funds, orders); RentalCrypto crypto = new RentalCrypto(); java.lang.reflect.Field field = RentalCrypto.class.getDeclaredField("masterKey"); @@ -340,6 +352,10 @@ public class RentalBusinessTest { after(60))); RentalChain chain = new RentalChain(json) { + @Override + public com.fasterxml.jackson.databind.JsonNode call(String network, String path, Map body) { + return json.valueToTree(map("balance", 10000000)); + } @Override public long relation( String network, String owner, String receiver, String type) { @@ -407,6 +423,89 @@ public class RentalBusinessTest { new DataSourceTransactionManager(source)); } + @Test + public void onchainFreezesExactlyOnceAndDoesNotRequirePackage() { + store.execute("DELETE FROM rent_user_package WHERE user_id=10"); + Map request = onchainRequest("onchain-idempotent"); + Map order = tx.execute(status -> orders.create(app, 10, request)); + assertNull(order.get("package_id")); + assertEquals(1000000L, number(order, "transfer_sun")); + assertEquals(money("0.173457"), amount(order, "sale_amount")); + assertEquals(money("0.010000"), amount(order, "supplier_fee_amount")); + assertEquals(money("0.163457"), amount(order, "supplier_net_amount")); + assertEquals(money("99.826543"), amount(store.get("account", payer, false), "available_amount")); + // 修改当前配置不重算已下单分账,也不会阻碍同商户单号的幂等恢复。 + try { + java.lang.reflect.Field onchainField = RentalOrders.class.getDeclaredField("onchain"); + onchainField.setAccessible(true); + java.lang.reflect.Field envField = RentalOnchain.class.getDeclaredField("environment"); + envField.setAccessible(true); + org.springframework.core.env.StandardEnvironment env = + (org.springframework.core.env.StandardEnvironment) envField.get(onchainField.get(orders)); + env.getPropertySources().addFirst(new org.springframework.core.env.MapPropertySource("changed", + map("rental.address-onchain.nile.platform-fee-percent", "80"))); + } catch (ReflectiveOperationException ex) { + throw new AssertionError(ex); + } + assertEquals(number(order, "id"), number(tx.execute(status -> orders.create(app, 10, request)), "id")); + assertEquals(money("0.010000"), amount(tx.execute(status -> orders.create(app, 10, request)), "supplier_fee_amount")); + assertEquals(1, store.rows("SELECT id FROM rent_ledger WHERE event_type='HOLD'").size()); + request.put("receiver_address", OWNER); + expectFailure(() -> tx.execute(status -> orders.create(app, 10, request))); + } + + @Test + public void onchainRequiresCapableNodeAndChargesOnlyAfterIndependentProof() { + Map order = tx.execute(status -> orders.create(app, 10, onchainRequest("onchain-success"))); + long orderId = number(order, "id"); + tasks.dispatch(orderId); + assertNull(store.one("SELECT id FROM rent_task WHERE order_id=?", orderId)); + store.execute("UPDATE rent_node SET transfer_enabled=1 WHERE id=?", node); + tasks.dispatch(orderId); + Map task = store.one("SELECT * FROM rent_task WHERE order_id=?", orderId); + assertEquals("TRANSFER_TRX", text(task, "task_type")); + assertEquals(0, number(store.get("wallet", wallet, false), "energy_reserved_sun")); + tasks.report(node, map("task_no", task.get("task_no"), "event_id", "onchain-built", "state", "BUILT", "tx_id", String.join("", Collections.nCopies(64, "c")))); + expectFailure(() -> tasks.report(node, map("task_no", task.get("task_no"), "event_id", "invalid-reject", "state", "REJECTED"))); + assertEquals("HELD", text(store.get("order", orderId, false), "fund_status")); + tasks.verify(number(task, "id")); + tasks.verify(number(task, "id")); + Map completed = store.get("order", orderId, false); + assertEquals("SUCCESS", text(completed, "status")); + assertEquals("NOT_REQUIRED", text(completed, "reclaim_status")); + assertEquals("CHARGED", text(completed, "fund_status")); + assertEquals(String.join("", Collections.nCopies(64, "c")), orders.confirmedTransferId(completed)); + assertEquals(money("0.163457"), amount(store.get("account", supplier, false), "supplier_pending_amount")); + assertEquals(money("0.010000"), amount(store.one("SELECT SUM(delta_platform_fee) AS fee FROM rent_ledger WHERE order_id=?", orderId), "fee")); + assertEquals(1, store.rows("SELECT id FROM rent_ledger WHERE order_id=? AND event_type='SUPPLIER_FEE'", orderId).size()); + assertEquals(1, store.rows("SELECT id FROM rent_ledger WHERE event_type='CHARGE'").size()); + long settlement = tx.execute(status -> reviews.settlement(Collections.singletonList(orderId), 99)); + assertEquals(money("0.163457"), amount(store.get("settlement", settlement, false), "amount")); + } + + @Test + public void onchainUnknownDoesNotReleaseOrRedispatchAndDefiniteRejectCanRelease() { + store.execute("UPDATE rent_node SET transfer_enabled=1 WHERE id=?", node); + Map order = tx.execute(status -> orders.create(app, 10, onchainRequest("onchain-unknown"))); + long orderId = number(order, "id"); + tasks.dispatch(orderId); + Map task = store.one("SELECT * FROM rent_task WHERE order_id=?", orderId); + tasks.report(node, map("task_no", task.get("task_no"), "event_id", "unknown", "state", "UNKNOWN")); + store.execute("UPDATE rent_order SET dispatch_deadline=? WHERE id=?", now().minusSeconds(60), orderId); + tasks.dispatch(orderId); + assertEquals("HELD", text(store.get("order", orderId, false), "fund_status")); + assertEquals(1, store.rows("SELECT id FROM rent_task WHERE order_id=?", orderId).size()); + tasks.report(node, map("task_no", task.get("task_no"), "event_id", "rejected", "state", "REJECTED")); + assertEquals("RELEASED", text(store.get("order", orderId, false), "fund_status")); + assertEquals(money("100"), amount(store.get("account", payer, false), "available_amount")); + assertEquals(0, store.rows("SELECT id FROM rent_ledger WHERE order_id=? AND event_type='SUPPLIER_FEE'", orderId).size()); + } + + private Map onchainRequest(String merchant) { + return map("order_type", "ADDRESS_ONCHAIN", "network", "NILE", "merchant_order_no", merchant, + "receiver_address", ADDRESS, "expected_amount", "0.173457"); + } + @Test public void extendedDurationHoldsQuotedFundsAndRetryDoesNotChargeAgain() { Map request = map("package_id", product, "merchant_order_no", "LONG-RENT", diff --git a/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalOnchainTest.java b/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalOnchainTest.java new file mode 100644 index 0000000..08f3e39 --- /dev/null +++ b/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalOnchainTest.java @@ -0,0 +1,177 @@ +package com.ruoyi.system.rental; + +import static com.ruoyi.system.rental.RentalValues.*; +import static org.junit.Assert.*; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import java.math.BigDecimal; +import java.util.Map; +import org.junit.Test; +import org.springframework.core.env.MapPropertySource; +import org.springframework.core.env.StandardEnvironment; + +/** 不连接真实链:覆盖网络价格隔离、精度与真实交易证明拒绝分支。 */ +public class RentalOnchainTest { + private static final String OWNER = "T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb"; + private static final String RECEIVER = "TXYZopYRdj2D9XRtbG411XZZ3kM5VkAeBf"; + private static final String TX = String.join("", java.util.Collections.nCopies(64, "a")); + private final ObjectMapper json = new ObjectMapper(); + + @Test + public void pricesRoundUpAndNetworksNeverFallback() throws Exception { + RentalOnchain pricing = pricing(map("rental.address-onchain.enabled", "true", + "rental.address-onchain.nile.trx-price-usdt", "0.1234567", + "rental.address-onchain.nile.service-fee-usdt", "0.0000001", + "rental.address-onchain.nile.platform-fee-percent", "20", + "rental.address-onchain.nile.fee-limit-sun", "3000000")); + Map request = map("network", "NILE", "receiver_address", RECEIVER); + assertEquals(new BigDecimal("0.123458"), amount(pricing.quote(request), "amount")); + request.put("network", "MAINNET"); + expectRejected(() -> pricing.quote(request)); + request.put("network", "NILE"); + request.put("transfer_sun", 2000000); + expectRejected(() -> pricing.quote(request)); + } + + @Test + public void serviceFeeSplitConservesMoneyAndValidatesPercentage() throws Exception { + Map config = map("rental.address-onchain.enabled", "true", + "rental.address-onchain.nile.trx-price-usdt", "0.15", + "rental.address-onchain.nile.service-fee-usdt", "0.05", + "rental.address-onchain.nile.fee-limit-sun", "3000000"); + RentalOnchain pricing = pricing(config); + Map request = map("network", "NILE", "receiver_address", RECEIVER); + String key = "rental.address-onchain.nile.platform-fee-percent"; + expectRejected(() -> pricing.quote(request)); + for (String invalid : new String[] {"-1", "100.01", "0.00001", "invalid"}) { + config.put(key, invalid); + expectRejected(() -> pricing.quote(request)); + } + for (String valid : new String[] {"0", "20", "100", "33.3333"}) { + config.put(key, valid); + Map quote = pricing.quote(request); + BigDecimal platform = amount(quote, "supplier_fee_amount"); + BigDecimal net = amount(quote, "supplier_net_amount"); + assertEquals(0, amount(quote, "amount").compareTo(platform.add(net))); + assertTrue(net.compareTo(amount(quote, "principal_usdt")) >= 0); + if ("20".equals(valid)) { + assertEquals(new BigDecimal("0.010000"), platform); + assertEquals(new BigDecimal("0.190000"), net); + } + } + // 最小USDT单位舍入后仍守恒:0.000001服务费的一半四舍五入归平台。 + config.put(key, "50"); + config.put("rental.address-onchain.nile.service-fee-usdt", "0.000001"); + assertEquals(new BigDecimal("0.000001"), amount(pricing.quote(request), "supplier_fee_amount")); + assertEquals(new BigDecimal("0.150000"), amount(pricing.quote(request), "supplier_net_amount")); + config.put("rental.address-onchain.nile.service-fee-usdt", "0"); + assertEquals(new BigDecimal("0.000000"), amount(pricing.quote(request), "supplier_fee_amount")); + // 主网不能借用NILE分成配置,配置齐全后也必须采用自己的比例。 + config.put("rental.address-onchain.mainnet.trx-price-usdt", "0.15"); + config.put("rental.address-onchain.mainnet.service-fee-usdt", "0.05"); + config.put("rental.address-onchain.mainnet.fee-limit-sun", "3000000"); + request.put("network", "MAINNET"); + expectRejected(() -> pricing.quote(request)); + config.put("rental.address-onchain.mainnet.platform-fee-percent", "80"); + assertEquals(new BigDecimal("0.040000"), amount(pricing.quote(request), "supplier_fee_amount")); + request.put("platform_fee_percent", "0"); + expectRejected(() -> pricing.quote(request)); + } + + @Test + public void disabledAndZeroRateRejectOrdering() throws Exception { + expectRejected(() -> pricing(map()).quote(map("network", "NILE", "receiver_address", RECEIVER))); + RentalOnchain pricing = pricing(map("rental.address-onchain.enabled", "true", + "rental.address-onchain.nile.trx-price-usdt", "0", + "rental.address-onchain.nile.service-fee-usdt", "0.1")); + expectRejected(() -> pricing.quote(map("network", "NILE", "receiver_address", RECEIVER))); + } + + @Test + public void independentProofChecksAmountReceiverNetworkDepthAndAuthorizationTime() throws Exception { + FakeChain chain = new FakeChain(); + Map task = task(); + assertEquals("CONFIRMED", text(chain.verify(task, TX, OWNER, RECEIVER), "status")); + assertEquals("NILE", chain.seenNetwork); + chain.amount = 999999; + expectRejected(() -> chain.verify(task, TX, OWNER, RECEIVER)); + chain.amount = 1000000; + chain.receiver = OWNER; + expectRejected(() -> chain.verify(task, TX, OWNER, RECEIVER)); + chain.receiver = RECEIVER; + chain.head = 100; + expectRejected(() -> chain.verify(task, TX, OWNER, RECEIVER)); + chain.head = 120; + chain.timestamp = System.currentTimeMillis() - 3600000; + expectRejected(() -> chain.verify(task, TX, OWNER, RECEIVER)); + } + + @Test + public void confirmedFailureIsDifferentFromMissingOrWrongContract() throws Exception { + FakeChain chain = new FakeChain(); + chain.result = "REVERT"; + assertEquals("FAILED", text(chain.verify(task(), TX, OWNER, RECEIVER), "status")); + chain.contract = "DelegateResourceContract"; + expectRejected(() -> chain.verify(task(), TX, OWNER, RECEIVER)); + } + + private Map task() { + return map("id", 1, "network", "NILE", "task_type", "TRANSFER_TRX", "resource_type", "TRX", + "delegate_sun", 1000000, "signed_at", now().minusSeconds(1), "deadline", after(300)); + } + + private RentalOnchain pricing(Map values) throws Exception { + StandardEnvironment env = new StandardEnvironment(); + env.getPropertySources().addFirst(new MapPropertySource("test", values)); + RentalOnchain result = new RentalOnchain(); + java.lang.reflect.Field field = RentalOnchain.class.getDeclaredField("environment"); + field.setAccessible(true); + field.set(result, env); + return result; + } + + private interface Action { void run() throws Exception; } + + private static void expectRejected(Action action) { + try { action.run(); fail("必须拒绝不安全请求"); } + catch (IllegalArgumentException expected) { /* 明确校验拒绝 */ } + catch (Exception unexpected) { throw new AssertionError(unexpected); } + } + + private final class FakeChain extends RentalChain { + long amount = 1000000; + long head = 120; + long timestamp = System.currentTimeMillis(); + String receiver = RECEIVER; + String seenNetwork; + String contract = "TransferContract"; + String result = "SUCCESS"; + + FakeChain() throws Exception { + super(json); + java.lang.reflect.Field field = RentalChain.class.getDeclaredField("confirmations"); + field.setAccessible(true); + field.set(this, 19L); + } + + @Override + public JsonNode call(String network, String path, Map body) { + seenNetwork = network; + if (path.endsWith("gettransactionbyid")) { + return json.valueToTree(map("txID", TX, "raw_data", map("timestamp", timestamp, + "contract", java.util.Collections.singletonList(map("type", contract, + "parameter", map("value", map("owner_address", hex(OWNER), "to_address", hex(receiver), "amount", amount))))), + "ret", java.util.Collections.singletonList(map("contractRet", result)))); + } + if (path.endsWith("gettransactioninfobyid")) { + return json.valueToTree(map("id", TX, "blockNumber", 100, "blockTimeStamp", timestamp)); + } + return json.valueToTree(map("block_header", map("raw_data", map("number", head)))); + } + + private String hex(String address) { + return org.tron.trident.core.ApiWrapper.toHex(org.tron.trident.core.ApiWrapper.parseAddress(address)); + } + } +} diff --git a/sql/rent_address_onchain_migration.sql b/sql/rent_address_onchain_migration.sql new file mode 100644 index 0000000..80dcb7e --- /dev/null +++ b/sql/rent_address_onchain_migration.sql @@ -0,0 +1,27 @@ +-- MySQL 5.7/8.0,无删表、无数据重建。先备份,停租赁worker/Agent,迁移后再部署新服务及Agent。 +-- 支持重复执行;历史订单回填为RESOURCE_RENTAL,不修改历史金额。 +DELIMITER $$ +DROP PROCEDURE IF EXISTS rent_upgrade_address_onchain$$ +CREATE PROCEDURE rent_upgrade_address_onchain() +BEGIN + IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='rent_order' AND column_name='order_type') THEN + ALTER TABLE rent_order ADD COLUMN order_type VARCHAR(24) NOT NULL DEFAULT 'RESOURCE_RENTAL' COMMENT 'RESOURCE_RENTAL资源租赁、ADDRESS_ONCHAIN固定1TRX转账', + ADD COLUMN transfer_sun BIGINT NULL COMMENT '地址上链固定1000000SUN', + ADD COLUMN trx_price_usdt DECIMAL(30,12) NULL COMMENT '1TRX兑换USDT汇率快照', + ADD COLUMN principal_usdt DECIMAL(30,6) NULL COMMENT 'TRX本金USDT折价', + ADD COLUMN service_fee_usdt DECIMAL(30,6) NULL COMMENT '固定服务费USDT'; + END IF; + IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='rent_node' AND column_name='transfer_enabled') THEN + ALTER TABLE rent_node ADD COLUMN transfer_enabled TINYINT NOT NULL DEFAULT 0 COMMENT 'Agent同步的固定1TRX转账授权能力'; + END IF; + ALTER TABLE rent_order MODIFY COLUMN package_id BIGINT NULL COMMENT '资源订单套餐id;地址上链为空'; + ALTER TABLE rent_task MODIFY COLUMN task_type VARCHAR(16) NOT NULL COMMENT 'DELEGATE、RECLAIM、TRANSFER_TRX'; +END$$ +CALL rent_upgrade_address_onchain()$$ +DROP PROCEDURE rent_upgrade_address_onchain$$ +DELIMITER ; + +-- TRX是转账任务的独立分类,不是可租赁资源。订单资源数量、租期、换算额度为0, +-- delegate_sun复用为原生操作本金;TRANSFER_TRX任务必须等于1000000。 +-- 新单供应商毛收入=总额;平台收入=服务费乘平台百分比,供应商净收入=总额减平台收入。 +-- 复用supplier_fee_percent/supplier_fee_amount/supplier_net_amount及现有流水,不重算历史订单。 diff --git a/sql/rent_init.sql b/sql/rent_init.sql index cd408eb..0d7455d 100644 --- a/sql/rent_init.sql +++ b/sql/rent_init.sql @@ -7,6 +7,8 @@ -- 采用逻辑外键,应用负责父记录归属、网络、金额非负、状态机及同事务一致性;MySQL5.7不强制CHECK。 -- 钱包按ENERGY/BANDWIDTH分别维护SUN额度、保留量和预留;同类型任务预留同事务,禁止跨类型挪用。 -- resource_type无默认值且必须显式校验:ENERGY数量单位Energy、BANDWIDTH数量单位bytes;链上类型分别1和0。 +-- 地址上链扩展:order_type=ADDRESS_ONCHAIN,任务TRANSFER_TRX,分类TRX,不走资源换算或回收。 +-- 地址上链固定1TRX,USDT本金折价及服务费按网络配置并锁定快照;旧库执行rent_address_onchain_migration.sql。 -- 委托接口只提交质押等值本金SUN,不直接提交Energy/bytes;请求量加正冗余后按当前全网参数换算,TRX向上取整。 -- 不使用DROP/ALTER,不是旧版53表升级脚本;IF NOT EXISTS不能将旧表升级成V2。 -- 业务规则及流程图详见docs/rental/schema-design.md,简化范围为本版设计选择,未执行数据库变更。 @@ -63,6 +65,7 @@ CREATE TABLE IF NOT EXISTS `rent_nonce` ( -- 供应商本地Agent节点;供应商直接关联共享用户,不另建成员表 CREATE TABLE IF NOT EXISTS `rent_node` ( + `transfer_enabled` TINYINT NOT NULL DEFAULT 0 COMMENT '认证Agent同步的固定1TRX转账能力及本地授权;旧Agent默认为关闭', `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '记录主键', `user_id` BIGINT NOT NULL COMMENT '供应商sys_user.user_id', `node_no` VARCHAR(64) NOT NULL COMMENT '节点全局编号', @@ -207,19 +210,24 @@ CREATE TABLE IF NOT EXISTS `rent_order` ( `app_id` BIGINT NOT NULL COMMENT 'rent_app.id', `merchant_order_no` VARCHAR(64) NOT NULL COMMENT '商户订单号,兼作业务幂等键', `request_hash` VARCHAR(64) NOT NULL COMMENT '原请求规范化摘要,同编号不同内容拒绝', - `package_id` BIGINT NOT NULL COMMENT 'rent_package.id', + `package_id` BIGINT NULL COMMENT '资源订单关联rent_package.id;地址上链为空', + `order_type` VARCHAR(24) NOT NULL DEFAULT 'RESOURCE_RENTAL' COMMENT 'RESOURCE_RENTAL资源租赁、ADDRESS_ONCHAIN固定1TRX转账', + `transfer_sun` BIGINT NULL COMMENT '地址上链固定1000000 SUN;资源租赁为空', + `trx_price_usdt` DECIMAL(30,12) NULL COMMENT '1TRX兑换USDT的配置汇率快照', + `principal_usdt` DECIMAL(30,6) NULL COMMENT 'TRX本金折价USDT,向上取6位', + `service_fee_usdt` DECIMAL(30,6) NULL COMMENT '当前网络固定服务费USDT快照', `billing_mode` VARCHAR(16) NOT NULL DEFAULT 'DURATION' COMMENT '计费模式快照:DURATION或PER_ORDER', `network` VARCHAR(16) CHARACTER SET ascii COLLATE ascii_bin NOT NULL COMMENT '网络:NILE、MAINNET,必须与所有关联对象一致', `receiver_address` VARCHAR(64) CHARACTER SET ascii COLLATE ascii_bin NOT NULL COMMENT '资源接收者,TRON Base58Check地址', - `resource_type` VARCHAR(16) NOT NULL COMMENT '套餐资源类型快照:ENERGY能量、BANDWIDTH带宽,订单创建后不可修改', - `resource_quantity` BIGINT NOT NULL COMMENT '套餐资源数量快照:ENERGY单位Energy、BANDWIDTH单位bytes,必须大于零', + `resource_type` VARCHAR(16) NOT NULL COMMENT 'ENERGY能量、BANDWIDTH带宽;地址上链分类TRX,创建后不可修改', + `resource_quantity` BIGINT NOT NULL COMMENT '资源订单数量必须大于零;地址上链为0,转账金额见transfer_sun', `redundancy_percent` DECIMAL(10,4) NOT NULL COMMENT '订单锁定冗余百分数,必须大于0,不能被套餐后续改价或调参覆盖', `target_resource_quantity` BIGINT NOT NULL COMMENT '含冗余最低交付目标max(请求量+1,ceil(请求量乘以(1+冗余百分数/100))),严格大于resource_quantity', - `duration_seconds` INT NOT NULL COMMENT '租期秒快照', + `duration_seconds` INT NOT NULL COMMENT '资源租期秒快照;地址上链为0无租期', `sale_amount` DECIMAL(30,6) NOT NULL DEFAULT 0 COMMENT 'USDT售价快照', `supplier_amount` DECIMAL(30,6) NOT NULL DEFAULT 0 COMMENT '供应商扣费前毛收入USDT快照,不能因费率变更被覆盖', - `supplier_fee_percent` DECIMAL(7,4) NOT NULL COMMENT '订单锁定供应商手续费百分数,必须大于0小于100', - `supplier_fee_amount` DECIMAL(30,6) NOT NULL COMMENT '平台手续费USDT快照=毛收入乘费率除100,按6位小数HALF_UP;必须大于0且小于毛收入', + `supplier_fee_percent` DECIMAL(7,4) NOT NULL COMMENT '平台分成百分数快照;资源订单按毛收入,地址上链按服务费且允许0至100', + `supplier_fee_amount` DECIMAL(30,6) NOT NULL COMMENT '平台收入USDT快照=计费基数乘百分比除100保留6位;地址上链以service_fee_usdt为基数,本金不分成', `supplier_net_amount` DECIMAL(30,6) NOT NULL COMMENT '供应商净应收USDT快照=供应商毛收入减平台手续费,必须大于0,结算以此为基数', `supplier_reversed_amount` DECIMAL(30,6) NOT NULL DEFAULT 0 COMMENT '已冲正供应商净应收USDT累计,不超过supplier_net_amount,按审核退款规则追加流水', `supplier_fee_reversed_amount` DECIMAL(30,6) NOT NULL DEFAULT 0 COMMENT '已退回或冲正平台手续费USDT累计,不超过supplier_fee_amount,不因退款自动推定全退', @@ -236,7 +244,7 @@ CREATE TABLE IF NOT EXISTS `rent_order` ( `dispatch_deadline` DATETIME(3) NOT NULL COMMENT '创建时锁定的最晚新任务执行时间UTC;WAITING超时取消,已投递不能仅凭过期判未执行', `service_started_at` DATETIME(3) NULL COMMENT '已独立核验委托交易所在区块的UTC时间,不使用核验完成时间延长租期', `service_expires_at` DATETIME(3) NULL COMMENT '业务租期结束,不等于自动回收,UTC', - `reclaim_status` VARCHAR(24) NOT NULL COMMENT '回收:NOT_STARTED、WAITING、RUNNING、RECOVERING、DONE、MANUAL_REVIEW', + `reclaim_status` VARCHAR(24) NOT NULL COMMENT '回收:NOT_STARTED、WAITING、RUNNING、RECOVERING、DONE、MANUAL_REVIEW;地址上链NOT_REQUIRED', `next_reclaim_at` DATETIME(3) NULL COMMENT '下次到期或资源恢复核对,UTC', `notify_url` VARCHAR(512) NULL COMMENT '该单回调URL快照,允许为空', `error_code` VARCHAR(64) NULL COMMENT '稳定错误码', @@ -266,18 +274,18 @@ CREATE TABLE IF NOT EXISTS `rent_task` ( `network` VARCHAR(16) CHARACTER SET ascii COLLATE ascii_bin NOT NULL COMMENT '与订单钱包及实际链上交易一致的网络,纳入HMAC', `source_transaction_id` BIGINT NULL COMMENT 'RECLAIM必须指向原已确认DELEGATE的rent_transaction.id;DELEGATE为空,不允许回收任务引用回收交易', `wallet_execution_slot` TINYINT NULL DEFAULT 1 COMMENT '同钱包同资源类型最多一个在途链上操作;未知保留1,终结且写入快照屏障后置NULL;与订单地址对占位独立', - `task_type` VARCHAR(16) NOT NULL COMMENT 'DELEGATE委托、RECLAIM回收,不支持转账', - `resource_type` VARCHAR(16) NOT NULL COMMENT '资源类型:ENERGY或BANDWIDTH,必须与订单及链上交易一致并纳入HMAC', + `task_type` VARCHAR(16) NOT NULL COMMENT 'DELEGATE委托、RECLAIM回收、TRANSFER_TRX固定1TRX转账', + `resource_type` VARCHAR(16) NOT NULL COMMENT 'ENERGY或BANDWIDTH;TRANSFER_TRX为TRX,必须与订单及链上交易一致并纳入HMAC', `resource_quantity` BIGINT NOT NULL COMMENT '本任务资源数量快照:ENERGY单位Energy、BANDWIDTH单位bytes,不得跨类型换算', `target_resource_quantity` BIGINT NOT NULL COMMENT '原订单含冗余目标快照;委托必须覆盖该量,回收任务仅用于追溯原委托目标', - `conversion_total_limit` BIGINT NOT NULL COMMENT '换算时该资源全网总额度:ENERGY为Energy,BANDWIDTH为质押带宽bytes,必须大于0', - `conversion_total_weight` BIGINT NOT NULL COMMENT '换算时该资源全网总权重,单位为协议TRX权重,不能当作SUN;必须大于0', + `conversion_total_limit` BIGINT NOT NULL COMMENT '资源换算全网总额度必须大于0;TRANSFER_TRX为0,不进行资源换算', + `conversion_total_weight` BIGINT NOT NULL COMMENT '资源换算全网TRX权重必须大于0;TRANSFER_TRX为0,不进行资源换算', `conversion_block_height` BIGINT NOT NULL COMMENT '可信换算查询对应区块高度,结合时间检查快照有效期', `conversion_at` DATETIME(3) NOT NULL COMMENT '本次换算参数查询UTC时间,Agent签名前必须重新检查参数及额度', `estimated_resource_quantity` BIGINT NOT NULL COMMENT '按本次换算参数和delegate_sun向下计算的资源量,委托任务必须不小于target_resource_quantity', `attempt_no` INT NOT NULL COMMENT '同订单同类型的尝试序号', `active_slot` TINYINT NULL DEFAULT 1 COMMENT '有效或已成功取1,仅明确未执行失败可置NULL;UNKNOWN不得释放', - `delegate_sun` BIGINT NOT NULL COMMENT '委托本金SUN=ceil(目标资源量乘全网权重除全网额度)乘1000000,TRX向上取整;回收取原确认本金,禁止重新按资源量换算', + `delegate_sun` BIGINT NOT NULL COMMENT '原生操作本金SUN;委托按目标资源换算、回收取原确认本金;TRANSFER_TRX固定1000000', `fee_limit_sun` BIGINT NOT NULL COMMENT '本地操作费用预算SUN;按当前网络费用、签名权限及资源评估,不作为协议fee_limit硬上限', `credential_id` BIGINT NOT NULL COMMENT '目标节点rent_credential.id', `nonce` VARCHAR(64) NOT NULL COMMENT '任务防重放随机数', @@ -318,8 +326,8 @@ CREATE TABLE IF NOT EXISTS `rent_transaction` ( `tx_id` VARCHAR(64) NOT NULL COMMENT '链上交易哈希', `owner_address` VARCHAR(64) CHARACTER SET ascii COLLATE ascii_bin NOT NULL COMMENT '实际资源owner,TRON Base58Check地址', `receiver_address` VARCHAR(64) CHARACTER SET ascii COLLATE ascii_bin NOT NULL COMMENT '实际receiver,TRON Base58Check地址', - `transaction_type` VARCHAR(16) NOT NULL COMMENT 'DELEGATE委托、RECLAIM撤销', - `resource_type` VARCHAR(16) NOT NULL COMMENT '实际链上资源类型:ENERGY对应resource_code=1、BANDWIDTH对应resource_code=0,独立核验', + `transaction_type` VARCHAR(16) NOT NULL COMMENT 'DELEGATE委托、RECLAIM撤销、TRANSFER_TRX原生固定1TRX转账', + `resource_type` VARCHAR(16) NOT NULL COMMENT 'ENERGY对应resource_code=1、BANDWIDTH对应resource_code=0;原生转账分类TRX无资源码', `amount_sun` BIGINT NOT NULL COMMENT '链上实际本金SUN', `verified_total_limit` BIGINT NULL COMMENT '独立核验区块该资源全网额度,确认前可空,确认委托时必须有有效正值', `verified_total_weight` BIGINT NULL COMMENT '独立核验区块该资源全网TRX权重,确认前可空,不能与SUN混用',