From fb1210106ef6e30a094a0167ebbf20de4682a1ad Mon Sep 17 00:00:00 2001 From: lik Date: Thu, 5 Nov 2026 18:54:52 +0800 Subject: [PATCH] =?UTF-8?q?refactor(escort):=20=E5=8F=96=E6=B6=88=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=8E=20status=20=E8=A7=A3=E8=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 cancelStatus(none/requested/cancelled),status 只描述服务生命周期 - record_state 拆分 canCancelTransition 与 CANCEL_TRANSITIONS - 管理端 Agent 工具、查询工具与接口层统一走取消状态机 - 列表默认隐藏已取消订单,支持 cancelStatus / includeCancelled 筛选 --- agent/bots/bot-escort-admin/prompts.js | 2 +- .../infra/tools/db/admin/escort_record_set.js | 55 ++++++- .../tools/db/attendant/escort_record_set.js | 12 +- .../tools/db/query/escort_record_query.js | 20 ++- handler/escort_record.js | 153 +++++++++++++----- models/schema/escort_record.js | 61 ++++++- test/logic.test.js | 22 ++- utils/record_state.js | 35 +++- 8 files changed, 286 insertions(+), 74 deletions(-) diff --git a/agent/bots/bot-escort-admin/prompts.js b/agent/bots/bot-escort-admin/prompts.js index 1ed055e..ca5ff50 100644 --- a/agent/bots/bot-escort-admin/prompts.js +++ b/agent/bots/bot-escort-admin/prompts.js @@ -55,7 +55,7 @@ class EscortAdminPrompts { 1. 先判定是查询、修改还是问规则;缺关键信息(订单或患者、要改成什么、时间范围)先用一句话确认,不猜。 2. 修改前先用查询定位记录,只用 escort_record_set 改用户明确要求的字段,其余字段不动。 3. 取消、改期、改金额、退款等不可逆或影响结算的操作,先复述"要改什么"并等确认。 -4. 状态只能按规则流转:pending→confirmed→in_progress→completed;pending/confirmed 可转 cancelled;completed、cancelled 为终态不可再改。被拒绝时如实说明当前状态和可选状态,不绕过、不空转重试。 +4. 服务状态只能按规则流转:pending→confirmed→in_progress→completed,completed 为终态不可再改。取消与状态解耦,用 cancelStatus 单独表达:none→requested→cancelled;已申请取消或已取消的订单不再推进服务状态。被拒绝时如实说明当前状态和可选状态,不绕过、不空转重试。 5. 结果回报:改完一句说清"改了什么、当前状态";失败说清原因和下一步。 6. 无工具支持的数据(结算汇总、财务报表、线下沟通记录)不推断、不估算,明确说明查不到并指向对应页面或同事。 diff --git a/agent/infra/tools/db/admin/escort_record_set.js b/agent/infra/tools/db/admin/escort_record_set.js index 189af8b..de7be9d 100644 --- a/agent/infra/tools/db/admin/escort_record_set.js +++ b/agent/infra/tools/db/admin/escort_record_set.js @@ -2,10 +2,15 @@ import { tool } from "@langchain/core/tools"; import { z } from "zod"; import mongoose from "mongoose"; import { DBModel } from "../../../../../models/index.js"; -import { canTransition, STATUS_TRANSITIONS } from "../../../../../utils/record_state.js"; +import { + canTransition, + canCancelTransition, + STATUS_TRANSITIONS, + CANCEL_STATUS_VALUES, +} from "../../../../../utils/record_state.js"; const escortRecordSetTool = tool( - async ({ orderId, status, notes, payment }) => { + async ({ orderId, status, cancelStatus, notes, payment }) => { try { if (!orderId) { return { @@ -32,8 +37,37 @@ const escortRecordSetTool = tool( // 状态迁移必须与接口层同一套规则:否则 Agent 能把已完成订单改回进行中, // 绕过状态机并造成费用/服务记录不一致 const update = {}; + // 兼容旧数据:取消曾存放在 status 中 + const currentCancel = record.status === "cancelled" + ? "cancelled" + : (record.cancelStatus || "none"); + + // 取消与 status 解耦,单独走取消状态机 + if (cancelStatus !== undefined && cancelStatus !== currentCancel) { + if (!canCancelTransition(currentCancel, cancelStatus)) { + return { + success: false, + error: `Illegal cancel status transition: ${currentCancel} -> ${cancelStatus}`, + }; + } + update.cancelStatus = cancelStatus; + if (cancelStatus === "requested") update.cancelRequestedAt = new Date(); + if (cancelStatus === "cancelled") update.cancelledAt = new Date(); + } if (status !== undefined && status !== record.status) { + if (currentCancel !== "none") { + return { + success: false, + error: "Order is cancelling or cancelled; service status cannot change.", + }; + } + if (update.cancelStatus) { + return { + success: false, + error: "Do not update service status and cancel status in the same request.", + }; + } if (!canTransition(record.status, status)) { const allowed = STATUS_TRANSITIONS[record.status] || []; return { @@ -75,6 +109,11 @@ const escortRecordSetTool = tool( // 以读取时的状态作为更新条件,避免并发下跳过中间状态;同时排除已软删除的订单 const filter = { _id: record._id, deletedAt: null }; if (status !== undefined && status !== record.status) filter.status = record.status; + if (cancelStatus !== undefined && cancelStatus !== currentCancel) { + filter.cancelStatus = currentCancel === "none" + ? { $in: ["none", null] } + : currentCancel; + } const updatedRecord = await DBModel.EscortRecord.findOneAndUpdate( filter, @@ -103,16 +142,22 @@ const escortRecordSetTool = tool( { name: "escort_record_set", description: - "Update escort record fields by record ID (_id). Supports updating status, notes (patientNote, escortNote, medicalSummary), and payment (totalFee, paidFee, status). Only provided fields will be updated.", + "Update escort record fields by record ID (_id). Supports updating service status, cancel status (none/requested/cancelled), notes (patientNote, escortNote, medicalSummary), and payment (totalFee, paidFee, status). Only provided fields will be updated.", schema: z.object({ orderId: z .string() .describe("Record ID (_id) used as the lookup key"), status: z - .enum(["pending", "confirmed", "in_progress", "completed", "cancelled"]) + .enum(["pending", "confirmed", "in_progress", "completed"]) .optional() .describe( - "Appointment status: pending (待确认), confirmed (已确认), in_progress (进行中), completed (已完成), cancelled (已取消)" + "Service status: pending (待确认), confirmed (已确认), in_progress (进行中), completed (已完成). Cancellation is controlled by cancelStatus." + ), + cancelStatus: z + .enum(CANCEL_STATUS_VALUES) + .optional() + .describe( + "Cancel status: none (未取消), requested (待取消), cancelled (已取消)" ), notes: z .object({ diff --git a/agent/infra/tools/db/attendant/escort_record_set.js b/agent/infra/tools/db/attendant/escort_record_set.js index 1971e60..2764713 100644 --- a/agent/infra/tools/db/attendant/escort_record_set.js +++ b/agent/infra/tools/db/attendant/escort_record_set.js @@ -59,13 +59,17 @@ function buildAttendantEscortRecordSetTool({ attendantId = null } = {}) { }; } + if ((record.cancelStatus || "none") !== "none" || record.status === "cancelled") { + return { + success: false, + error: "订单已取消或正在取消,不能修改。", + }; + } + if (!EDITABLE_RECORD_STATUS.includes(record.status)) { return { success: false, - error: - record.status === "pending" - ? "订单还未确认,不能操作,请联系管理员确认。" - : "订单已取消,不能修改。", + error: "订单还未确认或已结束,不能操作。", }; } diff --git a/agent/infra/tools/db/query/escort_record_query.js b/agent/infra/tools/db/query/escort_record_query.js index caab8c2..0c39cde 100644 --- a/agent/infra/tools/db/query/escort_record_query.js +++ b/agent/infra/tools/db/query/escort_record_query.js @@ -3,9 +3,12 @@ import { z } from "zod"; import { DBModel } from "../../../../../models/index.js"; import { escapeRegex, parseObjectId } from "../utils.js"; -const STATUS_VALUES = ["pending", "confirmed", "in_progress", "completed", "cancelled"]; +const STATUS_VALUES = ["pending", "confirmed", "in_progress", "completed"]; const STATUS_DESC = - "Appointment status: pending (待确认), confirmed (已确认), in_progress (进行中), completed (已完成), cancelled (已取消)"; + "Service status: pending (待确认), confirmed (已确认), in_progress (进行中), completed (已完成). Cancellation is a separate cancelStatus."; +const CANCEL_STATUS_VALUES = ["none", "requested", "cancelled"]; +const CANCEL_STATUS_DESC = + "Cancel status: none (未取消), requested (待取消), cancelled (已取消)"; /** * 严格解析 YYYY-MM-DD(东八区零点) @@ -41,6 +44,7 @@ function buildEscortRecordQueryTool({ userId = null, allowMobile = false, boundA const shape = { patientName: z.string().optional().describe("Patient name for fuzzy search"), status: z.enum(STATUS_VALUES).optional().describe(STATUS_DESC), + cancelStatus: z.enum(CANCEL_STATUS_VALUES).optional().describe(CANCEL_STATUS_DESC), page: z.number().int().min(1).optional().describe("Page number, starting from 1"), pageSize: z .number() @@ -71,7 +75,7 @@ function buildEscortRecordQueryTool({ userId = null, allowMobile = false, boundA } return tool( - async ({ patientName, mobile, attendantId, dateFrom, dateTo, status, page = 1, pageSize = 20 }) => { + async ({ patientName, mobile, attendantId, dateFrom, dateTo, status, cancelStatus, page = 1, pageSize = 20 }) => { try { if (!userId && !allowMobile && !attendantScope) { return { success: false, error: "用户未登录,无法查询陪诊记录" }; @@ -124,6 +128,16 @@ function buildEscortRecordQueryTool({ userId = null, allowMobile = false, boundA filter.status = status; } + if (cancelStatus === "cancelled") { + // 兼容旧数据:取消曾存放在 status 中 + filter.$or = [{ cancelStatus: "cancelled" }, { status: "cancelled" }]; + } else if (cancelStatus) { + filter.cancelStatus = cancelStatus; + } else if (!status) { + // 与列表口径一致:未显式查询时隐藏旧数据里的 status=cancelled + filter.status = { $ne: "cancelled" }; + } + // 用户端按订单归属过滤;不能用手机号作为隔离键(手机号可由用户自行修改) if (userId) { filter.userId = userId; diff --git a/handler/escort_record.js b/handler/escort_record.js index 1f35b5b..42a53f7 100644 --- a/handler/escort_record.js +++ b/handler/escort_record.js @@ -3,7 +3,12 @@ import services from "../resource/services.js"; import ResponseUtil from "../utils/responseUtil.js"; import logger from "../utils/logger.js"; import { isAdmin as isAdminUser, resolveEscortAdminRole } from "../utils/permissions.js"; -import { canTransition, STATUS_TRANSITIONS } from "../utils/record_state.js"; +import { + canTransition, + canCancelTransition, + STATUS_TRANSITIONS, + CANCEL_STATUS_VALUES, +} from "../utils/record_state.js"; import { HandlerPayment } from "./payment.js"; class HandlerEscortRecord { @@ -33,7 +38,8 @@ class HandlerEscortRecord { }; // 用户端只能发起取消,服务完成由平台确认,避免用户端重复写入终态。 - // 「未确认且未收款」取消即物理删除;其余先进 cancel_requested,等陪诊师/管理员确认。 + // 取消与 status 解耦:cancelStatus 为 requested 表示待确认,cancelled 表示已取消。 + // 「未确认且未收款」取消即物理删除;其余先置 requested,等陪诊师/管理员确认。 // 迁移规则集中在 utils/record_state.js,与管理端 Agent 工具共用 // 支付方式为平台受控枚举(与 schema 一致),空串表示清除/未记录 @@ -215,7 +221,7 @@ class HandlerEscortRecord { async _listRecords(ctx, forceSelf) { try { - const { status, userId, appointmentDate, healthProfileId } = ctx.request.query; + const { status, userId, appointmentDate, healthProfileId, cancelStatus, includeCancelled } = ctx.request.query; const { page, pageSize } = HandlerEscortRecord.parsePaging(ctx.request.query); const effectiveUserId = forceSelf ? ctx.state.user?._id : userId; @@ -229,10 +235,21 @@ class HandlerEscortRecord { return ResponseUtil.badRequest(ctx, "订单状态筛选值不正确"); } + // 取消状态筛选:none / requested / cancelled + let cancelStatusArray = null; + if (cancelStatus && String(cancelStatus).length > 0) { + cancelStatusArray = String(cancelStatus).split(',').filter(Boolean); + if (cancelStatusArray.some((item) => !CANCEL_STATUS_VALUES.includes(item))) { + return ResponseUtil.badRequest(ctx, "订单取消状态筛选值不正确"); + } + } + const result = await DBModel.EscortRecord.findRecordPage({ page, pageSize, status: statusArray, + cancelStatus: cancelStatusArray, + includeCancelled: ["1", "true"].includes(String(includeCancelled)), userId: effectiveUserId, appointmentDate, healthProfileId, @@ -415,10 +432,17 @@ class HandlerEscortRecord { } const isAdmin = HandlerEscortRecord.isAdmin(ctx.state.user); - // 非管理员的可改字段随订单状态收敛:终态无可改字段,进行中只剩就诊人备注 + // 兼容旧数据:取消曾存放在 status 中 + const cancelStatus = existing.status === "cancelled" + ? "cancelled" + : (existing.cancelStatus || "none"); + // 非管理员的可改字段随订单状态收敛:终态无可改字段,进行中只剩就诊人备注; + // 已申请取消或已取消的订单一律冻结,等待平台处理 const allowFields = isAdmin ? HandlerEscortRecord.RECORD_FIELDS - : HandlerEscortRecord.ownerEditableFields(existing.status); + : cancelStatus !== "none" + ? [] + : HandlerEscortRecord.ownerEditableFields(existing.status); if (allowFields.length === 0) { return ResponseUtil.forbidden(ctx, "已结束的订单不可修改"); } @@ -442,6 +466,9 @@ class HandlerEscortRecord { if (!HandlerEscortRecord.PAY_CHANNELS.includes(requestedChannel)) { return ResponseUtil.badRequest(ctx, "支付方式不正确"); } + if (cancelStatus !== "none") { + return ResponseUtil.badRequest(ctx, "已申请取消的订单不可修改支付方式"); + } if ((existing.payment?.status || "unpaid") !== "unpaid") { return ResponseUtil.forbidden(ctx, "已收款订单不可修改支付方式"); } @@ -563,20 +590,35 @@ class HandlerEscortRecord { let effectivePaymentStatus = paymentStatus; let effectivePayment = existing.payment || {}; - let targetStatus = status; + // 兼容旧数据:取消曾存放在 status 中 + const cancelStatus = existing.status === "cancelled" + ? "cancelled" + : (existing.cancelStatus || "none"); + + if (cancelStatus === "cancelled") { + return ResponseUtil.badRequest(ctx, "订单已取消,不能再次操作"); + } + if (role !== "admin" && role !== "attendant") { - // 用户端只能取消:未确认且未收款直接物理删除;已确认或已收款先进取消申请 + // 用户端只能取消:未确认且未收款直接物理删除;其余提交取消申请 if (status !== "cancelled" || !isOwner) { return ResponseUtil.forbidden(ctx, "不支持的状态变更"); } + if (cancelStatus === "requested") { + return ResponseUtil.badRequest(ctx, "取消申请已提交,请等待确认"); + } + if (!["pending", "confirmed"].includes(existing.status)) { + return ResponseUtil.badRequest(ctx, "当前订单状态不允许此操作"); + } + if (!cancelReason) return ResponseUtil.badRequest(ctx, "请选择取消原因"); + if (paymentStatus === "unpaid" && existing.status === "pending") { - if (!cancelReason) return ResponseUtil.badRequest(ctx, "请选择取消原因"); // 删除前必须先关单,否则旧 prepay 仍可支付一张已不存在的订单 const closeResult = await HandlerPayment.closeOpenPayRecords(id); if (closeResult.paid) { // 关单后发现钱已到账:不能删除,转待取消并等待确认后退款 - const updated = await DBModel.EscortRecord.updateRecordStatus(id, "pending", { - status: "cancel_requested", + const updated = await DBModel.EscortRecord.updateRecordCancel(id, cancelStatus, { + cancelStatus: "requested", cancelReason, cancelRequestedAt: new Date(), }); @@ -595,51 +637,76 @@ class HandlerEscortRecord { } return ResponseUtil.success(ctx, { record: deletedRecord, deleted: true }, "订单已取消"); } - if (!["pending", "confirmed"].includes(existing.status)) { - return ResponseUtil.badRequest(ctx, "当前订单状态不允许此操作"); - } + // 申请取消前先关闭未支付的 prepay,避免等待确认期间又被支付 - await HandlerPayment.closeOpenPayRecords(id); - targetStatus = "cancel_requested"; - } else if (targetStatus === "cancelled" && paymentStatus === "unpaid") { - // 平台直接取消待支付订单,同样先关单;关单后发现已支付则按已收款走退款 const closeResult = await HandlerPayment.closeOpenPayRecords(id); if (closeResult.paid) { const fresh = await DBModel.EscortRecord.findById(id); effectivePaymentStatus = fresh?.payment?.status || "paid"; effectivePayment = fresh?.payment || effectivePayment; } - } - - if (!canTransition(existing.status, targetStatus)) { - return ResponseUtil.badRequest(ctx, "当前订单状态不允许此操作"); - } - - const update = { status: targetStatus }; - if (targetStatus === "cancel_requested") { - if (!cancelReason) return ResponseUtil.badRequest(ctx, "请选择取消原因"); - update.cancelReason = cancelReason; - update.cancelRequestedAt = new Date(); - } - if (status === "cancelled") { - // 正式取消:保留申请原因;平台直接取消时补默认原因 - if (cancelReason) update.cancelReason = cancelReason; - else if (role === "admin" && !existing.cancelReason) update.cancelReason = "平台取消"; - update.cancelledAt = new Date(); - // 已收款订单先进入退款中;线上支付随后自动原路退款,线下由平台人工核销 - if (["partial", "paid"].includes(effectivePaymentStatus)) { - update["payment.status"] = "refunding"; + if (!canCancelTransition(cancelStatus, "requested")) { + return ResponseUtil.badRequest(ctx, "当前订单不允许取消"); } + const updatedRecord = await DBModel.EscortRecord.updateRecordCancel(id, cancelStatus, { + cancelStatus: "requested", + cancelReason, + cancelRequestedAt: new Date(), + }); + if (!updatedRecord) { + return ResponseUtil.error(ctx, "订单状态已变化,请刷新后重试", null, 409); + } + return ResponseUtil.success( + ctx, + { record: HandlerEscortRecord.withPaymentWindow(updatedRecord) }, + "取消申请已提交" + ); } - const updatedRecord = await DBModel.EscortRecord.updateRecordStatus(id, existing.status, update); + // 管理端/陪诊师:普通状态推进,或确认取消申请 / 直接取消 + if (status !== "cancelled") { + if (cancelStatus === "requested") { + return ResponseUtil.badRequest(ctx, "用户已申请取消,请先处理取消申请"); + } + if (!canTransition(existing.status, status)) { + return ResponseUtil.badRequest(ctx, "当前订单状态不允许此操作"); + } + const updatedRecord = await DBModel.EscortRecord.updateRecordStatus(id, existing.status, { status }); + if (!updatedRecord) { + return ResponseUtil.error(ctx, "订单状态已变化,请刷新后重试", null, 409); + } + return ResponseUtil.success(ctx, { record: updatedRecord }, "状态更新成功"); + } + + if (!canCancelTransition(cancelStatus, "cancelled")) { + return ResponseUtil.badRequest(ctx, "当前订单不允许取消"); + } + + // 取消前先关单:未支付订单可能仍有旧 prepay 在途,关单后发现已支付则按已收款走退款 + const closeResult = await HandlerPayment.closeOpenPayRecords(id); + if (closeResult.paid) { + const fresh = await DBModel.EscortRecord.findById(id); + effectivePaymentStatus = fresh?.payment?.status || "paid"; + effectivePayment = fresh?.payment || effectivePayment; + } + + const update = { + cancelStatus: "cancelled", + cancelledAt: new Date(), + // 已收款订单先进入退款中;线上支付随后自动原路退款,线下由平台人工核销 + ...(["partial", "paid"].includes(effectivePaymentStatus) ? { "payment.status": "refunding" } : {}), + }; + // 正式取消:保留申请原因;平台直接取消时补默认原因 + if (cancelReason) update.cancelReason = cancelReason; + else if (role === "admin" && !existing.cancelReason) update.cancelReason = "平台取消"; + + const updatedRecord = await DBModel.EscortRecord.updateRecordCancel(id, cancelStatus, update); if (!updatedRecord) { return ResponseUtil.error(ctx, "订单状态已变化,请刷新后重试", null, 409); } - // 已支付的线上订单:状态落库后再发起原路全额退款 - if (targetStatus === "cancelled" - && effectivePayment?.method === "online_wechat" + // 已支付的线上订单:取消落库后再发起原路全额退款 + if (effectivePayment?.method === "online_wechat" && ["partial", "paid"].includes(effectivePaymentStatus)) { HandlerPayment.createRefundForRecord(updatedRecord, { reason: updatedRecord.cancelReason || cancelReason || "订单取消", @@ -685,7 +752,7 @@ class HandlerEscortRecord { const update = { deletedAt: new Date() }; if (["partial", "paid"].includes(paymentStatus)) { - update.status = "cancelled"; + update.cancelStatus = "cancelled"; update.cancelReason = existing.cancelReason || "平台删除"; update.cancelledAt = update.deletedAt; update["payment.status"] = "refunding"; @@ -694,7 +761,7 @@ class HandlerEscortRecord { if (!softDeleted) { return ResponseUtil.error(ctx, "陪诊记录不存在", null, 404); } - if (update.status === "cancelled" && paymentMethod === "online_wechat") { + if (update.cancelStatus === "cancelled" && paymentMethod === "online_wechat") { HandlerPayment.createRefundForRecord(softDeleted, { reason: softDeleted.cancelReason || "平台删除", }).catch((err) => { diff --git a/models/schema/escort_record.js b/models/schema/escort_record.js index 303fe69..e7e457d 100644 --- a/models/schema/escort_record.js +++ b/models/schema/escort_record.js @@ -155,19 +155,33 @@ const EscortRecordSchema = mongoose.Schema( }, /** - * 陪诊状态 + * 陪诊状态(只描述服务生命周期,不含取消) * - pending: 待确认 - 订单已创建,等待确认 * - confirmed: 已确认 - 订单已确认,等待服务 - * - cancel_requested: 待取消 - 用户已申请取消,等待陪诊师或管理员确认 * - in_progress: 进行中 - 陪诊服务正在进行 * - completed: 已完成 - 陪诊服务已完成 - * - cancelled: 已取消 - 订单已取消 + * + * 取消单独用 cancelStatus 表达,取消后 status 保留取消前的服务状态。 */ status: { type: String, - enum: ["pending", "confirmed", "cancel_requested", "in_progress", "completed", "cancelled"], + enum: ["pending", "confirmed", "in_progress", "completed"], default: "pending", - comment: "陪诊状态:待确认、已确认、待取消、进行中、已完成、已取消", + comment: "陪诊状态:待确认、已确认、进行中、已完成", + }, + + /** + * 取消状态(与 status 解耦) + * - none: 未取消 + * - requested: 用户已申请取消,等待陪诊师/管理员确认 + * - cancelled: 已取消 + */ + cancelStatus: { + type: String, + enum: ["none", "requested", "cancelled"], + default: "none", + index: true, + comment: "取消状态:无、待取消、已取消", }, cancelReason: { type: String, default: "", comment: "订单取消原因" }, @@ -209,7 +223,10 @@ const EscortRecordSchema = mongoose.Schema( * @returns {Promise} 陪诊记录列表(按预约日期倒序) */ EscortRecordSchema.statics.buildRecordFilter = function (options = {}) { - const { status, userId, appointmentDate, healthProfileId, includeDeleted = false } = options; + const { + status, cancelStatus, userId, appointmentDate, healthProfileId, + includeDeleted = false, includeCancelled = false, + } = options; const filter = {}; // 软删除的订单默认不进入列表:数据库里保留审计,界面上视为已删除 @@ -218,6 +235,19 @@ EscortRecordSchema.statics.buildRecordFilter = function (options = {}) { if (status && Array.isArray(status) && status.length > 0) { filter.status = { $in: status }; } + // 取消状态与 status 解耦:默认隐藏已取消订单,显式指定 cancelStatus 或 includeCancelled 时放开 + if (cancelStatus && Array.isArray(cancelStatus) && cancelStatus.length > 0) { + if (cancelStatus.length === 1 && cancelStatus[0] === "cancelled") { + // 兼容旧数据:取消曾存放在 status 中 + filter.$or = [{ cancelStatus: "cancelled" }, { status: "cancelled" }]; + } else { + filter.cancelStatus = { $in: cancelStatus }; + } + } else if (!includeCancelled) { + // 历史数据没有 cancelStatus 字段,按未取消处理;旧数据仍可能把 cancelled 存在 status 里 + filter.cancelStatus = { $ne: "cancelled" }; + if (!filter.status) filter.status = { $ne: "cancelled" }; + } if (userId) filter.userId = userId; if (healthProfileId) filter.healthProfileId = healthProfileId; if (appointmentDate) { @@ -251,7 +281,11 @@ EscortRecordSchema.statics.findRecordPage = async function (options = {}) { this.find(filter).sort({ "schedule.date": -1 }).skip(skip).limit(pageSize).exec(), this.countDocuments(filter).exec(), this.countDocuments(baseFilter).exec(), - this.countDocuments({ ...baseFilter, status: { $in: ["pending", "confirmed", "in_progress"] } }).exec(), + this.countDocuments({ + ...baseFilter, + status: { $in: ["pending", "confirmed", "in_progress"] }, + cancelStatus: { $ne: "cancelled" }, + }).exec(), ]); return { records, total, counts: { all, ongoing } }; }; @@ -329,6 +363,19 @@ EscortRecordSchema.statics.updateRecordStatus = async function (id, fromStatus, ); }; +// 取消状态迁移以读取时的 cancelStatus 为条件;历史数据缺字段时按 none 处理。 +EscortRecordSchema.statics.updateRecordCancel = async function (id, fromCancelStatus, update) { + const from = fromCancelStatus || "none"; + const cancelFilter = from === "none" + ? { cancelStatus: { $in: ["none", null] } } + : { cancelStatus: from }; + return await this.findOneAndUpdate( + { _id: id, deletedAt: null, ...cancelFilter }, + { $set: { ...update, "meta.updatetime": Date.now() } }, + { new: true, runValidators: true } + ); +}; + EscortRecordSchema.statics.findByIdempotencyKey = async function (userId, idempotencyKey) { return await this.findOne({ userId, idempotencyKey, deletedAt: null }).exec(); }; diff --git a/test/logic.test.js b/test/logic.test.js index a079ed9..84a1add 100644 --- a/test/logic.test.js +++ b/test/logic.test.js @@ -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"] ); }); diff --git a/utils/record_state.js b/utils/record_state.js index 6f141e9..6109693 100644 --- a/utils/record_state.js +++ b/utils/record_state.js @@ -3,21 +3,32 @@ * * 之前 Agent 的 escort_record_set 直接改 status,绕过了接口层的迁移校验, * 可以把已完成订单改回进行中。规则集中在这里,任何入口都必须走 canTransition。 + * + * status 只描述服务生命周期;取消由独立的 cancelStatus 表达: + * - none → requested:用户对已确认/已收款订单提交取消申请,等陪诊师或管理员确认 + * - none / requested → cancelled:正式取消 */ -// 允许的状态迁移;终态不可再变 -// cancel_requested:用户对已确认/已收款订单提交的取消申请,等陪诊师或管理员确认 +// 允许的服务状态迁移;completed 不可再变 const STATUS_TRANSITIONS = { - pending: ["confirmed", "cancel_requested", "cancelled"], - confirmed: ["in_progress", "cancel_requested", "cancelled"], - cancel_requested: ["cancelled"], + pending: ["confirmed"], + confirmed: ["in_progress"], in_progress: ["completed"], completed: [], +}; + +// 取消状态迁移;cancelled 不可再变 +const CANCEL_TRANSITIONS = { + none: ["requested", "cancelled"], + requested: ["cancelled"], cancelled: [], }; +// 取消状态枚举,供接口参数校验复用 +const CANCEL_STATUS_VALUES = Object.keys(CANCEL_TRANSITIONS); + /** - * 判断状态迁移是否允许 + * 判断服务状态迁移是否允许 * @param {string} from 当前状态 * @param {string} to 目标状态 * @returns {boolean} @@ -26,4 +37,14 @@ function canTransition(from, to) { return (STATUS_TRANSITIONS[from] || []).includes(to); } -export { STATUS_TRANSITIONS, canTransition }; +/** + * 判断取消状态迁移是否允许 + * @param {string} from 当前取消状态 + * @param {string} to 目标取消状态 + * @returns {boolean} + */ +function canCancelTransition(from, to) { + return (CANCEL_TRANSITIONS[from] || []).includes(to); +} + +export { STATUS_TRANSITIONS, CANCEL_TRANSITIONS, CANCEL_STATUS_VALUES, canTransition, canCancelTransition };