打手端待审撤单与未处理反馈订单归入问题单分组并标注来源角标

This commit is contained in:
yml2213
2026-08-22 15:04:30 +08:00
parent 061bc2636d
commit 2224dd06d3
14 changed files with 249 additions and 41 deletions
@@ -2,6 +2,9 @@ import { runtimeConfig } from '../../config/runtime.js'
import {
createWorkerCancelRequest,
createWorkerOrderFeedback,
getLatestMaterialEventAtByOrderIds,
getPendingCancelRequestOrderIds,
getPendingFeedbackOrderIds,
getWorkOrderShare,
getWorkerCancelRequestRisk,
getWorkerOrderOverview,
@@ -61,26 +64,47 @@ export async function listWorkerMyOrders(query: JsonObject = {}, session: Worker
const myShares = await listWorkerSharesByWorker(worker.id)
const myShareByOrderId = new Map(myShares.map((share) => [Number(share.work_order_id), share]))
const workOrderIds = items.map((item) => Number(item.id))
const [notes, views] = await Promise.all([
listWorkerWorkOrderNotes(worker.id, workOrderIds),
listWorkerWorkOrderViews(worker.id, workOrderIds),
])
const [notes, views, pendingCancelOrderIds, pendingFeedbackOrderIds, materialEventAtByOrderId] =
await Promise.all([
listWorkerWorkOrderNotes(worker.id, workOrderIds),
listWorkerWorkOrderViews(worker.id, workOrderIds),
getPendingCancelRequestOrderIds(worker.id, workOrderIds),
getPendingFeedbackOrderIds(worker.id, workOrderIds),
getLatestMaterialEventAtByOrderIds(workOrderIds),
])
const noteByOrderId = new Map(
notes.map((item) => [Number(item.work_order_id), String(item.note || '')]),
)
const viewedAtByOrderId = new Map(
views.map((item) => [Number(item.work_order_id), String(item.viewed_at || '')]),
)
const materialSeenAtByOrderId = new Map(
views.map((item) => [Number(item.work_order_id), String(item.material_seen_at || '')]),
)
return {
items: items.map((item) =>
mapWorkOrderForWorker(
item,
permissions,
myShareByOrderId.get(Number(item.id)),
noteByOrderId.get(Number(item.id)) || '',
viewedAtByOrderId.get(Number(item.id)) || null,
),
),
items: items.map((item) => {
const workOrderId = Number(item.id)
const materialEventAt = materialEventAtByOrderId.get(workOrderId) || ''
const materialSeenAt = materialSeenAtByOrderId.get(workOrderId) || ''
const materialUpdated =
Boolean(materialEventAt) &&
(!materialSeenAt ||
new Date(materialEventAt).getTime() > new Date(materialSeenAt).getTime())
return {
...mapWorkOrderForWorker(
item,
permissions,
myShareByOrderId.get(workOrderId),
noteByOrderId.get(workOrderId) || '',
viewedAtByOrderId.get(workOrderId) || null,
),
// 问题单分组内的来源角标:平台标记 / 撤单审核中 / 反馈处理中。
problemMarked: item.status === 'problem',
pendingCancelRequest: pendingCancelOrderIds.has(workOrderId),
pendingFeedback: pendingFeedbackOrderIds.has(workOrderId),
materialUpdated,
}
}),
pagination: { page, pageSize, total },
}
}
@@ -319,8 +343,12 @@ export async function saveWorkerOrderNote(
}
}
/** 标记打手本人已查看工单,首次操作后不再展示“新”标识。 */
export async function markWorkerOrderRead(workOrderId: number | string, session: WorkerSession) {
/** 标记打手本人已查看工单,首次操作后不再展示“新”标识;materialSeen 同时刷新资料查看时间。 */
export async function markWorkerOrderRead(
workOrderId: number | string,
payload: JsonObject = {},
session: WorkerSession,
) {
requireActiveWorkerSession(session)
const workOrder = await getRequiredWorkOrder(workOrderId)
const workerId = Number(session.workerId)
@@ -339,6 +367,7 @@ export async function markWorkerOrderRead(workOrderId: number | string, session:
workOrderId: Number(workOrder.id),
workerId,
now: nowIso(),
materialSeen: payload.materialSeen === true || payload.materialSeen === 'true',
})
publishWorkOrderRealtimeChange({
workOrderId: Number(workOrder.id),