feat(worker-platform): 寄卖价格改由接单模板只读定价,我的寄卖支持服务端搜索与分页
1. 寄售价不再由卖家填写:打手端改为只读展示模板价(与履约押金同款只读框),服务端在发布时按同一套规则复算金额,保证展示口径与落库口径一致,直连接口也无法随意定价; 2. 模板缺档按「最接近的已配置档位」报价、距离相同取更低档:后台只配了 1/3/7 钻时,号主出 2 钻报 1 钻价、出 6 钻报 7 钻价,不再因为中间档没配价而拿不到价格; 3. 我的寄卖列表把分组、关键字、翻页全部下沉到 SQL:新增 listWorkerConsignmentPage 用 UNION ALL 合成「提报单行 + 无提报单库存兜底行」,CASE 推导 待审核/履约中/已完成 分组,返回当前分组 total 与三个分组的角标计数; 4. 关键字覆盖寄卖单号、规格名、系统/区服/系列/钻级、卖家角色名与数字 ID、联系方式、买家昵称与游戏 ID(读取 work_orders.material_json.collect.fields 的多种历史键名); 5. 前端搜索框 300ms 防抖后才请求服务端、换分组或换关键字自动回到第 1 页、列表底部增加分页器,并移除原来固定 pageSize 200 的隐形截断; 6. 新增仓库层与匹配层单测,其中包含 SQL 分组 CASE 与 domain/consignment-item-stage.ts 的 group 映射交叉断言,防止两处状态机漂移;后端 516 项、前端 66 项测试全部通过。
This commit is contained in:
@@ -2,6 +2,8 @@ import assert from 'node:assert/strict'
|
||||
import { readFile } from 'node:fs/promises'
|
||||
import test from 'node:test'
|
||||
|
||||
import { deriveConsignmentItemStage } from '../../domain/consignment-item-stage.js'
|
||||
|
||||
test('寄卖仓库按关键字搜索必须能搜到"寄卖单号"(SUB…),且计数查询带上同一个 join', async () => {
|
||||
const source = await readFile(new URL('./consignment-repo.ts', import.meta.url), 'utf8')
|
||||
// 卖家端与客服端现在只把提报单号(SUB…)当主标识展示,搜不到它客服等于瞎了
|
||||
@@ -55,3 +57,118 @@ test('占库写入的 allocation_status 默认值必须在 080 CHECK 枚举(
|
||||
`默认值「${match![1]}」违反 080 的 CHECK 约束,真实库必 500`,
|
||||
)
|
||||
})
|
||||
|
||||
function readWorkerPageQuery(source: string) {
|
||||
const start = source.indexOf('export async function listWorkerConsignmentPage')
|
||||
assert.ok(start > 0, '未找到「我的寄卖」分页查询')
|
||||
return source.slice(start, source.indexOf('\n}\n', start))
|
||||
}
|
||||
|
||||
test('我的寄卖:关键字必须覆盖卖家找单的口径(单号/规格/区服/钻级/角色/买家)', async () => {
|
||||
const source = await readFile(new URL('./consignment-repo.ts', import.meta.url), 'utf8')
|
||||
const body = readWorkerPageQuery(source)
|
||||
|
||||
for (const field of [
|
||||
'cs.submission_no',
|
||||
'cs.item_name',
|
||||
'cs.system',
|
||||
'cs.server_zone',
|
||||
'cs.series',
|
||||
"cs.diamond_level::text || '钻'",
|
||||
'cs.seller_game_id',
|
||||
'cs.contact_info',
|
||||
'ci.inventory_no',
|
||||
"wo.material_json -> 'collect' -> 'fields' ->> 'gameNickname'",
|
||||
"wo.material_json -> 'collect' -> 'fields' ->> 'gameId'",
|
||||
]) {
|
||||
assert.ok(body.includes(field), `关键字查询缺少可搜字段:${field}`)
|
||||
}
|
||||
|
||||
// 兜底行(没有归属提报单的库存)里不能引用提报单别名,否则真库直接 42703 报错
|
||||
const orphanStart = body.indexOf('NULL AS submission_id')
|
||||
const orphanBody = body.slice(orphanStart, body.indexOf(')\n `', orphanStart))
|
||||
assert.ok(!orphanBody.includes('cs.'), '兜底库存行的关键字条件引用了提报单别名 cs.')
|
||||
})
|
||||
|
||||
test('我的寄卖:分页与分组过滤必须走 SQL,不能再把全量记录捞回前端', async () => {
|
||||
const source = await readFile(new URL('./consignment-repo.ts', import.meta.url), 'utf8')
|
||||
const body = readWorkerPageQuery(source)
|
||||
|
||||
assert.ok(body.includes('ORDER BY sort_at DESC'), '排序必须在 SQL 完成')
|
||||
assert.ok(body.includes('LIMIT $'), '必须在 SQL 分页(LIMIT/OFFSET)')
|
||||
assert.ok(body.includes('OFFSET $'), '必须在 SQL 分页(LIMIT/OFFSET)')
|
||||
assert.ok(body.includes('COUNT(*)::integer AS total'), '必须返回总数供分页器使用')
|
||||
// 分组参数用独立的占位符,不能和关键字占位符撞号(撞号会把关键字当分组、条件全错)
|
||||
assert.ok(body.includes('WHERE group_key = $${groupValues.length}'), '分组过滤必须使用独立占位符')
|
||||
})
|
||||
|
||||
test('我的寄卖:SQL 里的分组口径与状态机的 group 映射保持一致', async () => {
|
||||
const source = await readFile(new URL('./consignment-repo.ts', import.meta.url), 'utf8')
|
||||
const body = readWorkerPageQuery(source)
|
||||
|
||||
// 真源是 domain/consignment-item-stage.ts 的 STAGE_META.group:
|
||||
// pending_review → reviewing;rejected → finished;
|
||||
// 库存 archived → finished;工单 cancelled/accepted/completed → finished;其余 active
|
||||
const reviewerWorkOrder = {
|
||||
status: 'in_progress',
|
||||
acceptance_mode: 'standard',
|
||||
gift_phase: '',
|
||||
gift_available_at: null,
|
||||
friend_added_at: null,
|
||||
}
|
||||
const cases: Array<{ expect: string; patch: Record<string, unknown> }> = [
|
||||
{ expect: 'reviewing', patch: { submissionStatus: 'pending_review', inventoryStatus: null } },
|
||||
{ expect: 'finished', patch: { submissionStatus: 'rejected', inventoryStatus: null } },
|
||||
{
|
||||
expect: 'finished',
|
||||
patch: {
|
||||
submissionStatus: 'approved',
|
||||
inventoryStatus: 'archived',
|
||||
workOrder: reviewerWorkOrder,
|
||||
},
|
||||
},
|
||||
{
|
||||
expect: 'finished',
|
||||
patch: {
|
||||
submissionStatus: 'approved',
|
||||
inventoryStatus: 'consumed',
|
||||
workOrder: { ...reviewerWorkOrder, status: 'cancelled' },
|
||||
},
|
||||
},
|
||||
{
|
||||
expect: 'finished',
|
||||
patch: {
|
||||
submissionStatus: 'approved',
|
||||
inventoryStatus: 'consumed',
|
||||
workOrder: { ...reviewerWorkOrder, status: 'accepted' },
|
||||
},
|
||||
},
|
||||
{
|
||||
expect: 'active',
|
||||
patch: {
|
||||
submissionStatus: 'approved',
|
||||
inventoryStatus: 'consumed',
|
||||
workOrder: reviewerWorkOrder,
|
||||
},
|
||||
},
|
||||
{ expect: 'active', patch: { submissionStatus: 'approved', inventoryStatus: 'in_stock' } },
|
||||
]
|
||||
for (const item of cases) {
|
||||
const stage = deriveConsignmentItemStage({
|
||||
submissionStatus: String(item.patch.submissionStatus),
|
||||
inventoryStatus: (item.patch.inventoryStatus as string | null) ?? null,
|
||||
workOrder: (item.patch.workOrder as never) ?? null,
|
||||
viewer: { role: 'seller', workerId: 1 },
|
||||
})
|
||||
assert.equal(stage.group, item.expect, `状态机口径变化:${JSON.stringify(item.patch)}`)
|
||||
}
|
||||
|
||||
// 上面这些 group 的判定条件必须都能在 SQL 的 CASE 里找到对应分支
|
||||
assert.ok(body.includes("WHEN cs.status = 'pending_review' THEN 'reviewing'"))
|
||||
assert.ok(body.includes("WHEN cs.status = 'rejected' THEN 'finished'"))
|
||||
assert.ok(body.includes("WHEN ci.status = 'archived' THEN 'finished'"))
|
||||
assert.ok(
|
||||
body.includes("WHEN wo.status IN ('cancelled', 'accepted', 'completed') THEN 'finished'"),
|
||||
)
|
||||
assert.ok(body.includes("ELSE 'active'"), '未匹配到的都归 active')
|
||||
})
|
||||
|
||||
@@ -940,6 +940,224 @@ export async function listConsignmentSubmissions(filters: {
|
||||
return { items: listRes.rows, total }
|
||||
}
|
||||
|
||||
/** 我的寄卖分组:与 domain/consignment-item-stage.ts 的 group 口径一致 */
|
||||
export type WorkerConsignmentGroup = 'all' | 'reviewing' | 'active' | 'finished'
|
||||
|
||||
export type WorkerConsignmentRowKey = {
|
||||
submissionId: number | null
|
||||
inventoryId: number | null
|
||||
createdAt: string
|
||||
}
|
||||
|
||||
export type WorkerConsignmentPage = {
|
||||
rows: WorkerConsignmentRowKey[]
|
||||
/** 当前分组 + 关键字下的总条数(分页用) */
|
||||
total: number
|
||||
/** 各分组条数(受关键字影响,不受当前分组影响),与前端筛选按钮角标对齐 */
|
||||
counts: Record<WorkerConsignmentGroup, number>
|
||||
}
|
||||
|
||||
/**
|
||||
* 「我的寄卖」服务端分页 / 搜索 / 分组计数。
|
||||
*
|
||||
* 两件事必须在 SQL 做掉,否则前端只能把全部记录捞回来自己过滤(超过 200 条就丢件):
|
||||
* 1. 关键字:单号 / 规格 / 系统 / 区服 / 系列 / 钻级 / 卖家角色 / 买家资料;
|
||||
* 2. 分组:状态机推导出来的阶段太多,但落到「待审核 / 履约中 / 已完成」三档只取决于
|
||||
* 提报单状态、库存状态、绑定工单状态——下面的 CASE 就是这个映射。
|
||||
* ⚠️ 改 domain/consignment-item-stage.ts 的阶段分组时必须同步改这里
|
||||
* (consignment-repo.test.ts 有一致的断言)。
|
||||
*
|
||||
* 只返回行标识(提报单/库存 id),完整数据由调用方按 id 批量取,避免在这里重复映射一遍字段。
|
||||
*/
|
||||
export async function listWorkerConsignmentPage(input: {
|
||||
workerId: number
|
||||
group?: WorkerConsignmentGroup | undefined
|
||||
keyword?: string | undefined
|
||||
page?: number | undefined
|
||||
pageSize?: number | undefined
|
||||
}): Promise<WorkerConsignmentPage> {
|
||||
const values: unknown[] = [input.workerId]
|
||||
const keyword = String(input.keyword || '').trim()
|
||||
let submissionKeywordFilter = ''
|
||||
let orphanKeywordFilter = ''
|
||||
if (keyword) {
|
||||
values.push(`%${keyword}%`)
|
||||
const p = `$${values.length}`
|
||||
// 提报单行:提报单 + 它产出的库存 + 绑定工单上的买家资料
|
||||
submissionKeywordFilter = `
|
||||
AND (
|
||||
cs.submission_no ILIKE ${p}
|
||||
OR cs.item_name ILIKE ${p}
|
||||
OR cs.system ILIKE ${p}
|
||||
OR cs.server_zone ILIKE ${p}
|
||||
OR cs.series ILIKE ${p}
|
||||
OR cs.diamond_level::text || '钻' ILIKE ${p}
|
||||
OR cs.seller_game_id ILIKE ${p}
|
||||
OR cs.contact_info ILIKE ${p}
|
||||
OR cs.seller_phone ILIKE ${p}
|
||||
OR ci.inventory_no ILIKE ${p}
|
||||
OR ci.item_name ILIKE ${p}
|
||||
OR ci.seller_game_id ILIKE ${p}
|
||||
OR ci.seller_contact ILIKE ${p}
|
||||
OR ci.seller_phone ILIKE ${p}
|
||||
OR wo.material_json -> 'collect' -> 'fields' ->> 'gameNickname' ILIKE ${p}
|
||||
OR wo.material_json -> 'collect' -> 'fields' ->> 'roleName' ILIKE ${p}
|
||||
OR wo.material_json -> 'collect' -> 'fields' ->> 'nickname' ILIKE ${p}
|
||||
OR wo.material_json -> 'collect' -> 'fields' ->> 'gameId' ILIKE ${p}
|
||||
OR wo.material_json -> 'collect' -> 'fields' ->> 'characterId' ILIKE ${p}
|
||||
OR wo.material_json -> 'collect' -> 'fields' ->> 'uid' ILIKE ${p}
|
||||
)`
|
||||
// 兜底行(没有归属提报单的库存):只能搜库存与买家资料,不能引用提报单别名
|
||||
orphanKeywordFilter = `
|
||||
AND (
|
||||
ci.inventory_no ILIKE ${p}
|
||||
OR ci.item_name ILIKE ${p}
|
||||
OR ci.system ILIKE ${p}
|
||||
OR ci.server_zone ILIKE ${p}
|
||||
OR ci.series ILIKE ${p}
|
||||
OR ci.diamond_level::text || '钻' ILIKE ${p}
|
||||
OR ci.seller_game_id ILIKE ${p}
|
||||
OR ci.seller_contact ILIKE ${p}
|
||||
OR ci.seller_phone ILIKE ${p}
|
||||
OR wo.material_json -> 'collect' -> 'fields' ->> 'gameNickname' ILIKE ${p}
|
||||
OR wo.material_json -> 'collect' -> 'fields' ->> 'roleName' ILIKE ${p}
|
||||
OR wo.material_json -> 'collect' -> 'fields' ->> 'nickname' ILIKE ${p}
|
||||
OR wo.material_json -> 'collect' -> 'fields' ->> 'gameId' ILIKE ${p}
|
||||
OR wo.material_json -> 'collect' -> 'fields' ->> 'characterId' ILIKE ${p}
|
||||
OR wo.material_json -> 'collect' -> 'fields' ->> 'uid' ILIKE ${p}
|
||||
)`
|
||||
}
|
||||
// 提报单行(连带它产出的库存与绑定工单)与「没有归属提报单的库存」兜底行
|
||||
const baseSql = `
|
||||
WITH base AS (
|
||||
SELECT
|
||||
cs.id AS submission_id,
|
||||
ci.id AS inventory_id,
|
||||
cs.created_at AS sort_at,
|
||||
CASE
|
||||
WHEN cs.status = 'pending_review' THEN 'reviewing'
|
||||
WHEN cs.status = 'rejected' THEN 'finished'
|
||||
WHEN ci.status = 'archived' THEN 'finished'
|
||||
WHEN wo.status IN ('cancelled', 'accepted', 'completed') THEN 'finished'
|
||||
ELSE 'active'
|
||||
END AS group_key
|
||||
FROM consignment_submissions cs
|
||||
LEFT JOIN consignment_inventories ci ON ci.source_submission_id = cs.id
|
||||
LEFT JOIN work_orders wo ON wo.id = ci.bound_work_order_id
|
||||
WHERE cs.worker_id = $1
|
||||
${submissionKeywordFilter}
|
||||
UNION ALL
|
||||
SELECT
|
||||
NULL AS submission_id,
|
||||
ci.id AS inventory_id,
|
||||
ci.created_at AS sort_at,
|
||||
CASE
|
||||
WHEN ci.status = 'archived' THEN 'finished'
|
||||
WHEN wo.status IN ('cancelled', 'accepted', 'completed') THEN 'finished'
|
||||
ELSE 'active'
|
||||
END AS group_key
|
||||
FROM consignment_inventories ci
|
||||
LEFT JOIN work_orders wo ON wo.id = ci.bound_work_order_id
|
||||
WHERE ci.worker_id = $1
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM consignment_submissions cs2
|
||||
WHERE cs2.id = ci.source_submission_id AND cs2.worker_id = $1
|
||||
)
|
||||
${orphanKeywordFilter}
|
||||
)
|
||||
`
|
||||
|
||||
const countsRes = await query<{ group_key: string; count: number }>(
|
||||
`${baseSql} SELECT group_key, COUNT(*)::integer AS count FROM base GROUP BY group_key`,
|
||||
values,
|
||||
)
|
||||
const counts: Record<WorkerConsignmentGroup, number> = {
|
||||
all: 0,
|
||||
reviewing: 0,
|
||||
active: 0,
|
||||
finished: 0,
|
||||
}
|
||||
for (const row of countsRes.rows) {
|
||||
const key = String(row.group_key || '') as WorkerConsignmentGroup
|
||||
const count = Number(row.count || 0)
|
||||
if (key === 'reviewing' || key === 'active' || key === 'finished') {
|
||||
counts[key] += count
|
||||
counts.all += count
|
||||
}
|
||||
}
|
||||
|
||||
const group = input.group || 'all'
|
||||
const page = Math.max(1, Number(input.page) || 1)
|
||||
const pageSize = Math.max(1, Math.min(50, Number(input.pageSize) || 10))
|
||||
let groupFilter = ''
|
||||
let groupValues = values
|
||||
if (group !== 'all') {
|
||||
groupValues = [...values, group]
|
||||
groupFilter = `WHERE group_key = $${groupValues.length}`
|
||||
}
|
||||
|
||||
const totalRes = await query<{ total: number }>(
|
||||
`${baseSql} SELECT COUNT(*)::integer AS total FROM base ${groupFilter}`,
|
||||
groupValues,
|
||||
)
|
||||
const total = Number(totalRes.rows[0]?.total || 0)
|
||||
|
||||
const listValues = [...groupValues, pageSize, (page - 1) * pageSize]
|
||||
const listRes = await query<{
|
||||
submission_id: string | number | null
|
||||
inventory_id: string | number | null
|
||||
sort_at: string
|
||||
}>(
|
||||
`${baseSql}
|
||||
SELECT submission_id, inventory_id, sort_at
|
||||
FROM base
|
||||
${groupFilter}
|
||||
ORDER BY sort_at DESC, COALESCE(submission_id, 0) DESC, COALESCE(inventory_id, 0) DESC
|
||||
LIMIT $${listValues.length - 1} OFFSET $${listValues.length}`,
|
||||
listValues,
|
||||
)
|
||||
|
||||
return {
|
||||
rows: listRes.rows.map((row) => ({
|
||||
submissionId: row.submission_id == null ? null : Number(row.submission_id),
|
||||
inventoryId: row.inventory_id == null ? null : Number(row.inventory_id),
|
||||
createdAt: row.sort_at,
|
||||
})),
|
||||
total,
|
||||
counts,
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 按 id 批量取提报单(「我的寄卖」分页后回填完整数据用)。
|
||||
* 这里的顺序不重要,调用方会用 Map 按 id 归位。
|
||||
*/
|
||||
export async function listConsignmentSubmissionsByIds(
|
||||
ids: Array<number | string>,
|
||||
): Promise<ConsignmentSubmissionRow[]> {
|
||||
const numericIds = [...new Set(ids.map(Number).filter((n) => Number.isFinite(n) && n > 0))]
|
||||
if (numericIds.length === 0) return []
|
||||
|
||||
const res = await query<ConsignmentSubmissionRow>(
|
||||
`
|
||||
SELECT
|
||||
cs.*,
|
||||
wc.name AS category_name,
|
||||
wo.acceptance_json AS gift_evidence_json,
|
||||
wo.work_order_no AS gift_work_order_no,
|
||||
wo.status AS gift_work_order_status
|
||||
FROM consignment_submissions cs
|
||||
LEFT JOIN work_categories wc ON wc.id = cs.category_id
|
||||
LEFT JOIN consignment_inventories rinv
|
||||
ON (rinv.id = cs.result_inventory_id OR rinv.source_submission_id = cs.id)
|
||||
LEFT JOIN work_orders wo ON wo.id = rinv.bound_work_order_id
|
||||
WHERE cs.id = ANY($1::bigint[])
|
||||
`,
|
||||
[numericIds],
|
||||
)
|
||||
return res.rows
|
||||
}
|
||||
|
||||
/**
|
||||
* 按提报单精确取现货。
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user