dachui/order_site
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(worker): 打手接单界面支持查看超时历史订单并增加安全免责警示

Browse Source 
- 数据库与查询层：通过索引 idx_work_order_events_timeout_worker_id 关联打手历史 timeout 事件与取消的拼单份额，打手在退回大厅或被他人抢走后仍能在「已超时」tab 查看历史记录；
- 状态与权限管控：针对超时工单将个人端状态稳定映射为 open，报酬与冻结押金置为 0，彻底禁用上传图片、提交验收、好友资料、申请取消等履约操作；
- 风险防护与免责说明：列表与抽屉详情顶部增加醒目的免责声明与警示横幅（告知订单已退回大厅或被他人接手，严禁在游戏内继续赠送，造成的损失平台概不负责）；锁定买家游戏资料与快捷复制；
- 验证方式：通过后端全部 676 个测试、typecheck、check:sql 及前端 check（eslint、vitest/node:test、tsc、vite build）。
This commit is contained in:
yml2213
2026-10-11 15:20:46 +08:00
parent b82f9c4063
commit 6012add3c9
10 changed files with 460 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/backend/src/repositories/worker-platform/work-order-query-repo.ts
+112 -1
View File
@@ -240,7 +240,18 @@ export function workerOrderStatusExpression(workerId = 0, workerShareAlias = 'wo
AND wf.status = 'pending'
)
)`
const isTimeoutForMe = `(
(wo.assigned_worker_id IS DISTINCT FROM ${normalizedWorkerId})
AND COALESCE(${workerShareAlias}.status, '') NOT IN ('joined', 'submitted', 'accepted')
AND EXISTS (
SELECT 1 FROM work_order_events timeout_ev
WHERE timeout_ev.work_order_id = wo.id
AND timeout_ev.event_type LIKE 'timeout_%'
AND timeout_ev.payload_json->>'workerId' = '${normalizedWorkerId}'
)
)`
return `CASE
WHEN ${isTimeoutForMe} THEN 'open'
WHEN (${baseExpression}) = 'in_progress' AND ${pendingHandlingExists} THEN 'problem'
ELSE ${baseExpression}
END`
@@ -385,7 +396,10 @@ export async function listWorkOrders({
END,
CASE
WHEN worker_share.status != 'cancelled' THEN worker_share.created_at
END
END,
worker_share.created_at,
wo.assigned_at,
wo.created_at
) DESC NULLS LAST, wo.id DESC`
: 'wo.id DESC'
const effectiveOrderBy = pinnedFirst ? `wo.pinned_at DESC NULLS LAST, ${orderBy}` : orderBy
@@ -594,6 +608,11 @@ export async function getWorkerOrderOverview(workerId: number | string): Promise
FROM work_order_shares wos
WHERE wos.worker_id = $1
AND wos.status != 'cancelled'
UNION
SELECT timeout_ev.work_order_id
FROM work_order_events timeout_ev
WHERE timeout_ev.event_type LIKE 'timeout_%'
AND timeout_ev.payload_json->>'workerId' = $1::text
),
worker_base AS (
SELECT
@@ -601,6 +620,13 @@ export async function getWorkerOrderOverview(workerId: number | string): Promise
wo.status AS wo_status,
wos.status AS wos_status,
wos.id IS NOT NULL AS is_worker_share,
wo.assigned_worker_id = $1 AS is_assigned_to_me,
EXISTS (
SELECT 1 FROM work_order_events we
WHERE we.work_order_id = wo.id
AND we.event_type LIKE 'timeout_%'
AND we.payload_json->>'workerId' = $1::text
) AS has_timeout_for_me,
CASE
WHEN wos.id IS NOT NULL THEN wos.share_reward
WHEN wo.assigned_worker_id = $1 THEN wo.reward_amount
@@ -617,6 +643,8 @@ export async function getWorkerOrderOverview(workerId: number | string): Promise
worker_orders AS (
SELECT
CASE
WHEN NOT is_assigned_to_me AND (NOT is_worker_share OR wos_status = 'cancelled' OR wos_status IS NULL) AND has_timeout_for_me
THEN 'open'
WHEN (
CASE
WHEN is_worker_share AND wo_status NOT IN ('accepted', 'cancelled', 'problem')
@@ -887,6 +915,84 @@ export async function countWorkerTimeoutEvents(workerId: number | string): Promi
return counts.get(Number(workerId)) || 0
}
export async function listWorkerTimeoutEventsByOrderIds(
workerId: number | string,
workOrderIds: number[],
): Promise<
Map<
number,
{
eventType: string
createdAt: string
policy: string
quantity?: number
depositAmount?: number
isSharing?: boolean
}
>
> {
if (workOrderIds.length === 0) return new Map()
const result = await query<{
work_order_id: string
event_type: string
created_at: string
payload_json: Record<string, unknown> | string
}>(
`SELECT work_order_id, event_type, created_at, payload_json
FROM work_order_events
WHERE event_type LIKE 'timeout_%'
AND payload_json->>'workerId' = $1::text
AND work_order_id = ANY($2::bigint[])
ORDER BY id DESC`,
[String(workerId), workOrderIds],
)
const map = new Map<
number,
{
eventType: string
createdAt: string
policy: string
quantity?: number
depositAmount?: number
isSharing?: boolean
}
>()
for (const row of result.rows) {
const orderId = Number(row.work_order_id)
if (!map.has(orderId)) {
const payload: Record<string, unknown> =
typeof row.payload_json === 'string'
? (() => {
try {
return JSON.parse(row.payload_json) as Record<string, unknown>
} catch {
return {}
}
})()
: (row.payload_json as Record<string, unknown>) || {}
const info: {
eventType: string
createdAt: string
policy: string
quantity?: number
depositAmount?: number
isSharing?: boolean
} = {
eventType: row.event_type,
createdAt: String(row.created_at),
policy: String(payload.policy || 'reopen'),
}
const qty = Number(payload.quantity || 0)
if (qty > 0) info.quantity = qty
const dep = Number(payload.depositAmount || 0)
if (dep > 0) info.depositAmount = dep
if (payload.isSharing === true) info.isSharing = true
map.set(orderId, info)
}
}
return map
}
export async function countWorkerCancellationsSince(
workerId: number | string,
sinceIso: string,
@@ -1027,6 +1133,11 @@ export function buildWorkOrderWhere({
FROM work_order_shares share_source
WHERE share_source.worker_id = ${workerSharePlaceholder}
AND share_source.status != 'cancelled'
UNION
SELECT timeout_ev.work_order_id
FROM work_order_events timeout_ev
WHERE timeout_ev.event_type LIKE 'timeout_%'
AND timeout_ev.payload_json->>'workerId' = ${workerSharePlaceholder}
) worker_visible ON worker_visible.work_order_id = wo.id
LEFT JOIN work_order_shares worker_share
ON worker_share.work_order_id = wo.id
apps/backend/src/repositories/worker-platform/work-order-share-repo.ts
+16
View File
@@ -60,6 +60,22 @@ export async function listWorkerSharesByWorker(
return result.rows
}
export async function listCancelledWorkerSharesByWorker(
workerId: number | string,
workOrderIds: number[],
): Promise<WorkOrderShareRow[]> {
if (workOrderIds.length === 0) return []
const result = await query<WorkOrderShareRow>(
`${WORK_ORDER_SHARE_SELECT}
WHERE wos.worker_id = $1
AND wos.work_order_id = ANY($2::bigint[])
AND wos.status = 'cancelled'
ORDER BY wos.id DESC`,
[Number(workerId), workOrderIds],
)
return result.rows
}
export async function countWorkOrderPendingSharingSubmissions(
workOrderId: number | string,
): Promise<number> {
apps/backend/src/services/worker-platform/work-order-display-mappers.ts
+31 -5
View File
@@ -421,12 +421,27 @@ export function mapWorkOrderAdmin(
}
}
export type WorkerOrderMapOptions = {
isTimedOutForMe?: boolean
timeoutNotice?:
| {
isTimedOut: boolean
timedOutAt: string | null
policy?: string
warningMessage?: string
isTakenByOther?: boolean
}
| null
| undefined
}
export function mapWorkOrderForWorker(
workOrder: WorkOrderRow,
permissions: { depositFreeAmount: number },
myShare?: WorkOrderShareRow | null,
workerNote = '',
viewedAt?: string | null,
options?: WorkerOrderMapOptions,
) {
const mapped = mapWorkOrderAdmin(workOrder)
const {
@@ -441,17 +456,27 @@ export function mapWorkOrderForWorker(
adminNote: _adminNote,
...visibleOrder
} = mapped
const personalStatus = resolveWorkerShareStatus(workOrder.status, myShare?.status)
const isTimedOutForMe =
options?.isTimedOutForMe === true || Boolean(options?.timeoutNotice?.isTimedOut)
const personalStatus = isTimedOutForMe
? WORK_ORDER_STATUS.OPEN
: resolveWorkerShareStatus(workOrder.status, myShare?.status)
return {
...visibleOrder,
productName: myShare
? resolveWorkerShareProductName(workOrder.product_name, Number(myShare.quantity || 0))
: visibleOrder.productName,
status: personalStatus,
rewardAmount: myShare ? Number(myShare.share_reward || 0) : visibleOrder.rewardAmount,
freezeDepositAmount: myShare
? Number(myShare.share_deposit || 0)
: resolveFreezeDepositAmount(workOrder, permissions),
rewardAmount: isTimedOutForMe
? 0
: myShare
? Number(myShare.share_reward || 0)
: visibleOrder.rewardAmount,
freezeDepositAmount: isTimedOutForMe
? 0
: myShare
? Number(myShare.share_deposit || 0)
: resolveFreezeDepositAmount(workOrder, permissions),
/** 用于大厅拼单按当前剩余份数准确计算个人免押后的押金。 */
depositFreeAmount: Number(permissions.depositFreeAmount || 0),
assignedAt: myShare?.created_at || visibleOrder.assignedAt,
@@ -466,6 +491,7 @@ export function mapWorkOrderForWorker(
workerNote,
myShare: myShare ? mapWorkOrderShare(myShare) : null,
...(viewedAt === undefined ? {} : { isUnread: !viewedAt }),
...(options?.timeoutNotice ? { timeoutNotice: options.timeoutNotice } : {}),
}
}
apps/backend/src/services/worker-platform/worker-my-order-service.ts
+80 -16
View File
@@ -8,9 +8,11 @@ import {
getWorkOrderShare,
getWorkerCancelRequestRisk,
getWorkerOrderOverview,
listCancelledWorkerSharesByWorker,
listWorkerCancelRequests,
listWorkerOrderFeedbacks,
listWorkerSharesByWorker,
listWorkerTimeoutEventsByOrderIds,
listWorkerWorkOrderNotes,
listWorkerWorkOrderViews,
listWorkOrderEventsByOrderId,
@@ -88,14 +90,26 @@ export async function listWorkerMyOrders(query: JsonObject = {}, session: Worker
const workOrderIds = items.map((item) => Number(item.id))
const myShares = await listWorkerSharesByWorker(worker.id, workOrderIds)
const myShareByOrderId = new Map(myShares.map((share) => [Number(share.work_order_id), share]))
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 [
notes,
views,
pendingCancelOrderIds,
pendingFeedbackOrderIds,
materialEventAtByOrderId,
timeoutEventsByOrderId,
cancelledShares,
] = await Promise.all([
listWorkerWorkOrderNotes(worker.id, workOrderIds),
listWorkerWorkOrderViews(worker.id, workOrderIds),
getPendingCancelRequestOrderIds(worker.id, workOrderIds),
getPendingFeedbackOrderIds(worker.id, workOrderIds),
getLatestMaterialEventAtByOrderIds(workOrderIds),
listWorkerTimeoutEventsByOrderIds(worker.id, workOrderIds),
listCancelledWorkerSharesByWorker(worker.id, workOrderIds),
])
const cancelledShareByOrderId = new Map(
cancelledShares.map((share) => [Number(share.work_order_id), share]),
)
const noteByOrderId = new Map(
notes.map((item) => [Number(item.work_order_id), String(item.note || '')]),
)
@@ -108,24 +122,71 @@ export async function listWorkerMyOrders(query: JsonObject = {}, session: Worker
return {
items: items.map((item) => {
const workOrderId = Number(item.id)
const activeShare = myShareByOrderId.get(workOrderId)
const cancelledShare = cancelledShareByOrderId.get(workOrderId)
const timeoutEvent = timeoutEventsByOrderId.get(workOrderId)
// 判断当前打手是否仍持有该单
const isOwnerCurrently =
(item.assigned_worker_id != null &&
Number(item.assigned_worker_id) === Number(worker.id)) ||
Boolean(activeShare)
// 若不是当前持有人，但有该打手的超时事件或取消份额，则判定为该打手的已超时历史单
const isTimedOutForMe =
!isOwnerCurrently && Boolean(timeoutEvent || (cancelledShare && item.sharing_enabled))
let timeoutNotice:
| {
isTimedOut: boolean
timedOutAt: string | null
warningMessage: string
isTakenByOther?: boolean
}
| undefined = undefined
if (isTimedOutForMe) {
const isTakenByOther =
(item.assigned_worker_id != null &&
Number(item.assigned_worker_id) !== Number(worker.id)) ||
['in_progress', 'submitted', 'pending_acceptance', 'accepted'].includes(item.status)
const warningMessage = isTakenByOther
? '该订单已超时返回大厅并被其他打手接手，请勿继续在游戏内赠送！若私自继续赠送，造成的财产损失平台概不负责。'
: '该订单已超时退回抢单大厅，您已失去接单资格，请勿在游戏内赠送！若私自继续赠送，造成的财产损失平台概不负责。'
timeoutNotice = {
isTimedOut: true,
timedOutAt:
timeoutEvent?.createdAt ||
(item.deadline_at ? String(item.deadline_at) : null) ||
item.updated_at,
warningMessage,
isTakenByOther,
}
}
const materialEventAt = materialEventAtByOrderId.get(workOrderId) || ''
const materialSeenAt = materialSeenAtByOrderId.get(workOrderId) || ''
const materialUpdated =
!isTimedOutForMe &&
Boolean(materialEventAt) &&
(!materialSeenAt ||
new Date(materialEventAt).getTime() > new Date(materialSeenAt).getTime())
return {
...mapWorkOrderForWorker(
item,
permissions,
myShareByOrderId.get(workOrderId),
activeShare || cancelledShare || null,
noteByOrderId.get(workOrderId) || '',
viewedAtByOrderId.get(workOrderId) || null,
{ isTimedOutForMe, timeoutNotice },
),
// 问题单分组内的来源角标：平台标记 / 退单审核中 / 反馈处理中。
problemMarked: item.status === 'problem',
pendingCancelRequest: pendingCancelOrderIds.has(workOrderId),
pendingFeedback: pendingFeedbackOrderIds.has(workOrderId),
problemMarked: !isTimedOutForMe && item.status === 'problem',
pendingCancelRequest: !isTimedOutForMe && pendingCancelOrderIds.has(workOrderId),
pendingFeedback: !isTimedOutForMe && pendingFeedbackOrderIds.has(workOrderId),
materialUpdated,
}
}),
@@ -183,10 +244,13 @@ export async function getWorkerMyOrderEvents(workOrderId: number | string, sessi
const workerId = Number(session.workerId)
const sharingShare = await getWorkOrderShare(workOrder.id, workerId)
if (!sharingShare && !workerOwnsWorkOrder(workOrder, workerId)) {
throw createHttpError('只能查看自己订单的流转记录', {
statusCode: 403,
errorCode: 'work_order_events_owner_required',
})
const timeoutEvents = await listWorkerTimeoutEventsByOrderIds(workerId, [Number(workOrder.id)])
if (!timeoutEvents.has(Number(workOrder.id))) {
throw createHttpError('只能查看自己订单的流转记录', {
statusCode: 403,
errorCode: 'work_order_events_owner_required',
})
}
}
const events = await listWorkOrderEventsByOrderId(workOrderId)
return { items: await mapWorkOrderEvents(events) }