From 127d575a1caffe1ecd59f26e9987dc0900db61c9 Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Sun, 25 Oct 2026 11:41:36 -0400 Subject: [PATCH] =?UTF-8?q?PROXY\=5FACCOUNT=20=E7=A7=9F=E8=B5=81=E8=B4=A6?= =?UTF-8?q?=E6=88=B7=EF=BC=8C=E9=A6=96=E9=A1=B5=E4=B8=AD=E7=9A=84=E7=A7=9F?= =?UTF-8?q?=E8=B5=81=E5=A5=97=E9=A4=90=EF=BC=8C=E4=B8=8D=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E7=94=A8=E5=88=97=E8=A1=A8=E7=9A=84=E7=9A=84=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=EF=BC=8C=E5=BA=94=E4=B8=BA=E4=B8=80=E4=B8=AAuserId=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=AF=B9=E5=BA=94=E4=B8=80=E4=B8=AA=E5=A5=97=E9=A4=90?= =?UTF-8?q?=EF=BC=8C=E8=AF=B7=E4=BF=AE=E6=AD=A3=EF=BC=8C=E8=A6=81=E6=B1=82?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BE=8E=E8=A7=82=EF=BC=8C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=E5=8F=8B=E5=A5=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/rental/single-user-package.md | 25 +++++++++++++++++++ docs/rental/user-package-bindings.md | 2 ++ .../system/rental/RentalApiController.java | 2 +- .../com/ruoyi/system/rental/RentalOrders.java | 2 +- .../system/rental/RentalPackageBindings.java | 14 +++++------ .../ruoyi/system/rental/RentalQueries.java | 2 +- .../system/rental/RentalBusinessTest.java | 6 ++++- sql/rent_init.sql | 4 +-- sql/rent_seed_three_packages.sql | 10 +++++--- sql/rent_user_package.sql | 2 +- sql/rent_user_package_single.sql | 14 +++++++++++ 11 files changed, 65 insertions(+), 18 deletions(-) create mode 100644 docs/rental/single-user-package.md create mode 100644 sql/rent_user_package_single.sql diff --git a/docs/rental/single-user-package.md b/docs/rental/single-user-package.md new file mode 100644 index 0000000..3688dfd --- /dev/null +++ b/docs/rental/single-user-package.md @@ -0,0 +1,25 @@ +# 一人一个当前套餐 + +本说明取代此前“用户多套餐、单默认”的设计。一个 user_id 仅有一个 ACTIVE 当前套餐,所有所属应用共用;历史绑定保留为 DISABLED,不物理删除。default_slot=1 是兼容字段,表示唯一当前套餐,其余绑定为 NULL。原有唯一(user_id,default_slot)继续保护当前槽位。 + +## 页面 + +PROXY_ACCOUNT 首页“租赁套餐”及应用页的套餐区统一为单套餐卡片,展示名称、网络、资源类型/数量、租期、冗余和 USDT 单价;不显示用户可选套餐列表。 + +点击立即租赁后选择本人启用应用、填写接收地址并确认,商户单号自动生成;请求失败保留单号供幂等重试。请求固定用户确认时的套餐ID,管理员切换套餐后服务端拒绝旧ID的新单,避免悄悄换价。订单结果在“我的订单”查看。 + +无当前绑定时引导联系管理员,套餐下架时展示不可用提示并禁止下单。无下单权限时按钮禁用。 + +## 管理及部署 + +管理员在租赁套餐页选择系统用户与上架套餐,点击“绑定/更换套餐”;同一事务停用该用户其他绑定并启用新套餐,无需再选择默认项。新旧绑定保留审计,历史订单价格及幂等重试不变。停用当前项后用户没有可下单套餐,不会自动切换历史套餐。 + +旧多套餐数据先备份,在停服维护窗口执行 `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完整构建成功。构建存在其他模块已有的导出缺失及体积警告。本次未执行实际数据库迁移、浏览器登录联调或链上广播。 diff --git a/docs/rental/user-package-bindings.md b/docs/rental/user-package-bindings.md index 1c70f48..3b89299 100644 --- a/docs/rental/user-package-bindings.md +++ b/docs/rental/user-package-bindings.md @@ -1,5 +1,7 @@ # 用户套餐绑定与自动下单 +**当前规则已修正为一人一个当前套餐**,以下多套餐描述为上一版设计记录。页面、绑定替换规则、旧数据迁移及示例脚本当前行为,以 [单用户单套餐说明](single-user-package.md) 为准。 + 新增独立表 `rent_user_package`,租赁核心表从16增加为17;按系统用户而非单个应用授权,多个应用共享 `rent_app.user_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 d75943a..06a540b 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 @@ -73,7 +73,7 @@ public class RentalApiController { "SELECT" + " id,package_code,revision,name,network,resource_type,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') ORDER BY" + + " 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")); return AjaxResult.success(products); 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 88c568d..d67cc12 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 @@ -84,7 +84,7 @@ public class RentalOrders { 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' FOR UPDATE", + + " 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")) { 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 2616035..ea73211 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 @@ -26,14 +26,14 @@ public class RentalPackageBindings { 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); + // 一人仅一个当前套餐,切换时停用其他绑定,历史记录继续保留。 + 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); } 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", makeDefault ? 1 : null); + "default_slot", enabled ? 1 : null); if (existing == null) { values.put("user_id", userId); values.put("package_id", packageId); @@ -43,13 +43,13 @@ public class RentalPackageBindings { store.update("user_package", number(existing, "id"), values); } store.event("PACKAGE", packageId, "BIND_USER", actor, - "用户ID=" + userId + ",状态=" + values.get("status") + ",默认=" + makeDefault); + "用户ID=" + userId + ",状态=" + values.get("status") + ",一人一个当前套餐"); } /** 显式安全列,供本人/管理员页面查看,不返回成本或供应商利润。 */ 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.network,p.resource_type,p.resource_quantity,p.duration_seconds,p.sale_amount,p.status" + + "p.name,p.revision,p.network,p.resource_type,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); } 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 1bb1893..01c1c91 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')"; + 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)"; break; case "wallet": where = 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 7335c93..8d7cc0a 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 @@ -157,6 +157,9 @@ public class RentalBusinessTest { 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()); + assertEquals(1, store.rows("SELECT id FROM rent_user_package WHERE user_id=10 AND status='ACTIVE'").size()); + expectFailure(() -> tx.execute(status -> orders.create(app, 10, + map("package_id", product, "merchant_order_no", "OLD-PACKAGE", "receiver_address", ADDRESS)))); 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)))); @@ -948,7 +951,8 @@ public class RentalBusinessTest { "{}", "status", "ACTIVE")); - store.insert("user_package", map("user_id", 10, "package_id", bandwidth, "status", "ACTIVE", "created_by", 99)); + 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)); Map order = tx.execute( status -> diff --git a/sql/rent_init.sql b/sql/rent_init.sql index a66d895..0c4710b 100644 --- a/sql/rent_init.sql +++ b/sql/rent_init.sql @@ -165,13 +165,13 @@ 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;每用户最多一个默认', + `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时间', diff --git a/sql/rent_seed_three_packages.sql b/sql/rent_seed_three_packages.sql index 01dacb8..a6cbae1 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(旧库)。 -- 三个 NILE 示例套餐,价格仅为示例,正式使用前确认运营定价。 --- 需要同时绑定时,将 NULL 改为真实 sys_user.user_id;不绑定则保留 NULL。 +-- 如需绑定基础能量套餐,将 NULL 改为真实 sys_user.user_id;一个用户只绑定一个当前套餐。 SET @rental_user_id = NULL; -- 改为执行绑定配置的管理员ID,仅记录配置来源。 SET @rental_operator_id = 1; @@ -13,12 +13,14 @@ 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 IN ('DEMO_ENERGY_65K','DEMO_ENERGY_130K','DEMO_BANDWIDTH_1500') AND p.revision=1 AND p.status='ACTIVE' +FROM sys_user u JOIN rent_package p ON p.package_code='DEMO_ENERGY_65K' 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.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) diff --git a/sql/rent_user_package.sql b/sql/rent_user_package.sql index 594562f..3b4eae3 100644 --- a/sql/rent_user_package.sql +++ b/sql/rent_user_package.sql @@ -4,7 +4,7 @@ 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;每用户最多一个默认', + `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时间', diff --git a/sql/rent_user_package_single.sql b/sql/rent_user_package_single.sql new file mode 100644 index 0000000..5535f33 --- /dev/null +++ b/sql/rent_user_package_single.sql @@ -0,0 +1,14 @@ +-- 旧多套餐绑定收敛:保留启用默认项,无默认项时保留最近绑定,其余停用;不删除历史。 +-- 停服维护窗口执行,执行前备份 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 +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 +SET b.default_slot=1,b.version=b.version+1,b.updated_at=UTC_TIMESTAMP(3) +WHERE b.default_slot IS NULL; +DROP TEMPORARY TABLE rent_user_package_keep; +COMMIT;