feat(fulfillment): 支持删除待分类和强制删除渠道规则

This commit is contained in:
yml2213
2026-11-04 13:52:11 +08:00
parent 209fa657ed
commit c31fa7db76
9 changed files with 760 additions and 48 deletions
@@ -20,15 +20,17 @@ test(
const { closeDb, query } = await import('../../db/client.js')
const {
assignChannelByInternalSku,
deletePendingChannelGroup,
deleteChannelRules,
ensureVoucherRuleForSku,
forceDeleteChannelRules,
listChannelRules,
listChannelRulesPage,
listPendingChannelGroups,
switchChannelForOrderItems,
upsertChannelRule,
} = await import('./channel-assign-service.js')
const { saveManualFulfillmentConfig } =
const { deleteManualSkuClassification, saveManualFulfillmentConfig } =
await import('../cost-center/manual-fulfillment-config-service.js')
const { runAffiliateFallback } = await import('./affiliate-fallback-service.js')
const { retryPendingWorkOrderRouting } = await import('./pending-channel-repair-service.js')
@@ -49,6 +51,8 @@ test(
const fallbackSku = `集成测试兜底-${suffix}`
const autoManualSku = `集成测试自动人工-${suffix}`
const retryWorkOrderSku = `集成测试重试接单-${suffix}`
const manualRemoveSku = `集成测试移除人工-${suffix}`
const protectedRuleSku = `集成测试强制删除-${suffix}`
const retryWorkOrderRuleKey = `it-retry-${suffix}`
const orderIds: number[] = []
const orderItemIds: number[] = []
@@ -62,6 +66,8 @@ test(
fallbackSku,
autoManualSku,
retryWorkOrderSku,
manualRemoveSku,
protectedRuleSku,
]
let generatedVoucherProductId: number | null = null
let autoManualProductId: number | null = null
@@ -70,19 +76,26 @@ test(
async function createPendingOrderItem(
sku: string,
options: { provider?: string; platform?: string; shopId?: string } = {},
options: { provider?: string; platform?: string; shopId?: string; shopName?: string } = {},
) {
const provider = options.provider || '91kaquan'
const platform = options.platform || 'kuaishou-91'
const targetShopId = options.shopId || shopId
const targetShopName = options.shopName || ''
const order = await query<{ id: number }>(
`INSERT INTO orders (
provider, platform, shop_id, platform_order_id, order_status, pay_status,
provider, platform, shop_id, shop_name, platform_order_id, order_status, pay_status,
total_amount, paid_at, created_at, updated_at
) VALUES (
$1, $2, $3, $4, 'paid', 'paid', 1000, NOW(), NOW(), NOW()
$1, $2, $3, $4, $5, 'paid', 'paid', 1000, NOW(), NOW(), NOW()
) RETURNING id`,
[provider, platform, targetShopId, `IT-ROUTING-${suffix}-${orderItemIds.length + 1}`],
[
provider,
platform,
targetShopId,
targetShopName,
`IT-ROUTING-${suffix}-${orderItemIds.length + 1}`,
],
)
const orderId = Number(order.rows[0]!.id)
orderIds.push(orderId)
@@ -343,11 +356,15 @@ test(
const crossShopA = `it-routing-a-${suffix}`
const crossShopB = `it-routing-b-${suffix}`
await createPendingOrderItem(crossShopSku, { shopId: crossShopA })
await createPendingOrderItem(crossShopSku, {
shopId: crossShopA,
shopName: '测试店铺 A',
})
await createPendingOrderItem(crossShopSku, {
provider: 'pdd',
platform: 'pdd',
shopId: crossShopB,
shopName: '测试店铺 B',
})
const pendingGroups = await listPendingChannelGroups({
keyword: crossShopSku,
@@ -359,6 +376,86 @@ test(
assert.equal(pendingGroups.items[0]?.item_count, 2)
assert.deepEqual(pendingGroups.items[0]?.providers.sort(), ['91kaquan', 'pdd'])
assert.deepEqual(pendingGroups.items[0]?.shop_ids.sort(), [crossShopA, crossShopB])
assert.deepEqual(
pendingGroups.items[0]?.shops.sort((left, right) => left.id.localeCompare(right.id)),
[
{ id: crossShopA, name: '测试店铺 A' },
{ id: crossShopB, name: '测试店铺 B' },
],
)
const deletedPending = await deletePendingChannelGroup({
internalSku: crossShopSku,
adminUserId: null,
})
assert.equal(deletedPending.archivedItems, 2)
assert.equal(deletedPending.preservedOrders, 2)
assert.equal(
(
await listPendingChannelGroups({
keyword: crossShopSku,
page: 1,
pageSize: 10,
})
).total,
0,
)
const preservedOrders = await query<{ count: number }>(
`SELECT COUNT(*)::int AS count FROM orders WHERE id = ANY($1::bigint[])`,
[orderIds],
)
assert.ok(preservedOrders.rows[0].count >= 2)
const manualRemoveItemId = await createPendingOrderItem(manualRemoveSku, {
shopId: crossShopA,
shopName: '测试店铺 A',
})
await query(
`UPDATE order_items
SET fulfillment_status = 'assigned', fulfillment_channel = 'manual',
fulfillment_source = 'carrier_evidence', fulfillment_config_id = NULL,
updated_at = NOW()
WHERE id = $1`,
[manualRemoveItemId],
)
await query(
`INSERT INTO manual_sku_registry (
sku_key, display_name, shop_count, order_count, item_count, revenue_fen,
first_seen_date, last_seen_date, scan_from_date, scan_to_date, created_at, updated_at
) VALUES ($1, $1, 1, 1, 1, 1000, CURRENT_DATE, CURRENT_DATE, CURRENT_DATE, CURRENT_DATE, NOW(), NOW())`,
[manualRemoveSku],
)
await query(
`INSERT INTO internal_sku_channels (
internal_sku, channel, priority, is_fallback, enabled, source, config_json
) VALUES ($1, 'manual', 90, TRUE, TRUE, 'manual_config', '{}'::jsonb)`,
[manualRemoveSku],
)
const deletedManual = await deleteManualSkuClassification(manualRemoveSku)
assert.equal(deletedManual.affectedItems, 1)
assert.equal(deletedManual.deletedRegistry, 1)
assert.equal(deletedManual.deletedRules, 1)
const removedManualItem = await query<{
fulfillment_status: string
fulfillment_channel: string | null
}>(`SELECT fulfillment_status, fulfillment_channel FROM order_items WHERE id = $1`, [
manualRemoveItemId,
])
assert.equal(removedManualItem.rows[0]?.fulfillment_status, 'pending')
assert.equal(removedManualItem.rows[0]?.fulfillment_channel, null)
const protectedRule = await query<{ id: number }>(
`INSERT INTO internal_sku_channels (
internal_sku, channel, priority, is_fallback, enabled, source, config_json
) VALUES ($1, 'manual', 70, FALSE, TRUE, 'manual_config', '{}'::jsonb)
RETURNING id`,
[protectedRuleSku],
)
const protectedRuleId = Number(protectedRule.rows[0]!.id)
await assert.rejects(() => deleteChannelRules([protectedRuleId]), /不能在渠道页直接删除/)
const forcedDeleted = await forceDeleteChannelRules([protectedRuleId])
assert.equal(forcedDeleted.deletedCount, 1)
assert.deepEqual(forcedDeleted.deletedIds, [protectedRuleId])
const fallbackItemId = await createPendingOrderItem(fallbackSku)
await query(
@@ -539,6 +636,7 @@ test(
await query(`DELETE FROM internal_sku_channels WHERE internal_sku = ANY($1::text[])`, [
internalSkus,
])
await query(`DELETE FROM manual_sku_registry WHERE sku_key = ANY($1::text[])`, [internalSkus])
await query(
`DELETE FROM sku_channel_rules
WHERE provider = '91kaquan' AND shop_id = $1 AND match_key = ANY($2::text[])`,