目前还缺少,套餐绑定关系的逻辑,请单独一张表,并且引导添加user\_id系统用户绑定套餐逻辑,并且在创建租赁订单,自动关联应用对应user\_id的套餐信息。 另外给我一个脚本,创建3个套餐的脚本。
This commit is contained in:
1 parent
a83e1fef40
commit
0fd0450ddb
16 files changed
+298
-14
No files matched your search
@@ -1,5 +1,7 @@
|
|||||||
## 平台简介
|
## 平台简介
|
||||||
|
|
||||||
|
用户套餐绑定与默认套餐下单:旧库先执行 [绑定表增量SQL](sql/rent_user_package.sql),三个NILE示例套餐见 [套餐初始化脚本](sql/rent_seed_three_packages.sql),管理及API说明见 [用户套餐绑定](docs/rental/user-package-bindings.md)。升级后未绑定用户不能创建新租赁订单。
|
||||||
|
|
||||||
能量与带宽租赁模块:三端配置、业务API、Agent安装及验收边界见[租赁实现说明](docs/rental/implementation.md);初始化结构见[租赁SQL](sql/rent_init.sql),菜单权限见[租赁菜单SQL](sql/rent_menu.sql)。本地Agent可选Node.js或[JDK17 + JavaFX20.0.2桌面版](../rent-agent-java/README.md)。默认不启动租赁调度与节点通道,本地Agent默认禁止广播。
|
能量与带宽租赁模块:三端配置、业务API、Agent安装及验收边界见[租赁实现说明](docs/rental/implementation.md);初始化结构见[租赁SQL](sql/rent_init.sql),菜单权限见[租赁菜单SQL](sql/rent_menu.sql)。本地Agent可选Node.js或[JDK17 + JavaFX20.0.2桌面版](../rent-agent-java/README.md)。默认不启动租赁调度与节点通道,本地Agent默认禁止广播。
|
||||||
|
|
||||||
susdt是一套全部开源的快速开发平台,毫无保留给个人及企业免费使用。
|
susdt是一套全部开源的快速开发平台,毫无保留给个人及企业免费使用。
|
||||||
|
|||||||
@@ -67,8 +67,8 @@ class RentalDesignChecks(unittest.TestCase):
|
|||||||
self.insert(table, **values)
|
self.insert(table, **values)
|
||||||
|
|
||||||
def test_table_and_document_coverage(self):
|
def test_table_and_document_coverage(self):
|
||||||
self.assertEqual(len(TABLES), 16)
|
self.assertEqual(len(TABLES), 17)
|
||||||
self.assertEqual(len(re.findall(r"CREATE TABLE", DDL)), 16)
|
self.assertEqual(len(re.findall(r"CREATE TABLE", DDL)), 17)
|
||||||
doc = (ROOT / "docs/rental/table-functional-flows.md").read_text("utf-8")
|
doc = (ROOT / "docs/rental/table-functional-flows.md").read_text("utf-8")
|
||||||
sections = set(re.findall(r"### 2\.\d+ (rent_\w+):", doc))
|
sections = set(re.findall(r"### 2\.\d+ (rent_\w+):", doc))
|
||||||
self.assertEqual(sections, set(TABLES))
|
self.assertEqual(sections, set(TABLES))
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
# 租赁模块三端实现与运行说明
|
# 租赁模块三端实现与运行说明
|
||||||
|
|
||||||
|
用户套餐绑定增量:核心表新增 rent_user_package,管理员授权具体套餐版本;应用按 user_id 选择已绑定套餐,省略 package_id 自动选择默认。部署前执行增量表SQL并配置用户绑定,见 [用户套餐绑定与脚本](user-package-bindings.md)。历史订单和在途处理不受绑定变更影响。
|
||||||
|
|
||||||
本文对应当前工作区的 V2.2 实现。设计依据仍为 [schema-design.md](schema-design.md) 和 [rent_init.sql](../../sql/rent_init.sql)。代码交付不等于生产迁移或真实链上验收;本次没有修改现有数据库,没有执行任何真实广播。
|
本文对应当前工作区的 V2.2 实现。设计依据仍为 [schema-design.md](schema-design.md) 和 [rent_init.sql](../../sql/rent_init.sql)。代码交付不等于生产迁移或真实链上验收;本次没有修改现有数据库,没有执行任何真实广播。
|
||||||
|
|
||||||
## 1. 三端职责
|
## 1. 三端职责
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
# 能量/带宽出租表结构与业务流程 V2.2
|
# 能量/带宽出租表结构与业务流程 V2.2
|
||||||
|
|
||||||
|
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)。下文“本次仅设计”描述设计审查阶段,不替代当前实现记录。
|
状态: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)。下文“本次仅设计”描述设计审查阶段,不替代当前实现记录。
|
||||||
|
|
||||||
## 1. 简化范围和保留边界
|
## 1. 简化范围和保留边界
|
||||||
|
|||||||
@@ -518,6 +518,12 @@ flowchart TD
|
|||||||
| 节点重复上报 | event(event_no),相同编号不同内容拒绝 |
|
| 节点重复上报 | event(event_no),相同编号不同内容拒绝 |
|
||||||
| 旧连接覆盖新连接 | node.session_epoch 条件更新 |
|
| 旧连接覆盖新连接 | node.session_epoch 条件更新 |
|
||||||
|
|
||||||
|
### 2.17 rent_user_package:系统用户套餐绑定
|
||||||
|
|
||||||
|
系统用户与具体套餐版本多对多绑定。user_id 对应 sys_user,package_id 对应 rent_package;status 控制新单授权,default_slot=1 为用户默认项,其他为 NULL。每用户套餐唯一、每用户默认项唯一。created_by 记录管理员,version 和 UTC 时间用于更新与追溯。
|
||||||
|
|
||||||
|
管理员选用户→绑定已上架套餐→设置默认;应用通过 rent_app.user_id 使用绑定。新单省略套餐时选默认,显式指定时仍校验用户绑定;订单快照保存绑定编号和用户编号。停用不影响历史订单。详见 [绑定与部署说明](user-package-bindings.md)。当前核心表总计17张,前述16张为原基线。
|
||||||
|
|
||||||
## 6. 对账与实现注意事项
|
## 6. 对账与实现注意事项
|
||||||
|
|
||||||
1. 每日核对账户冻结余额与 HELD 订单、待结算余额与未结净应收、余额投影与不可变流水;差异记录审计并人工处理。
|
1. 每日核对账户冻结余额与 HELD 订单、待结算余额与未结净应收、余额投影与不可变流水;差异记录审计并人工处理。
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
# 用户套餐绑定与自动下单
|
||||||
|
|
||||||
|
新增独立表 `rent_user_package`,租赁核心表从16增加为17;按系统用户而非单个应用授权,多个应用共享 `rent_app.user_id` 对应的绑定。
|
||||||
|
|
||||||
|
## 部署与引导
|
||||||
|
|
||||||
|
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,可同时绑定三个套餐,并在尚无默认项时指定基础能量套餐。重跑不覆盖已有价格、绑定或默认项。
|
||||||
|
|
||||||
|
## 表字段与约束
|
||||||
|
|
||||||
|
`id`:主键;`user_id`:系统用户;`package_id`:具体套餐版本;`status`:ACTIVE/DISABLED;`default_slot`:默认为1,其余NULL;`created_by`:配置者;`version`:更新版本;`created_at/updated_at`:UTC。
|
||||||
|
|
||||||
|
唯一(user_id,package_id)避免重复绑定,唯一(user_id,default_slot)保证每用户最多一个默认项。停用默认项会清除默认槽,不自动切换到另一套餐,避免无意改用不同网络/价格。新价格版本必须重新绑定,不自动迁移旧版本。
|
||||||
|
|
||||||
|
## 下单规则
|
||||||
|
|
||||||
|
创建订单仍必须提供应用ID、商户单号、接收地址;`package_id` 可选。
|
||||||
|
|
||||||
|
```json
|
||||||
|
{"app_id":1,"merchant_order_no":"ORDER-001","receiver_address":"有效TRON地址"}
|
||||||
|
```
|
||||||
|
|
||||||
|
服务端从应用记录读取 user_id,省略套餐时选择该用户唯一 ACTIVE 默认项;显式指定时必须有 ACTIVE 用户绑定,且套餐上架。请求携带 network/resource_type 时必须与套餐匹配。没有默认项或绑定不可用则明确拒绝,不回退到任意公开套餐。客户端提交 user_id 不影响服务端归属。
|
||||||
|
|
||||||
|
订单保存 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布尔值,不物理删除绑定,保留审计。
|
||||||
|
|
||||||
|
## 验证
|
||||||
|
|
||||||
|
JDK8 租赁隔离测试59项通过,含默认选择、未授权套餐拒绝、绑定停用、默认切换幂等、客户端user_id不能改变归属,以及三套餐INSERT重复执行和字段有效性。离线DDL与文档测试12项通过,前端ESLint、模板编译和staging构建通过,产物在usdt-ui/dist-rental-package-binding。构建仍有其他页面的3项导出缺失及资源体积警告。
|
||||||
|
|
||||||
|
未执行实际MySQL建表、套餐/绑定写入或真实登录浏览器验收。脚本三套餐INSERT使用H2做兼容转换隔离验证,不替代实际MySQL部署验收。
|
||||||
@@ -72,9 +72,10 @@ public class RentalApiController {
|
|||||||
store.rows(
|
store.rows(
|
||||||
"SELECT"
|
"SELECT"
|
||||||
+ " id,package_code,revision,name,network,resource_type,resource_quantity,duration_seconds,sale_amount"
|
+ " id,package_code,revision,name,network,resource_type,resource_quantity,duration_seconds,sale_amount"
|
||||||
+ " FROM rent_package WHERE status='ACTIVE' AND network=? ORDER BY"
|
+ " 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') ORDER BY"
|
||||||
+ " id",
|
+ " id",
|
||||||
network(input(data, "network", 16)));
|
network(input(data, "network", 16)), number(app, "user_id"));
|
||||||
return AjaxResult.success(products);
|
return AjaxResult.success(products);
|
||||||
}
|
}
|
||||||
Map<String, Object> order;
|
Map<String, Object> order;
|
||||||
|
|||||||
@@ -34,6 +34,51 @@ public class RentalController {
|
|||||||
@org.springframework.beans.factory.annotation.Autowired
|
@org.springframework.beans.factory.annotation.Autowired
|
||||||
private RentalReconciliation reconciliation;
|
private RentalReconciliation reconciliation;
|
||||||
|
|
||||||
|
@org.springframework.beans.factory.annotation.Autowired
|
||||||
|
private RentalPackageBindings packageBindings;
|
||||||
|
|
||||||
|
/** 同一套餐管理权限负责授权;普通租赁用户不能自行添加绑定。 */
|
||||||
|
@PostMapping("/package/bind")
|
||||||
|
@PreAuthorize("@ss.hasPermi('rent:package:edit')")
|
||||||
|
public AjaxResult bindPackage(@RequestBody Map<String, Object> body) {
|
||||||
|
require(body.get("enabled") instanceof Boolean && body.get("is_default") instanceof Boolean,
|
||||||
|
"必须明确绑定状态及是否默认");
|
||||||
|
packageBindings.bind(number(body, "user_id"), number(body, "package_id"),
|
||||||
|
Boolean.TRUE.equals(body.get("enabled")), Boolean.TRUE.equals(body.get("is_default")), user());
|
||||||
|
return AjaxResult.success();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/package/bindings/{userId}")
|
||||||
|
@PreAuthorize("@ss.hasPermi('rent:package:edit')")
|
||||||
|
public AjaxResult userPackageBindings(@PathVariable long userId) {
|
||||||
|
return AjaxResult.success(packageBindings.list(userId));
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/package/bindings")
|
||||||
|
@PreAuthorize("@ss.hasPermi('rent:portal:view')")
|
||||||
|
public AjaxResult myPackageBindings() {
|
||||||
|
return AjaxResult.success(packageBindings.list(user()));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 用户选择器复用套餐管理权限,不额外开放系统用户管理权限。 */
|
||||||
|
@GetMapping("/package/users")
|
||||||
|
@PreAuthorize("@ss.hasPermi('rent:package:edit')")
|
||||||
|
public AjaxResult packageUsers(@RequestParam(defaultValue = "") String keyword) {
|
||||||
|
require(keyword.length() <= 100, "搜索内容过长");
|
||||||
|
return AjaxResult.success(store.rows("SELECT user_id,user_name,nick_name FROM sys_user"
|
||||||
|
+ " WHERE del_flag='0' AND status='0' AND (user_name LIKE ? OR nick_name LIKE ?)"
|
||||||
|
+ " ORDER BY user_id LIMIT 30", "%" + keyword + "%", "%" + keyword + "%"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/package/options")
|
||||||
|
@PreAuthorize("@ss.hasPermi('rent:package:edit')")
|
||||||
|
public AjaxResult packageOptions(@RequestParam(defaultValue = "") String keyword) {
|
||||||
|
require(keyword.length() <= 100, "搜索内容过长");
|
||||||
|
return AjaxResult.success(store.rows("SELECT id,name,network,resource_type,revision FROM rent_package"
|
||||||
|
+ " WHERE status='ACTIVE' AND (name LIKE ? OR package_code LIKE ?) ORDER BY id DESC LIMIT 30",
|
||||||
|
"%" + keyword + "%", "%" + keyword + "%"));
|
||||||
|
}
|
||||||
|
|
||||||
public RentalController(
|
public RentalController(
|
||||||
RentalStore store,
|
RentalStore store,
|
||||||
RentalProvisioning provisioning,
|
RentalProvisioning provisioning,
|
||||||
|
|||||||
@@ -45,7 +45,20 @@ public class RentalOrders {
|
|||||||
String merchant = input(request, "merchant_order_no", 64);
|
String merchant = input(request, "merchant_order_no", 64);
|
||||||
String receiver = input(request, "receiver_address", 64);
|
String receiver = input(request, "receiver_address", 64);
|
||||||
address(receiver);
|
address(receiver);
|
||||||
long packageId = number(request, "package_id");
|
Map<String, Object> existing = store.one(
|
||||||
|
"SELECT * FROM rent_order WHERE app_id=? AND merchant_order_no=?", appId, merchant);
|
||||||
|
long packageId;
|
||||||
|
if (request.containsKey("package_id") && !text(request, "package_id").isEmpty()) {
|
||||||
|
packageId = number(request, "package_id");
|
||||||
|
} else if (existing != null) {
|
||||||
|
// 默认套餐变更后,幂等重试仍关联原订单版本,不重新扣款。
|
||||||
|
packageId = number(existing, "package_id");
|
||||||
|
} else {
|
||||||
|
Map<String, Object> 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");
|
||||||
|
}
|
||||||
String notify = text(request, "notify_url").trim();
|
String notify = text(request, "notify_url").trim();
|
||||||
if (notify.isEmpty()) {
|
if (notify.isEmpty()) {
|
||||||
notify = text(app, "notify_url");
|
notify = text(app, "notify_url");
|
||||||
@@ -63,11 +76,6 @@ public class RentalOrders {
|
|||||||
receiver,
|
receiver,
|
||||||
"notify_url",
|
"notify_url",
|
||||||
notify)));
|
notify)));
|
||||||
Map<String, Object> existing =
|
|
||||||
store.one(
|
|
||||||
"SELECT * FROM rent_order WHERE app_id=? AND merchant_order_no=?",
|
|
||||||
appId,
|
|
||||||
merchant);
|
|
||||||
if (existing != null) {
|
if (existing != null) {
|
||||||
require(hash.equals(text(existing, "request_hash")), "同一商户订单号参数不一致");
|
require(hash.equals(text(existing, "request_hash")), "同一商户订单号参数不一致");
|
||||||
return existing;
|
return existing;
|
||||||
@@ -75,6 +83,15 @@ public class RentalOrders {
|
|||||||
Map<String, Object> product = store.get("package", packageId, true);
|
Map<String, Object> product = store.get("package", packageId, true);
|
||||||
validatePackage(product);
|
validatePackage(product);
|
||||||
require("ACTIVE".equals(text(product, "status")), "套餐未上架");
|
require("ACTIVE".equals(text(product, "status")), "套餐未上架");
|
||||||
|
Map<String, Object> binding = store.one("SELECT * FROM rent_user_package"
|
||||||
|
+ " WHERE user_id=? AND package_id=? AND status='ACTIVE' 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")) {
|
if (request.containsKey("resource_type")) {
|
||||||
require(
|
require(
|
||||||
text(product, "resource_type").equals(text(request, "resource_type")),
|
text(product, "resource_type").equals(text(request, "resource_type")),
|
||||||
|
|||||||
@@ -0,0 +1,56 @@
|
|||||||
|
package com.ruoyi.system.rental;
|
||||||
|
|
||||||
|
import static com.ruoyi.system.rental.RentalValues.*;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
|
/** 用户级套餐授权;客户端不能通过更换 app_id、user_id 或 package_id 越权购买。 */
|
||||||
|
@Service
|
||||||
|
public class RentalPackageBindings {
|
||||||
|
private final RentalStore store;
|
||||||
|
|
||||||
|
public RentalPackageBindings(RentalStore store) {
|
||||||
|
this.store = store;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 管理员先选系统用户,再配置绑定;锁用户行使同用户默认套餐切换串行化。 */
|
||||||
|
@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,
|
||||||
|
"系统用户不存在或已停用");
|
||||||
|
Map<String, Object> product = store.get("package", packageId, true);
|
||||||
|
if (enabled) {
|
||||||
|
require("ACTIVE".equals(text(product, "status")), "请先审核上架套餐再绑定用户");
|
||||||
|
RentalOrders.validatePackage(product);
|
||||||
|
}
|
||||||
|
require(enabled || !makeDefault, "停用绑定不能设为默认");
|
||||||
|
if (makeDefault) {
|
||||||
|
store.execute("UPDATE rent_user_package SET default_slot=NULL,version=version+1,updated_at=? WHERE user_id=? AND default_slot=1",
|
||||||
|
now(), userId);
|
||||||
|
}
|
||||||
|
Map<String, Object> existing = store.one("SELECT * FROM rent_user_package WHERE user_id=? AND package_id=? FOR UPDATE", userId, packageId);
|
||||||
|
Map<String, Object> values = map("status", enabled ? "ACTIVE" : "DISABLED",
|
||||||
|
"default_slot", makeDefault ? 1 : null);
|
||||||
|
if (existing == null) {
|
||||||
|
values.put("user_id", userId);
|
||||||
|
values.put("package_id", packageId);
|
||||||
|
values.put("created_by", actor);
|
||||||
|
store.insert("user_package", values);
|
||||||
|
} else {
|
||||||
|
store.update("user_package", number(existing, "id"), values);
|
||||||
|
}
|
||||||
|
store.event("PACKAGE", packageId, "BIND_USER", actor,
|
||||||
|
"用户ID=" + userId + ",状态=" + values.get("status") + ",默认=" + makeDefault);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 显式安全列,供本人/管理员页面查看,不返回成本或供应商利润。 */
|
||||||
|
public List<Map<String, Object>> 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.network,p.resource_type,p.resource_quantity,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);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -27,7 +27,7 @@ public class RentalQueries {
|
|||||||
where = "r.user_id=?";
|
where = "r.user_id=?";
|
||||||
break;
|
break;
|
||||||
case "package":
|
case "package":
|
||||||
where = "r.status='ACTIVE'";
|
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')";
|
||||||
break;
|
break;
|
||||||
case "wallet":
|
case "wallet":
|
||||||
where =
|
where =
|
||||||
@@ -65,9 +65,7 @@ public class RentalQueries {
|
|||||||
default:
|
default:
|
||||||
throw new IllegalArgumentException("该资源仅限运营查询");
|
throw new IllegalArgumentException("该资源仅限运营查询");
|
||||||
}
|
}
|
||||||
if (!"package".equals(type)) {
|
|
||||||
args.add(user);
|
args.add(user);
|
||||||
}
|
|
||||||
if ("order".equals(type) || "credential".equals(type)) {
|
if ("order".equals(type) || "credential".equals(type)) {
|
||||||
args.add(user);
|
args.add(user);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ public class RentalStore {
|
|||||||
"node",
|
"node",
|
||||||
"wallet",
|
"wallet",
|
||||||
"package",
|
"package",
|
||||||
|
"user_package",
|
||||||
"account",
|
"account",
|
||||||
"order",
|
"order",
|
||||||
"task",
|
"task",
|
||||||
|
|||||||
@@ -133,6 +133,58 @@ public class RentalBusinessTest {
|
|||||||
expectFailure(() -> tx.execute(status -> identity.deleteAppCredential(number(nodeKey, "id"), 20)));
|
expectFailure(() -> tx.execute(status -> identity.deleteAppCredential(number(nodeKey, "id"), 20)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 用户默认套餐选择及授权隔离,不受客户端user_id影响。 */
|
||||||
|
@Test
|
||||||
|
public void userBindingsControlAutomaticAndExplicitOrders() throws Exception {
|
||||||
|
store.execute("CREATE TABLE sys_user(user_id BIGINT PRIMARY KEY,user_name VARCHAR(64),nick_name VARCHAR(64),status CHAR(1),del_flag CHAR(1))");
|
||||||
|
store.execute("INSERT INTO sys_user VALUES(10,'buyer','buyer','0','0')");
|
||||||
|
RentalPackageBindings bindings = new RentalPackageBindings(store);
|
||||||
|
Map<String, Object> request = map("merchant_order_no", "AUTO-1", "receiver_address", ADDRESS, "user_id", 20);
|
||||||
|
Map<String, Object> original = tx.execute(status -> orders.create(app, 10, request));
|
||||||
|
assertEquals(product, number(original, "package_id"));
|
||||||
|
Map snapshot = json.readValue(text(original, "package_snapshot"), Map.class);
|
||||||
|
assertEquals(10L, ((Number) snapshot.get("binding_user_id")).longValue());
|
||||||
|
assertEquals(1, new RentalQueries(store).list("package", 10L, 1).size());
|
||||||
|
assertTrue(new RentalQueries(store).list("package", 20L, 1).isEmpty());
|
||||||
|
Map<String, Object> alternate = new LinkedHashMap<>(store.get("package", product, false));
|
||||||
|
alternate.remove("id"); alternate.put("package_code", "ALT-TEST");
|
||||||
|
long alternativeId = store.insert("package", alternate);
|
||||||
|
expectFailure(() -> tx.execute(status -> orders.create(app, 10,
|
||||||
|
map("package_id", alternativeId, "merchant_order_no", "NOT-BOUND", "receiver_address", ADDRESS))));
|
||||||
|
tx.execute(status -> { bindings.bind(10, alternativeId, true, true, 99); return null; });
|
||||||
|
Map<String, Object> next = tx.execute(status -> orders.create(app, 10,
|
||||||
|
map("merchant_order_no", "AUTO-2", "receiver_address", ADDRESS)));
|
||||||
|
assertEquals(alternativeId, number(next, "package_id"));
|
||||||
|
assertEquals(number(original, "id"), number(tx.execute(status -> orders.create(app, 10, request)), "id"));
|
||||||
|
assertEquals(1, store.rows("SELECT id FROM rent_user_package WHERE user_id=10 AND default_slot=1").size());
|
||||||
|
tx.execute(status -> { bindings.bind(10, alternativeId, false, false, 99); return null; });
|
||||||
|
expectFailure(() -> tx.execute(status -> orders.create(app, 10,
|
||||||
|
map("merchant_order_no", "NO-DEFAULT", "receiver_address", ADDRESS))));
|
||||||
|
expectFailure(() -> tx.execute(status -> orders.create(app, 10,
|
||||||
|
map("package_id", alternativeId, "merchant_order_no", "DISABLED", "receiver_address", ADDRESS))));
|
||||||
|
expectFailure(() -> tx.execute(status -> { bindings.bind(999, product, true, true, 99); return null; }));
|
||||||
|
assertEquals(number(next, "id"), number(tx.execute(status -> orders.create(app, 10,
|
||||||
|
map("merchant_order_no", "AUTO-2", "receiver_address", ADDRESS))), "id"));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 直接验证交付脚本中的三套餐INSERT及重复执行,不连接真实MySQL。 */
|
||||||
|
@Test
|
||||||
|
public void seedScriptCreatesThreeValidPackagesIdempotently() throws Exception {
|
||||||
|
String script = new String(Files.readAllBytes(Paths.get("../sql/rent_seed_three_packages.sql")), StandardCharsets.UTF_8);
|
||||||
|
int start = script.indexOf("INSERT INTO rent_package(");
|
||||||
|
String insert = script.substring(start, script.indexOf(';', start))
|
||||||
|
.replace("JSON_OBJECT('refund','MANUAL_REVIEW','delegate_lock',FALSE)", "'{\"refund\":\"MANUAL_REVIEW\",\"delegate_lock\":false}'")
|
||||||
|
.replace("UTC_TIMESTAMP(3)", "CURRENT_TIMESTAMP");
|
||||||
|
store.execute(insert);
|
||||||
|
store.execute(insert);
|
||||||
|
List<Map<String, Object>> products = store.rows("SELECT * FROM rent_package WHERE package_code LIKE 'DEMO_%'");
|
||||||
|
assertEquals(3, products.size());
|
||||||
|
for (Map<String, Object> seeded : products) {
|
||||||
|
RentalOrders.validatePackage(seeded);
|
||||||
|
assertEquals("NILE", text(seeded, "network"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private RentalProvisioning rentalDeletion() { return new RentalProvisioning(store, orders); }
|
private RentalProvisioning rentalDeletion() { return new RentalProvisioning(store, orders); }
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
@@ -246,6 +298,7 @@ public class RentalBusinessTest {
|
|||||||
"{}",
|
"{}",
|
||||||
"status",
|
"status",
|
||||||
"ACTIVE"));
|
"ACTIVE"));
|
||||||
|
store.insert("user_package", map("user_id", 10, "package_id", product, "status", "ACTIVE", "default_slot", 1, "created_by", 99));
|
||||||
wallet =
|
wallet =
|
||||||
store.insert(
|
store.insert(
|
||||||
"wallet",
|
"wallet",
|
||||||
@@ -895,6 +948,7 @@ public class RentalBusinessTest {
|
|||||||
"{}",
|
"{}",
|
||||||
"status",
|
"status",
|
||||||
"ACTIVE"));
|
"ACTIVE"));
|
||||||
|
store.insert("user_package", map("user_id", 10, "package_id", bandwidth, "status", "ACTIVE", "created_by", 99));
|
||||||
Map<String, Object> order =
|
Map<String, Object> order =
|
||||||
tx.execute(
|
tx.execute(
|
||||||
status ->
|
status ->
|
||||||
|
|||||||
+19
-1
@@ -1,4 +1,4 @@
|
|||||||
-- 能量/带宽出租设计 V2.2;16表,Energy/Bandwidth独立套餐、USDT内部余额、人工充值/结算、幂等退款。
|
-- 能量/带宽出租设计 V2.2 + 用户套餐绑定;17表,Energy/Bandwidth独立套餐、USDT内部余额、人工充值/结算、幂等退款。
|
||||||
-- 共用sys_user、登录、Google和若依RBAC,只复用TRON只读查询;不引用支付apps/orders/wallet_address及其资金服务。
|
-- 共用sys_user、登录、Google和若依RBAC,只复用TRON只读查询;不引用支付apps/orders/wallet_address及其资金服务。
|
||||||
-- MySQL5.7.8+/8.0,InnoDB DYNAMIC,utf8mb4_bin;大索引前缀需启用。
|
-- MySQL5.7.8+/8.0,InnoDB DYNAMIC,utf8mb4_bin;大索引前缀需启用。
|
||||||
-- 所有日期DATETIME(3)表示UTC,由应用显式写入,不改变支付LOCAL连接时区。
|
-- 所有日期DATETIME(3)表示UTC,由应用显式写入,不改变支付LOCAL连接时区。
|
||||||
@@ -165,6 +165,24 @@ CREATE TABLE IF NOT EXISTS `rent_package` (
|
|||||||
KEY `idx_package_sale` (`network`,`resource_type`,`status`)
|
KEY `idx_package_sale` (`network`,`resource_type`,`status`)
|
||||||
) ENGINE=InnoDB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='能量或带宽固定套餐及价格版本;套餐代码的资源类型不可改变';
|
) 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;每用户最多一个默认',
|
||||||
|
`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`),
|
||||||
|
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';
|
||||||
|
|
||||||
-- 独立租赁资金账户;仅USDT,按用户和网络隔离
|
-- 独立租赁资金账户;仅USDT,按用户和网络隔离
|
||||||
CREATE TABLE IF NOT EXISTS `rent_account` (
|
CREATE TABLE IF NOT EXISTS `rent_account` (
|
||||||
`id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '记录主键',
|
`id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '记录主键',
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
-- 先执行 rent_init.sql(新库)或 rent_user_package.sql(旧库)。
|
||||||
|
-- 三个 NILE 示例套餐,价格仅为示例,正式使用前确认运营定价。
|
||||||
|
-- 需要同时绑定时,将 NULL 改为真实 sys_user.user_id;不绑定则保留 NULL。
|
||||||
|
SET @rental_user_id = NULL;
|
||||||
|
-- 改为执行绑定配置的管理员ID,仅记录配置来源。
|
||||||
|
SET @rental_operator_id = 1;
|
||||||
|
START TRANSACTION;
|
||||||
|
INSERT INTO rent_package(package_code,revision,name,network,resource_type,resource_quantity,redundancy_percent,duration_seconds,sale_amount,supplier_amount,supplier_fee_percent,fee_limit_sun,delegate_lock,status,rules,version,created_at,updated_at)
|
||||||
|
SELECT s.code,1,s.name,'NILE',s.resource,s.quantity,20,3600,s.sale,s.gross,5,1000000,0,'ACTIVE',JSON_OBJECT('refund','MANUAL_REVIEW','delegate_lock',FALSE),0,UTC_TIMESTAMP(3),UTC_TIMESTAMP(3)
|
||||||
|
FROM (
|
||||||
|
SELECT 'DEMO_ENERGY_65K' code,'能量基础套餐 65000 / 1小时' name,'ENERGY' resource,65000 quantity,3.000000 sale,2.400000 gross
|
||||||
|
UNION ALL SELECT 'DEMO_ENERGY_130K','能量进阶套餐 130000 / 1小时','ENERGY',130000,5.000000,4.000000
|
||||||
|
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 IN ('DEMO_ENERGY_65K','DEMO_ENERGY_130K','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);
|
||||||
|
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;
|
||||||
|
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;
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
-- 增量升级:用户套餐绑定;不改写历史订单,不自动给现有用户授权。
|
||||||
|
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;每用户最多一个默认',
|
||||||
|
`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`),
|
||||||
|
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';
|
||||||
Reference in new issue
Block a user