refactor(escort): 取消状态与 status 解耦

- 新增 cancelStatus(none/requested/cancelled),status 只描述服务生命周期
- record_state 拆分 canCancelTransition 与 CANCEL_TRANSITIONS
- 管理端 Agent 工具、查询工具与接口层统一走取消状态机
- 列表默认隐藏已取消订单,支持 cancelStatus / includeCancelled 筛选
This commit is contained in:
lik
2026-11-05 18:54:52 +08:00
parent 23b9de16a6
commit fb1210106e
8 changed files with 286 additions and 74 deletions
+18 -4
View File
@@ -1,7 +1,7 @@
import { test } from "node:test";
import assert from "node:assert/strict";
import { canTransition, STATUS_TRANSITIONS } from "../utils/record_state.js";
import { canTransition, canCancelTransition, STATUS_TRANSITIONS, CANCEL_TRANSITIONS } from "../utils/record_state.js";
import { isAdmin } from "../utils/permissions.js";
import { escapeRegex } from "../agent/infra/tools/db/utils.js";
import {
@@ -18,16 +18,26 @@ test("订单状态机只允许正向流转", () => {
assert.equal(canTransition("pending", "confirmed"), true);
assert.equal(canTransition("confirmed", "in_progress"), true);
assert.equal(canTransition("in_progress", "completed"), true);
assert.equal(canTransition("pending", "cancelled"), true);
// 取消已从 status 拆出,不再作为状态迁移
assert.equal(canTransition("pending", "cancelled"), false);
// 终态不可回退,也不能跳步
assert.equal(canTransition("completed", "in_progress"), false);
assert.equal(canTransition("cancelled", "pending"), false);
assert.equal(canTransition("pending", "completed"), false);
// 未知状态一律拒绝
assert.equal(canTransition("unknown", "pending"), false);
});
test("取消状态机独立于服务状态", () => {
assert.equal(canCancelTransition("none", "requested"), true);
assert.equal(canCancelTransition("none", "cancelled"), true);
assert.equal(canCancelTransition("requested", "cancelled"), true);
// 已取消不可回退,也不能再次申请
assert.equal(canCancelTransition("cancelled", "none"), false);
assert.equal(canCancelTransition("cancelled", "requested"), false);
assert.equal(canCancelTransition("requested", "none"), false);
});
test("管理端身份要求显式 role=admin", () => {
assert.equal(isAdmin(null), false);
assert.equal(isAdmin({}), false);
@@ -145,6 +155,10 @@ test("百度地图请求自动注入鉴权且不影响其他域名", () => {
test("状态机表覆盖全部订单状态", () => {
assert.deepEqual(
Object.keys(STATUS_TRANSITIONS).sort(),
["cancel_requested", "cancelled", "completed", "confirmed", "in_progress", "pending"]
["completed", "confirmed", "in_progress", "pending"]
);
assert.deepEqual(
Object.keys(CANCEL_TRANSITIONS).sort(),
["cancelled", "none", "requested"]
);
});