refactor(escort): 取消状态与 status 解耦
- 新增 cancelStatus(none/requested/cancelled),status 只描述服务生命周期 - record_state 拆分 canCancelTransition 与 CANCEL_TRANSITIONS - 管理端 Agent 工具、查询工具与接口层统一走取消状态机 - 列表默认隐藏已取消订单,支持 cancelStatus / includeCancelled 筛选
This commit is contained in:
+110
-43
@@ -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) => {
|
||||
|
||||
Reference in New Issue
Block a user