feat(admin): 收口人工履约入口并修复履约筛选
This commit is contained in:
yml2213
@@ -100,6 +100,44 @@ test('订单列表 platformOrderId 为拼多多 order_sn 时走索引快路径',
|
||||
assert.deepEqual(calls[0]?.params, [orderSn])
|
||||
})
|
||||
|
||||
test('订单列表按当前履约模式筛选，不再依赖任务执行器', async () => {
|
||||
const calls: Array<{ sql: string; params: unknown[] }> = []
|
||||
|
||||
await listOrdersWithExecutor(createExecutor(calls, 0), {
|
||||
fulfillmentMode: 'manual',
|
||||
})
|
||||
|
||||
assert.match(calls[0]?.sql || '', /oi\.fulfillment_mode = \$1/)
|
||||
assert.match(calls[0]?.sql || '', /oi\.fulfillment_mode <> \$1/)
|
||||
assert.doesNotMatch(calls[0]?.sql || '', /COUNT\(DISTINCT/)
|
||||
assert.doesNotMatch(calls[0]?.sql || '', /ft\.executor_key/)
|
||||
assert.deepEqual(calls[0]?.params, ['manual'])
|
||||
})
|
||||
|
||||
test('订单列表待判定筛选不扫描任务执行器', async () => {
|
||||
const calls: Array<{ sql: string; params: unknown[] }> = []
|
||||
|
||||
await listOrdersWithExecutor(createExecutor(calls, 0), {
|
||||
fulfillmentMode: 'pending',
|
||||
})
|
||||
|
||||
assert.match(calls[0]?.sql || '', /NOT EXISTS/)
|
||||
assert.match(calls[0]?.sql || '', /oi\.fulfillment_mode IN/)
|
||||
assert.doesNotMatch(calls[0]?.sql || '', /COUNT\(DISTINCT/)
|
||||
assert.deepEqual(calls[0]?.params, [])
|
||||
})
|
||||
|
||||
test('订单列表混合履约筛选按订单项聚合判定', async () => {
|
||||
const calls: Array<{ sql: string; params: unknown[] }> = []
|
||||
|
||||
await listOrdersWithExecutor(createExecutor(calls, 0), {
|
||||
fulfillmentMode: 'mixed',
|
||||
})
|
||||
|
||||
assert.match(calls[0]?.sql || '', /HAVING COUNT\(DISTINCT oi\.fulfillment_mode\) > 1/)
|
||||
assert.deepEqual(calls[0]?.params, [])
|
||||
})
|
||||
|
||||
function createExecutor(
|
||||
calls: Array<{ sql: string; params: unknown[] }>,
|
||||
total: number,
|
||||
|
||||
@@ -240,6 +240,7 @@ export async function listOrdersWithExecutor(
|
||||
keyword = '',
|
||||
provider = '',
|
||||
executorKey = '',
|
||||
fulfillmentMode = '',
|
||||
platformOrderId = '',
|
||||
payStatus = '',
|
||||
taskStatus = '',
|
||||
@@ -333,6 +334,38 @@ export async function listOrdersWithExecutor(
|
||||
)
|
||||
}
|
||||
|
||||
if (fulfillmentMode) {
|
||||
const knownModes = `('work_order', 'affiliate_dash', 'legacy_platform', 'manual')`
|
||||
if (fulfillmentMode === 'pending') {
|
||||
filters.push(`NOT EXISTS (
|
||||
SELECT 1 FROM order_items oi
|
||||
WHERE oi.order_id = o.id AND oi.fulfillment_mode IN ${knownModes}
|
||||
)`)
|
||||
} else if (fulfillmentMode === 'mixed') {
|
||||
filters.push(`o.id IN (
|
||||
SELECT oi.order_id FROM order_items oi
|
||||
WHERE oi.fulfillment_mode IN ${knownModes}
|
||||
GROUP BY oi.order_id
|
||||
HAVING COUNT(DISTINCT oi.fulfillment_mode) > 1
|
||||
)`)
|
||||
} else {
|
||||
params.push(fulfillmentMode)
|
||||
const modeParam = `$${params.length}`
|
||||
filters.push(`(
|
||||
EXISTS (
|
||||
SELECT 1 FROM order_items oi
|
||||
WHERE oi.order_id = o.id AND oi.fulfillment_mode = ${modeParam}
|
||||
)
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM order_items oi
|
||||
WHERE oi.order_id = o.id
|
||||
AND oi.fulfillment_mode IN ${knownModes}
|
||||
AND oi.fulfillment_mode <> ${modeParam}
|
||||
)
|
||||
)`)
|
||||
}
|
||||
}
|
||||
|
||||
if (skuCode) {
|
||||
params.push(skuCode)
|
||||
filters.push(
|
||||
|
||||
@@ -11,10 +11,6 @@ import {
|
||||
listSalesDailyFacts,
|
||||
rebuildSalesDailyFacts,
|
||||
} from '../../services/finance/sales-facts-service.js'
|
||||
import {
|
||||
createManualOrderCost,
|
||||
listManualOrderCostItems,
|
||||
} from '../../services/finance/manual-order-cost-service.js'
|
||||
import {
|
||||
confirmManualFulfillment,
|
||||
listManualFulfillmentPending,
|
||||
@@ -118,45 +114,6 @@ router.post(
|
||||
),
|
||||
)
|
||||
|
||||
router.get(
|
||||
'/finance/manual-order-cost-items',
|
||||
requireAnyAdminPermission(['finance.view', 'fund.view']),
|
||||
createJsonHandler(() => listManualOrderCostItems(), {
|
||||
successMessage: 'ok',
|
||||
errorMessage: '读取人工录单成本项失败',
|
||||
scope: '[admin/finance/manual-order-cost-items]',
|
||||
}),
|
||||
)
|
||||
|
||||
router.post(
|
||||
'/finance/manual-order-costs',
|
||||
requireAnyAdminPermission(['fund.expense', 'finance.config']),
|
||||
createJsonHandler((req) => createManualOrderCost(bodyOf(req), sessionOf(req)), {
|
||||
successMessage: '订单人工成本已录入',
|
||||
errorMessage: '录入订单人工成本失败',
|
||||
scope: '[admin/finance/manual-order-costs]',
|
||||
audit: (req, data) => {
|
||||
const result = data as {
|
||||
expenseNo?: string
|
||||
amountFen?: number
|
||||
orderId?: number
|
||||
costSnapshotId?: number | null
|
||||
}
|
||||
return {
|
||||
action: 'manual_order_cost_created',
|
||||
targetType: 'fund_expense',
|
||||
targetId: result.expenseNo || '',
|
||||
data: {
|
||||
expenseNo: result.expenseNo || '',
|
||||
amountFen: result.amountFen || 0,
|
||||
orderId: result.orderId || req.body?.orderId || '',
|
||||
costSnapshotId: result.costSnapshotId || null,
|
||||
},
|
||||
}
|
||||
},
|
||||
}),
|
||||
)
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// 人工履约待办与确认履约
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
@@ -28,11 +28,13 @@ export function mapAdminOrderListItem(
|
||||
orderItems = [],
|
||||
vouchers = [],
|
||||
workOrderCount = 0,
|
||||
manualConfig = { pending: 0, unconfigured: 0 },
|
||||
}: {
|
||||
tasks?: TaskRow[]
|
||||
orderItems?: OrderItemRow[]
|
||||
vouchers?: KuaishouIndustryVoucherRow[]
|
||||
workOrderCount?: number
|
||||
manualConfig?: { pending: number; unconfigured: number }
|
||||
} = {},
|
||||
): AdminOrderListItem {
|
||||
const fulfillmentProgress = buildOrderFulfillmentProgress(tasks)
|
||||
@@ -121,6 +123,8 @@ export function mapAdminOrderListItem(
|
||||
fulfillmentMode: fulfillment.fulfillmentMode,
|
||||
manualItemCount: fulfillment.manualItemCount,
|
||||
pendingItemCount: fulfillment.pendingItemCount,
|
||||
manualPendingCount: manualConfig.pending,
|
||||
manualUnconfiguredCount: manualConfig.unconfigured,
|
||||
hasVoucher: fulfillment.hasVoucher,
|
||||
voucherState: fulfillment.voucherState,
|
||||
canClaimH5: fulfillment.canClaimH5,
|
||||
|
||||
@@ -7,6 +7,7 @@ import {
|
||||
} from '../../repositories/order-item-repo.js'
|
||||
import { getOrderById, listOrders } from '../../repositories/order-repo.js'
|
||||
import { listOrderRefunds } from '../finance/order-refund-service.js'
|
||||
import { getManualFulfillmentCountsByOrderIds } from '../finance/manual-fulfillment-service.js'
|
||||
import {
|
||||
getTaskById,
|
||||
listTasks,
|
||||
@@ -104,6 +105,7 @@ export async function getAdminOrders(
|
||||
keyword: String(query.keyword || '').trim(),
|
||||
provider: String(query.provider || '').trim(),
|
||||
executorKey: String(query.executorKey || '').trim(),
|
||||
fulfillmentMode: normalizeOrderFulfillmentModeFilter(query.fulfillmentMode),
|
||||
platformOrderId: String(query.platformOrderId || '').trim(),
|
||||
payStatus: String(query.payStatus || '').trim(),
|
||||
taskStatus: String(query.taskStatus || '').trim(),
|
||||
@@ -114,11 +116,12 @@ export async function getAdminOrders(
|
||||
|
||||
const orderIds = items.map((item) => Number(item.id)).filter((id) => id > 0)
|
||||
const oids = items.map((item) => item.platform_order_id).filter(Boolean)
|
||||
const [orderItems, tasks, vouchers, workOrders] = await Promise.all([
|
||||
const [orderItems, tasks, vouchers, workOrders, manualCounts] = await Promise.all([
|
||||
listOrderItemsByOrderIds(orderIds),
|
||||
listTasksByOrderIds(orderIds),
|
||||
listKuaishouIndustryVouchersByOids(oids),
|
||||
listWorkOrdersByOrderIds(orderIds),
|
||||
getManualFulfillmentCountsByOrderIds(orderIds),
|
||||
])
|
||||
const orderItemsByOrderId = groupRowsByOrderId(orderItems)
|
||||
const tasksByOrderId = groupRowsByOrderId(tasks)
|
||||
@@ -136,12 +139,29 @@ export async function getAdminOrders(
|
||||
tasks: orderTasks,
|
||||
vouchers: orderVouchers,
|
||||
workOrderCount: orderWorkOrders.length,
|
||||
manualConfig: manualCounts.get(orderId) || { pending: 0, unconfigured: 0 },
|
||||
})
|
||||
}),
|
||||
pagination: { page, pageSize, total },
|
||||
}
|
||||
}
|
||||
|
||||
const ADMIN_ORDER_FULFILLMENT_MODES = new Set([
|
||||
'work_order',
|
||||
'affiliate_dash',
|
||||
'legacy_platform',
|
||||
'manual',
|
||||
'mixed',
|
||||
'pending',
|
||||
])
|
||||
|
||||
function normalizeOrderFulfillmentModeFilter(value: unknown): string {
|
||||
const mode = String(value || '')
|
||||
.trim()
|
||||
.toLowerCase()
|
||||
return ADMIN_ORDER_FULFILLMENT_MODES.has(mode) ? mode : ''
|
||||
}
|
||||
|
||||
function groupRowsByOrderId<T extends { order_id?: number | string | null }>(
|
||||
rows: T[],
|
||||
): Map<number, T[]> {
|
||||
@@ -182,12 +202,14 @@ export async function getAdminOrderDetail(
|
||||
})
|
||||
}
|
||||
|
||||
const [items, tasks, workOrders, refunds] = await Promise.all([
|
||||
const [items, tasks, workOrders, refunds, manualCounts] = await Promise.all([
|
||||
listOrderItemsByOrderId(order.id),
|
||||
listTasksByOrderId(order.id),
|
||||
listWorkOrdersByOrderId(order.id),
|
||||
listOrderRefunds(order.id),
|
||||
getManualFulfillmentCountsByOrderIds([order.id]),
|
||||
])
|
||||
const manualConfig = manualCounts.get(Number(order.id)) || { pending: 0, unconfigured: 0 }
|
||||
const kuaishouIndustryVouchers = await listKuaishouIndustryVouchersByOid(order.platform_order_id)
|
||||
const itemSummary = summarizeOrderItems(items, order, kuaishouIndustryVouchers)
|
||||
const orderItemTitle = resolveOrderItemTitle(items[0], order, kuaishouIndustryVouchers)
|
||||
@@ -233,6 +255,8 @@ export async function getAdminOrderDetail(
|
||||
fulfillmentMode: fulfillment.fulfillmentMode,
|
||||
manualItemCount: fulfillment.manualItemCount,
|
||||
pendingItemCount: fulfillment.pendingItemCount,
|
||||
manualPendingCount: manualConfig.pending,
|
||||
manualUnconfiguredCount: manualConfig.unconfigured,
|
||||
hasVoucher: fulfillment.hasVoucher,
|
||||
voucherState: fulfillment.voucherState,
|
||||
workOrderCount: workOrders.length,
|
||||
|
||||
@@ -78,6 +78,12 @@ export async function listManualFulfillmentPending(
|
||||
} else if (status === 'fulfilled') {
|
||||
conditions.push('fulfilled.fulfilled_at IS NOT NULL')
|
||||
}
|
||||
// 订单页按单打开确认框：只取该订单的待办项。
|
||||
const orderId = Number(input.orderId ?? input.order_id ?? 0)
|
||||
if (Number.isFinite(orderId) && orderId > 0) {
|
||||
params.push(Math.trunc(orderId))
|
||||
conditions.push(`oi.order_id = $${params.length}`)
|
||||
}
|
||||
if (keyword) {
|
||||
params.push(`%${escapeLike(keyword)}%`)
|
||||
const placeholder = `$${params.length}`
|
||||
@@ -565,3 +571,52 @@ function optionalText(value: unknown, maxLength: number) {
|
||||
function escapeLike(value: string) {
|
||||
return value.replace(/[\\%_]/g, (char) => `\\${char}`)
|
||||
}
|
||||
|
||||
/**
|
||||
* 订单列表/详情用：按订单统计「可确认履约」与「未配置履约渠道」的数量。
|
||||
*
|
||||
* - pending：有人工履约配置且还没有 manual_case 快照；
|
||||
* - unconfigured：人工单但没有绑定履约配置（需要先到成本中心配 SKU）。
|
||||
*/
|
||||
export async function getManualFulfillmentCountsByOrderIds(
|
||||
orderIds: Array<number | string>,
|
||||
): Promise<Map<number, { pending: number; unconfigured: number }>> {
|
||||
const ids = orderIds.map(Number).filter((id) => Number.isFinite(id) && id > 0)
|
||||
if (ids.length === 0) return new Map()
|
||||
const result = await query<{
|
||||
order_id: number
|
||||
pending_count: number
|
||||
unconfigured_count: number
|
||||
}>(
|
||||
`
|
||||
WITH fulfilled AS (
|
||||
SELECT order_item_id, MAX(created_at) AS fulfilled_at
|
||||
FROM cost_snapshots
|
||||
WHERE subject_type = 'manual_case' AND superseded_at IS NULL
|
||||
GROUP BY order_item_id
|
||||
)
|
||||
SELECT
|
||||
oi.order_id,
|
||||
COUNT(*) FILTER (
|
||||
WHERE cfg.id IS NOT NULL AND fulfilled.fulfilled_at IS NULL
|
||||
)::int AS pending_count,
|
||||
COUNT(*) FILTER (WHERE cfg.id IS NULL)::int AS unconfigured_count
|
||||
FROM order_items oi
|
||||
LEFT JOIN manual_fulfillment_configs cfg ON cfg.id = oi.fulfillment_config_id
|
||||
LEFT JOIN fulfilled ON fulfilled.order_item_id = oi.id
|
||||
WHERE oi.order_id = ANY($1::bigint[])
|
||||
AND oi.fulfillment_mode = 'manual'
|
||||
GROUP BY oi.order_id
|
||||
`,
|
||||
[ids],
|
||||
)
|
||||
return new Map(
|
||||
result.rows.map((row) => [
|
||||
Number(row.order_id),
|
||||
{
|
||||
pending: Number(row.pending_count || 0),
|
||||
unconfigured: Number(row.unconfigured_count || 0),
|
||||
},
|
||||
]),
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,547 +0,0 @@
|
||||
import type { PoolClient } from 'pg'
|
||||
|
||||
import { query, withTransaction } from '../../db/client.js'
|
||||
import type { JsonObject } from '../../types/json.js'
|
||||
import { createHttpError } from '../../utils/http.js'
|
||||
import { nowIso } from '../../utils/time.js'
|
||||
import type { AdminSession } from '../admin/admin-auth-service.js'
|
||||
import { getOwnAgentAccountId, writeFundExpense } from '../admin/admin-fund-service.js'
|
||||
|
||||
/**
|
||||
* 订单页「人工录单」服务。
|
||||
*
|
||||
* 口径（2026-10-23 确认）：
|
||||
* * 人工成本逐单、按实际金额，不按工时、不按固定单量/固定单价；
|
||||
* * 成本从客服备用金账户直接扣款，客服角色只能用本人账户，管理员/财务可代录；
|
||||
* * **没有登记单、没有审批、没有报销**：录入即写 actual 成本快照；
|
||||
* * 资金台账唯一真源是 manual_expenses（客服备用金支出明细），本服务不另存支出表。
|
||||
*
|
||||
* 成本快照主体：subject_type='manual_case'，subject_id=manual_expenses.id。
|
||||
*/
|
||||
|
||||
const PAYEE_TYPES = new Set(['worker', 'upstream', 'customer', 'platform', 'other'])
|
||||
const PAYMENT_METHODS = new Set(['wechat', 'alipay', 'bank', 'cash', 'platform_balance', 'other'])
|
||||
/** 人工录单的费用类型；与备用金分类的映射见 mapFundExpenseCategory()。 */
|
||||
const EXPENSE_CATEGORIES = new Set([
|
||||
'goods_purchase',
|
||||
'compensation',
|
||||
'refund_advance',
|
||||
'service_fee',
|
||||
'freight',
|
||||
'recharge',
|
||||
'other',
|
||||
])
|
||||
|
||||
type ManualOrderCostResult = {
|
||||
expenseNo: string
|
||||
fundExpenseId: number
|
||||
fundAccountId: number
|
||||
fundAccountNo: string
|
||||
amountFen: number
|
||||
orderId: number
|
||||
orderItemId: number
|
||||
costSnapshotId: number | null
|
||||
fulfillmentMode: string
|
||||
warning: string
|
||||
}
|
||||
|
||||
/**
|
||||
* 录入一笔人工成本：扣客服备用金 + 写 actual 成本快照。
|
||||
*
|
||||
* 全流程在同一事务内：余额不足直接拒绝，不允许负余额。
|
||||
*/
|
||||
export async function createManualOrderCost(
|
||||
payload: JsonObject,
|
||||
session: AdminSession,
|
||||
): Promise<ManualOrderCostResult> {
|
||||
const orderId = normalizeId(payload.orderId ?? payload.order_id, '订单号无效')
|
||||
const amountFen = normalizeAmountFen(payload.amountFen ?? payload.amount_fen)
|
||||
const note = optionalText(payload.note, 500) || '订单页人工录单'
|
||||
const expenseCategory = normalizeStatus(
|
||||
payload.expenseCategory ?? payload.expense_category,
|
||||
EXPENSE_CATEGORIES,
|
||||
'service_fee',
|
||||
'费用类型无效',
|
||||
)
|
||||
const payeeName = optionalText(payload.payeeName ?? payload.payee_name, 120) || '内部人工'
|
||||
const payeeType = normalizeStatus(
|
||||
payload.payeeType ?? payload.payee_type,
|
||||
PAYEE_TYPES,
|
||||
'other',
|
||||
'收款方类型无效',
|
||||
)
|
||||
const paymentMethod = normalizeStatus(
|
||||
payload.paymentMethod ?? payload.payment_method,
|
||||
PAYMENT_METHODS,
|
||||
'other',
|
||||
'付款方式无效',
|
||||
)
|
||||
const evidenceJson = normalizeEvidence(payload.evidenceJson ?? payload.evidence_json)
|
||||
if (!hasEvidence(evidenceJson)) {
|
||||
evidenceJson.note = note
|
||||
}
|
||||
|
||||
const orderItemId = await resolveOrderItemId(
|
||||
orderId,
|
||||
normalizeOptionalId(payload.orderItemId ?? payload.order_item_id),
|
||||
)
|
||||
const fundAccountId = await resolveFundAccountId(
|
||||
normalizeOptionalId(payload.fundAccountId ?? payload.fund_account_id),
|
||||
session,
|
||||
)
|
||||
const costItemId = await resolveManualCostItemId()
|
||||
const paidAt = nowIso()
|
||||
|
||||
return withTransaction(async (client) => {
|
||||
const fundWritten = await writeFundExpense(client, {
|
||||
agentAccountId: fundAccountId,
|
||||
amountFen,
|
||||
category: mapFundExpenseCategory(expenseCategory),
|
||||
payeeType: mapFundPayeeType(payeeType),
|
||||
payeeName,
|
||||
payeeAccount: optionalText(payload.payeeAccount ?? payload.payee_account, 120),
|
||||
orderId,
|
||||
orderItemId,
|
||||
paidAt,
|
||||
evidence: toFundEvidence(evidenceJson),
|
||||
note: buildFundExpenseNote(note, optionalText(evidenceJson.reference, 200)),
|
||||
actorUserId: session.userId,
|
||||
})
|
||||
const fundExpenseId = Number(fundWritten.expense.id)
|
||||
const fundAccountNo = await loadFundAccountNo(client, fundAccountId)
|
||||
|
||||
const context = await loadOrderItemContext(client, orderItemId)
|
||||
const versionId = await resolveCostVersionId(client, costItemId, context, paidAt)
|
||||
let costSnapshotId: number | null = null
|
||||
let warning = ''
|
||||
|
||||
if (!versionId) {
|
||||
// 匹配不到有效成本版本不允许静默记 0，必须进异常队列。
|
||||
await client.query(
|
||||
`
|
||||
INSERT INTO cost_exceptions (
|
||||
subject_type, subject_id, order_item_id, work_order_id,
|
||||
reason, status, detail_json, created_at
|
||||
) VALUES (
|
||||
'order_item', $1, $1, $2, 'manual_expense_cost_missing', 'open', $3::jsonb, NOW()
|
||||
)
|
||||
ON CONFLICT (subject_type, subject_id, reason) DO NOTHING
|
||||
`,
|
||||
[
|
||||
orderItemId,
|
||||
context.workOrderId,
|
||||
JSON.stringify({
|
||||
fundExpenseId,
|
||||
fundExpenseNo: fundWritten.expense.expense_no,
|
||||
amountFen,
|
||||
message: '人工录单已扣备用金，但该成本项没有匹配到有效成本版本',
|
||||
}),
|
||||
],
|
||||
)
|
||||
warning = '人工录单已扣备用金，但未匹配到有效成本版本，已进入异常队列'
|
||||
} else {
|
||||
const snapshotResult = await client.query<{ id: number }>(
|
||||
`
|
||||
INSERT INTO cost_snapshots (
|
||||
subject_type, subject_id, order_id, order_item_id, work_order_id,
|
||||
cost_item_id, cost_version_id, canonical_product_id,
|
||||
quantity, unit_amount_fen, total_amount_fen, snapshot_stage, source,
|
||||
metadata_json, cost_basis_at, resolved_at, created_at
|
||||
) VALUES (
|
||||
'manual_case', $1, $2, $3, $4,
|
||||
$5, $6, $7,
|
||||
1, $8, $8, 'actual', 'manual_input',
|
||||
$9::jsonb, $10, $11, $11
|
||||
)
|
||||
ON CONFLICT (subject_type, subject_id, cost_item_id)
|
||||
WHERE superseded_at IS NULL
|
||||
DO NOTHING
|
||||
RETURNING id
|
||||
`,
|
||||
[
|
||||
fundExpenseId,
|
||||
orderId,
|
||||
orderItemId,
|
||||
context.workOrderId,
|
||||
costItemId,
|
||||
versionId,
|
||||
context.canonicalProductId,
|
||||
amountFen,
|
||||
JSON.stringify({
|
||||
source: 'manual_order_cost',
|
||||
fundExpenseId,
|
||||
fundExpenseNo: fundWritten.expense.expense_no,
|
||||
fundAccountNo,
|
||||
paidByName: fundWritten.ownerName,
|
||||
payeeName,
|
||||
payeeType,
|
||||
paymentMethod,
|
||||
expenseCategory,
|
||||
evidence: evidenceJson,
|
||||
fulfillmentMode: context.fulfillmentMode,
|
||||
}),
|
||||
paidAt,
|
||||
nowIso(),
|
||||
],
|
||||
)
|
||||
costSnapshotId = snapshotResult.rows[0]?.id ?? null
|
||||
if (!costSnapshotId) {
|
||||
// 唯一索引冲突意味着同一主体+成本项已有有效快照。钱已经扣了，不能静默吞掉，
|
||||
// 否则会出现「钱扣了、成本没记」的账实不符。
|
||||
throw createHttpError(
|
||||
'该订单项已有同成本项的人工成本快照，本次未写入成本；备用金扣款已回滚，请改用新的支出单或先处理已有快照',
|
||||
{ statusCode: 409, errorCode: 'manual_order_cost_snapshot_conflict' },
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
expenseNo: fundWritten.expense.expense_no,
|
||||
fundExpenseId,
|
||||
fundAccountId,
|
||||
fundAccountNo,
|
||||
amountFen,
|
||||
orderId,
|
||||
orderItemId,
|
||||
costSnapshotId,
|
||||
fulfillmentMode: context.fulfillmentMode,
|
||||
warning,
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/** 人工录单可用的成本项：人工客服履约成本。 */
|
||||
export async function listManualOrderCostItems() {
|
||||
const result = await query<{
|
||||
id: number
|
||||
code: string
|
||||
name: string
|
||||
cost_model: string
|
||||
pricing_mode: string
|
||||
}>(
|
||||
`
|
||||
SELECT id, code, name, cost_model, pricing_mode
|
||||
FROM cost_items
|
||||
WHERE status = 'active'
|
||||
AND cost_model = 'manual_actual'
|
||||
ORDER BY id
|
||||
`,
|
||||
)
|
||||
return {
|
||||
items: result.rows.map((row) => ({
|
||||
id: Number(row.id),
|
||||
code: row.code,
|
||||
name: row.name,
|
||||
costModel: row.cost_model,
|
||||
pricingMode: row.pricing_mode,
|
||||
})),
|
||||
}
|
||||
}
|
||||
|
||||
async function resolveOrderItemId(orderId: number, requestedItemId: number | null) {
|
||||
const itemsResult = await query<{ id: number }>(
|
||||
'SELECT id FROM order_items WHERE order_id = $1 ORDER BY id ASC',
|
||||
[orderId],
|
||||
)
|
||||
if (itemsResult.rows.length === 0) {
|
||||
throw createHttpError('订单没有订单项，无法录入人工成本', {
|
||||
statusCode: 400,
|
||||
errorCode: 'manual_order_cost_items_missing',
|
||||
})
|
||||
}
|
||||
if (requestedItemId) {
|
||||
if (!itemsResult.rows.some((row) => Number(row.id) === requestedItemId)) {
|
||||
throw createHttpError('订单项不属于该订单', {
|
||||
statusCode: 400,
|
||||
errorCode: 'manual_order_cost_item_mismatch',
|
||||
})
|
||||
}
|
||||
return requestedItemId
|
||||
}
|
||||
if (itemsResult.rows.length === 1) {
|
||||
return Number(itemsResult.rows[0]?.id || 0)
|
||||
}
|
||||
throw createHttpError('订单有多个订单项，请选择要计入的订单项', {
|
||||
statusCode: 400,
|
||||
errorCode: 'manual_order_cost_item_required',
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 备用金账户归属校验：客服只能用本人账户；管理员/财务可代录到指定客服账户。
|
||||
*/
|
||||
async function resolveFundAccountId(requestedFundAccountId: number | null, session: AdminSession) {
|
||||
if (session.role === 'support') {
|
||||
const ownAccountId = await getOwnAgentAccountId(session.userId)
|
||||
if (!ownAccountId) {
|
||||
throw createHttpError('当前账号还没有备用金账户', {
|
||||
statusCode: 404,
|
||||
errorCode: 'fund_agent_account_not_found',
|
||||
})
|
||||
}
|
||||
if (requestedFundAccountId && requestedFundAccountId !== ownAccountId) {
|
||||
throw createHttpError('只能使用自己的备用金账户', {
|
||||
statusCode: 403,
|
||||
errorCode: 'manual_order_cost_fund_account_forbidden',
|
||||
})
|
||||
}
|
||||
return ownAccountId
|
||||
}
|
||||
if (!requestedFundAccountId) {
|
||||
throw createHttpError('请选择备用金账户，人工录单必须从备用金扣款', {
|
||||
statusCode: 400,
|
||||
errorCode: 'manual_order_cost_fund_account_required',
|
||||
})
|
||||
}
|
||||
return requestedFundAccountId
|
||||
}
|
||||
|
||||
async function resolveManualCostItemId() {
|
||||
const result = await query<{ id: number }>(
|
||||
`SELECT id FROM cost_items
|
||||
WHERE code = 'sys_manual_service' AND status = 'active'
|
||||
LIMIT 1`,
|
||||
)
|
||||
const costItemId = Number(result.rows[0]?.id || 0)
|
||||
if (!costItemId) {
|
||||
throw createHttpError('人工客服履约成本项未启用', {
|
||||
statusCode: 409,
|
||||
errorCode: 'manual_order_cost_item_unavailable',
|
||||
})
|
||||
}
|
||||
return costItemId
|
||||
}
|
||||
|
||||
type OrderItemContext = {
|
||||
orderId: number
|
||||
canonicalProductId: number | null
|
||||
provider: string
|
||||
shopId: string
|
||||
workOrderId: number | null
|
||||
workProductRuleId: number | null
|
||||
fulfillmentMode: string
|
||||
}
|
||||
|
||||
async function loadFundAccountNo(client: PoolClient, fundAccountId: number) {
|
||||
const result = await client.query<{ account_no: string }>(
|
||||
'SELECT account_no FROM fund_accounts WHERE id = $1 LIMIT 1',
|
||||
[fundAccountId],
|
||||
)
|
||||
return result.rows[0]?.account_no || ''
|
||||
}
|
||||
|
||||
async function loadOrderItemContext(
|
||||
client: PoolClient,
|
||||
orderItemId: number,
|
||||
): Promise<OrderItemContext> {
|
||||
const result = await client.query<OrderItemContext>(
|
||||
`
|
||||
SELECT
|
||||
oi.order_id,
|
||||
oi.canonical_product_id,
|
||||
o.provider,
|
||||
o.shop_id,
|
||||
wo.id AS work_order_id,
|
||||
wo.product_rule_id AS work_product_rule_id,
|
||||
COALESCE(oi.fulfillment_mode, 'manual') AS fulfillment_mode
|
||||
FROM order_items oi
|
||||
JOIN orders o ON o.id = oi.order_id
|
||||
LEFT JOIN LATERAL (
|
||||
SELECT id, product_rule_id
|
||||
FROM work_orders
|
||||
WHERE order_item_id = oi.id
|
||||
ORDER BY id DESC
|
||||
LIMIT 1
|
||||
) wo ON TRUE
|
||||
WHERE oi.id = $1
|
||||
LIMIT 1
|
||||
`,
|
||||
[orderItemId],
|
||||
)
|
||||
const row = result.rows[0]
|
||||
if (!row) {
|
||||
throw createHttpError('订单项不存在', {
|
||||
statusCode: 404,
|
||||
errorCode: 'manual_order_cost_order_item_not_found',
|
||||
})
|
||||
}
|
||||
return row
|
||||
}
|
||||
|
||||
/**
|
||||
* 解析成本版本：优先级 rule > product > shop > provider > global，按业务发生时间匹配。
|
||||
* 人工成本项的 draft 占位版本也接受，避免未启用正式版本时人工单无法入账。
|
||||
*/
|
||||
async function resolveCostVersionId(
|
||||
client: PoolClient,
|
||||
costItemId: number,
|
||||
context: OrderItemContext,
|
||||
basisAt: string,
|
||||
) {
|
||||
const result = await client.query<{ id: number }>(
|
||||
`
|
||||
SELECT v.id
|
||||
FROM cost_versions v
|
||||
WHERE v.cost_item_id = $1
|
||||
AND (
|
||||
v.status = 'active'
|
||||
OR (
|
||||
v.status = 'draft'
|
||||
AND EXISTS (
|
||||
SELECT 1 FROM cost_items ci
|
||||
WHERE ci.id = v.cost_item_id AND ci.code = 'sys_manual_service'
|
||||
)
|
||||
)
|
||||
)
|
||||
AND v.effective_from <= $2
|
||||
AND (v.effective_to IS NULL OR v.effective_to > $2)
|
||||
AND (
|
||||
(v.scope_type = 'rule' AND $6::bigint IS NOT NULL AND v.work_product_rule_id = $6)
|
||||
OR (v.scope_type = 'product' AND $5::bigint IS NOT NULL AND v.canonical_product_id = $5)
|
||||
OR (v.scope_type = 'shop' AND v.provider = $3 AND v.shop_id = $4)
|
||||
OR (v.scope_type = 'provider' AND v.provider = $3)
|
||||
OR (v.scope_type = 'global')
|
||||
)
|
||||
ORDER BY
|
||||
CASE v.scope_type
|
||||
WHEN 'rule' THEN 1
|
||||
WHEN 'product' THEN 2
|
||||
WHEN 'shop' THEN 3
|
||||
WHEN 'provider' THEN 4
|
||||
ELSE 5
|
||||
END,
|
||||
v.effective_from DESC,
|
||||
v.id DESC
|
||||
LIMIT 1
|
||||
`,
|
||||
[
|
||||
costItemId,
|
||||
basisAt,
|
||||
context.provider,
|
||||
context.shopId,
|
||||
context.canonicalProductId,
|
||||
context.workProductRuleId,
|
||||
],
|
||||
)
|
||||
return result.rows[0]?.id ?? null
|
||||
}
|
||||
|
||||
/** 人工录单的费用类型映射到备用金支出分类。 */
|
||||
function mapFundExpenseCategory(category: string): string {
|
||||
switch (category) {
|
||||
case 'goods_purchase':
|
||||
return 'purchase'
|
||||
case 'compensation':
|
||||
return 'compensation'
|
||||
case 'freight':
|
||||
return 'freight'
|
||||
case 'recharge':
|
||||
return 'platform_recharge'
|
||||
default:
|
||||
return 'other'
|
||||
}
|
||||
}
|
||||
|
||||
function mapFundPayeeType(payeeType: string): string {
|
||||
switch (payeeType) {
|
||||
case 'worker':
|
||||
case 'upstream':
|
||||
return 'supplier'
|
||||
case 'customer':
|
||||
return 'customer'
|
||||
case 'platform':
|
||||
return 'platform'
|
||||
default:
|
||||
return 'other'
|
||||
}
|
||||
}
|
||||
|
||||
function toFundEvidence(evidence: JsonObject): JsonObject[] {
|
||||
const items: JsonObject[] = []
|
||||
const urls = Array.isArray(evidence.urls) ? evidence.urls : []
|
||||
for (const value of urls) {
|
||||
const url = String(value || '').trim()
|
||||
if (url) {
|
||||
items.push({ url, filename: '人工录单凭证', contentType: 'image/*' })
|
||||
}
|
||||
}
|
||||
const reference = String(evidence.reference || '').trim()
|
||||
if (/^https?:\/\//i.test(reference) && !items.some((item) => item.url === reference)) {
|
||||
items.push({ url: reference, filename: '人工录单凭证', contentType: 'image/*' })
|
||||
}
|
||||
return items.slice(0, 6)
|
||||
}
|
||||
|
||||
function buildFundExpenseNote(note: string, reference: string): string {
|
||||
const parts = ['人工录单']
|
||||
if (reference) parts.push(`凭证：${reference}`)
|
||||
if (note) parts.push(note)
|
||||
return parts.join(' · ').slice(0, 500)
|
||||
}
|
||||
|
||||
function normalizeEvidence(value: unknown): JsonObject {
|
||||
if (value && typeof value === 'object' && !Array.isArray(value)) {
|
||||
return value as JsonObject
|
||||
}
|
||||
const text = String(value || '').trim()
|
||||
return text ? { reference: text } : {}
|
||||
}
|
||||
|
||||
function hasEvidence(evidence: JsonObject) {
|
||||
const urls = Array.isArray(evidence.urls) ? evidence.urls : []
|
||||
return (
|
||||
urls.length > 0 ||
|
||||
Boolean(String(evidence.reference || '').trim()) ||
|
||||
Boolean(String(evidence.note || '').trim())
|
||||
)
|
||||
}
|
||||
|
||||
function normalizeAmountFen(value: unknown) {
|
||||
const amount = Math.trunc(Number(value) || 0)
|
||||
if (amount <= 0) {
|
||||
throw createHttpError('支出金额必须大于 0', {
|
||||
statusCode: 400,
|
||||
errorCode: 'manual_order_cost_amount_invalid',
|
||||
})
|
||||
}
|
||||
if (amount > 100_000_000_00) {
|
||||
throw createHttpError('支出金额超出允许范围', {
|
||||
statusCode: 400,
|
||||
errorCode: 'manual_order_cost_amount_too_large',
|
||||
})
|
||||
}
|
||||
return amount
|
||||
}
|
||||
|
||||
function normalizeOptionalId(value: unknown) {
|
||||
const parsed = Number(value)
|
||||
return Number.isInteger(parsed) && parsed > 0 ? parsed : null
|
||||
}
|
||||
|
||||
function normalizeId(value: unknown, message: string) {
|
||||
const parsed = Number(value)
|
||||
if (!Number.isInteger(parsed) || parsed <= 0) {
|
||||
throw createHttpError(message, {
|
||||
statusCode: 400,
|
||||
errorCode: 'manual_order_cost_id_invalid',
|
||||
})
|
||||
}
|
||||
return parsed
|
||||
}
|
||||
|
||||
function normalizeStatus(value: unknown, allowed: Set<string>, fallback: string, message: string) {
|
||||
const text = String(value || '').trim() || fallback
|
||||
if (!allowed.has(text)) {
|
||||
throw createHttpError(message, {
|
||||
statusCode: 400,
|
||||
errorCode: 'manual_order_cost_value_invalid',
|
||||
})
|
||||
}
|
||||
return text
|
||||
}
|
||||
|
||||
function optionalText(value: unknown, maxLength: number) {
|
||||
return String(value || '')
|
||||
.trim()
|
||||
.slice(0, maxLength)
|
||||
}
|
||||
@@ -11,6 +11,7 @@ export type AdminOrderListQueryInput = {
|
||||
keyword?: string
|
||||
provider?: string
|
||||
executorKey?: string
|
||||
fulfillmentMode?: string
|
||||
platformOrderId?: string
|
||||
payStatus?: string
|
||||
taskStatus?: string
|
||||
|
||||
@@ -61,6 +61,8 @@ export type AdminOrderListItem = {
|
||||
fulfillmentMode: AdminOrderFulfillmentMode
|
||||
manualItemCount: number
|
||||
pendingItemCount: number
|
||||
manualPendingCount: number
|
||||
manualUnconfiguredCount: number
|
||||
hasVoucher: boolean
|
||||
voucherState: AdminVoucherState
|
||||
workOrderCount?: number
|
||||
|
||||
@@ -4,6 +4,7 @@ export type OrderListQueryInput = {
|
||||
keyword?: string
|
||||
provider?: string
|
||||
executorKey?: string
|
||||
fulfillmentMode?: string
|
||||
platformOrderId?: string
|
||||
payStatus?: string
|
||||
taskStatus?: string
|
||||
|
||||
Reference in New Issue
Block a user