fix(worker-platform): 资料更新不再覆盖并发抢单状态
This commit is contained in:
@@ -66,69 +66,109 @@ export async function createWorkOrder(input: CreateWorkOrderInput): Promise<Work
|
||||
return getWorkOrderById(result.rows[0]?.id || 0)
|
||||
}
|
||||
|
||||
export type WorkOrderUpdatePatch = Partial<
|
||||
Pick<
|
||||
WorkOrderRow,
|
||||
| 'status'
|
||||
| 'assigned_worker_id'
|
||||
| 'material_json'
|
||||
| 'acceptance_json'
|
||||
| 'draft_acceptance_json'
|
||||
| 'problem_note'
|
||||
| 'reward_amount'
|
||||
| 'sharing_enabled'
|
||||
| 'sharing_total_quantity'
|
||||
| 'sharing_unit_reward'
|
||||
| 'published_at'
|
||||
| 'hall_queued_at'
|
||||
| 'pinned_at'
|
||||
| 'assigned_at'
|
||||
| 'submitted_at'
|
||||
| 'accepted_at'
|
||||
| 'updated_at'
|
||||
>
|
||||
>
|
||||
|
||||
/**
|
||||
* 只更新 patch 中显式传入的列。
|
||||
*
|
||||
* 旧实现先读整行、再把整行写回,并发下会用旧快照覆盖别人刚写入的状态:
|
||||
* 2026-10-31 生产工单 195657 抢单写入 in_progress 后,被资料更新的旧快照写回 open。
|
||||
* 另外可传 expectedStatus 做乐观锁,状态已变化时不落库,由调用方重试或报冲突。
|
||||
*/
|
||||
export function buildWorkOrderUpdateStatement(
|
||||
workOrderId: number | string,
|
||||
patch: WorkOrderUpdatePatch,
|
||||
options: { expectedStatus?: string } = {},
|
||||
): { text: string; values: unknown[] } | null {
|
||||
const assignments: string[] = []
|
||||
const values: unknown[] = []
|
||||
const assign = (column: string, value: unknown, cast = '') => {
|
||||
values.push(value)
|
||||
assignments.push(`${column} = $${values.length}${cast}`)
|
||||
}
|
||||
|
||||
if (patch.status !== undefined) assign('status', patch.status)
|
||||
if (patch.assigned_worker_id !== undefined) {
|
||||
assign('assigned_worker_id', patch.assigned_worker_id || null)
|
||||
}
|
||||
if (patch.material_json !== undefined) {
|
||||
assign('material_json', toJsonString(patch.material_json), '::jsonb')
|
||||
// 派生列与 material_json 同源,只在本次真的改了 material_json 时重算。
|
||||
assign('source_order_amount_fen', resolveSourceOrderAmountFen(patch.material_json))
|
||||
}
|
||||
if (patch.acceptance_json !== undefined) {
|
||||
assign('acceptance_json', toJsonString(patch.acceptance_json), '::jsonb')
|
||||
}
|
||||
if (patch.draft_acceptance_json !== undefined) {
|
||||
assign('draft_acceptance_json', toJsonString(patch.draft_acceptance_json), '::jsonb')
|
||||
}
|
||||
if (patch.problem_note !== undefined) assign('problem_note', patch.problem_note || '')
|
||||
if (patch.reward_amount !== undefined) {
|
||||
assign('reward_amount', toPositiveInteger(patch.reward_amount, 0))
|
||||
}
|
||||
if (patch.sharing_enabled !== undefined) {
|
||||
assign('sharing_enabled', patch.sharing_enabled === true)
|
||||
}
|
||||
if (patch.sharing_total_quantity !== undefined) {
|
||||
assign('sharing_total_quantity', toPositiveInteger(patch.sharing_total_quantity, 1))
|
||||
}
|
||||
if (patch.sharing_unit_reward !== undefined) {
|
||||
assign('sharing_unit_reward', toPositiveInteger(patch.sharing_unit_reward, 0))
|
||||
}
|
||||
if (patch.published_at !== undefined) assign('published_at', patch.published_at || null)
|
||||
if (patch.hall_queued_at !== undefined) assign('hall_queued_at', patch.hall_queued_at || null)
|
||||
if (patch.pinned_at !== undefined) assign('pinned_at', patch.pinned_at || null)
|
||||
if (patch.assigned_at !== undefined) assign('assigned_at', patch.assigned_at || null)
|
||||
if (patch.submitted_at !== undefined) assign('submitted_at', patch.submitted_at || null)
|
||||
if (patch.accepted_at !== undefined) assign('accepted_at', patch.accepted_at || null)
|
||||
if (patch.updated_at !== undefined) assign('updated_at', patch.updated_at)
|
||||
|
||||
if (assignments.length === 0) return null
|
||||
|
||||
values.push(Number(workOrderId))
|
||||
let where = `WHERE id = $${values.length}`
|
||||
if (options.expectedStatus !== undefined) {
|
||||
values.push(options.expectedStatus)
|
||||
where += ` AND status = $${values.length}`
|
||||
}
|
||||
|
||||
return {
|
||||
text: `UPDATE work_orders SET ${assignments.join(', ')} ${where} RETURNING id`,
|
||||
values,
|
||||
}
|
||||
}
|
||||
|
||||
export async function updateWorkOrder(
|
||||
workOrderId: number | string,
|
||||
patch: Partial<
|
||||
Pick<
|
||||
WorkOrderRow,
|
||||
| 'status'
|
||||
| 'assigned_worker_id'
|
||||
| 'material_json'
|
||||
| 'acceptance_json'
|
||||
| 'draft_acceptance_json'
|
||||
| 'problem_note'
|
||||
| 'reward_amount'
|
||||
| 'sharing_enabled'
|
||||
| 'sharing_total_quantity'
|
||||
| 'sharing_unit_reward'
|
||||
| 'published_at'
|
||||
| 'hall_queued_at'
|
||||
| 'pinned_at'
|
||||
| 'assigned_at'
|
||||
| 'submitted_at'
|
||||
| 'accepted_at'
|
||||
| 'updated_at'
|
||||
>
|
||||
>,
|
||||
patch: WorkOrderUpdatePatch,
|
||||
options: { expectedStatus?: string } = {},
|
||||
): Promise<WorkOrderRow | null> {
|
||||
const current = await getWorkOrderById(workOrderId)
|
||||
if (!current) return null
|
||||
const next = { ...current, ...patch }
|
||||
await query(
|
||||
`
|
||||
UPDATE work_orders
|
||||
SET
|
||||
status = $1, assigned_worker_id = $2, material_json = $3::jsonb,
|
||||
acceptance_json = $4::jsonb, draft_acceptance_json = $5::jsonb,
|
||||
problem_note = $6, reward_amount = $7, sharing_enabled = $8,
|
||||
sharing_total_quantity = $9, sharing_unit_reward = $10, published_at = $11,
|
||||
hall_queued_at = $12, pinned_at = $13, assigned_at = $14, submitted_at = $15,
|
||||
accepted_at = $16, source_order_amount_fen = $17, updated_at = $18
|
||||
WHERE id = $19
|
||||
`,
|
||||
[
|
||||
next.status,
|
||||
next.assigned_worker_id || null,
|
||||
toJsonString(next.material_json),
|
||||
toJsonString(next.acceptance_json),
|
||||
toJsonString(next.draft_acceptance_json),
|
||||
next.problem_note || '',
|
||||
toPositiveInteger(next.reward_amount, 0),
|
||||
next.sharing_enabled === true,
|
||||
toPositiveInteger(next.sharing_total_quantity, 1),
|
||||
toPositiveInteger(next.sharing_unit_reward, 0),
|
||||
next.published_at || null,
|
||||
next.hall_queued_at || null,
|
||||
next.pinned_at || null,
|
||||
next.assigned_at || null,
|
||||
next.submitted_at || null,
|
||||
next.accepted_at || null,
|
||||
// material_json 可能被这次 patch 改写(如补资料 / 快手发码回填),派生列跟着重算
|
||||
resolveSourceOrderAmountFen(next.material_json),
|
||||
next.updated_at,
|
||||
Number(workOrderId),
|
||||
],
|
||||
)
|
||||
const statement = buildWorkOrderUpdateStatement(workOrderId, patch, options)
|
||||
// 空 patch 不产生写操作;返回当前值,保持原有调用语义。
|
||||
if (!statement) return getWorkOrderById(workOrderId)
|
||||
const result = await query<{ id: number }>(statement.text, statement.values)
|
||||
if (!result.rows[0]) return null
|
||||
return getWorkOrderById(workOrderId)
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
import assert from 'node:assert/strict'
|
||||
import { readFile } from 'node:fs/promises'
|
||||
import test from 'node:test'
|
||||
|
||||
import { buildWorkOrderUpdateStatement } from './work-order-management-repo.js'
|
||||
|
||||
/**
|
||||
* 2026-10-31 生产事故:客服更新资料时把抢单刚写入的 in_progress 覆盖回 open。
|
||||
* 这里锁住两个约束:只更新显式传入的列;状态流转必须带 expectedStatus 乐观锁。
|
||||
*/
|
||||
test('资料更新不写 status,只更新 material_json 与派生列', () => {
|
||||
const now = '2026-10-31T11:24:00.000Z'
|
||||
const statement = buildWorkOrderUpdateStatement(
|
||||
195657,
|
||||
{
|
||||
material_json: { source: { orderAmountFen: 800 }, collect: { complete: true } },
|
||||
updated_at: now,
|
||||
},
|
||||
{ expectedStatus: 'open' },
|
||||
)
|
||||
|
||||
assert.ok(statement)
|
||||
const setClause = statement.text.slice(
|
||||
statement.text.indexOf('SET') + 'SET'.length,
|
||||
statement.text.indexOf('WHERE'),
|
||||
)
|
||||
assert.ok(!setClause.includes('status ='), '资料更新不得重写 status')
|
||||
assert.ok(setClause.includes('material_json = $1::jsonb'))
|
||||
assert.ok(setClause.includes('source_order_amount_fen = $2'))
|
||||
assert.ok(setClause.includes('updated_at = $3'))
|
||||
assert.ok(statement.text.includes('WHERE id = $4 AND status = $5'))
|
||||
assert.deepEqual(statement.values, [
|
||||
JSON.stringify({ source: { orderAmountFen: 800 }, collect: { complete: true } }),
|
||||
800,
|
||||
now,
|
||||
195657,
|
||||
'open',
|
||||
])
|
||||
})
|
||||
|
||||
test('真正的状态流转才写 status,并带读取时的状态做乐观锁', () => {
|
||||
const now = '2026-10-31T11:24:00.000Z'
|
||||
const statement = buildWorkOrderUpdateStatement(
|
||||
42,
|
||||
{ status: 'unassigned', updated_at: now },
|
||||
{ expectedStatus: 'pending_material' },
|
||||
)
|
||||
|
||||
assert.ok(statement)
|
||||
const setClause = statement.text.slice(
|
||||
statement.text.indexOf('SET') + 'SET'.length,
|
||||
statement.text.indexOf('WHERE'),
|
||||
)
|
||||
assert.match(setClause, /status = \$1/)
|
||||
assert.ok(statement.text.includes('WHERE id = $3 AND status = $4'))
|
||||
assert.deepEqual(statement.values, ['unassigned', now, 42, 'pending_material'])
|
||||
})
|
||||
|
||||
test('未传入的列不会出现在 UPDATE 中', () => {
|
||||
const statement = buildWorkOrderUpdateStatement(
|
||||
7,
|
||||
{ pinned_at: null, updated_at: '2026-10-31T11:24:00.000Z' },
|
||||
{ expectedStatus: 'open' },
|
||||
)
|
||||
|
||||
assert.ok(statement)
|
||||
const setClause = statement.text.slice(
|
||||
statement.text.indexOf('SET') + 'SET'.length,
|
||||
statement.text.indexOf('WHERE'),
|
||||
)
|
||||
assert.ok(!statement.text.includes('assigned_worker_id ='))
|
||||
assert.ok(!setClause.includes('status ='))
|
||||
assert.ok(statement.text.includes('pinned_at = $1'))
|
||||
})
|
||||
|
||||
test('空 patch 不产生写语句', () => {
|
||||
assert.equal(buildWorkOrderUpdateStatement(1, {}), null)
|
||||
})
|
||||
|
||||
test('资料更新服务只在真实流转时写 status,并用读取时的状态重试', async () => {
|
||||
const source = await readFile(
|
||||
new URL('../../services/worker-platform/admin-work-order-material-service.ts', import.meta.url),
|
||||
'utf8',
|
||||
)
|
||||
|
||||
assert.ok(source.includes('expectedStatus: workOrder.status'))
|
||||
assert.ok(source.includes('if (nextStatus !== workOrder.status) patch.status = nextStatus'))
|
||||
assert.equal(source.includes('status: nextStatus,'), false, '不得无条件把读取时的状态写回')
|
||||
assert.ok(source.includes('MATERIAL_UPDATE_MAX_ATTEMPTS'))
|
||||
})
|
||||
Reference in New Issue
Block a user