fix(consignment): 修复内部匹配 delay=0 黑洞、匹配改写报酬不恢复、草稿未发布即生效

P0-1: internalMatch.delayMinutes 归一化后 <=0 直接回大厅,不再依赖 fallbackToHall 进入 internal_matching(手动/自动两条入口共用 resolveInternalMatchDelayMinutes)。

P0-2: 新增 work_orders.consignment_original_reward_fen(迁移 145),匹配改写报酬前固化原值;两个统一释放入口(releaseConsignmentAllocationsForWorkOrderWithClient / releaseConsignmentInventoryBindingForWorkOrderWithClient)恢复并清空,覆盖释放、取消、超时、驳回等全部路径;二次匹配不再覆盖原值。

P1-1: 打手端分类、工单配置解析、寄售仓库筛选项改读 consignment_profile_versions.config_json(current_version 快照),后台仍读写草稿;版本缺失时回退草稿兼容历史数据。

测试:新增配置归一化/报酬恢复/发布快照单测,集成测试补草稿隔离与快照发布用例;隔离库 35/35 通过,worker-platform 单测 415 通过。
This commit is contained in:
2026-11-06 17:28:25 +08:00
parent f68375fa71
commit 3ee679ad4d
13 changed files with 327 additions and 23 deletions
@@ -226,12 +226,41 @@ export async function releaseConsignmentAllocationRowsWithClient(
await releaseAllocationRows(client, rows, now)
}
/**
* 恢复寄卖匹配前的工单报酬。
*
* 匹配成功时把 reward_amount 改写为「库存售价-服务费」,原值固化在
* work_orders.consignment_original_reward_fen。所有释放库存的路径都必须调用本函数,
* 否则超时/取消/退款后大厅会继续展示寄卖结算价,二次匹配还会在已改写金额上继续扣费。
*
* 幂等:只处理原始报酬非空的工单,恢复后立即清空,重复调用无副作用。
*/
export async function restoreConsignmentOriginalRewardWithClient(
client: PoolClient,
workOrderId: number,
now: string,
): Promise<boolean> {
const result = await client.query<{ reward_amount: number | string }>(
`
UPDATE work_orders
SET reward_amount = COALESCE(consignment_original_reward_fen, reward_amount),
consignment_original_reward_fen = NULL,
updated_at = $2
WHERE id = $1 AND consignment_original_reward_fen IS NOT NULL
RETURNING reward_amount
`,
[workOrderId, now],
)
return Boolean(result.rows[0])
}
/** 释放整个工单占用的全部库存(整单取消 / 退回大厅 / 撤销履约)。 */
export async function releaseConsignmentAllocationsForWorkOrderWithClient(
client: PoolClient,
workOrderId: number,
now: string,
): Promise<number> {
await restoreConsignmentOriginalRewardWithClient(client, workOrderId, now)
const result = await client.query<ConsignmentAllocationRow>(
`SELECT * FROM consignment_inventory_allocations WHERE work_order_id = $1 AND status = 'reserved' FOR UPDATE`,
[workOrderId],
@@ -3,6 +3,7 @@ import { query, withTransaction } from '../../db/client.js'
import {
releaseConsignmentAllocationRowsWithClient,
releaseConsignmentAllocationsForWorkOrderWithClient,
restoreConsignmentOriginalRewardWithClient,
type ConsignmentAllocationRow,
} from './consignment-allocation-repo.js'
import { toJsonString } from './shared.js'
@@ -984,6 +985,9 @@ export async function releaseConsignmentInventoryBindingForWorkOrderWithClient(
}>('SELECT acceptance_mode, friend_added_at FROM work_orders WHERE id = $1', [workOrderId])
const order = orderRes.rows[0]
if (!order) return null
// 解绑库存意味着这张工单不再由寄卖库存履约:先把匹配时改写的报酬恢复成原值,
// 再走后面的回库/作废逻辑(无论走 archiveOnly 还是普通回库都要恢复)。
await restoreConsignmentOriginalRewardWithClient(client, Number(workOrderId), input.now)
const confirmedShare = await client.query<{ id: number }>(
`SELECT ca.id
FROM consignment_inventory_allocations ca
@@ -425,6 +425,8 @@ export type WorkOrderRow = {
internal_match_deadline_at?: string | null
hall_visible_at?: string | null
internal_match_attempts?: number
/** 寄卖内部匹配前的原始工单报酬;匹配改写 reward_amount 时写入,释放库存时恢复并清空。 */
consignment_original_reward_fen?: number | string | null
/** 超时「重新匹配」时排除的原卖家与原库存,避免同一卖家立刻再次接回同一单。 */
rematch_excluded_worker_id?: number | null
rematch_excluded_inventory_id?: number | null
@@ -132,6 +132,8 @@ export async function parkWorkOrderWaitingFriendAddWithClient(
eventType?: string | undefined
materialJson?: unknown
rewardAmountFen?: number | null | undefined
/** 本次同时改写 reward_amount 时,先把原值固化到 consignment_original_reward_fen。 */
captureOriginalReward?: boolean | undefined
extraPayload?: Record<string, unknown>
},
): Promise<WorkOrderRow | null> {
@@ -174,6 +176,11 @@ export async function parkWorkOrderWaitingFriendAddWithClient(
last_assigned_worker_id = NULL,
accepted_at = CASE WHEN $4 THEN NULL ELSE accepted_at END,
material_json = COALESCE($5::jsonb, material_json),
consignment_original_reward_fen = CASE
WHEN $8::boolean AND $7::bigint IS NOT NULL
THEN COALESCE(consignment_original_reward_fen, reward_amount)
ELSE consignment_original_reward_fen
END,
reward_amount = COALESCE($7, reward_amount),
updated_at = $2::timestamptz
WHERE id = $6
@@ -186,6 +193,7 @@ export async function parkWorkOrderWaitingFriendAddWithClient(
materialJson,
workOrder.id,
targetRewardAmountFen,
input.captureOriginalReward === true,
],
)
await createWorkOrderEventWithClient(client, {
@@ -95,7 +95,13 @@ export type WorkOrderUpdatePatch = Partial<
| 'accepted_at'
| 'updated_at'
>
>
> & {
/**
* 本次同时改写 reward_amount 时,先把改写前的金额固化到
* consignment_original_reward_fen(仅在为空时写入),供释放库存时恢复。
*/
capture_consignment_original_reward?: boolean
}
/**
* 只更新 patch 中显式传入的列。
@@ -135,6 +141,12 @@ export function buildWorkOrderUpdateStatement(
if (patch.reward_amount !== undefined) {
assign('reward_amount', toPositiveInteger(patch.reward_amount, 0))
}
if (patch.capture_consignment_original_reward === true) {
// SET 表达式读取的是更新前的行值,因此这里拿到的是本次改写前的原报酬。
assignments.push(
'consignment_original_reward_fen = COALESCE(consignment_original_reward_fen, reward_amount)',
)
}
if (patch.sharing_enabled !== undefined) {
assign('sharing_enabled', patch.sharing_enabled === true)
}