feat(consignment): 接单模板反推规格字段,打手端大批量选项改下拉
- 新增 consignment-template-spec-service:按「分类 + 子树」解析接单模板商品名, 全部可拆成统一维度且无组合碰撞时生成多字段矩阵,否则整类降级为商品名下拉; 选项只存 ruleKey,取价时实时回查模板,模板停用/删除即无价(missingPricePolicy=block)。 - 匹配引擎:模板驱动配置强制使用 profile specs(不再回退库存旧快照),订单侧按 product_rule_id 反解规格;解析失败按 unknown 处理,不参与自动匹配。 - 管理端:寄卖配置新增「从接单模板生成」,弹窗给出推荐模式(规格字段 / 商品名下拉)、 降级原因与组合→模板价覆盖矩阵。 - 打手端:选项超过 8 个改用带搜索的下拉(地铁逃生 100 个商品),规格网格按字段数 自适应铺满;物品名改用商品名,去掉硬编码「苏尔南」后缀。 - 迁移重编号:合并 main 后寄卖线顺延为 147–151,migrate.ts 保留 legacy→new 幂等映射。 - 同工作区的拼单份额报酬口径、超时重匹配兜底、整单/拼单匹配弹窗调整一并提交。 验证:前端 254/254、后端寄卖相关 41/41、双端 tsc 通过;开发库已实跑 发布→审核入库→自动匹配(模板价 1200 → 匹配报酬 1200)。
This commit is contained in:
@@ -425,3 +425,112 @@ export async function listEnabledWorkProductRulesForSuggestion(): Promise<
|
||||
rewardAmountFen: Number(row.reward_amount || 0),
|
||||
}))
|
||||
}
|
||||
|
||||
export type ConsignmentTemplateRuleRow = {
|
||||
id: number
|
||||
ruleKey: string
|
||||
productName: string
|
||||
categoryId: number | null
|
||||
rewardAmountFen: number
|
||||
unitPriceFen: number
|
||||
pricingMode: string
|
||||
sharingEnabled: boolean
|
||||
sharingTotalQuantity: number
|
||||
sharingUnitRewardFen: number
|
||||
}
|
||||
|
||||
/**
|
||||
* 模板驱动规格:取「分类 + 其子树」内启用且有价的接单模板规则。
|
||||
* 苏尔南手枪的价表分布在父分类(4)与子分类(65/66/67),因此必须带子树一起取。
|
||||
*/
|
||||
export async function listEnabledPricedWorkProductRulesForCategorySubtree(
|
||||
categoryIdInput: number | string,
|
||||
): Promise<ConsignmentTemplateRuleRow[]> {
|
||||
const categoryId = Number(categoryIdInput)
|
||||
if (!Number.isInteger(categoryId) || categoryId <= 0) return []
|
||||
const result = await query<{
|
||||
id: number
|
||||
rule_key: string
|
||||
product_name: string
|
||||
category_id: number | null
|
||||
reward_amount: number
|
||||
unit_price_fen: number
|
||||
pricing_mode: string
|
||||
sharing_enabled: boolean
|
||||
sharing_total_quantity: number
|
||||
sharing_unit_reward: number
|
||||
}>(
|
||||
`WITH RECURSIVE subtree AS (
|
||||
SELECT id FROM work_categories WHERE id = $1
|
||||
UNION ALL
|
||||
SELECT c.id FROM work_categories c JOIN subtree s ON c.parent_id = s.id
|
||||
)
|
||||
SELECT r.id, r.rule_key, r.product_name, r.category_id,
|
||||
r.reward_amount, COALESCE(r.unit_price_fen, 0) AS unit_price_fen,
|
||||
r.pricing_mode, r.sharing_enabled, r.sharing_total_quantity,
|
||||
COALESCE(r.sharing_unit_reward, 0) AS sharing_unit_reward
|
||||
FROM work_product_rules r
|
||||
WHERE r.enabled = TRUE
|
||||
AND r.category_id IN (SELECT id FROM subtree)
|
||||
AND (r.reward_amount > 0 OR COALESCE(r.unit_price_fen, 0) > 0)
|
||||
ORDER BY r.category_id NULLS LAST, r.sort_order ASC, r.id ASC`,
|
||||
[categoryId],
|
||||
)
|
||||
return result.rows.map((row) => ({
|
||||
id: Number(row.id),
|
||||
ruleKey: row.rule_key,
|
||||
productName: row.product_name,
|
||||
categoryId:
|
||||
row.category_id === null || row.category_id === undefined ? null : Number(row.category_id),
|
||||
rewardAmountFen: Number(row.reward_amount || 0),
|
||||
unitPriceFen: Number(row.unit_price_fen || 0),
|
||||
pricingMode: String(row.pricing_mode || 'fixed'),
|
||||
sharingEnabled: row.sharing_enabled === true,
|
||||
sharingTotalQuantity: Number(row.sharing_total_quantity || 1),
|
||||
sharingUnitRewardFen: Number(row.sharing_unit_reward || 0),
|
||||
}))
|
||||
}
|
||||
|
||||
/** 模板驱动规格取价:按规则键取一条启用的模板规则;未启用/已删除返回 null。 */
|
||||
export async function getEnabledWorkProductRuleByKey(
|
||||
ruleKeyInput: string,
|
||||
): Promise<ConsignmentTemplateRuleRow | null> {
|
||||
const ruleKey = String(ruleKeyInput || '').trim()
|
||||
if (!ruleKey) return null
|
||||
const result = await query<{
|
||||
id: number
|
||||
rule_key: string
|
||||
product_name: string
|
||||
category_id: number | null
|
||||
reward_amount: number
|
||||
unit_price_fen: number
|
||||
pricing_mode: string
|
||||
sharing_enabled: boolean
|
||||
sharing_total_quantity: number
|
||||
sharing_unit_reward: number
|
||||
}>(
|
||||
`SELECT id, rule_key, product_name, category_id,
|
||||
reward_amount, COALESCE(unit_price_fen, 0) AS unit_price_fen,
|
||||
pricing_mode, sharing_enabled, sharing_total_quantity,
|
||||
COALESCE(sharing_unit_reward, 0) AS sharing_unit_reward
|
||||
FROM work_product_rules
|
||||
WHERE rule_key = $1 AND enabled = TRUE
|
||||
LIMIT 1`,
|
||||
[ruleKey],
|
||||
)
|
||||
const row = result.rows[0]
|
||||
if (!row) return null
|
||||
return {
|
||||
id: Number(row.id),
|
||||
ruleKey: row.rule_key,
|
||||
productName: row.product_name,
|
||||
categoryId:
|
||||
row.category_id === null || row.category_id === undefined ? null : Number(row.category_id),
|
||||
rewardAmountFen: Number(row.reward_amount || 0),
|
||||
unitPriceFen: Number(row.unit_price_fen || 0),
|
||||
pricingMode: String(row.pricing_mode || 'fixed'),
|
||||
sharingEnabled: row.sharing_enabled === true,
|
||||
sharingTotalQuantity: Number(row.sharing_total_quantity || 1),
|
||||
sharingUnitRewardFen: Number(row.sharing_unit_reward || 0),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -691,8 +691,14 @@ export async function settleOverdueWorkOrder(input: {
|
||||
${CLEAR_DELIVERY_RESIDUE_SQL},
|
||||
published_at = CASE WHEN $1 = 'open' THEN $2 ELSE published_at END,
|
||||
hall_queued_at = CASE WHEN $1 = 'open' THEN $2 ELSE hall_queued_at END,
|
||||
internal_match_deadline_at = CASE WHEN $1 = 'internal_matching' THEN NULL ELSE internal_match_deadline_at END,
|
||||
hall_visible_at = CASE WHEN $1 = 'internal_matching' THEN NULL ELSE hall_visible_at END,
|
||||
-- 重新匹配由 startConsignmentRematch 补正式截止时间;这里先写 1 分钟兜底,
|
||||
-- 即使后续补写失败,超时任务也能把工单发回大厅,不会永久悬空。
|
||||
internal_match_deadline_at = CASE
|
||||
WHEN $1 = 'internal_matching' THEN ($2::timestamptz + INTERVAL '1 minute')
|
||||
ELSE internal_match_deadline_at END,
|
||||
hall_visible_at = CASE
|
||||
WHEN $1 = 'internal_matching' THEN ($2::timestamptz + INTERVAL '1 minute')
|
||||
ELSE hall_visible_at END,
|
||||
${RESET_GIFT_FLOW_SQL},
|
||||
updated_at = $2
|
||||
WHERE id = $3
|
||||
|
||||
@@ -127,15 +127,29 @@ async function finalizeSharingOrderAcceptedWithClient(
|
||||
now: input.now,
|
||||
})
|
||||
}
|
||||
// 拼单母单没有单一接单人(份额打手已各自按 share_reward 结算),
|
||||
// 传 0 让供货货款必走本渠道,不会与份额报酬重复。
|
||||
await settleConsignmentSupplierPayoutByWorkOrderWithClient(client, {
|
||||
workOrderId: input.workOrderId,
|
||||
assignedWorkerId: 0,
|
||||
rewardUnfreezeEnabled: input.rewardUnfreezeEnabled,
|
||||
unfreezeDays: input.unfreezeDays,
|
||||
now: input.now,
|
||||
})
|
||||
// 拼单可能有多个供货卖家,每个份额对应一条库存/提报单,
|
||||
// 发布押金必须按份额逐条释放,不能只认 material 里的第一条库存。
|
||||
const shareSubmissionResult = await client.query<{ source_submission_id: number | string }>(
|
||||
`
|
||||
SELECT DISTINCT ci.source_submission_id
|
||||
FROM work_order_shares wos
|
||||
INNER JOIN consignment_inventories ci ON ci.id = wos.consignment_inventory_id
|
||||
WHERE wos.work_order_id = $1
|
||||
AND wos.status != 'cancelled'
|
||||
AND ci.source_submission_id IS NOT NULL
|
||||
`,
|
||||
[input.workOrderId],
|
||||
)
|
||||
for (const row of shareSubmissionResult.rows) {
|
||||
await releaseConsignmentPublishDepositBySubmissionWithClient(client, {
|
||||
submissionId: String(row.source_submission_id),
|
||||
note: `寄卖拼单份额验收完成释放发布押金 #${input.workOrderId}`,
|
||||
now: input.now,
|
||||
})
|
||||
}
|
||||
// 拼单寄卖的份额报酬在 applySharingMatch 里已按「库存净售价 × 数量」写入 share_reward,
|
||||
// 验收时随份额报酬一起结算给对应卖家;这里不能再走整单级供货货款,
|
||||
// 否则会用 LIMIT 1 的供应商反查只给一个卖家重复付款。
|
||||
}
|
||||
|
||||
export async function acceptWorkOrderAndSettle(input: {
|
||||
@@ -555,13 +569,16 @@ export async function acceptWorkOrderAndSettle(input: {
|
||||
|
||||
// 寄卖货款:内部现货履约时订单没有接单打手,通用报酬结算里没人收这笔钱,
|
||||
// 必须在这里补给供货卖家(接单人就是卖家本人时不重复付款,见函数注释)。
|
||||
await settleConsignmentSupplierPayoutByWorkOrderWithClient(client, {
|
||||
workOrderId: input.workOrderId,
|
||||
assignedWorkerId: workerId,
|
||||
rewardUnfreezeEnabled: input.rewardUnfreezeEnabled,
|
||||
unfreezeDays: input.unfreezeDays,
|
||||
now: input.now,
|
||||
})
|
||||
// 拼单工单的份额报酬已经包含寄卖货款,不能再按整单反查一个供应商重复付款。
|
||||
if (shares.length === 0) {
|
||||
await settleConsignmentSupplierPayoutByWorkOrderWithClient(client, {
|
||||
workOrderId: input.workOrderId,
|
||||
assignedWorkerId: workerId,
|
||||
rewardUnfreezeEnabled: input.rewardUnfreezeEnabled,
|
||||
unfreezeDays: input.unfreezeDays,
|
||||
now: input.now,
|
||||
})
|
||||
}
|
||||
|
||||
await createWorkOrderEventWithClient(client, {
|
||||
workOrderId: input.workOrderId,
|
||||
|
||||
Reference in New Issue
Block a user