From df0752204deab2f8bc42545f47641c05eda7f01e Mon Sep 17 00:00:00 2001 From: lik Date: Tue, 3 Nov 2026 17:45:45 +0800 Subject: [PATCH] =?UTF-8?q?feat(escort):=20=E9=99=AA=E8=AF=8A=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=94=AF=E6=8C=81=E8=AE=B0=E5=BD=95=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=EF=BC=88=E7=BA=BF=E4=B8=8A=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?/=E7=BA=BF=E4=B8=8B=E7=8E=B0=E9=87=91/=E7=BA=BF=E4=B8=8B?= =?UTF-8?q?=E8=BD=AC=E8=B4=A6=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- handler/escort_record.js | 19 +++++++++++++++++-- models/schema/escort_record.js | 9 ++++++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/handler/escort_record.js b/handler/escort_record.js index 93b4fec..695168f 100644 --- a/handler/escort_record.js +++ b/handler/escort_record.js @@ -34,6 +34,9 @@ class HandlerEscortRecord { // 迁移规则集中在 utils/record_state.js,与管理端 Agent 工具共用 static OWNER_ALLOWED_STATUS = ["cancelled"]; + // 支付方式为平台受控枚举(与 schema 一致),空串表示清除/未记录 + static PAYMENT_METHODS = ["", "online_wechat", "offline_cash", "offline_transfer"]; + // 单页最大条数,避免 pageSize 传超大值一次拖库 static MAX_PAGE_SIZE = 200; @@ -296,8 +299,9 @@ class HandlerEscortRecord { if (!service.areas.includes(body.hospital?.province)) { return ResponseUtil.badRequest(ctx, "所选省份暂未开通服务"); } - if (!String(body.hospital?.name || "").trim() || !String(body.hospital?.department || "").trim()) { - return ResponseUtil.badRequest(ctx, "请填写就诊医院和科室"); + // 科室为选填:用户可能尚未确定科室,可下单后在详情页补录 + if (!String(body.hospital?.name || "").trim()) { + return ResponseUtil.badRequest(ctx, "请填写就诊医院"); } const scheduleResult = HandlerEscortRecord.buildSchedule( service, @@ -331,6 +335,11 @@ class HandlerEscortRecord { paidFee: 0, status: "unpaid", }; + // 支付方式由平台在收款时补记:仅管理员代客下单时可指定,用户端提交一律丢弃 + if (HandlerEscortRecord.isAdmin(ctx.state.user) + && HandlerEscortRecord.PAYMENT_METHODS.includes(body.payment?.method)) { + payload.payment.method = body.payment.method; + } try { const newRecord = await DBModel.EscortRecord.createRecord(payload); @@ -381,6 +390,12 @@ class HandlerEscortRecord { return ResponseUtil.badRequest(ctx, "该订单当前状态不支持修改这些信息"); } + // 支付方式为受控枚举:管理端修改时校验,防止写入非法值 + const paymentMethod = update["payment.method"] ?? update.payment?.method; + if (paymentMethod !== undefined && !HandlerEscortRecord.PAYMENT_METHODS.includes(paymentMethod)) { + return ResponseUtil.badRequest(ctx, "支付方式不正确"); + } + // 档案归属校验:档案必须属于订单所属用户,避免把订单挂到他人档案上; // 通过后同步刷新订单里的就诊人快照 if (payload.healthProfileId) { diff --git a/models/schema/escort_record.js b/models/schema/escort_record.js index d1ad33b..9446d28 100644 --- a/models/schema/escort_record.js +++ b/models/schema/escort_record.js @@ -12,7 +12,7 @@ import mongoose from "mongoose"; * - 就诊信息:hospital(医院省份、名称、地址、科室、医生、病历号) * - 时间安排:schedule(预约时间、开始时间、结束时间、时长) * - 陪诊员信息:attendant(陪诊员ID、姓名) - * - 费用信息:payment(总费用、已支付、支付状态) + * - 费用信息:payment(总费用、已支付、支付方式、支付状态) * - 备注信息:notes(患者备注、陪诊记录、就诊摘要) * - 状态信息:status(陪诊状态) * - 元数据:meta(创建时间、更新时间) @@ -118,6 +118,13 @@ const EscortRecordSchema = mongoose.Schema( payment: { totalFee: { type: Number, default: 0, comment: "陪诊服务总费用(元)" }, paidFee: { type: Number, default: 0, comment: "已支付费用(元)" }, + // 支付由客服协助完成,方式由平台在收款时补记;空串表示未记录(历史订单兼容) + method: { + type: String, + enum: ["", "online_wechat", "offline_cash", "offline_transfer"], + default: "", + comment: "支付方式:线上微信、线下现金、线下转账", + }, status: { type: String, enum: ["unpaid", "partial", "paid", "refunding", "refunded"],