建议统一成“收益结算 + 提现付款” 按建议的逻辑帮我实现。

This commit is contained in:
lu7213 committed 2026-11-03 02:48:03 -05:00
1 parent 1151dc2535
commit be6ac23844
18 files changed
+352 -16

No files matched your search

+18
View File
@@ -0,0 +1,18 @@
-- MySQL 5.7/8.0。停服后升级,再部署新服务。保留所有历史单状态和资金,不将旧单转为内部划转。
DELIMITER $$
DROP PROCEDURE IF EXISTS migrate_rent_income_settlement$$
CREATE PROCEDURE migrate_rent_income_settlement()
BEGIN
IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE()
AND table_name='rent_settlement' AND column_name='settlement_mode') THEN
ALTER TABLE rent_settlement ADD COLUMN settlement_mode VARCHAR(24) NOT NULL DEFAULT 'LEGACY_PAYOUT'
COMMENT 'INTERNAL_TRANSFER收益划转;LEGACY_PAYOUT历史付款';
END IF;
IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE()
AND table_name='rent_settlement' AND column_name='settled_at') THEN
ALTER TABLE rent_settlement ADD COLUMN settled_at DATETIME(3) NULL COMMENT '内部收益结算完成时间';
END IF;
END$$
CALL migrate_rent_income_settlement()$$
DROP PROCEDURE migrate_rent_income_settlement$$
DELIMITER ;
+9 -5
View File
@@ -256,6 +256,8 @@ CREATE TABLE IF NOT EXISTS `rent_order` (
`updated_at` DATETIME(3) NOT NULL COMMENT '更新服务器本地时间,追加记录与创建时间相同',
PRIMARY KEY (`id`),
UNIQUE KEY `uk_order_no` (`order_no`),
`onchain_pending_slot` TINYINT GENERATED ALWAYS AS (CASE WHEN `order_type`='ADDRESS_ONCHAIN' AND `status` NOT IN ('SUCCESS','FAILED','CANCELLED') THEN 1 ELSE NULL END),
UNIQUE KEY `uk_order_onchain_pending` (`network`,`receiver_address`,`onchain_pending_slot`),
UNIQUE KEY `uk_merchant_order` (`app_id`,`merchant_order_no`),
UNIQUE KEY `uk_order_relation` (`wallet_id`,`receiver_address`,`resource_type`,`relation_slot`),
KEY `idx_order_schedule` (`status`,`created_at`),
@@ -357,7 +359,7 @@ CREATE TABLE IF NOT EXISTS `rent_ledger` (
`id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '记录主键',
`account_id` BIGINT NOT NULL COMMENT 'rent_account.id',
`business_key` VARCHAR(160) CHARACTER SET ascii COLLATE ascii_bin NOT NULL COMMENT '全局唯一记账键;普通业务含事件及账户,TOPUP仅按网络及链上事件唯一标识构造,不含账户以防跨用户重复充值',
`event_type` VARCHAR(24) NOT NULL COMMENT 'TOPUP充值、HOLD冻结、CHARGE扣款、RELEASE解冻、SUPPLIER_EARN毛应收、SUPPLIER_FEE供应商手续费、SETTLE净额结算、REFUND退款、REVERSAL冲正',
`event_type` VARCHAR(24) NOT NULL COMMENT 'TOPUP充值、HOLD冻结、CHARGE扣款、RELEASE解冻、SUPPLIER_EARN毛应收、SUPPLIER_FEE手续费、INCOME_SETTLE收益入账、SETTLE历史付款、REFUND退款、REVERSAL冲正',
`delta_available` DECIMAL(30,6) NOT NULL DEFAULT 0 COMMENT '可用余额变化,有正负',
`delta_frozen` DECIMAL(30,6) NOT NULL DEFAULT 0 COMMENT '冻结余额变化,有正负',
`delta_supplier_pending` DECIMAL(30,6) NOT NULL DEFAULT 0 COMMENT '供应商待结算变化,有正负',
@@ -383,13 +385,15 @@ CREATE TABLE IF NOT EXISTS `rent_ledger` (
KEY `idx_ledger_order` (`order_id`,`id`)
) ENGINE=InnoDB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='不可变租赁资金流水;余额与流水同事务,冲正追加不覆盖';
-- 供应商人工结算单;不自动链上出金
-- 供应商收益结算;新单内部划转,历史单保留原付款处理
CREATE TABLE IF NOT EXISTS `rent_settlement` (
`id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '记录主键',
`settlement_no` VARCHAR(40) NOT NULL COMMENT '结算单号',
`settlement_mode` VARCHAR(24) NOT NULL DEFAULT 'LEGACY_PAYOUT' COMMENT 'INTERNAL_TRANSFER收益划转;LEGACY_PAYOUT历史对外付款,新业务显式写INTERNAL_TRANSFER',
`settled_at` DATETIME(3) NULL COMMENT '收益转入可用余额完成时间;不同于历史付款paid_at',
`account_id` BIGINT NOT NULL COMMENT '供应商rent_account.id',
`amount` DECIMAL(30,6) NOT NULL DEFAULT 0 COMMENT '本次人工结算USDT总额,必须大于零',
`status` VARCHAR(32) NOT NULL DEFAULT 'PENDING' COMMENT 'PENDING待审、APPROVED待付款、PAYING已占用付款授权、PAID付款核验完成、REJECTED明确未付拒绝、UNKNOWN付款待核对',
`amount` DECIMAL(30,6) NOT NULL DEFAULT 0 COMMENT '本次净收益结算USDT总额,必须大于零',
`status` VARCHAR(32) NOT NULL DEFAULT 'PENDING' COMMENT 'PENDING待审、SETTLED内部收益结算完成、REJECTED拒绝;APPROVED/PAYING/PAID/UNKNOWN仅历史付款模式',
`payout_no` VARCHAR(64) NULL COMMENT '人工付款授权唯一编号;先同事务进入PAYING并持久化该编号再付款,重试查询原付款,不重新授权',
`payment_started_at` DATETIME(3) NULL COMMENT '进入PAYING的服务器本地时间;PAYING或UNKNOWN不能因超时释放来源',
`payment_evidence` JSON NULL COMMENT '收款信息、唯一付款凭据和独立核对结果;没有确认不能记已付',
@@ -406,7 +410,7 @@ CREATE TABLE IF NOT EXISTS `rent_settlement` (
UNIQUE KEY `uk_settlement_payment` (`payment_reference`),
UNIQUE KEY `uk_settlement_payout` (`payout_no`),
KEY `idx_settlement_account` (`account_id`,`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_settlement_item` (
+24
View File
@@ -0,0 +1,24 @@
-- MySQL 5.7/8.0:同网络同地址仅允许一笔未终结的地址上链订单。
-- 升级期间暂停下单;不修改历史订单、交易或资金。
DELIMITER $$
DROP PROCEDURE IF EXISTS migrate_rent_onchain_pending$$
CREATE PROCEDURE migrate_rent_onchain_pending()
BEGIN
IF EXISTS (SELECT 1 FROM rent_order
WHERE order_type='ADDRESS_ONCHAIN' AND status NOT IN ('SUCCESS','FAILED','CANCELLED')
GROUP BY network,receiver_address HAVING COUNT(*)>1) THEN
SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='Duplicate pending onchain orders: reconcile orders and funds before migration';
END IF;
IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE()
AND table_name='rent_order' AND column_name='onchain_pending_slot') THEN
ALTER TABLE rent_order ADD COLUMN onchain_pending_slot TINYINT GENERATED ALWAYS AS
(CASE WHEN order_type='ADDRESS_ONCHAIN' AND status NOT IN ('SUCCESS','FAILED','CANCELLED') THEN 1 ELSE NULL END);
END IF;
IF NOT EXISTS (SELECT 1 FROM information_schema.statistics WHERE table_schema=DATABASE()
AND table_name='rent_order' AND index_name='uk_order_onchain_pending') THEN
ALTER TABLE rent_order ADD UNIQUE KEY uk_order_onchain_pending(network,receiver_address,onchain_pending_slot);
END IF;
END$$
CALL migrate_rent_onchain_pending()$$
DROP PROCEDURE migrate_rent_onchain_pending$$
DELIMITER ;