fix(consignment): 内部库存履约后不再把买家资料暴露给上一手打手

退回大厅留下的 last_assigned 在状态离开待接单后会重新可见。履约时摘掉上一手,并清掉已经漏出的内部现货工单。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
yml2213
2026-10-05 19:18:43 +08:00
co-authored by Cursor
parent eae78aae34
commit 250c456a46
8 changed files with 131 additions and 38 deletions
@@ -173,6 +173,22 @@ test('普通关键词仍然走 trgm 表达式模糊搜索', () => {
assert.deepEqual(query.params, ['%指挥官密钥%'])
})
test('内部现货不再因上一手 last_assigned 进入打手可见集', async () => {
const query = buildWorkOrderWhere({ workerSharingId: 183, statuses: ['in_progress'] })
assert.match(query.joins, /historical\.last_assigned_worker_id = \$1/)
assert.match(query.joins, /consignment,fulfillmentType/)
assert.match(query.joins, /worker_deposit/)
assert.match(query.joins, /historical\.assigned_worker_id IS NULL/)
const { readFile } = await import('node:fs/promises')
const src = await readFile(
new URL('./worker-platform/work-order-query-repo.ts', import.meta.url),
'utf8',
)
const calls = src.match(/retainedWorkerOrderPredicate\('/g) || []
assert.equal(calls.length, 2, '列表和概览必须共用同一条历史可见条件')
})
test('「仅问题单」检索走短路分支,从 pending 表反查而非枚举可见集', () => {
const query = buildWorkOrderWhere({ workerSharingId: 7, statuses: ['problem'] })
@@ -96,6 +96,25 @@ export function hasInternalConsignmentFulfillment(workOrder: {
return true
}
/**
* 打手是否还能把这张工单当成自己的单。
*
* 当前指派优先。退回大厅后留下的 last_assigned_worker_id 只用于回看自己做过的单;
* 一旦改走内部现货,这张单没有接单打手,上一手不能再看到买家资料。
*/
export function workerOwnsWorkOrder(
workOrder: {
assigned_worker_id?: number | null
last_assigned_worker_id?: number | null
material_json?: unknown
},
workerId: number,
): boolean {
if (Number(workOrder.assigned_worker_id || 0) === workerId) return true
if (Number(workOrder.last_assigned_worker_id || 0) !== workerId) return false
return !hasInternalConsignmentFulfillment(workOrder)
}
/**
* 内部寄售现货履约落地:占库成功,但**不**算已加好友。
*
@@ -150,6 +169,9 @@ export async function parkWorkOrderWaitingFriendAddWithClient(
friend_added_at = NULL,
gift_available_at = NULL,
deadline_at = NULL,
-- 内部现货没有接单打手。退回大厅留下的上一手必须摘掉,
-- 否则状态一离开 open,他的「我的订单」会重新带出买家资料。
last_assigned_worker_id = NULL,
accepted_at = CASE WHEN $4 THEN NULL ELSE accepted_at END,
material_json = COALESCE($5::jsonb, material_json),
reward_amount = COALESCE($7, reward_amount),
@@ -513,6 +513,34 @@ export async function getWorkOrderStatistics(input: ListInput = {}): Promise<Wor
return statistics
}
/**
* 上一手打手仍可回看的历史单。
*
* 大厅中的单(status=open)默认不展示,除非是超时退回。
* 内部现货没有接单打手:退回大厅留下的 last_assigned_worker_id 不能在履约改走库存后继续暴露买家资料。
* 判定与 hasInternalConsignmentFulfillment 一致。
*/
export function retainedWorkerOrderPredicate(alias: string, workerParam: string): string {
return `
${alias}.last_assigned_worker_id = ${workerParam}
AND (
${alias}.status <> 'open'
OR EXISTS (
SELECT 1
FROM work_order_events timeout_event
WHERE timeout_event.work_order_id = ${alias}.id
AND timeout_event.event_type = 'timeout_reopen'
)
)
AND NOT (
${alias}.assigned_worker_id IS NULL
AND COALESCE(${alias}.material_json #>> '{consignment,inventoryId}', '') <> ''
AND COALESCE(${alias}.material_json #>> '{consignment,fulfillmentType}', '') <> 'worker_deposit'
AND COALESCE(NULLIF(${alias}.material_json #>> '{consignment,workerId}', ''), '0') = '0'
)
`
}
/** 汇总打手本人各订单状态的可结算金额,拼单按个人份额计算。 */
export async function getWorkerOrderOverview(workerId: number | string): Promise<
Array<{
@@ -533,16 +561,7 @@ export async function getWorkerOrderOverview(workerId: number | string): Promise
UNION
SELECT wo.id AS work_order_id
FROM work_orders wo
WHERE wo.last_assigned_worker_id = $1
AND (
wo.status <> 'open'
OR EXISTS (
SELECT 1
FROM work_order_events timeout_event
WHERE timeout_event.work_order_id = wo.id
AND timeout_event.event_type = 'timeout_reopen'
)
)
WHERE ${retainedWorkerOrderPredicate('wo', '$1')}
UNION
SELECT wos.work_order_id
FROM work_order_shares wos
@@ -909,16 +928,7 @@ export function buildWorkOrderWhere({
UNION
SELECT historical.id AS work_order_id
FROM work_orders historical
WHERE historical.last_assigned_worker_id = ${workerSharePlaceholder}
AND (
historical.status <> 'open'
OR EXISTS (
SELECT 1
FROM work_order_events timeout_event
WHERE timeout_event.work_order_id = historical.id
AND timeout_event.event_type = 'timeout_reopen'
)
)
WHERE ${retainedWorkerOrderPredicate('historical', workerSharePlaceholder)}
UNION
SELECT share_source.work_order_id
FROM work_order_shares share_source
@@ -2,6 +2,7 @@ import type { PoolClient } from 'pg'
import { query, withTransaction } from '../../db/client.js'
import { createWorkOrderEventWithClient } from './work-order-event-repo.js'
import { workerOwnsWorkOrder } from './work-order-gift-repo.js'
import { getWorkOrderByIdWithClient } from './work-order-repo.js'
import type { WorkerOrderFeedbackRow, WorkOrderRow, WorkOrderShareRow } from './types.js'
@@ -79,10 +80,9 @@ export async function createWorkerOrderFeedback(input: {
[input.workOrderId, input.workerId],
)
const share = shareResult.rows[0] || null
const isOrderOwner =
Number(order.assigned_worker_id || 0) === input.workerId ||
Number(order.last_assigned_worker_id || 0) === input.workerId
if (!share && !isOrderOwner) return { feedback: null, failureReason: 'owner_required' }
if (!share && !workerOwnsWorkOrder(order, input.workerId)) {
return { feedback: null, failureReason: 'owner_required' }
}
const result = await client.query<{ id: number }>(
`INSERT INTO worker_order_feedbacks (