feat: 卡流量读数先过采集队列再入账,扣减按采集时刻确定套餐
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 9m27s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 9m27s
- 每卡 Redis 采集队列(默认 N=3、跨天清空、回退容差 1 MB),攒满且不下降才写最后一个点 - 测试环境全量切换日快照计量,下线灰度名单、切换水位与卡表基线扣费;全部卡置待建起点 - 读数区分没给值与 0;有套餐的卡读数 0 也写快照与日用量 0 行;重置日比较基准为 0 照常防旧值 - 新增采集记录(按月分区保留 90 天)、人工冲正流水与后台接口、采集告警 - 扣减按采集时刻有效套餐查找,只对生效中套餐做状态迁移,查不到套餐按成功跳过 - 换货新卡(新设备下的卡)打待建起点;采集间隔上限只校验启用中的轮询配置 Change: add-card-traffic-queue-and-observed-deduction Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
3
migrations/000267_add_card_traffic_collection.down.sql
Normal file
3
migrations/000267_add_card_traffic_collection.down.sql
Normal file
@@ -0,0 +1,3 @@
|
||||
-- 回滚卡流量采集记录与待建起点标记。
|
||||
DROP TABLE IF EXISTS tb_card_traffic_collection;
|
||||
ALTER TABLE tb_iot_card DROP COLUMN IF EXISTS traffic_baseline_pending;
|
||||
52
migrations/000267_add_card_traffic_collection.up.sql
Normal file
52
migrations/000267_add_card_traffic_collection.up.sql
Normal file
@@ -0,0 +1,52 @@
|
||||
-- 卡流量采集队列与全量切换(add-card-traffic-queue-and-observed-deduction)。
|
||||
-- 1. tb_iot_card 增加"待建起点"标记:带标记的卡第一次通过采集队列写入时,只写快照、把本月最大快照全部记为已结算、
|
||||
-- 不扣费,然后清标记。全量切换时全部卡置位,避免把卡表基线算法已扣过的本月用量再扣一遍;换卡新卡同样置位。
|
||||
-- 2. 新增采集记录 tb_card_traffic_collection:采集时刻有套餐的卡每次采集一条(含接口失败、读数为 0、被队列拦下),
|
||||
-- 按 observed_at 按月分区,保留 90 天,过期按整月分区删除(由应用层维护分区)。系统写入,不软删。
|
||||
-- 3. 不使用数据库外键;iot_card_id 由应用层显式校验(ENG-MODEL-001)。
|
||||
|
||||
ALTER TABLE tb_iot_card ADD COLUMN traffic_baseline_pending BOOLEAN NOT NULL DEFAULT FALSE;
|
||||
COMMENT ON COLUMN tb_iot_card.traffic_baseline_pending IS '卡流量待建起点:第一次通过采集队列写入时只建起点不扣费,之后清除';
|
||||
UPDATE tb_iot_card SET traffic_baseline_pending = TRUE WHERE deleted_at IS NULL;
|
||||
|
||||
CREATE TABLE tb_card_traffic_collection (
|
||||
id BIGSERIAL,
|
||||
iot_card_id BIGINT NOT NULL,
|
||||
observed_at TIMESTAMPTZ NOT NULL,
|
||||
observation_id VARCHAR(128) NOT NULL DEFAULT '',
|
||||
source VARCHAR(32) NOT NULL DEFAULT '',
|
||||
scene VARCHAR(64) NOT NULL DEFAULT '',
|
||||
result VARCHAR(32) NOT NULL,
|
||||
vendor_used_mb NUMERIC(14,3),
|
||||
queue_points JSONB,
|
||||
decision VARCHAR(32) NOT NULL DEFAULT '',
|
||||
month_used_mb NUMERIC(14,3),
|
||||
stale_guarded BOOLEAN,
|
||||
delta_mb NUMERIC(14,3),
|
||||
event_id VARCHAR(128) NOT NULL DEFAULT '',
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
PRIMARY KEY (id, observed_at)
|
||||
) PARTITION BY RANGE (observed_at);
|
||||
|
||||
CREATE INDEX idx_card_traffic_collection_card_time ON tb_card_traffic_collection (iot_card_id, observed_at DESC);
|
||||
CREATE INDEX idx_card_traffic_collection_observation ON tb_card_traffic_collection (observation_id);
|
||||
|
||||
COMMENT ON TABLE tb_card_traffic_collection IS '卡流量采集记录:采集时刻有套餐的卡每次采集一条,按月分区保留 90 天';
|
||||
COMMENT ON COLUMN tb_card_traffic_collection.observation_id IS '采集 ID,与流量事件、扣费审计串联';
|
||||
COMMENT ON COLUMN tb_card_traffic_collection.source IS '来源:polling/manual_sync/business_event';
|
||||
COMMENT ON COLUMN tb_card_traffic_collection.scene IS '场景:traffic_polling/manual_refresh/pre_activation_settlement 等';
|
||||
COMMENT ON COLUMN tb_card_traffic_collection.result IS '读数结果:ok/failed/rate_limited/invalid_payload/no_reading/invalid_reading';
|
||||
COMMENT ON COLUMN tb_card_traffic_collection.vendor_used_mb IS '运营商原始读数(MB),没有给值时为空';
|
||||
COMMENT ON COLUMN tb_card_traffic_collection.queue_points IS '入队后的采集队列(采集时间 + 读数)';
|
||||
COMMENT ON COLUMN tb_card_traffic_collection.decision IS '写入判断:written/baseline/queue_not_full/slope_negative/out_of_order/settled_existing,读数无效时为空';
|
||||
COMMENT ON COLUMN tb_card_traffic_collection.month_used_mb IS '写入时换算后的本月累计(MB)';
|
||||
COMMENT ON COLUMN tb_card_traffic_collection.stale_guarded IS '写入时是否触发重置日防旧值';
|
||||
COMMENT ON COLUMN tb_card_traffic_collection.delta_mb IS '写入时本次增量(MB)';
|
||||
COMMENT ON COLUMN tb_card_traffic_collection.event_id IS '写入时的流量事件 ID';
|
||||
|
||||
CREATE TABLE tb_card_traffic_collection_202610 PARTITION OF tb_card_traffic_collection
|
||||
FOR VALUES FROM ('2026-10-01 00:00:00+08') TO ('2026-11-01 00:00:00+08');
|
||||
CREATE TABLE tb_card_traffic_collection_202611 PARTITION OF tb_card_traffic_collection
|
||||
FOR VALUES FROM ('2026-11-01 00:00:00+08') TO ('2026-12-01 00:00:00+08');
|
||||
CREATE TABLE tb_card_traffic_collection_202612 PARTITION OF tb_card_traffic_collection
|
||||
FOR VALUES FROM ('2026-12-01 00:00:00+08') TO ('2027-01-01 00:00:00+08');
|
||||
2
migrations/000268_add_package_usage_adjustment.down.sql
Normal file
2
migrations/000268_add_package_usage_adjustment.down.sql
Normal file
@@ -0,0 +1,2 @@
|
||||
-- 回滚套餐流量人工冲正流水。
|
||||
DROP TABLE IF EXISTS tb_package_usage_adjustment;
|
||||
38
migrations/000268_add_package_usage_adjustment.up.sql
Normal file
38
migrations/000268_add_package_usage_adjustment.up.sql
Normal file
@@ -0,0 +1,38 @@
|
||||
-- 套餐流量人工冲正流水(add-card-traffic-queue-and-observed-deduction)。
|
||||
-- 冲正只通过本表进行:事务内锁套餐行、按当前已用量加减,退回后不得小于 0;冲正不改卡日快照与已结算。
|
||||
-- 只新增不修改、不删除;不使用数据库外键(ENG-MODEL-001)。
|
||||
CREATE TABLE tb_package_usage_adjustment (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
package_usage_id BIGINT NOT NULL,
|
||||
iot_card_id BIGINT NOT NULL DEFAULT 0,
|
||||
device_id BIGINT NOT NULL DEFAULT 0,
|
||||
delta_mb BIGINT NOT NULL,
|
||||
before_usage_mb BIGINT NOT NULL,
|
||||
after_usage_mb BIGINT NOT NULL,
|
||||
before_status INTEGER NOT NULL,
|
||||
after_status INTEGER NOT NULL,
|
||||
reason VARCHAR(500) NOT NULL,
|
||||
ref_observation_id VARCHAR(128) NOT NULL DEFAULT '',
|
||||
ref_event_id VARCHAR(128) NOT NULL DEFAULT '',
|
||||
operator_id BIGINT NOT NULL,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
CONSTRAINT ck_package_usage_adjustment_delta CHECK (delta_mb <> 0),
|
||||
CONSTRAINT ck_package_usage_adjustment_after CHECK (after_usage_mb >= 0)
|
||||
);
|
||||
|
||||
CREATE INDEX idx_package_usage_adjustment_usage ON tb_package_usage_adjustment (package_usage_id, created_at DESC);
|
||||
CREATE INDEX idx_package_usage_adjustment_card ON tb_package_usage_adjustment (iot_card_id, created_at DESC);
|
||||
|
||||
COMMENT ON TABLE tb_package_usage_adjustment IS '套餐流量人工冲正流水:正数补扣、负数退回';
|
||||
COMMENT ON COLUMN tb_package_usage_adjustment.package_usage_id IS '套餐使用记录ID';
|
||||
COMMENT ON COLUMN tb_package_usage_adjustment.iot_card_id IS '单卡套餐的卡ID,设备套餐为 0';
|
||||
COMMENT ON COLUMN tb_package_usage_adjustment.device_id IS '设备套餐的设备ID,单卡套餐为 0';
|
||||
COMMENT ON COLUMN tb_package_usage_adjustment.delta_mb IS '调整量(MB):正数补扣,负数退回';
|
||||
COMMENT ON COLUMN tb_package_usage_adjustment.before_usage_mb IS '锁定后调整前的套餐已用量(MB)';
|
||||
COMMENT ON COLUMN tb_package_usage_adjustment.after_usage_mb IS '调整后的套餐已用量(MB)';
|
||||
COMMENT ON COLUMN tb_package_usage_adjustment.before_status IS '调整前套餐状态';
|
||||
COMMENT ON COLUMN tb_package_usage_adjustment.after_status IS '调整后套餐状态';
|
||||
COMMENT ON COLUMN tb_package_usage_adjustment.reason IS '冲正原因(必填)';
|
||||
COMMENT ON COLUMN tb_package_usage_adjustment.ref_observation_id IS '关联的采集 ID(可选)';
|
||||
COMMENT ON COLUMN tb_package_usage_adjustment.ref_event_id IS '关联的流量事件 ID(可选)';
|
||||
COMMENT ON COLUMN tb_package_usage_adjustment.operator_id IS '操作人账号ID';
|
||||
Reference in New Issue
Block a user