From dafa5261bdaaba83541a1eac14704a8e824f089c Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Fri, 30 Oct 2026 08:31:27 -0400 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=A7=9F=E8=B5=81=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E4=B8=8D=E8=A6=81=E4=BC=A0=E9=80=92=E5=A5=97?= =?UTF-8?q?=E9=A4=90id=EF=BC=8C=E6=94=B9=E6=88=90=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=BD=91=E7=BB=9C=E5=92=8C=E8=B5=84=E6=BA=90=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=BA=94=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E5=92=8Capi-debugger=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=92=8C=E5=A5=97=E9=A4=90=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E7=AB=8B=E5=8D=B3=E7=A7=9F=E8=B5=81=E7=9A=84?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=85=A5=E5=8F=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/rental/implementation.md | 4 +- docs/rental/merchant-order-callback-demo.md | 7 +- docs/rental/role-dashboard.md | 2 +- docs/rental/schema-design.md | 4 +- docs/rental/single-user-package.md | 26 +-- docs/rental/table-functional-flows.md | 4 +- docs/rental/user-package-bindings.md | 57 +++--- .../system/rental/RentalApiController.java | 24 +-- .../ruoyi/system/rental/RentalController.java | 2 +- .../ruoyi/system/rental/RentalDashboard.java | 5 +- .../com/ruoyi/system/rental/RentalOrders.java | 39 ++-- .../system/rental/RentalPackageBindings.java | 68 ++++++- .../ruoyi/system/rental/RentalQueries.java | 2 +- .../service/impl/RentPackageServiceImpl.java | 11 ++ .../system/rental/RentalBusinessTest.java | 168 +++++++++++++++++- sql/rent_init.sql | 8 +- sql/rent_seed_three_packages.sql | 19 +- sql/rent_user_package.sql | 6 +- sql/rent_user_package_scope.sql | 36 ++++ sql/rent_user_package_single.sql | 8 +- 20 files changed, 381 insertions(+), 119 deletions(-) create mode 100644 sql/rent_user_package_scope.sql diff --git a/docs/rental/implementation.md b/docs/rental/implementation.md index e2aec08..1098d62 100644 --- a/docs/rental/implementation.md +++ b/docs/rental/implementation.md @@ -4,7 +4,7 @@ 供应商/租赁账户首页现为统计图表与运行监控看板,不嵌入业务操作菜单;接口、指标口径和可选索引升级见[角色统计看板](role-dashboard.md)。 -用户套餐绑定增量:核心表新增 rent_user_package,管理员授权具体套餐版本;应用按 user_id 选择已绑定套餐,省略 package_id 自动选择默认。部署前执行增量表SQL并配置用户绑定,见 [用户套餐绑定与脚本](user-package-bindings.md)。历史订单和在途处理不受绑定变更影响。 +用户套餐绑定增量:核心表新增 rent_user_package,管理员授权具体套餐版本;应用按 user_id 选择已绑定套餐,报价/下单必须提交 network/resource_type 选择分类,禁止提交 package_id;每用户每网络每资源类型最多一个当前套餐。部署前执行增量表SQL并配置用户绑定,见 [用户套餐绑定与脚本](user-package-bindings.md)。历史订单和在途处理不受绑定变更影响。 本文对应当前工作区的 V2.2 实现。设计依据仍为 [schema-design.md](schema-design.md) 和 [rent_init.sql](../../sql/rent_init.sql)。代码交付不等于生产迁移或真实链上验收;本次没有修改现有数据库,没有执行任何真实广播。 @@ -125,7 +125,7 @@ POST SHA256(实际UTF-8请求体)的小写十六进制 ``` -使用Secret做HMAC-SHA256,输出小写64位十六进制。scope为API/NODE/TASK/WEBHOOK,不能互换;不共用支付MD5。下单字段:`package_id`、`merchant_order_no`、`receiver_address`,可选 `notify_url` 和与套餐一致的 `resource_type`。APP和用户从凭证推导。`query` 用 `merchant_order_no`;`packages` 用 `network`。 +使用Secret做HMAC-SHA256,输出小写64位十六进制。scope为API/NODE/TASK/WEBHOOK,不能互换;不共用支付MD5。下单必填字段:`network`、`resource_type`、`merchant_order_no`、`receiver_address`,可选 `notify_url`、`duration_seconds`、`resource_quantity`、`expected_amount`;禁止提交 `package_id`,由服务端按分类解析套餐。APP和用户从凭证推导。`query` 用 `merchant_order_no`;`packages` 用 `network`。 跨语言固定向量:Secret=`test-secret`、scope=`API`、key=`test-key`、timestamp=`1700000000123`、nonce=`abcdefghijklmnop`、method=`POST`、path=`/api/rental/v1/create`、body=`{"amount":"1.000000"}`,结果为 `47241a34f0813881384317eafbfc068dc9f7c6061a8fe269cb815e7820d48430`。此值仅用于测试,不是有效运行凭证。 diff --git a/docs/rental/merchant-order-callback-demo.md b/docs/rental/merchant-order-callback-demo.md index 7ef007a..2bd7d01 100644 --- a/docs/rental/merchant-order-callback-demo.md +++ b/docs/rental/merchant-order-callback-demo.md @@ -16,7 +16,8 @@ Secret只在弹窗内存中用于签名,关闭弹窗清除,不写浏览器 ```json { - "package_id": 1, + "network": "NILE", + "resource_type": "ENERGY", "duration_seconds": 7200, "receiver_address": "TXYZopYRdj2D9XRtbG411XZZ3kM5VkAeBf", "merchant_order_no": "WEB_UNIQUE_ORDER_NO", @@ -24,9 +25,11 @@ Secret只在弹窗内存中用于签名,关闭弹窗清除,不写浏览器 } ``` +network和resource_type为报价与下单必填项,服务端按所属用户匹配分类套餐;禁止提交package_id。弹窗可切换网络、资源类型,切换后必须重新报价。 + 报价返回 `amount`(精确十进制字符串)、`currency=USDT`、`duration_seconds`、`network`、`resource_quantity`。确认下单传 `expected_amount`,服务端重新计算并比较,价格变更则拒绝。所有费用使用BigDecimal。 -租期为套餐基础租期的1至720个整数倍,总售价、供应商毛收入同比例增加,资源数量保持不变。例如基础3600秒、售价3USDT,7200秒为6USDT。该规则同时作用于登录入口及外部API;不传租期继续使用基础租期,兼容现有调用。实际资源回收按订单租期快照执行。请求超时后使用相同商户单号及原参数重试;不要更换单号重复扣费。 +租期为套餐基础租期的1至720个整数倍,总售价、供应商毛收入同比例增加,资源数量同步按租期倍数增加。例如基础3600秒、售价3USDT,7200秒为6USDT。该规则同时作用于登录入口及外部API;不传租期继续使用基础租期,兼容现有调用。实际资源回收按订单租期快照执行。请求超时后使用相同商户单号及原参数重试;不要更换单号重复扣费。 回调地址只允许公网HTTPS、443端口、无查询参数,不允许内网或回环目标。留空沿用应用默认地址。订单创建成功是同步API响应,不代表链上已经交付;以查询API及已验签异步通知为准。当前协议没有浏览器return_url跳转回调。 diff --git a/docs/rental/role-dashboard.md b/docs/rental/role-dashboard.md index 2cc890a..d66e049 100644 --- a/docs/rental/role-dashboard.md +++ b/docs/rental/role-dashboard.md @@ -33,7 +33,7 @@ 订单仅沿rent_order.app_id→rent_app.user_id归属查询,不与同用户供应商订单混合。净消费为CHARGE的-delta_frozen减REFUND的delta_available,不包含HOLD/RELEASE;退款来自早期订单时本期净消费可能为负。金额统一BigDecimal,响应返回6位十进制字符串,卡片按字符串展示;图表坐标使用近似数值,不用于账务计算。 -当前租赁中为SUCCESS且服务未到期、回收未DONE;处理中为WAITING/EXECUTING/VERIFYING。人工核对包含履约或回收MANUAL_REVIEW。回调沿本人应用订单归属,DEAD为重试耗尽,PENDING/SENDING为待确认。应用启用状态、有效APP凭证数量、当前套餐网络和上架状态均单独展示,绝不返回Secret或签名。套餐绑定属于另一个网络时提示网络不匹配,不冒充可用套餐。 +当前租赁中为SUCCESS且服务未到期、回收未DONE;处理中为WAITING/EXECUTING/VERIFYING。人工核对包含履约或回收MANUAL_REVIEW。回调沿本人应用订单归属,DEAD为重试耗尽,PENDING/SENDING为待确认。应用启用状态、有效APP凭证数量、当前网络下的能量与带宽套餐分别展示名称和上架状态,绝不返回Secret或签名;不读取或冒充其他网络的套餐。 ## 刷新与部署 diff --git a/docs/rental/schema-design.md b/docs/rental/schema-design.md index 4ae1244..b0e35d6 100644 --- a/docs/rental/schema-design.md +++ b/docs/rental/schema-design.md @@ -4,7 +4,7 @@ 资金账户新增可用USDT提现:申请冻结、后台/Telegram审核、管理员Hash核验及链上监听自动到账,完整表、状态、配置及部署见 [租赁资金账户提现](../rental-withdraw.md)。提现不保存付款私钥、不自动广播,所有到账均以已确认USDT Transfer为依据。 -2026-10-25增量:新增第17张表 rent_user_package,按系统用户绑定套餐与默认项;下单从应用user_id确定授权,见 [用户套餐绑定](user-package-bindings.md)。以下16表描述为原设计基线。 +2026-10-25增量:新增第17张表 rent_user_package,按系统用户+网络+资源类型绑定当前套餐;已有库先执行 sql/rent_user_package_scope.sql;下单从应用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)。下文“本次仅设计”描述设计审查阶段,不替代当前实现记录。 @@ -142,7 +142,7 @@ flowchart TD TronLink钱包验证的完整规则见下方“TronLink钱包控制权验证”;下单仍使用原有HMAC或系统登录认证。 -1. 请求提交package_id、merchant_order_no、receiver_address(resource_type由套餐决定,如请求携带则必须一致),可指定回调URL。应用/用户由认证结果派生。查同一(app_id,merchant_order_no),相同规范化摘要返回原单,不同摘要拒绝。 +1. 请求提交network、resource_type、merchant_order_no、receiver_address(禁止提交package_id,由服务端按用户与分类匹配套餐),可指定回调URL。应用/用户由认证结果派生。查同一(app_id,merchant_order_no),相同规范化摘要返回原单,不同摘要拒绝。 2. 事务内锁套餐及账户,校验上架、网络、价格、地址和余额,保存订单/规则快照:可用减售价、冻结加售价,写HOLD流水和订单WAITING。同事务写状态审计。套餐改价新增revision,旧行不直接改金额。 3. 后台扫描WAITING并条件抢占。按锁定正冗余比例计算target_resource_quantity,再选在线、审核通过且快照有效的供应钱包,以当前该资源L/W换算整TRX向上取整后的delegate_sun。预计资源必须覆盖冗余目标,并保存完整换算快照;Energy和Bandwidth参数不能混用。 4. 事务内锁订单与钱包,按订单 resource_type 检查对应 delegatable_sun-retain_sun-reserved_sun 足够,取得地址对占位和钱包执行占位,固定 supplier_account_id,仅增加该类型 reserved_sun、创建 DELEGATE 任务并置订单 EXECUTING。任务显式保存 network,意图固定网络、类型、数量、地址、本金、非锁定参数、期限、费用和目标节点。签名前还须核验接收账户可委托条件及同类型地址对基线为零。 diff --git a/docs/rental/single-user-package.md b/docs/rental/single-user-package.md index 9fa4eb9..5f249d3 100644 --- a/docs/rental/single-user-package.md +++ b/docs/rental/single-user-package.md @@ -1,25 +1,9 @@ -# 一人一个当前套餐 +# 当前分类套餐规则 -本说明取代此前“用户多套餐、单默认”的设计。一个 user_id 仅有一个 ACTIVE 当前套餐,所有所属应用共用;历史绑定保留为 DISABLED,不物理删除。default_slot=1 是兼容字段,表示唯一当前套餐,其余绑定为 NULL。原有唯一(user_id,default_slot)继续保护当前槽位。 +此前“一人一个当前套餐”的全局限制已被“每用户 + 网络 + 资源类型一个当前套餐”取代。 -## 页面 +NILE、MAINNET 下的 ENERGY、BANDWIDTH 分别绑定,最多四个当前套餐;相同分类更换套餐才会停用旧绑定。所有应用共用所属用户的分类绑定,历史订单快照和幂等重试保持不变。 -PROXY_ACCOUNT 首页“租赁套餐”及应用页的套餐区统一为单套餐卡片,展示名称、网络、资源类型/数量、租期、冗余和 USDT 单价;不显示用户可选套餐列表。 +完整流程、API兼容规则、字段约束及部署顺序见 [用户分类套餐绑定与下单](user-package-bindings.md)。 -点击立即租赁后填写应用API Key、Secret、接收地址、租期、API基地址及可选回调地址,先获取服务端报价再确认下单,商户单号自动生成;请求失败保留单号供幂等重试。请求固定用户确认时的套餐ID,管理员切换套餐后服务端拒绝旧ID的新单,避免悄悄换价。订单结果在“我的订单”查看。详见[API下单及回调示例](merchant-order-callback-demo.md)。 - -无当前绑定时引导联系管理员,套餐下架时展示不可用提示并禁止下单。API下单通过应用凭证认证,不依赖后台rent:order:create权限。 - -## 管理及部署 - -管理员在租赁套餐页选择系统用户与上架套餐,点击“绑定/更换套餐”;同一事务停用该用户其他绑定并启用新套餐,无需再选择默认项。新旧绑定保留审计,历史订单价格及幂等重试不变。停用当前项后用户没有可下单套餐,不会自动切换历史套餐。 - -旧多套餐数据先备份,在停服维护窗口执行 `sql/rent_user_package_single.sql`:保留原启用默认项;没有默认项时保留最近启用绑定;其他停用。不删除绑定或修改订单。已停用且只有异常默认槽位的数据,应先人工核对。 - -新示例脚本仍创建三个NILE套餐用于管理员分配,但指定 `@rental_user_id` 时只给尚无当前套餐的用户绑定基础65000能量套餐,不同时绑定三个,也不覆盖已有套餐。需要其他套餐时在管理页面更换。 - -应用下单和外部API只允许当前 ACTIVE、default_slot=1、套餐上架的绑定,客户端显式指定历史套餐也不能绕过。GET /rental/package/bindings 仍保留历史元数据供管理复用,用户卡片只显示唯一当前项。 - -## 验证记录 - -后端59项租赁测试通过,前端ESLint、4个Vue模板及CSS解析通过,staging完整构建成功。构建存在其他模块已有的导出缺失及体积警告。本次未执行实际数据库迁移、浏览器登录联调或链上广播。 +已有数据库必须先执行 sql/rent_user_package_scope.sql 再部署新版代码。不能只运行 CREATE TABLE IF NOT EXISTS。sql/rent_user_package_single.sql 已调整为分类收敛,不再按用户全局停用其他分类。 diff --git a/docs/rental/table-functional-flows.md b/docs/rental/table-functional-flows.md index a93b9fc..b1e0b31 100644 --- a/docs/rental/table-functional-flows.md +++ b/docs/rental/table-functional-flows.md @@ -520,9 +520,9 @@ flowchart TD ### 2.17 rent_user_package:系统用户套餐绑定 -系统用户与具体套餐版本多对多绑定。user_id 对应 sys_user,package_id 对应 rent_package;status 控制新单授权,default_slot=1 为用户默认项,其他为 NULL。每用户套餐唯一、每用户默认项唯一。created_by 记录管理员,version 和 UTC 时间用于更新与追溯。 +系统用户与具体套餐版本多对多绑定。user_id 对应 sys_user,package_id 对应 rent_package;network/resource_type 从套餐复制,status 控制新单授权,default_slot=1 为该网络该资源的当前项,其他为 NULL。唯一(user_id,package_id)防重复,唯一(user_id,network,resource_type,default_slot)保证分类唯一。created_by 记录管理员,version 和 UTC 时间用于更新与追溯。 -管理员选用户→绑定已上架套餐→设置默认;应用通过 rent_app.user_id 使用绑定。新单省略套餐时选默认,显式指定时仍校验用户绑定;订单快照保存绑定编号和用户编号。停用不影响历史订单。详见 [绑定与部署说明](user-package-bindings.md)。当前核心表总计17张,前述16张为原基线。 +管理员选用户→绑定已上架套餐→替换同网络同资源的当前项;应用通过 rent_app.user_id 使用绑定。新单必须指定网络和资源类型,禁止提交套餐ID,服务端匹配此分类的当前有效绑定;订单快照保存绑定编号和用户编号。停用不影响历史订单。详见 [绑定与部署说明](user-package-bindings.md)。当前核心表总计17张,前述16张为原基线。 ## 6. 对账与实现注意事项 diff --git a/docs/rental/user-package-bindings.md b/docs/rental/user-package-bindings.md index 3b89299..9ef4ee4 100644 --- a/docs/rental/user-package-bindings.md +++ b/docs/rental/user-package-bindings.md @@ -1,39 +1,56 @@ -# 用户套餐绑定与自动下单 +# 用户分类套餐绑定与下单 -**当前规则已修正为一人一个当前套餐**,以下多套餐描述为上一版设计记录。页面、绑定替换规则、旧数据迁移及示例脚本当前行为,以 [单用户单套餐说明](single-user-package.md) 为准。 +当前规则:一个系统用户在每个“网络 + 资源类型”分类最多一个当前套餐。同一用户最多四个分类:NILE/ENERGY、NILE/BANDWIDTH、MAINNET/ENERGY、MAINNET/BANDWIDTH。所有租赁应用通过 rent_app.user_id 共用绑定。DURATION、PER_ORDER 是计费模式,不增加独立绑定名额;地址上链不需要套餐。 -新增独立表 `rent_user_package`,租赁核心表从16增加为17;按系统用户而非单个应用授权,多个应用共享 `rent_app.user_id` 对应的绑定。 +## 数据与业务流程 -## 部署与引导 +rent_user_package 保存 user_id、package_id、network、resource_type、status、default_slot、created_by、version、created_at、updated_at。network/resource_type 从服务端套餐记录复制,不接受客户端覆盖。唯一键 (user_id,package_id) 防止重复绑定,(user_id,network,resource_type,default_slot) 保护分类唯一。当前项 ACTIVE/default_slot=1,停用和历史项 DISABLED/default_slot=NULL。 -1. 旧库执行 `sql/rent_user_package.sql`,新库使用已包含此表的 `sql/rent_init.sql`。不自动授权存量用户。 -2. 执行 `sql/rent_seed_three_packages.sql` 创建三个可重复执行的 NILE 示例套餐:65000能量/3 USDT、130000能量/5 USDT、1500 bytes带宽/1 USDT,租期均1小时,冗余20%,供应商费率5%。价格仅用于演示。 -3. 管理员在“租赁套餐”页下方“用户套餐绑定”搜索系统用户,再搜索已上架套餐,绑定并勾选一个默认套餐。需要 `rent:package:edit`,普通用户不能自行授权。 -4. 用户应用页查看已绑定套餐;未绑定时显示联系管理员的引导。后台和外部API套餐列表均只返回本人已绑定的上架套餐。 -5. 示例脚本默认只创建套餐;将开头 `@rental_user_id` 从 NULL 改成真实系统用户ID,可同时绑定三个套餐,并在尚无默认项时指定基础能量套餐。重跑不覆盖已有价格、绑定或默认项。 +管理员在“租赁套餐”的用户套餐绑定区选择用户及上架套餐。绑定事务锁定用户和套餐,只停用相同网络及资源类型的其他当前项,写入审计和分类日志。其他分类不变。停用不会自动选择其他历史套餐;下架套餐不能下单。已有绑定记录的套餐不能直接修改网络或资源类型,应新建套餐版本后重新绑定。 -## 表字段与约束 +“我的套餐”切换网络,分别显示能量、带宽卡片及未绑定引导。立即租赁预选所选卡片的网络和资源类型,可在弹窗切换;切换后重置资源数量、租期及报价。请求仅提交network/resource_type,不传套餐ID,先报价,再确认费用创建订单。资金按套餐网络冻结,两个网络余额独立。首页监控也分别显示所选网络的两类套餐状态。 -`id`:主键;`user_id`:系统用户;`package_id`:具体套餐版本;`status`:ACTIVE/DISABLED;`default_slot`:默认为1,其余NULL;`created_by`:配置者;`version`:更新版本;`created_at/updated_at`:UTC。 +## API 选择规则 -唯一(user_id,package_id)避免重复绑定,唯一(user_id,default_slot)保证每用户最多一个默认项。停用默认项会清除默认槽,不自动切换到另一套餐,避免无意改用不同网络/价格。新价格版本必须重新绑定,不自动迁移旧版本。 +POST /api/rental/v1/packages:network 必填,resource_type 可选;只返回本人当前绑定且已上架的套餐,不筛选资源类型时最多两项。不要直接选择返回数组的第一项。 -## 下单规则 +quote 和 create 共用分类解析器: -创建订单仍必须提供应用ID、商户单号、接收地址;`package_id` 可选。 +1. network和resource_type均必填,分别为NILE/MAINNET与ENERGY/BANDWIDTH;服务端从应用归属的user_id解析当前有效绑定。 +2. 请求禁止提交package_id,包括空字符串或NULL;响应中的内部套餐编号只用于查询与审计,不能作为下单入参。 +3. 多候选、未绑定、绑定停用、套餐下架、网络或资源不匹配均明确拒绝,不回退到任意公开套餐。 +4. user_id 来自应用归属,客户端提交不会改变授权。旧客户端必须同步升级为提交network/resource_type并移除package_id。 +5. 原商户单号幂等重试保持原套餐和价格快照;绑定更换或增加其他分类不会重复冻结。重试仍必须提交网络和资源,且必须与原订单一致。 + +分类自动选择示例: ```json -{"app_id":1,"merchant_order_no":"ORDER-001","receiver_address":"有效TRON地址"} +{ + "network": "NILE", + "resource_type": "ENERGY", + "receiver_address": "TXYZopYRdj2D9XRtbG411XZZ3kM5VkAeBf", + "merchant_order_no": "RENT-001" +} ``` -服务端从应用记录读取 user_id,省略套餐时选择该用户唯一 ACTIVE 默认项;显式指定时必须有 ACTIVE 用户绑定,且套餐上架。请求携带 network/resource_type 时必须与套餐匹配。没有默认项或绑定不可用则明确拒绝,不回退到任意公开套餐。客户端提交 user_id 不影响服务端归属。 +实际集成应保留报价使用的network、resource_type、资源数量及租期,并将报价amount以expected_amount提交下单;服务端按当前分类绑定重新计价,价格变化则拒绝。订单内部仍保存package_id及不可变快照;原商户单号重试不会重新匹配新套餐。API调试台支持网络、资源类型筛选,并要求从套餐结果中明确选择。 -订单保存 package_id 和完整不可变 package_snapshot,快照附加 binding_id、binding_user_id。金额、数量、网络、费率均来自服务端套餐。默认项更改或绑定停用后,同一商户订单号的幂等重试仍使用原订单版本,不重复冻结。 +## 部署 -接口:GET /rental/package/users、GET /rental/package/options、GET /rental/package/bindings/{userId}、POST /rental/package/bind(均套餐管理权限);GET /rental/package/bindings(本人查看权限)。绑定写入启用状态及is_default布尔值,不物理删除绑定,保留审计。 +新库执行 sql/rent_init.sql。尚无绑定表的旧库先执行 sql/rent_user_package.sql。**已存在绑定表的数据库,备份并停服后执行 sql/rent_user_package_scope.sql,再部署新版后端及前端。** CREATE TABLE IF NOT EXISTS 无法升级旧表。 + +增量脚本从套餐回填网络、资源类型,先检查孤立引用和分类槽位冲突,再新增分类唯一键并移除 uk_user_default。保留所有历史绑定和订单;不恢复之前已停用的授权。脚本支持重跑,但MySQL DDL隐式提交,发生错误时须修复数据后继续,不能依赖事务回滚全部DDL。执行账户需要建表变更及存储过程权限。 + +sql/rent_user_package_single.sql 已改为按分类收敛,不再全局停用其他分类。一般升级不需执行;仅在人工核对异常 ACTIVE/NULL 数据后按需使用。 + +sql/rent_seed_three_packages.sql 仍创建三个NILE示例套餐。指定 @rental_user_id 时,可分别绑定基础65000能量和1500带宽;不同时绑定两个能量套餐,不覆盖已有同分类当前项、历史绑定或价格。示例价格仅用于演示,不自动授权现有用户。 + +管理接口不变:GET /rental/package/users、GET /rental/package/options、GET /rental/package/bindings/{userId}、POST /rental/package/bind,需要 rent:package:edit;GET /rental/package/bindings 查看本人。is_default 保留兼容,启用即当前分类项,停用清空槽位。 ## 验证 -JDK8 租赁隔离测试59项通过,含默认选择、未授权套餐拒绝、绑定停用、默认切换幂等、客户端user_id不能改变归属,以及三套餐INSERT重复执行和字段有效性。离线DDL与文档测试12项通过,前端ESLint、模板编译和staging构建通过,产物在usdt-ui/dist-rental-package-binding。构建仍有其他页面的3项导出缺失及资源体积警告。 +隔离测试覆盖四分类共存、同分类替换、停用隔离、越权与不匹配拒绝、多候选拒绝、签名API套餐筛选及报价下单一致性、数据库唯一键、并发绑定串行化、原订单重试与首页网络隔离。使用H2真实事务及行锁,不连接生产数据库或TRON。部署前仍需在目标MySQL版本验证迁移,并做真实登录联调。 -未执行实际MySQL建表、套餐/绑定写入或真实登录浏览器验收。脚本三套餐INSERT使用H2做兼容转换隔离验证,不替代实际MySQL部署验收。 +本次验证:JDK8 Rental*Test 共115项通过;8个相关前端文件ESLint、Vue模板及分类交互验证、staging完整构建通过。构建保留其他模块已有的3项API导出缺失及包体积警告,产物位于 usdt-ui/dist-rental-package-scope-preview。未执行实际数据库升级或生产部署。 + +取消套餐ID入参的后续验证:116项Rental*Test、6个相关文件ESLint、分类切换/报价重置/请求不含ID/调试台拒绝旧参数交互检查及最终staging构建通过,保留上述已有构建警告。本次接口调整无新增SQL;前后端及商户调用方应一起升级。 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 cef4bc1..4a185d3 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 @@ -97,14 +97,18 @@ public class RentalApiController { // 类型由路由确定;无需客户端通过通用接口选择转账业务。 data.put("order_type", expectedType); if ("packages".equals(operation)) { + String selectedNetwork = network(input(data, "network", 16)); + String selectedResource = data.containsKey("resource_type") ? resource(input(data, "resource_type", 16)) : null; List> products = store.rows( "SELECT" - + " id,package_code,revision,name,network,resource_type,resource_quantity,duration_seconds,sale_amount" + + " id,package_code,revision,name,network,resource_type,billing_mode,resource_quantity,duration_seconds,sale_amount" + " FROM rent_package p WHERE status='ACTIVE' AND network=?" - + " AND EXISTS(SELECT 1 FROM rent_user_package b WHERE b.package_id=p.id AND b.user_id=? AND b.status='ACTIVE' AND b.default_slot=1) ORDER BY" - + " id", - network(input(data, "network", 16)), number(app, "user_id")); + + " AND EXISTS(SELECT 1 FROM rent_user_package b WHERE b.package_id=p.id AND b.user_id=?" + + " AND b.network=p.network AND b.resource_type=p.resource_type AND b.status='ACTIVE' AND b.default_slot=1)" + + (selectedResource == null ? "" : " AND resource_type=?") + " ORDER BY resource_type,id", + selectedResource == null ? new Object[] {selectedNetwork, number(app, "user_id")} + : new Object[] {selectedNetwork, number(app, "user_id"), selectedResource}); return AjaxResult.success(products); } Map order; @@ -119,24 +123,20 @@ public class RentalApiController { } require(text(data, "order_type").isEmpty() || "RESOURCE_RENTAL".equals(text(data, "order_type")), "不支持的订单类型"); + RentalPackageBindings.requireResourceSelection(data); RentalOrders.address(input(data, "receiver_address", 64)); if (!text(data, "notify_url").trim().isEmpty()) { RentalHttp.checkUrl(text(data, "notify_url").trim()); } - Map product = store.one("SELECT p.* FROM rent_package p" - + " JOIN rent_user_package b ON b.package_id=p.id WHERE b.user_id=?" - + " AND b.status='ACTIVE' AND b.default_slot=1 AND p.status='ACTIVE' AND p.id=?", - number(app, "user_id"), number(data, "package_id")); - require(product != null, "套餐未绑定或已下架"); - RentalOrders.validatePackage(product); + Map product = RentalPackageBindings.resolve(store, number(app, "user_id"), data, false); Map price = RentalPricing.price(product, data); return AjaxResult.success(map("package_id", price.get("id"), "network", price.get("network"), - "billing_mode", price.get("billing_mode"), "requested_resource_quantity", price.get("requested_resource_quantity"), + "resource_type", price.get("resource_type"), "billing_mode", price.get("billing_mode"), "requested_resource_quantity", price.get("requested_resource_quantity"), "duration_seconds", price.get("duration_seconds"), "amount", amount(price, "sale_amount").toPlainString(), "resource_quantity", price.get("resource_quantity"), "currency", "USDT")); } if ("create".equals(operation)) { - order = orders.create(number(app, "id"), number(app, "user_id"), data); + order = orders.createByResource(number(app, "id"), number(app, "user_id"), data); } else { order = store.one( diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalController.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalController.java index 0a4043e..4820a7a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalController.java @@ -224,7 +224,7 @@ public class RentalController { @PostMapping("/order") @PreAuthorize("@ss.hasPermi('rent:order:create')") public AjaxResult order(@RequestBody Map body) { - Map order = orders.create(number(body, "app_id"), user(), body); + Map order = orders.createByResource(number(body, "app_id"), user(), body); return AjaxResult.success( map( "id", diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalDashboard.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalDashboard.java index 6819fcf..924440f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalDashboard.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalDashboard.java @@ -156,9 +156,10 @@ public class RentalDashboard { result.put("webhooks", store.rows("SELECT h.status,COUNT(*) AS total FROM rent_webhook h" + " JOIN rent_order o ON o.id=h.order_id JOIN rent_app a ON a.id=o.app_id" + " WHERE a.user_id=? AND o.network=? GROUP BY h.status", user, network)); - result.put("package", store.one("SELECT p.name,p.network,p.resource_type,p.resource_quantity," + result.put("packages", store.rows("SELECT p.name,p.network,p.resource_type,p.resource_quantity," + "p.status,p.duration_seconds FROM rent_user_package b JOIN rent_package p ON p.id=b.package_id" - + " WHERE b.user_id=? AND b.status='ACTIVE' AND b.default_slot=1", user)); + + " WHERE b.user_id=? AND b.network=? AND b.network=p.network AND b.resource_type=p.resource_type" + + " AND b.status='ACTIVE' AND b.default_slot=1 ORDER BY p.resource_type", user, network)); result.put("refunds", store.one("SELECT COUNT(*) AS pending FROM rent_refund r" + " JOIN rent_order o ON o.id=r.order_id JOIN rent_app a ON a.id=o.app_id" + " WHERE a.user_id=? AND o.network=? AND r.status='PENDING'", user, network)); 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 0bc9507..4a8ef04 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 @@ -38,6 +38,18 @@ public class RentalOrders { } } + /** + * HTTP下单统一入口:资源订单必须指定网络和资源类型,套餐ID仅由服务端解析并落库。 + * 地址上链仍复用原独立规则。原商户单号重试由create保留原套餐快照,不重新匹配新绑定。 + */ + @Transactional(rollbackFor = Exception.class) + public Map createByResource(long appId, long user, Map request) { + if (!RentalOnchain.isOrder(request)) { + RentalPackageBindings.requireResourceSelection(request); + } + return create(appId, user, request); + } + @Transactional(rollbackFor = Exception.class) public Map create(long appId, long user, Map request) { // 锁应用行使同应用幂等竞争顺序化;不能仅依靠先查后插。 @@ -64,10 +76,7 @@ public class RentalOrders { // 默认套餐变更后,幂等重试仍关联原订单版本,不重新扣款。 packageId = number(existing, "package_id"); } else { - Map binding = store.one("SELECT package_id FROM rent_user_package" - + " WHERE user_id=? AND status='ACTIVE' AND default_slot=1", number(app, "user_id")); - require(binding != null, "该应用所属用户尚未设置默认套餐,请联系管理员绑定,或选择已绑定套餐"); - packageId = number(binding, "package_id"); + packageId = number(RentalPackageBindings.resolve(store, number(app, "user_id"), request, false), "id"); } String notify = text(request, "notify_url").trim(); if (notify.isEmpty()) { @@ -96,25 +105,13 @@ public class RentalOrders { } if (existing != null) { require(hash.equals(text(existing, "request_hash")), "同一商户订单号参数不一致"); + require(!request.containsKey("network") || text(existing, "network").equals(text(request, "network")), "原订单网络与请求不符"); + require(!request.containsKey("resource_type") || text(existing, "resource_type").equals(text(request, "resource_type")), "原订单资源类型与请求不符"); return existing; } - Map product = store.get("package", packageId, true); - validatePackage(product); - require("ACTIVE".equals(text(product, "status")), "套餐未上架"); - Map binding = store.one("SELECT * FROM rent_user_package" - + " WHERE user_id=? AND package_id=? AND status='ACTIVE' AND default_slot=1 FOR UPDATE", - number(app, "user_id"), packageId); - require(binding != null, "该套餐未绑定到应用所属用户或绑定已停用"); - if (request.containsKey("network")) { - require(text(product, "network").equals(text(request, "network")), "套餐网络与请求不符"); - } - product.put("binding_id", binding.get("id")); - product.put("binding_user_id", app.get("user_id")); - if (request.containsKey("resource_type")) { - require( - text(product, "resource_type").equals(text(request, "resource_type")), - "资源类型与套餐不符"); - } + Map selection = new java.util.LinkedHashMap<>(request); + selection.put("package_id", packageId); + Map product = RentalPackageBindings.resolve(store, number(app, "user_id"), selection, true); product = RentalPricing.price(product, request); if (request.containsKey("expected_amount")) { require(amount(product, "sale_amount").compareTo(amount(request, "expected_amount")) == 0, diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalPackageBindings.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalPackageBindings.java index ea73211..0a98fb6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalPackageBindings.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalPackageBindings.java @@ -4,11 +4,13 @@ import static com.ruoyi.system.rental.RentalValues.*; import java.util.List; import java.util.Map; +import java.util.ArrayList; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; /** 用户级套餐授权;客户端不能通过更换 app_id、user_id 或 package_id 越权购买。 */ @Service +@lombok.extern.slf4j.Slf4j public class RentalPackageBindings { private final RentalStore store; @@ -16,7 +18,14 @@ public class RentalPackageBindings { this.store = store; } - /** 管理员先选系统用户,再配置绑定;锁用户行使同用户默认套餐切换串行化。 */ + /** 外部报价/下单只按分类选套餐,禁止客户端用内部套餐编号绕过当前绑定。 */ + public static void requireResourceSelection(Map request) { + require(!request.containsKey("package_id"), "不再支持package_id,请提交network和resource_type"); + network(input(request, "network", 16)); + resource(input(request, "resource_type", 16)); + } + + /** 锁定系统用户,使同用户绑定切换串行;只有同网络同资源类型的旧绑定会被停用。 */ @Transactional(rollbackFor = Exception.class) public void bind(long userId, long packageId, boolean enabled, boolean makeDefault, long actor) { require(store.one("SELECT user_id FROM sys_user WHERE user_id=? AND del_flag='0' AND status='0' FOR UPDATE", userId) != null, @@ -26,14 +35,17 @@ public class RentalPackageBindings { require("ACTIVE".equals(text(product, "status")), "请先审核上架套餐再绑定用户"); RentalOrders.validatePackage(product); } - // 一人仅一个当前套餐,切换时停用其他绑定,历史记录继续保留。 + String network = network(text(product, "network")); + String resourceType = resource(text(product, "resource_type")); + // 分类由可信套餐确定,不接受请求覆盖;不同网络/资源类型互不替换。 if (enabled) { - store.execute("UPDATE rent_user_package SET status='DISABLED',default_slot=NULL,version=version+1,updated_at=? WHERE user_id=? AND package_id<>?", - now(), userId, packageId); + store.execute("UPDATE rent_user_package SET status='DISABLED',default_slot=NULL,version=version+1,updated_at=?" + + " WHERE user_id=? AND network=? AND resource_type=? AND package_id<>? AND (status='ACTIVE' OR default_slot IS NOT NULL)", + now(), userId, network, resourceType, packageId); } Map existing = store.one("SELECT * FROM rent_user_package WHERE user_id=? AND package_id=? FOR UPDATE", userId, packageId); Map values = map("status", enabled ? "ACTIVE" : "DISABLED", - "default_slot", enabled ? 1 : null); + "default_slot", enabled ? 1 : null, "network", network, "resource_type", resourceType); if (existing == null) { values.put("user_id", userId); values.put("package_id", packageId); @@ -43,14 +55,54 @@ public class RentalPackageBindings { store.update("user_package", number(existing, "id"), values); } store.event("PACKAGE", packageId, "BIND_USER", actor, - "用户ID=" + userId + ",状态=" + values.get("status") + ",一人一个当前套餐"); + "用户ID=" + userId + ",网络=" + network + ",资源=" + resourceType + ",状态=" + values.get("status")); + log.info("用户分类套餐绑定完成 userId={} packageId={} network={} resourceType={} enabled={} actorId={}", + userId, packageId, network, resourceType, enabled, actor); } /** 显式安全列,供本人/管理员页面查看,不返回成本或供应商利润。 */ public List> list(long userId) { return store.rows("SELECT b.id AS binding_id,b.user_id,b.package_id,b.status AS binding_status,b.default_slot," - + "p.name,p.revision,p.network,p.resource_type,p.resource_quantity,p.redundancy_percent,p.duration_seconds,p.sale_amount,p.status" + + "p.name,p.revision,b.network,b.resource_type,p.billing_mode,p.resource_quantity,p.redundancy_percent,p.duration_seconds,p.sale_amount,p.status" + " FROM rent_user_package b JOIN rent_package p ON p.id=b.package_id" - + " WHERE b.user_id=? ORDER BY b.default_slot DESC,b.id DESC", userId); + + " WHERE b.user_id=? ORDER BY b.network,b.resource_type,b.default_slot DESC,b.id DESC", userId); + } + + /** + * 报价与下单共用分类解析。显式ID必须为本人有效绑定;省略ID时按可选网络/资源过滤, + * 只有唯一候选才允许旧客户端继续调用,禁止静默取第一条。调用方下单事务使用lock=true。 + */ + public static Map resolve(RentalStore store, long user, Map request, boolean lock) { + StringBuilder sql = new StringBuilder("SELECT p.* FROM rent_package p JOIN rent_user_package b ON b.package_id=p.id" + + " AND b.network=p.network AND b.resource_type=p.resource_type WHERE b.user_id=?" + + " AND b.status='ACTIVE' AND b.default_slot=1 AND p.status='ACTIVE'"); + List args = new ArrayList<>(); + args.add(user); + if (request.containsKey("package_id") && !text(request, "package_id").isEmpty()) { + sql.append(" AND p.id=?"); args.add(number(request, "package_id")); + } + if (request.containsKey("network")) { + sql.append(" AND p.network=?"); args.add(network(input(request, "network", 16))); + } + if (request.containsKey("resource_type")) { + sql.append(" AND p.resource_type=?"); args.add(resource(input(request, "resource_type", 16))); + } + List> candidates = store.rows(sql.append(" ORDER BY p.id").toString(), args.toArray()); + require(!candidates.isEmpty(), "未找到当前分类有效绑定的套餐,请核对套餐ID、网络与资源类型"); + require(candidates.size() == 1, "存在多个可用套餐,请指定package_id,或补充network和resource_type"); + Map product = candidates.get(0); + if (lock) { product = store.get("package", number(product, "id"), true); } + require("ACTIVE".equals(text(product, "status")), "套餐已下架"); + require(!request.containsKey("network") || network(input(request, "network", 16)).equals(text(product, "network")), "套餐网络已变更,请重新报价"); + require(!request.containsKey("resource_type") || resource(input(request, "resource_type", 16)).equals(text(product, "resource_type")), "套餐资源类型已变更,请重新报价"); + Map binding = store.one("SELECT * FROM rent_user_package WHERE user_id=? AND package_id=?" + + " AND network=? AND resource_type=? AND status='ACTIVE' AND default_slot=1" + (lock ? " FOR UPDATE" : ""), + user, product.get("id"), product.get("network"), product.get("resource_type")); + require(binding != null, "套餐绑定已变更,请重新选择并报价"); + RentalOrders.validatePackage(product); + product.put("binding_id", binding.get("id")); product.put("binding_user_id", user); + log.debug("分类套餐解析成功 userId={} packageId={} network={} resourceType={} lock={}", + user, product.get("id"), product.get("network"), product.get("resource_type"), lock); + return product; } } 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 abf021a..166c407 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 @@ -27,7 +27,7 @@ public class RentalQueries { where = "r.user_id=?"; break; case "package": - where = "r.status='ACTIVE' AND EXISTS(SELECT 1 FROM rent_user_package b WHERE b.package_id=r.id AND b.user_id=? AND b.status='ACTIVE' AND b.default_slot=1)"; + where = "r.status='ACTIVE' AND EXISTS(SELECT 1 FROM rent_user_package b WHERE b.package_id=r.id AND b.user_id=? AND b.network=r.network AND b.resource_type=r.resource_type AND b.status='ACTIVE' AND b.default_slot=1)"; break; case "wallet": where = diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RentPackageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RentPackageServiceImpl.java index 489e1d3..cde7a8e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RentPackageServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RentPackageServiceImpl.java @@ -178,8 +178,19 @@ public class RentPackageServiceImpl extends ServiceImpl current = jdbcTemplate.queryForMap( + "SELECT network,resource_type FROM rent_package WHERE id=? FOR UPDATE", rentPackage.getId()); + boolean scopeChanged = rentPackage.getNetwork() != null && !rentPackage.getNetwork().equals(current.get("network")) + || rentPackage.getResourceType() != null && !rentPackage.getResourceType().equals(current.get("resource_type")); + if (scopeChanged && jdbcTemplate.queryForObject( + "SELECT COUNT(*) FROM rent_user_package WHERE package_id=?", Long.class, rentPackage.getId()) > 0L) + { + throw new IllegalArgumentException("已有绑定记录的套餐不能修改网络或资源类型,请创建新套餐版本"); + } rentPackage.setUpdatedAt(DateUtils.getNowDate()); return rentPackageMapper.updateRentPackage(rentPackage); } 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 bb8fe17..7ca666c 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 @@ -173,6 +173,168 @@ public class RentalBusinessTest { map("merchant_order_no", "AUTO-2", "receiver_address", ADDRESS))), "id")); } + /** 四个分类独立共存、精确选取和幂等重试;同分类替换不影响其他三类。 */ + @Test + public void networkAndResourceBindingsAreIndependent() throws Exception { + store.execute("CREATE TABLE sys_user(user_id BIGINT PRIMARY KEY,status CHAR(1),del_flag CHAR(1))"); + store.execute("INSERT INTO sys_user VALUES(10,'0','0')"); + RentalPackageBindings bindings = new RentalPackageBindings(store); + Map retry = map("merchant_order_no", "SCOPE-ORIGINAL", "receiver_address", ADDRESS); + Map original = tx.execute(status -> orders.create(app, 10, retry)); + long bandwidth = scopedProduct("NILE", "BANDWIDTH", "SCOPE-NB"); + long mainEnergy = scopedProduct("MAINNET", "ENERGY", "SCOPE-ME"); + long mainBandwidth = scopedProduct("MAINNET", "BANDWIDTH", "SCOPE-MB"); + for (long id : new long[] {bandwidth, mainEnergy, mainBandwidth}) { + tx.execute(status -> { bindings.bind(10, id, true, true, 99); return null; }); + } + assertEquals(4, store.rows("SELECT id FROM rent_user_package WHERE user_id=10 AND default_slot=1").size()); + RentalDashboard dashboard = new RentalDashboard(store); + assertEquals(2, ((List) dashboard.overview(10, "account", "NILE", 7).get("packages")).size()); + assertEquals(2, ((List) dashboard.overview(10, "account", "MAINNET", 7).get("packages")).size()); + assertTrue(((List) dashboard.overview(20, "account", "NILE", 7).get("packages")).isEmpty()); + assertEquals(mainEnergy, number(RentalPackageBindings.resolve(store, 10, + map("network", "MAINNET", "resource_type", "ENERGY"), false), "id")); + assertEquals(bandwidth, number(RentalPackageBindings.resolve(store, 10, + map("package_id", bandwidth, "network", "NILE", "resource_type", "BANDWIDTH"), false), "id")); + expectFailure(() -> RentalPackageBindings.resolve(store, 10, map(), false)); + expectFailure(() -> RentalPackageBindings.resolve(store, 10, map("network", "NILE"), false)); + expectFailure(() -> RentalPackageBindings.resolve(store, 10, map("package_id", product, "network", "MAINNET"), false)); + expectFailure(() -> RentalPackageBindings.resolve(store, 20, map("package_id", product), false)); + expectFailure(() -> tx.execute(status -> orders.create(app, 10, + map("merchant_order_no", "AMBIGUOUS", "receiver_address", ADDRESS)))); + Map scoped = tx.execute(status -> orders.create(app, 10, + map("network", "NILE", "resource_type", "BANDWIDTH", "merchant_order_no", "SCOPED", "receiver_address", ADDRESS))); + assertEquals(bandwidth, number(scoped, "package_id")); + long replacement = scopedProduct("NILE", "ENERGY", "SCOPE-NEW"); + tx.execute(status -> { bindings.bind(10, replacement, true, true, 99); return null; }); + assertEquals(4, store.rows("SELECT id FROM rent_user_package WHERE user_id=10 AND default_slot=1").size()); + assertEquals(number(original, "id"), number(tx.execute(status -> orders.create(app, 10, retry)), "id")); + expectFailure(() -> tx.execute(status -> orders.create(app, 10, + map("merchant_order_no", "SCOPE-ORIGINAL", "receiver_address", ADDRESS, "network", "MAINNET")))); + tx.execute(status -> { bindings.bind(10, replacement, false, false, 99); return null; }); + expectFailure(() -> RentalPackageBindings.resolve(store, 10, map("network", "NILE", "resource_type", "ENERGY"), false)); + assertEquals(bandwidth, number(RentalPackageBindings.resolve(store, 10, map("network", "NILE"), false), "id")); + } + + /** 签名API按分类筛选,报价与实际下单使用完全相同的选择规则。 */ + @Test + @SuppressWarnings("unchecked") + public void scopedMerchantPackagesQuoteAndCreateAgree() throws Exception { + long bandwidth = scopedProduct("NILE", "BANDWIDTH", "API-BANDWIDTH"); + store.insert("user_package", map("user_id", 10, "package_id", bandwidth, "network", "NILE", + "resource_type", "BANDWIDTH", "status", "ACTIVE", "default_slot", 1, "created_by", 99)); + Map credential = tx.execute(status -> identity.issue("APP", app, 10)); + String key = text(credential, "api_key"), secret = text(credential, "api_secret"); + RentalApiController api = new RentalApiController(identity, store, orders, json); + List> products = (List>) api.execute("packages", + signedRequest("/api/rental/v1/packages", "{\"network\":\"NILE\"}", key, secret, "API")).get("data"); + assertEquals(2, products.size()); + List> filtered = (List>) api.execute("packages", + signedRequest("/api/rental/v1/packages", "{\"network\":\"NILE\",\"resource_type\":\"BANDWIDTH\"}", key, secret, "API")).get("data"); + assertEquals(1, filtered.size()); + assertEquals(bandwidth, number(filtered.get(0), "id")); + Map request = map("network", "NILE", "resource_type", "BANDWIDTH", + "receiver_address", ADDRESS, "merchant_order_no", "API-SCOPE"); + Map quote = (Map) api.execute("quote", + signedRequest("/api/rental/v1/quote", json.writeValueAsString(request), key, secret, "API")).get("data"); + assertEquals(bandwidth, number(quote, "package_id")); + assertEquals("BANDWIDTH", text(quote, "resource_type")); + request.put("expected_amount", quote.get("amount")); + Map order = tx.execute(status -> orders.create(app, 10, request)); + assertEquals(bandwidth, number(order, "package_id")); + assertEquals(amount(quote, "amount"), amount(order, "sale_amount")); + request.remove("resource_type"); + expectFailure(() -> { try { api.execute("quote", signedRequest("/api/rental/v1/quote", + json.writeValueAsString(request), key, secret, "API")); } catch (Exception ex) { throw new IllegalArgumentException(ex); } }); + } + + /** 对外请求禁止套餐ID,分类均必填;更换绑定后原单仍按历史快照幂等。 */ + @Test + public void resourceOnlyEntryRejectsPackageIdsAndRequiresBothSelectors() throws Exception { + Map credential = tx.execute(status -> identity.issue("APP", app, 10)); + String key = text(credential, "api_key"), secret = text(credential, "api_secret"); + RentalApiController api = new RentalApiController(identity, store, orders, json); + Map valid = map("network", "NILE", "resource_type", "ENERGY", + "receiver_address", ADDRESS, "merchant_order_no", "RESOURCE-ONLY"); + List> invalidRequests = new ArrayList<>(); + for (String missing : Arrays.asList("network", "resource_type")) { + Map invalid = new LinkedHashMap<>(valid); + invalid.remove(missing); invalidRequests.add(invalid); + } + for (Object id : Arrays.asList(product, "", "99999")) { + Map invalid = new LinkedHashMap<>(valid); + invalid.put("package_id", id); invalidRequests.add(invalid); + } + Map unknown = new LinkedHashMap<>(valid); + unknown.put("resource_type", "BANDWIDTH"); invalidRequests.add(unknown); + for (Map invalid : invalidRequests) { + expectFailure(() -> tx.execute(status -> orders.createByResource(app, 10, invalid))); + for (String operation : Arrays.asList("quote", "create")) { + expectFailure(() -> { + try { + tx.execute(status -> { + try { + return api.execute(operation, signedRequest("/api/rental/v1/" + operation, + json.writeValueAsString(invalid), key, secret, "API")); + } catch (Exception ex) { throw new IllegalArgumentException(ex); } + }); + } catch (Exception ex) { throw new IllegalArgumentException(ex); } + }); + } + } + assertEquals(0, store.rows("SELECT id FROM rent_order").size()); + assertEquals(money("100"), amount(store.get("account", payer, false), "available_amount")); + Map original = tx.execute(status -> orders.createByResource(app, 10, valid)); + store.execute("CREATE TABLE sys_user(user_id BIGINT PRIMARY KEY,status CHAR(1),del_flag CHAR(1))"); + store.execute("INSERT INTO sys_user VALUES(10,'0','0')"); + long replacement = scopedProduct("NILE", "ENERGY", "REPLACED-RESOURCE-ONLY"); + tx.execute(status -> { new RentalPackageBindings(store).bind(10, replacement, true, true, 99); return null; }); + Map retried = tx.execute(status -> orders.createByResource(app, 10, valid)); + assertEquals(number(original, "id"), number(retried, "id")); + assertEquals(product, number(retried, "package_id")); + assertEquals(money("90"), amount(store.get("account", payer, false), "available_amount")); + Map changed = new LinkedHashMap<>(valid); + changed.put("network", "MAINNET"); + expectFailure(() -> tx.execute(status -> orders.createByResource(app, 10, changed))); + changed.put("network", "NILE"); changed.put("resource_type", "BANDWIDTH"); + expectFailure(() -> tx.execute(status -> orders.createByResource(app, 10, changed))); + } + + /** 数据库分类唯一键为并发与绕过服务写入提供最后一道保护。 */ + @Test + public void scopedBindingUniquenessAndConcurrentReplacement() throws Exception { + store.execute("CREATE TABLE sys_user(user_id BIGINT PRIMARY KEY,status CHAR(1),del_flag CHAR(1))"); + store.execute("INSERT INTO sys_user VALUES(10,'0','0')"); + long first = scopedProduct("NILE", "ENERGY", "CONCURRENT-1"); + long second = scopedProduct("NILE", "ENERGY", "CONCURRENT-2"); + try { + store.insert("user_package", map("user_id", 10, "package_id", first, "network", "NILE", + "resource_type", "ENERGY", "status", "ACTIVE", "default_slot", 1, "created_by", 99)); + fail("same scope must be unique"); + } catch (org.springframework.dao.DuplicateKeyException expected) { /* 唯一键按预期拒绝。 */ } + RentalPackageBindings bindings = new RentalPackageBindings(store); + ExecutorService executor = Executors.newFixedThreadPool(2); + CountDownLatch start = new CountDownLatch(1); + try { + List> futures = new ArrayList<>(); + for (long id : new long[] {first, second}) { + futures.add(executor.submit(() -> { + try { start.await(); } catch (InterruptedException ex) { Thread.currentThread().interrupt(); throw new IllegalStateException(ex); } + tx.execute(status -> { bindings.bind(10, id, true, true, 99); return null; }); + })); + } + start.countDown(); + for (Future future : futures) { future.get(15, TimeUnit.SECONDS); } + assertEquals(1, store.rows("SELECT id FROM rent_user_package WHERE user_id=10 AND default_slot=1").size()); + } finally { executor.shutdownNow(); } + } + + private long scopedProduct(String network, String resourceType, String code) { + Map copy = new LinkedHashMap<>(store.get("package", product, false)); + copy.remove("id"); copy.put("network", network); copy.put("resource_type", resourceType); copy.put("package_code", code); + return store.insert("package", copy); + } + /** 直接验证交付脚本中的三套餐INSERT及重复执行,不连接真实MySQL。 */ @Test public void seedScriptCreatesThreeValidPackagesIdempotently() throws Exception { @@ -327,7 +489,7 @@ public class RentalBusinessTest { "{}", "status", "ACTIVE")); - store.insert("user_package", map("user_id", 10, "package_id", product, "status", "ACTIVE", "default_slot", 1, "created_by", 99)); + store.insert("user_package", map("user_id", 10, "package_id", product, "network", "NILE", "resource_type", "ENERGY", "status", "ACTIVE", "default_slot", 1, "created_by", 99)); wallet = store.insert( "wallet", @@ -596,7 +758,7 @@ public class RentalBusinessTest { Map credential = tx.execute(status -> identity.issue("APP", app, 10)); String key = text(credential, "api_key"), secret = text(credential, "api_secret"); RentalApiController controller = new RentalApiController(identity, store, orders, json); - Map data = map("package_id", product, "merchant_order_no", "API-RENT", + Map data = map("network", "NILE", "resource_type", "ENERGY", "merchant_order_no", "API-RENT", "duration_seconds", 7200, "receiver_address", ADDRESS); Map quote = (Map) controller.execute("quote", signedRequest("/api/rental/v1/quote", json.writeValueAsString(data), key, secret, "API")).get("data"); @@ -1387,7 +1549,7 @@ public class RentalBusinessTest { "status", "ACTIVE")); store.execute("UPDATE rent_user_package SET status='DISABLED',default_slot=NULL WHERE user_id=10"); - store.insert("user_package", map("user_id", 10, "package_id", bandwidth, "status", "ACTIVE", "default_slot", 1, "created_by", 99)); + store.insert("user_package", map("user_id", 10, "package_id", bandwidth, "network", "NILE", "resource_type", "BANDWIDTH", "status", "ACTIVE", "default_slot", 1, "created_by", 99)); Map order = tx.execute( status -> diff --git a/sql/rent_init.sql b/sql/rent_init.sql index d1d3a65..ce5bccf 100644 --- a/sql/rent_init.sql +++ b/sql/rent_init.sql @@ -169,20 +169,22 @@ CREATE TABLE IF NOT EXISTS `rent_package` ( KEY `idx_package_sale` (`network`,`resource_type`,`status`) ) ENGINE=InnoDB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='能量或带宽固定套餐及价格版本;套餐代码的资源类型不可改变'; --- 系统用户与套餐版本绑定:每用户一个当前套餐,历史绑定停用保留。 +-- 系统用户与套餐版本绑定:每用户+网络+资源类型一个当前套餐,历史绑定停用保留。 CREATE TABLE IF NOT EXISTS `rent_user_package` ( `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '绑定记录ID', `user_id` BIGINT NOT NULL COMMENT 'sys_user.user_id,应用按所属用户共用绑定', `package_id` BIGINT NOT NULL COMMENT 'rent_package.id,绑定具体不可变版本', `status` VARCHAR(32) NOT NULL DEFAULT 'ACTIVE' COMMENT 'ACTIVE可下单、DISABLED停用', - `default_slot` TINYINT NULL COMMENT '当前套餐取1,历史绑定NULL;每用户最多一个当前套餐', + `network` VARCHAR(16) NOT NULL COMMENT '套餐网络NILE/MAINNET', + `resource_type` VARCHAR(16) NOT NULL COMMENT '套餐资源ENERGY/BANDWIDTH', + `default_slot` TINYINT NULL COMMENT '当前分类套餐取1,历史绑定NULL', `created_by` BIGINT NOT NULL COMMENT '配置管理员sys_user.user_id', `version` BIGINT NOT NULL DEFAULT 0 COMMENT '乐观锁版本', `created_at` DATETIME(3) NOT NULL COMMENT '创建UTC时间', `updated_at` DATETIME(3) NOT NULL COMMENT '更新UTC时间', PRIMARY KEY (`id`), UNIQUE KEY `uk_user_package` (`user_id`,`package_id`), - UNIQUE KEY `uk_user_default` (`user_id`,`default_slot`), + UNIQUE KEY `uk_user_scope_default` (`user_id`,`network`,`resource_type`,`default_slot`), KEY `idx_user_package_active` (`user_id`,`status`), KEY `idx_package_binding` (`package_id`,`status`) ) ENGINE=InnoDB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='系统用户与租赁套餐绑定;默认取1,其余NULL'; diff --git a/sql/rent_seed_three_packages.sql b/sql/rent_seed_three_packages.sql index a6cbae1..09428a2 100644 --- a/sql/rent_seed_three_packages.sql +++ b/sql/rent_seed_three_packages.sql @@ -1,6 +1,6 @@ --- 先执行 rent_init.sql(新库)或 rent_user_package.sql(旧库)。 +-- 新库先执行rent_init.sql;已有绑定表的旧库先执行rent_user_package_scope.sql。 -- 三个 NILE 示例套餐,价格仅为示例,正式使用前确认运营定价。 --- 如需绑定基础能量套餐,将 NULL 改为真实 sys_user.user_id;一个用户只绑定一个当前套餐。 +-- 如需绑定基础能量及带宽套餐,将NULL改为真实user_id;不覆盖已有同网络同资源套餐。 SET @rental_user_id = NULL; -- 改为执行绑定配置的管理员ID,仅记录配置来源。 SET @rental_operator_id = 1; @@ -13,18 +13,13 @@ FROM ( UNION ALL SELECT 'DEMO_BANDWIDTH_1500','带宽套餐 1500 bytes / 1小时','BANDWIDTH',1500,1.000000,0.800000 ) s WHERE NOT EXISTS(SELECT 1 FROM rent_package p WHERE p.package_code=s.code AND p.revision=1); --- 重跑不改价格,不覆盖已有套餐;只给尚无当前套餐的指定用户绑定基础能量套餐。 -INSERT INTO rent_user_package(user_id,package_id,status,default_slot,created_by,version,created_at,updated_at) -SELECT u.user_id,p.id,'ACTIVE',NULL,@rental_operator_id,0,UTC_TIMESTAMP(3),UTC_TIMESTAMP(3) -FROM sys_user u JOIN rent_package p ON p.package_code='DEMO_ENERGY_65K' AND p.revision=1 AND p.status='ACTIVE' +-- 重跑不改价格;每个分类只在尚无当前绑定时插入。 +INSERT INTO rent_user_package(user_id,package_id,network,resource_type,status,default_slot,created_by,version,created_at,updated_at) +SELECT u.user_id,p.id,p.network,p.resource_type,'ACTIVE',1,@rental_operator_id,0,UTC_TIMESTAMP(3),UTC_TIMESTAMP(3) +FROM sys_user u JOIN rent_package p ON p.package_code IN ('DEMO_ENERGY_65K','DEMO_BANDWIDTH_1500') AND p.revision=1 AND p.status='ACTIVE' WHERE u.user_id=@rental_user_id AND u.status='0' AND u.del_flag='0' AND NOT EXISTS(SELECT 1 FROM rent_user_package b WHERE b.user_id=u.user_id AND b.package_id=p.id) -AND NOT EXISTS(SELECT 1 FROM rent_user_package b WHERE b.user_id=u.user_id AND b.status='ACTIVE'); --- 当前已有套餐的用户不执行上述绑定:以下默认更新也不会覆盖已有默认项。 -SET @rental_has_default=(SELECT COUNT(*) FROM rent_user_package WHERE user_id=@rental_user_id AND default_slot=1); -UPDATE rent_user_package b JOIN rent_package p ON p.id=b.package_id -SET b.default_slot=1,b.version=b.version+1,b.updated_at=UTC_TIMESTAMP(3) -WHERE b.user_id=@rental_user_id AND b.status='ACTIVE' AND p.package_code='DEMO_ENERGY_65K' AND p.revision=1 AND @rental_has_default=0; +AND NOT EXISTS(SELECT 1 FROM rent_user_package b WHERE b.user_id=u.user_id AND b.network=p.network AND b.resource_type=p.resource_type AND b.default_slot=1); COMMIT; SELECT id,package_code,name,network,resource_type,resource_quantity,sale_amount,status FROM rent_package WHERE package_code IN ('DEMO_ENERGY_65K','DEMO_ENERGY_130K','DEMO_BANDWIDTH_1500') AND revision=1; diff --git a/sql/rent_user_package.sql b/sql/rent_user_package.sql index 3b4eae3..7acf8be 100644 --- a/sql/rent_user_package.sql +++ b/sql/rent_user_package.sql @@ -4,14 +4,16 @@ CREATE TABLE IF NOT EXISTS `rent_user_package` ( `user_id` BIGINT NOT NULL COMMENT 'sys_user.user_id,应用按所属用户共用绑定', `package_id` BIGINT NOT NULL COMMENT 'rent_package.id,绑定具体不可变版本', `status` VARCHAR(32) NOT NULL DEFAULT 'ACTIVE' COMMENT 'ACTIVE可下单、DISABLED停用', - `default_slot` TINYINT NULL COMMENT '当前套餐取1,历史绑定NULL;每用户最多一个当前套餐', + `network` VARCHAR(16) NOT NULL COMMENT '套餐网络NILE/MAINNET', + `resource_type` VARCHAR(16) NOT NULL COMMENT '套餐资源ENERGY/BANDWIDTH', + `default_slot` TINYINT NULL COMMENT '当前分类套餐取1,历史绑定NULL', `created_by` BIGINT NOT NULL COMMENT '配置管理员sys_user.user_id', `version` BIGINT NOT NULL DEFAULT 0 COMMENT '乐观锁版本', `created_at` DATETIME(3) NOT NULL COMMENT '创建UTC时间', `updated_at` DATETIME(3) NOT NULL COMMENT '更新UTC时间', PRIMARY KEY (`id`), UNIQUE KEY `uk_user_package` (`user_id`,`package_id`), - UNIQUE KEY `uk_user_default` (`user_id`,`default_slot`), + UNIQUE KEY `uk_user_scope_default` (`user_id`,`network`,`resource_type`,`default_slot`), KEY `idx_user_package_active` (`user_id`,`status`), KEY `idx_package_binding` (`package_id`,`status`) ) ENGINE=InnoDB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='系统用户与租赁套餐绑定;默认取1,其余NULL'; diff --git a/sql/rent_user_package_scope.sql b/sql/rent_user_package_scope.sql new file mode 100644 index 0000000..b90161c --- /dev/null +++ b/sql/rent_user_package_scope.sql @@ -0,0 +1,36 @@ +-- 已有数据库升级。停服并备份后执行;先于新版代码部署。新库直接执行rent_init.sql。 +-- 不恢复已停用绑定,不改变历史订单。DDL隐式提交,失败后修复数据可重跑。 +DELIMITER $$ +DROP PROCEDURE IF EXISTS upgrade_rent_package_scope$$ +CREATE PROCEDURE upgrade_rent_package_scope() +BEGIN + IF EXISTS (SELECT 1 FROM rent_user_package b LEFT JOIN rent_package p ON p.id=b.package_id + WHERE p.id IS NULL OR p.network NOT IN ('NILE','MAINNET') OR p.resource_type NOT IN ('ENERGY','BANDWIDTH')) THEN + SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='Invalid/orphan package bindings; repair before upgrading'; + END IF; + IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='rent_user_package' AND column_name='network') THEN + ALTER TABLE rent_user_package ADD COLUMN network VARCHAR(16) NULL COMMENT '套餐网络NILE/MAINNET'; + END IF; + IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='rent_user_package' AND column_name='resource_type') THEN + ALTER TABLE rent_user_package ADD COLUMN resource_type VARCHAR(16) NULL COMMENT '套餐资源ENERGY/BANDWIDTH'; + END IF; + UPDATE rent_user_package b JOIN rent_package p ON p.id=b.package_id + SET b.network=p.network,b.resource_type=p.resource_type; + IF EXISTS (SELECT 1 FROM rent_user_package WHERE default_slot=1 + GROUP BY user_id,network,resource_type HAVING COUNT(*)>1) THEN + SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='Conflicting current bindings; repair before upgrading'; + END IF; + ALTER TABLE rent_user_package MODIFY network VARCHAR(16) NOT NULL COMMENT '套餐网络NILE/MAINNET', + MODIFY resource_type VARCHAR(16) NOT NULL COMMENT '套餐资源ENERGY/BANDWIDTH', + MODIFY default_slot TINYINT NULL COMMENT '当前分类套餐取1,历史绑定NULL'; + -- 先建立分类唯一约束,再解除旧全局唯一约束,避免无约束窗口。 + IF NOT EXISTS (SELECT 1 FROM information_schema.statistics WHERE table_schema=DATABASE() AND table_name='rent_user_package' AND index_name='uk_user_scope_default') THEN + ALTER TABLE rent_user_package ADD UNIQUE KEY uk_user_scope_default(user_id,network,resource_type,default_slot); + END IF; + IF EXISTS (SELECT 1 FROM information_schema.statistics WHERE table_schema=DATABASE() AND table_name='rent_user_package' AND index_name='uk_user_default') THEN + ALTER TABLE rent_user_package DROP INDEX uk_user_default; + END IF; +END$$ +CALL upgrade_rent_package_scope()$$ +DROP PROCEDURE upgrade_rent_package_scope$$ +DELIMITER ; diff --git a/sql/rent_user_package_single.sql b/sql/rent_user_package_single.sql index 5535f33..d6debd6 100644 --- a/sql/rent_user_package_single.sql +++ b/sql/rent_user_package_single.sql @@ -1,10 +1,10 @@ --- 旧多套餐绑定收敛:保留启用默认项,无默认项时保留最近绑定,其余停用;不删除历史。 +-- 分类收敛:先执行 rent_user_package_scope.sql;每用户+网络+资源保留一个,不删除历史。 -- 停服维护窗口执行,执行前备份 rent_user_package。可重复执行。 START TRANSACTION; CREATE TEMPORARY TABLE rent_user_package_keep AS -SELECT user_id,COALESCE(MAX(CASE WHEN default_slot=1 THEN id END),MAX(id)) AS keep_id -FROM rent_user_package WHERE status='ACTIVE' GROUP BY user_id; -UPDATE rent_user_package b JOIN rent_user_package_keep k ON k.user_id=b.user_id +SELECT user_id,network,resource_type,COALESCE(MAX(CASE WHEN default_slot=1 THEN id END),MAX(id)) AS keep_id +FROM rent_user_package WHERE status='ACTIVE' GROUP BY user_id,network,resource_type; +UPDATE rent_user_package b JOIN rent_user_package_keep k ON k.user_id=b.user_id AND k.network=b.network AND k.resource_type=b.resource_type SET b.status='DISABLED',b.default_slot=NULL,b.version=b.version+1,b.updated_at=UTC_TIMESTAMP(3) WHERE b.id<>k.keep_id AND (b.status<>'DISABLED' OR b.default_slot IS NOT NULL); UPDATE rent_user_package b JOIN rent_user_package_keep k ON k.keep_id=b.id