完善报销通知与付款进度(08-01-reimbursement-notification-progress-clarity)
这个提交包含在:
@@ -11,6 +11,7 @@ const { parseDateOnlyString } = require("../utils/date");
|
||||
const { FEATURE_FLAG_KEYS, evaluateFeatureFlag } = require("../services/featureFlags");
|
||||
const { createNotificationsWithRecords } = require("../services/notifications");
|
||||
const { NOTIFICATION_TYPES } = require("../constants/notificationTypes");
|
||||
const { resolvePermissionsForRoles, hasPermission } = require("../constants/permissions");
|
||||
const { sendNotificationEmailSafe } = require("../services/email");
|
||||
const { flushNotificationDispatchTasks } = require("../services/notificationDispatcher");
|
||||
const { enqueueReimbursementJournalExport } = require("../services/integrations/erpJournal");
|
||||
@@ -247,6 +248,118 @@ function ensureBatchReviewPermission(fastify, request) {
|
||||
}
|
||||
}
|
||||
|
||||
function roleCodesOf(employee) {
|
||||
return (employee?.roles ?? []).map((role) => role.role_code).filter(Boolean);
|
||||
}
|
||||
|
||||
function employeeHasRolePermission(employee, permissionCode) {
|
||||
return hasPermission(resolvePermissionsForRoles(roleCodesOf(employee)), permissionCode);
|
||||
}
|
||||
|
||||
async function resolvePaymentReviewRecipientIds(tx, makerId) {
|
||||
const candidates = await tx.employee.findMany({
|
||||
where: {
|
||||
status: "active",
|
||||
id: { not: makerId },
|
||||
roles: { some: { role_code: { in: ["manager", "ceo"] } } },
|
||||
},
|
||||
orderBy: [{ employee_no: "asc" }, { id: "asc" }],
|
||||
select: {
|
||||
id: true,
|
||||
roles: { select: { role_code: true } },
|
||||
},
|
||||
});
|
||||
|
||||
return candidates
|
||||
.filter((employee) => employeeHasRolePermission(employee, "payment.batch.review"))
|
||||
.map((employee) => employee.id);
|
||||
}
|
||||
|
||||
async function resolvePaymentExecutionRecipientIds(tx, { makerId, reviewerId }) {
|
||||
const candidates = await tx.employee.findMany({
|
||||
where: {
|
||||
status: "active",
|
||||
id: { not: reviewerId },
|
||||
OR: [
|
||||
{ id: makerId },
|
||||
{ roles: { some: { role_code: { in: ["finance", "finance_mgr"] } } } },
|
||||
],
|
||||
},
|
||||
orderBy: [{ employee_no: "asc" }, { id: "asc" }],
|
||||
select: {
|
||||
id: true,
|
||||
roles: { select: { role_code: true } },
|
||||
},
|
||||
});
|
||||
const eligible = candidates.filter((employee) =>
|
||||
employee.id !== reviewerId && employeeHasRolePermission(employee, "payment.batch.manage"),
|
||||
);
|
||||
const activeMaker = eligible.find((employee) => employee.id === makerId);
|
||||
if (activeMaker) {
|
||||
return [activeMaker.id];
|
||||
}
|
||||
|
||||
return eligible
|
||||
.filter((employee) => roleCodesOf(employee).some((roleCode) => ["finance", "finance_mgr"].includes(roleCode)))
|
||||
.map((employee) => employee.id);
|
||||
}
|
||||
|
||||
async function createPaymentResponsibilityNotification(tx, {
|
||||
recipientEmployeeIds,
|
||||
type,
|
||||
title,
|
||||
body,
|
||||
batchId,
|
||||
actorId,
|
||||
}) {
|
||||
const notifications = await createNotificationsWithRecords(tx, {
|
||||
recipientEmployeeIds,
|
||||
type,
|
||||
title,
|
||||
body,
|
||||
targetType: "payment_batch",
|
||||
targetId: batchId,
|
||||
});
|
||||
|
||||
return {
|
||||
notifications,
|
||||
type,
|
||||
title,
|
||||
body,
|
||||
targetType: "payment_batch",
|
||||
targetId: batchId,
|
||||
targetPath: `/payment-batches?id=${encodeURIComponent(batchId)}`,
|
||||
actorId,
|
||||
};
|
||||
}
|
||||
|
||||
async function dispatchPaymentResponsibilityNotification(fastify, request, task) {
|
||||
if (!task?.notifications?.length) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
await flushNotificationDispatchTasks({
|
||||
prisma: fastify.prisma,
|
||||
config: fastify.config,
|
||||
logger: fastify.log,
|
||||
requestId: request.id,
|
||||
tasks: [task],
|
||||
});
|
||||
} catch (error) {
|
||||
fastify.log.error(
|
||||
{
|
||||
err: error,
|
||||
requestId: request.id,
|
||||
notificationType: task.type,
|
||||
targetType: task.targetType,
|
||||
targetId: task.targetId,
|
||||
},
|
||||
"Failed to dispatch payment responsibility notification",
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
function buildBatchNo() {
|
||||
const now = new Date();
|
||||
const date = now.toISOString().slice(0, 10).replace(/-/g, "");
|
||||
@@ -1057,7 +1170,7 @@ async function paymentBatchesRoutes(fastify) {
|
||||
}
|
||||
const entityIds = Array.from(new Set(body.entityIds)).sort();
|
||||
|
||||
const created = await fastify.prisma.$transaction(async (tx) => {
|
||||
const { batch: created, notificationTask } = await fastify.prisma.$transaction(async (tx) => {
|
||||
await lockPaymentEntities(tx, body.entityType, entityIds);
|
||||
const snapshots = await loadEntitySnapshots(tx, body.entityType, entityIds);
|
||||
if (snapshots.length !== entityIds.length) {
|
||||
@@ -1130,9 +1243,24 @@ async function paymentBatchesRoutes(fastify) {
|
||||
}),
|
||||
});
|
||||
|
||||
return loadBatchWithItems(tx, batch.id);
|
||||
const recipientEmployeeIds = await resolvePaymentReviewRecipientIds(tx, request.employee.id);
|
||||
const nextNotificationTask = await createPaymentResponsibilityNotification(tx, {
|
||||
recipientEmployeeIds,
|
||||
type: NOTIFICATION_TYPES.paymentBatchReviewRequested,
|
||||
title: "待付款复核",
|
||||
body: "付款安排已创建,请完成付款复核。",
|
||||
batchId: batch.id,
|
||||
actorId: request.employee.id,
|
||||
});
|
||||
|
||||
return {
|
||||
batch: await loadBatchWithItems(tx, batch.id),
|
||||
notificationTask: nextNotificationTask,
|
||||
};
|
||||
});
|
||||
|
||||
await dispatchPaymentResponsibilityNotification(fastify, request, notificationTask);
|
||||
|
||||
return reply.code(201).send({ requestId: request.id, data: { item: mapBatch(created, []) } });
|
||||
});
|
||||
|
||||
@@ -1590,7 +1718,7 @@ async function paymentBatchesRoutes(fastify) {
|
||||
const batchId = parseId(request.params?.id);
|
||||
const body = parseBody(REVIEW_SCHEMA, request.body);
|
||||
|
||||
const result = await fastify.prisma.$transaction(async (tx) => {
|
||||
const { batch: result, notificationTask } = await fastify.prisma.$transaction(async (tx) => {
|
||||
const batch = await lockBatchWithItems(tx, batchId);
|
||||
await ensureBatchSourceDepartmentsEnabled(fastify, tx, batch);
|
||||
const batchRisk = summarizeBatchRisk(batch);
|
||||
@@ -1659,9 +1787,27 @@ async function paymentBatchesRoutes(fastify) {
|
||||
}),
|
||||
});
|
||||
|
||||
return reviewed;
|
||||
const recipientEmployeeIds = await resolvePaymentExecutionRecipientIds(tx, {
|
||||
makerId: batch.created_by,
|
||||
reviewerId: request.employee.id,
|
||||
});
|
||||
const nextNotificationTask = await createPaymentResponsibilityNotification(tx, {
|
||||
recipientEmployeeIds,
|
||||
type: NOTIFICATION_TYPES.paymentBatchExecutionRequested,
|
||||
title: "待完成付款",
|
||||
body: "付款复核已通过,请完成付款并登记回单。",
|
||||
batchId,
|
||||
actorId: request.employee.id,
|
||||
});
|
||||
|
||||
return {
|
||||
batch: reviewed,
|
||||
notificationTask: nextNotificationTask,
|
||||
};
|
||||
});
|
||||
|
||||
await dispatchPaymentResponsibilityNotification(fastify, request, notificationTask);
|
||||
|
||||
return sendData(reply, request, { item: mapBatch(result, []) });
|
||||
});
|
||||
|
||||
|
||||
在新工单中引用
屏蔽一个用户