feat(worker): 打手接单界面支持查看超时历史订单并增加安全免责警示
- 数据库与查询层:通过索引 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:
@@ -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
|
||||
|
||||
@@ -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> {
|
||||
|
||||
Reference in New Issue
Block a user