feat(escort): 订单取消改为两级确认
未确认且未收款的订单取消后直接删除;已确认或已收款转 cancel_requested,由名下陪诊师或管理员确认后正式取消,避免用户单方取消已履约订单。DELETE 接口收紧为仅管理员软删除。
This commit is contained in:
+55
-38
@@ -1,7 +1,7 @@
|
||||
import { DBModel } from "../models/index.js";
|
||||
import services from "../resource/services.js";
|
||||
import ResponseUtil from "../utils/responseUtil.js";
|
||||
import { isAdmin as isAdminUser } from "../utils/permissions.js";
|
||||
import { isAdmin as isAdminUser, resolveEscortAdminRole } from "../utils/permissions.js";
|
||||
import { canTransition, STATUS_TRANSITIONS } from "../utils/record_state.js";
|
||||
|
||||
class HandlerEscortRecord {
|
||||
@@ -30,9 +30,9 @@ class HandlerEscortRecord {
|
||||
in_progress: ["notes.patientNote"],
|
||||
};
|
||||
|
||||
// 用户端只能取消;服务完成由平台确认,避免用户端重复写入终态。
|
||||
// 用户端只能发起取消,服务完成由平台确认,避免用户端重复写入终态。
|
||||
// 「未确认且未收款」取消即物理删除;其余先进 cancel_requested,等陪诊师/管理员确认。
|
||||
// 迁移规则集中在 utils/record_state.js,与管理端 Agent 工具共用
|
||||
static OWNER_ALLOWED_STATUS = ["cancelled"];
|
||||
|
||||
// 支付方式为平台受控枚举(与 schema 一致),空串表示清除/未记录
|
||||
static PAYMENT_METHODS = ["", "online_wechat", "offline_cash", "offline_transfer"];
|
||||
@@ -80,7 +80,10 @@ class HandlerEscortRecord {
|
||||
static canAccess(user, record) {
|
||||
if (!record) return false;
|
||||
if (HandlerEscortRecord.isAdmin(user)) return true;
|
||||
return String(record.userId) === String(user?._id);
|
||||
if (String(record.userId) === String(user?._id)) return true;
|
||||
// 陪诊师可访问自己名下的订单:管理端要据此处理取消申请与服务状态
|
||||
return Boolean(record.attendant?.id)
|
||||
&& String(record.attendant.id) === String(user?._id);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -461,22 +464,50 @@ class HandlerEscortRecord {
|
||||
return ResponseUtil.forbidden(ctx, "无权修改该订单");
|
||||
}
|
||||
|
||||
const isAdmin = HandlerEscortRecord.isAdmin(ctx.state.user);
|
||||
if (!isAdmin && !HandlerEscortRecord.OWNER_ALLOWED_STATUS.includes(status)) {
|
||||
return ResponseUtil.forbidden(ctx, "不支持的状态变更");
|
||||
const user = ctx.state.user;
|
||||
const role = await resolveEscortAdminRole(user);
|
||||
const isOwner = String(existing.userId) === String(user?._id);
|
||||
const paymentStatus = existing.payment?.status || "unpaid";
|
||||
|
||||
let targetStatus = status;
|
||||
if (role !== "admin" && role !== "attendant") {
|
||||
// 用户端只能取消:未确认且未收款直接物理删除;已确认或已收款先进取消申请
|
||||
if (status !== "cancelled" || !isOwner) {
|
||||
return ResponseUtil.forbidden(ctx, "不支持的状态变更");
|
||||
}
|
||||
if (paymentStatus === "unpaid" && existing.status === "pending") {
|
||||
// 接入微信支付后:删除前必须先关单,否则旧 prepay 仍可支付一张已不存在的订单
|
||||
const deletedRecord = await DBModel.EscortRecord.deleteRecord(id);
|
||||
if (!deletedRecord) {
|
||||
return ResponseUtil.error(ctx, "陪诊记录不存在", null, 404);
|
||||
}
|
||||
return ResponseUtil.success(ctx, { record: deletedRecord, deleted: true }, "订单已取消");
|
||||
}
|
||||
if (!["pending", "confirmed"].includes(existing.status)) {
|
||||
return ResponseUtil.badRequest(ctx, "当前订单状态不允许此操作");
|
||||
}
|
||||
targetStatus = "cancel_requested";
|
||||
}
|
||||
if (!canTransition(existing.status, status)) {
|
||||
|
||||
if (!canTransition(existing.status, targetStatus)) {
|
||||
return ResponseUtil.badRequest(ctx, "当前订单状态不允许此操作");
|
||||
}
|
||||
|
||||
const update = { status };
|
||||
if (status === "cancelled") {
|
||||
const cancelReason = String(reason || (isAdmin ? "平台取消" : "")).trim();
|
||||
const update = { status: targetStatus };
|
||||
const cancelReason = String(reason || "").trim().slice(0, 200);
|
||||
if (targetStatus === "cancel_requested") {
|
||||
if (!cancelReason) return ResponseUtil.badRequest(ctx, "请选择取消原因");
|
||||
update.cancelReason = cancelReason.slice(0, 200);
|
||||
// 接入微信支付后:此处应关闭未支付的 prepay,避免申请取消期间又被支付
|
||||
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(existing.payment?.status)) {
|
||||
if (["partial", "paid"].includes(paymentStatus)) {
|
||||
update["payment.status"] = "refunding";
|
||||
}
|
||||
}
|
||||
@@ -504,36 +535,22 @@ class HandlerEscortRecord {
|
||||
if (!existing) {
|
||||
return ResponseUtil.error(ctx, "陪诊记录不存在", null, 404);
|
||||
}
|
||||
if (!HandlerEscortRecord.canAccess(ctx.state.user, existing)) {
|
||||
|
||||
// 用户端不再提供删除入口:未确认且未收款的取消已在 updateStatus 中直接物理删除。
|
||||
// 这里只保留管理员的数据清理能力,且一律软删除,保留费用与服务审计链。
|
||||
if (!HandlerEscortRecord.isAdmin(ctx.state.user)) {
|
||||
return ResponseUtil.forbidden(ctx, "无权删除该订单");
|
||||
}
|
||||
|
||||
// 删除口径(与产品确认一致):
|
||||
// - 未支付且未进入服务阶段:物理删除,允许用户/管理员清理误建订单;
|
||||
// - 其他(已支付/进行中/已完成):仅管理员可「软删除」,
|
||||
// 状态置为已取消并打 deletedAt 标记,保留费用与服务审计链,列表默认不再展示
|
||||
const paymentStatus = existing.payment?.status || "unpaid";
|
||||
const hardDeletable = paymentStatus === "unpaid"
|
||||
&& ["pending", "confirmed", "cancelled"].includes(existing.status);
|
||||
|
||||
if (hardDeletable) {
|
||||
const deletedRecord = await DBModel.EscortRecord.deleteRecord(id);
|
||||
if (!deletedRecord) {
|
||||
return ResponseUtil.error(ctx, "陪诊记录不存在", null, 404);
|
||||
}
|
||||
return ResponseUtil.success(ctx, { record: deletedRecord }, "删除成功");
|
||||
const update = { deletedAt: new Date() };
|
||||
if (["partial", "paid"].includes(paymentStatus)) {
|
||||
update.status = "cancelled";
|
||||
update.cancelReason = existing.cancelReason || "平台删除";
|
||||
update.cancelledAt = update.deletedAt;
|
||||
update["payment.status"] = "refunding";
|
||||
}
|
||||
|
||||
if (!HandlerEscortRecord.isAdmin(ctx.state.user)) {
|
||||
return ResponseUtil.forbidden(ctx, "该订单不可删除");
|
||||
}
|
||||
|
||||
const softDeleted = await DBModel.EscortRecord.updateRecord(id, {
|
||||
status: "cancelled",
|
||||
cancelReason: "平台删除",
|
||||
cancelledAt: new Date(),
|
||||
deletedAt: new Date(),
|
||||
});
|
||||
const softDeleted = await DBModel.EscortRecord.updateRecord(id, update);
|
||||
if (!softDeleted) {
|
||||
return ResponseUtil.error(ctx, "陪诊记录不存在", null, 404);
|
||||
}
|
||||
|
||||
@@ -146,18 +146,20 @@ const EscortRecordSchema = mongoose.Schema(
|
||||
* 陪诊状态
|
||||
* - pending: 待确认 - 订单已创建,等待确认
|
||||
* - confirmed: 已确认 - 订单已确认,等待服务
|
||||
* - cancel_requested: 待取消 - 用户已申请取消,等待陪诊师或管理员确认
|
||||
* - in_progress: 进行中 - 陪诊服务正在进行
|
||||
* - completed: 已完成 - 陪诊服务已完成
|
||||
* - cancelled: 已取消 - 订单已取消
|
||||
*/
|
||||
status: {
|
||||
type: String,
|
||||
enum: ["pending", "confirmed", "in_progress", "completed", "cancelled"],
|
||||
enum: ["pending", "confirmed", "cancel_requested", "in_progress", "completed", "cancelled"],
|
||||
default: "pending",
|
||||
comment: "陪诊状态:待确认、已确认、进行中、已完成、已取消",
|
||||
comment: "陪诊状态:待确认、已确认、待取消、进行中、已完成、已取消",
|
||||
},
|
||||
|
||||
cancelReason: { type: String, default: "", comment: "订单取消原因" },
|
||||
cancelRequestedAt: { type: Date, default: null, comment: "用户申请取消时间" },
|
||||
cancelledAt: { type: Date, default: null, comment: "订单取消时间" },
|
||||
|
||||
/**
|
||||
|
||||
+1
-1
@@ -145,6 +145,6 @@ test("百度地图请求自动注入鉴权且不影响其他域名", () => {
|
||||
test("状态机表覆盖全部订单状态", () => {
|
||||
assert.deepEqual(
|
||||
Object.keys(STATUS_TRANSITIONS).sort(),
|
||||
["cancelled", "completed", "confirmed", "in_progress", "pending"]
|
||||
["cancel_requested", "cancelled", "completed", "confirmed", "in_progress", "pending"]
|
||||
);
|
||||
});
|
||||
|
||||
@@ -6,9 +6,11 @@
|
||||
*/
|
||||
|
||||
// 允许的状态迁移;终态不可再变
|
||||
// cancel_requested:用户对已确认/已收款订单提交的取消申请,等陪诊师或管理员确认
|
||||
const STATUS_TRANSITIONS = {
|
||||
pending: ["confirmed", "cancelled"],
|
||||
confirmed: ["in_progress", "cancelled"],
|
||||
pending: ["confirmed", "cancel_requested", "cancelled"],
|
||||
confirmed: ["in_progress", "cancel_requested", "cancelled"],
|
||||
cancel_requested: ["cancelled"],
|
||||
in_progress: ["completed"],
|
||||
completed: [],
|
||||
cancelled: [],
|
||||
|
||||
Reference in New Issue
Block a user