fix(escort): 陪诊员仅可管理分配给自己的订单
在职陪诊员此前对任意订单都能执行状态流转,订单主人只要同时是陪诊员 就能自行确认或完成服务。改为只有订单上指派的陪诊员才具备管理权, 其余情况一律走用户取消流程。
This commit is contained in:
@@ -766,6 +766,11 @@ class HandlerEscortRecord {
|
||||
const isUserApp = requestAppId === "wxapp-escort";
|
||||
const role = isUserApp ? null : await resolveEscortAdminRole(user);
|
||||
const isOwner = String(existing.userId) === String(user?._id);
|
||||
const isAssignedAttendant = role === "attendant"
|
||||
&& String(existing.attendant?.id || "") === String(user?._id || "");
|
||||
// 陪诊员身份只赋予其名下订单的管理权。订单主人即使同时是在职陪诊员,
|
||||
// 对未分配给自己的订单也只能走用户取消流程,不能自行确认或完成服务。
|
||||
const canManageOrder = role === "admin" || isAssignedAttendant;
|
||||
const paymentStatus = existing.payment?.status || "unpaid";
|
||||
const cancelReason = String(reason || "").trim().slice(0, 200);
|
||||
let effectivePaymentStatus = paymentStatus;
|
||||
@@ -780,7 +785,7 @@ class HandlerEscortRecord {
|
||||
return ResponseUtil.badRequest(ctx, "订单已取消,不能再次操作");
|
||||
}
|
||||
|
||||
if (role !== "admin" && role !== "attendant") {
|
||||
if (!canManageOrder) {
|
||||
// 用户端只能取消:未确认订单直接取消(未收款删除、已收款退款);已确认订单提交取消申请
|
||||
if (status !== "cancelled" || !isOwner) {
|
||||
return ResponseUtil.forbidden(ctx, "不支持的状态变更");
|
||||
|
||||
@@ -183,6 +183,41 @@ test("切换支付渠道时嵌套 payment 摊平后不会产生路径冲突", as
|
||||
);
|
||||
});
|
||||
|
||||
test("在职陪诊员不能确认未分配给自己的本人订单", async () => {
|
||||
const record = buildRecord({ status: "pending" });
|
||||
let statusUpdates = 0;
|
||||
const recordStub = {
|
||||
...createRecordStub(record),
|
||||
updateRecordStatus: async () => {
|
||||
statusUpdates += 1;
|
||||
return record;
|
||||
},
|
||||
};
|
||||
const employeeStub = {
|
||||
findOne: () => ({
|
||||
select: () => ({
|
||||
lean: async () => ({ role: "attendant" }),
|
||||
}),
|
||||
}),
|
||||
};
|
||||
|
||||
await withModel("EscortRecord", recordStub, () =>
|
||||
withModel("Employee", employeeStub, async () => {
|
||||
const ctx = createCtx({
|
||||
user: {
|
||||
_id: OWNER_ID,
|
||||
app: { "wxapp-escort-admin": { role: ["user"] } },
|
||||
},
|
||||
body: { status: "confirmed" },
|
||||
});
|
||||
await new HandlerEscortRecord().updateStatus(ctx);
|
||||
|
||||
assert.equal(ctx.body.code, 403);
|
||||
assert.equal(statusUpdates, 0);
|
||||
})
|
||||
);
|
||||
});
|
||||
|
||||
test("健康档案更新把嵌套对象摊平成点号路径", () => {
|
||||
const picked = HandlerHealthProfile.pickFields(
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user