diff --git a/handler/escort_record.js b/handler/escort_record.js index ae96b2e..d748e68 100644 --- a/handler/escort_record.js +++ b/handler/escort_record.js @@ -913,18 +913,19 @@ class HandlerEscortRecord { const addressResult = HandlerEscortRecord.buildShippingAddress(body.shippingAddress, profile); const payload = HandlerEscortRecord.pickFields(body); - // 用户可在下单时指定陪诊师:只认 employeeId,快照字段由服务端回填。 + // 下单时指定陪诊师:只认 employeeId,快照字段由服务端回填。 + // 管理员用用户端下单也要走这条解析:否则会把客户端原样的 { employeeId } + // 落库(name/mobile 走默认空串、id 缺失),详情页会误显示「待分配」。 // 未指定则清空,订单进入公共订单池等待抢单或管理端指派。 let selectedEmployee = null; - if (!isAdmin) { + if (body.attendant?.employeeId) { const selected = await HandlerEscortRecord.resolveSelectedAttendant(body.attendant); if (selected.error) return ResponseUtil.badRequest(ctx, selected.error); - if (selected.employee) { - selectedEmployee = selected.employee; - payload.attendant = { ...selected.snapshot, sharedWith: [] }; - } else { - delete payload.attendant; - } + selectedEmployee = selected.employee; + payload.attendant = { ...selected.snapshot, sharedWith: [] }; + } else if (!isAdmin) { + // 用户端不接受客户端自带的姓名 / 电话快照 + delete payload.attendant; } // 归属以档案为准:管理员传入的 userId 一律忽略,无归属档案留空 payload.userId = orderUserId; diff --git a/test/attendant_selection.test.js b/test/attendant_selection.test.js index 62afb27..c9c78fa 100644 --- a/test/attendant_selection.test.js +++ b/test/attendant_selection.test.js @@ -49,11 +49,11 @@ function buildBody(attendant) { }; } -function createCtx(body) { +function createCtx(body, user = { _id: USER_ID }) { return { request: { query: {}, body }, params: {}, - state: { user: { _id: USER_ID } }, + state: { user }, headers: {}, status: 200, body: null, @@ -83,7 +83,7 @@ function employeeFindOneStub(employee, overrides = {}) { }; } -async function runCreate({ attendant, employee = buildEmployee() } = {}) { +async function runCreate({ attendant, employee = buildEmployee(), user } = {}) { const calls = { payload: null, bumped: null }; const recordStub = { findByIdempotencyKey: async () => null, @@ -99,7 +99,7 @@ async function runCreate({ attendant, employee = buildEmployee() } = {}) { }, }); - const ctx = createCtx(buildBody(attendant)); + const ctx = createCtx(buildBody(attendant), user); await withModel("HealthProfile", { findProfileById: async () => buildProfile() }, () => withModel("EscortRecord", recordStub, () => withModel("Employee", employeeStub, () => new HandlerEscortRecord().createRecord(ctx)) @@ -125,6 +125,28 @@ test("用户下单指定陪诊师:服务端回填快照并累加接单数", as assert.equal(calls.bumped, EMPLOYEE_ID); }); +test("管理员用用户端下单指定陪诊师:同样回填快照而不是落库 employeeId", async () => { + const admin = { + _id: USER_ID, + apps: [{ appId: "web-escort-admin", roles: ["admin"], status: "active" }], + }; + const { ctx, calls } = await runCreate({ + user: admin, + attendant: { employeeId: EMPLOYEE_ID }, + }); + + assert.equal(ctx.body.code, 0); + assert.deepEqual(calls.payload.attendant, { + id: EMPLOYEE_USER_ID, + name: "李四", + sex: "female", + mobile: "13700137000", + sharedWith: [], + }); + assert.equal(calls.payload.attendant.employeeId, undefined); + assert.equal(calls.bumped, EMPLOYEE_ID); +}); + test("用户不指定陪诊师:订单进入公共池,不写陪诊师、不累加接单数", async () => { const { ctx, calls } = await runCreate({ attendant: null });