创建租赁订单,不要传递套餐id,改成选择网络和资源类型,修改对应的接口,和api-debugger调试页面,和套餐页面的立即租赁的页面入参。
This commit is contained in:
1 parent
8605c946c9
commit
dafa5261bd
20 files changed
+381
-119
No files matched your search
+5
-3
@@ -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';
|
||||
|
||||
@@ -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;
|
||||
@@ -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';
|
||||
@@ -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 ;
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user