彻底重构-3

apps/backend/src/services/admin/admin-audit-service.js

@@ -1,5 +1,6 @@
 import { createAdminAuditLog, listAdminAuditLogs } from '../../repositories/admin-audit-log-repo.js'
 import { nowIso } from '../../utils/time.js'
+import { normalizeDateQuery, normalizePage, normalizePageSize, safeParseJson } from './admin-query-utils.js'
 
 export async function writeAdminAuditLog(session, payload = {}) {
   if (!session?.userId) {
@@ -46,38 +47,3 @@ export async function getAdminAuditLogs(query = {}) {
     pagination: { page, pageSize, total },
   }
 }
-
-function normalizePage(rawValue) {
-  const parsed = Number(rawValue)
-  return Number.isFinite(parsed) && parsed > 0 ? Math.floor(parsed) : 1
-}
-
-function normalizePageSize(rawValue) {
-  const parsed = Number(rawValue)
-  if (!Number.isFinite(parsed) || parsed <= 0) {
-    return 20
-  }
-  return Math.min(100, Math.floor(parsed))
-}
-
-function normalizeDateQuery(rawValue, endOfDay = false) {
-  const normalized = String(rawValue || '').trim()
-
-  if (!normalized) {
-    return ''
-  }
-
-  if (/^\d{4}-\d{2}-\d{2}$/.test(normalized)) {
-    return endOfDay ? `${normalized}T23:59:59.999Z` : `${normalized}T00:00:00.000Z`
-  }
-
-  return normalized
-}
-
-function safeParseJson(value) {
-  try {
-    return typeof value === 'string' ? JSON.parse(value) : value || {}
-  } catch {
-    return {}
-  }
-}

apps/backend/src/services/admin/admin-auth-service.js

@@ -11,6 +11,7 @@ import {
 } from '../../repositories/admin-user-repo.js'
 import { addHours, nowIso } from '../../utils/time.js'
 import { createHttpError } from '../../utils/http.js'
+import { normalizePage, normalizePageSize } from './admin-query-utils.js'
 
 export async function ensureAdminUsersBootstrapped() {
   ensureAdminAuthConfigured()
@@ -360,19 +361,6 @@ function safeCompare(input, expected) {
   return crypto.timingSafeEqual(left, right)
 }
 
-function normalizePage(rawValue) {
-  const parsed = Number(rawValue)
-  return Number.isFinite(parsed) && parsed > 0 ? Math.floor(parsed) : 1
-}
-
-function normalizePageSize(rawValue) {
-  const parsed = Number(rawValue)
-  if (!Number.isFinite(parsed) || parsed <= 0) {
-    return 20
-  }
-  return Math.min(100, Math.floor(parsed))
-}
-
 function normalizeRoleQuery(role) {
   const normalized = String(role || '').trim().toLowerCase()
   return ['admin', 'operator'].includes(normalized) ? normalized : ''

apps/backend/src/services/admin/admin-query-utils.js

@@ -0,0 +1,38 @@
+export function normalizePage(rawValue) {
+  const parsed = Number(rawValue)
+  return Number.isFinite(parsed) && parsed > 0 ? Math.floor(parsed) : 1
+}
+
+export function normalizePageSize(rawValue) {
+  const parsed = Number(rawValue)
+  if (!Number.isFinite(parsed) || parsed <= 0) {
+    return 20
+  }
+  return Math.min(100, Math.floor(parsed))
+}
+
+export function normalizeDateQuery(rawValue, endOfDay = false) {
+  const normalized = String(rawValue || '').trim()
+
+  if (!normalized) {
+    return ''
+  }
+
+  if (/^\d{4}-\d{2}-\d{2}$/.test(normalized)) {
+    return endOfDay ? `${normalized}T23:59:59.999Z` : `${normalized}T00:00:00.000Z`
+  }
+
+  return normalized
+}
+
+export function safeParseJson(rawText) {
+  if (rawText && typeof rawText === 'object') {
+    return rawText
+  }
+
+  try {
+    return JSON.parse(String(rawText || '{}'))
+  } catch {
+    return {}
+  }
+}

apps/backend/src/services/admin/admin-service.js

@@ -1,5 +1,5 @@
 import { runtimeConfig } from '../../config/runtime.js'
-import { getDb } from '../../db/client.js'
+import { query } from '../../db/client.js'
 import { createTaskClaimToken } from '../claim/claim-service.js'
 import {
   getAgisoShopConfig,
@@ -18,19 +18,45 @@ import { formatFenToAmount, normalizeFen, parseAmountToFen } from '../../utils/m
 import { nowIso } from '../../utils/time.js'
 import { reserveCdkForTask } from '../order/cdk-service.js'
 import { replayAgisoTradeWebhookEvent } from '../order/webhook-service.js'
+import { normalizeDateQuery, normalizePage, normalizePageSize, safeParseJson } from './admin-query-utils.js'
 
-export function getAdminDashboardSummary() {
-  const db = getDb()
+export async function getAdminDashboardSummary() {
   const todayPrefix = nowIso().slice(0, 10)
-  const summary = db.prepare(`
-    SELECT
-      (SELECT COUNT(*) FROM orders WHERE substr(created_at, 1, 10) = ?) AS today_orders,
-      (SELECT COUNT(*) FROM delivery_tasks WHERE task_status IN ('paid', 'cdk_reserved', 'link_generated')) AS paid_pending_claim,
-      (SELECT COUNT(*) FROM delivery_tasks WHERE task_status IN ('claimed', 'role_confirmed', 'redeeming')) AS claiming_tasks,
-      (SELECT COUNT(*) FROM delivery_tasks WHERE task_status = 'redeemed' AND substr(updated_at, 1, 10) = ?) AS redeemed_today,
-      (SELECT COUNT(*) FROM delivery_tasks WHERE task_status IN ('retry_pending', 'manual_review', 'waiting_inventory')) AS abnormal_tasks,
-      (SELECT COUNT(DISTINCT sku_code) FROM cdk_inventory WHERE status = 'available') AS sku_with_inventory
-  `).get(todayPrefix, todayPrefix)
+  const result = await query(
+    `
+      SELECT
+        (SELECT COUNT(*)::int FROM orders WHERE to_char(created_at AT TIME ZONE 'Asia/Shanghai', 'YYYY-MM-DD') = $1) AS today_orders,
+        (
+          SELECT COUNT(*)::int
+          FROM fulfillment_tasks
+          WHERE task_status IN ('paid', 'link_generated')
+             OR (inventory_status = 'reserved' AND task_status NOT IN ('claimed', 'role_confirmed', 'redeeming', 'redeemed', 'closed', 'expired'))
+        ) AS paid_pending_claim,
+        (
+          SELECT COUNT(*)::int
+          FROM fulfillment_tasks
+          WHERE task_status IN ('claimed', 'role_confirmed', 'redeeming')
+        ) AS claiming_tasks,
+        (
+          SELECT COUNT(*)::int
+          FROM fulfillment_tasks
+          WHERE task_status = 'redeemed'
+            AND to_char(updated_at AT TIME ZONE 'Asia/Shanghai', 'YYYY-MM-DD') = $1
+        ) AS redeemed_today,
+        (
+          SELECT COUNT(*)::int
+          FROM fulfillment_tasks
+          WHERE task_status IN ('retry_pending', 'manual_review', 'waiting_inventory')
+        ) AS abnormal_tasks,
+        (
+          SELECT COUNT(DISTINCT sku_code)::int
+          FROM inventory_items
+          WHERE status = 'available'
+        ) AS sku_with_inventory
+    `,
+    [todayPrefix],
+  )
+  const summary = result.rows[0] || {}
 
   return {
     todayOrders: Number(summary?.today_orders || 0),
@@ -42,10 +68,10 @@ export function getAdminDashboardSummary() {
   }
 }
 
-export function getAdminOrders(query = {}) {
+export async function getAdminOrders(query = {}) {
   const page = normalizePage(query.page)
   const pageSize = normalizePageSize(query.pageSize)
-  const { items, total } = listOrders({
+  const { items, total } = await listOrders({
     page,
     pageSize,
     platformOrderId: String(query.platformOrderId || '').trim(),
@@ -56,13 +82,13 @@ export function getAdminOrders(query = {}) {
   })
 
   return {
-    items: items.map(mapAdminOrderListItem),
+    items: await Promise.all(items.map((item) => mapAdminOrderListItem(item))),
     pagination: { page, pageSize, total },
   }
 }
 
-export function getAdminOrderDetail(orderId) {
-  const order = getOrderById(Number(orderId))
+export async function getAdminOrderDetail(orderId) {
+  const order = await getOrderById(Number(orderId))
 
   if (!order) {
     throw createHttpError('订单不存在', {
@@ -71,9 +97,11 @@ export function getAdminOrderDetail(orderId) {
     })
   }
 
-  const items = listOrderItemsByOrderId(order.id)
-  const tasks = listTasksByOrderId(order.id)
-  const webhookEvents = listWebhookEventsByOrderId(order.id)
+  const [items, tasks, webhookEvents] = await Promise.all([
+    listOrderItemsByOrderId(order.id),
+    listTasksByOrderId(order.id),
+    listWebhookEventsByOrderId(order.id),
+  ])
   const itemSummary = summarizeOrderItems(items)
 
   return {
@@ -105,7 +133,7 @@ export function getAdminOrderDetail(orderId) {
       skuName: item.sku_name,
       itemTitle: resolveOrderItemTitle(item),
       quantity: item.quantity,
-      deliveryMode: item.delivery_mode,
+      deliveryMode: resolveOrderItemDeliveryMode(tasks, item.id),
       spec: safeParseJson(item.spec_json),
     })),
     tasks: tasks.map(mapAdminTaskSummary),
@@ -125,10 +153,10 @@ export function getAdminOrderDetail(orderId) {
   }
 }
 
-export function getAdminTasks(query = {}) {
+export async function getAdminTasks(query = {}) {
   const page = normalizePage(query.page)
   const pageSize = normalizePageSize(query.pageSize)
-  const { items, total } = listTasks({
+  const { items, total } = await listTasks({
     page,
     pageSize,
     status: String(query.status || '').trim(),
@@ -146,8 +174,8 @@ export function getAdminTasks(query = {}) {
   }
 }
 
-export function getAdminTaskDetail(taskId) {
-  const task = getTaskById(Number(taskId))
+export async function getAdminTaskDetail(taskId) {
+  const task = await getTaskById(Number(taskId))
 
   if (!task) {
     throw createHttpError('任务不存在', {
@@ -156,10 +184,13 @@ export function getAdminTaskDetail(taskId) {
     })
   }
 
-  const order = getOrderById(task.order_id)
-  const orderItem = order ? listOrderItemsByOrderId(order.id).find((item) => item.id === task.order_item_id) || null : null
-  const claimToken = task.claim_token_id ? getClaimTokenById(task.claim_token_id) : null
-  const cdk = task.reserved_cdk_id ? getCdkById(task.reserved_cdk_id) : null
+  const [order, claimToken, cdk] = await Promise.all([
+    getOrderById(task.order_id),
+    getTaskPrimaryClaimTokenId(task) ? getClaimTokenById(getTaskPrimaryClaimTokenId(task)) : Promise.resolve(null),
+    getTaskPrimaryInventoryItemId(task) ? getCdkById(getTaskPrimaryInventoryItemId(task)) : Promise.resolve(null),
+  ])
+  const orderItems = order ? await listOrderItemsByOrderId(order.id) : []
+  const orderItem = orderItems.find((item) => item.id === task.order_item_id) || null
 
   return {
     task: mapAdminTaskListItem({
@@ -210,7 +241,7 @@ export function getAdminTaskDetail(taskId) {
     screenshotUrl: task.screenshot_path ? `/api/v1/admin/tasks/${task.id}/screenshot` : '',
     operations: {
       canRetry: ['retry_pending', 'manual_review', 'waiting_inventory'].includes(task.task_status),
-      canReleaseCdk: Boolean(task.reserved_cdk_id && ['link_generated', 'retry_pending', 'manual_review', 'waiting_inventory', 'closed'].includes(task.task_status)),
+      canReleaseCdk: Boolean(getTaskPrimaryInventoryItemId(task) && ['link_generated', 'retry_pending', 'manual_review', 'waiting_inventory', 'closed'].includes(task.task_status)),
       canRegenerateClaimLink: ['link_generated', 'claimed', 'role_confirmed', 'retry_pending', 'manual_review'].includes(task.task_status),
       canClose: !['redeemed', 'closed'].includes(task.task_status),
       canMarkManualReview: !['redeemed', 'closed', 'manual_review'].includes(task.task_status),
@@ -218,8 +249,8 @@ export function getAdminTaskDetail(taskId) {
   }
 }
 
-export function getAdminTaskScreenshotPath(taskId) {
-  const task = getRequiredTask(taskId)
+export async function getAdminTaskScreenshotPath(taskId) {
+  const task = await getRequiredTask(taskId)
 
   if (!task.screenshot_path) {
     throw createHttpError('当前任务还没有截图', {
@@ -231,10 +262,10 @@ export function getAdminTaskScreenshotPath(taskId) {
   return task.screenshot_path
 }
 
-export function getAdminCdks(query = {}) {
+export async function getAdminCdks(query = {}) {
   const page = normalizePage(query.page)
   const pageSize = normalizePageSize(query.pageSize)
-  const { items, total } = listCdks({
+  const { items, total } = await listCdks({
     page,
     pageSize,
     skuCode: String(query.skuCode || '').trim(),
@@ -243,15 +274,16 @@ export function getAdminCdks(query = {}) {
   })
 
   return {
-    items: items.map(mapAdminCdkListItem),
+    items: await Promise.all(items.map((item) => mapAdminCdkListItem(item))),
     pagination: { page, pageSize, total },
   }
 }
 
-export function createAdminCdk(payload = {}) {
+export async function createAdminCdk(payload = {}) {
   const skuCode = String(payload.skuCode || '').trim()
   const cdkCode = String(payload.cdkCode || '').trim()
   const batchNo = String(payload.batchNo || '').trim()
+  const credentialType = String(payload.credentialType || 'tencent_code').trim() || 'tencent_code'
 
   if (!skuCode || !cdkCode) {
     throw createHttpError('缺少 skuCode 或 cdkCode', {
@@ -261,11 +293,12 @@ export function createAdminCdk(payload = {}) {
   }
 
   const now = nowIso()
-  const created = createCdks([
+  const created = await createCdks([
     {
       skuCode,
       cdkCode,
       batchNo,
+      credentialType,
       createdAt: now,
       updatedAt: now,
     },
@@ -278,7 +311,7 @@ export function createAdminCdk(payload = {}) {
     })
   }
 
-  const { items } = listCdks({
+  const { items } = await listCdks({
     page: 1,
     pageSize: 1,
     skuCode,
@@ -286,11 +319,11 @@ export function createAdminCdk(payload = {}) {
   const createdItem = items.find((item) => item.cdk_code === cdkCode) || null
 
   return {
-    cdk: createdItem ? mapAdminCdkListItem(createdItem) : null,
+    cdk: createdItem ? await mapAdminCdkListItem(createdItem) : null,
   }
 }
 
-export function importAdminCdks(payload = {}) {
+export async function importAdminCdks(payload = {}) {
   const rows = normalizeCdkImportRows(payload)
 
   if (rows.length === 0) {
@@ -305,11 +338,12 @@ export function importAdminCdks(payload = {}) {
     skuCode: row.skuCode,
     batchNo: row.batchNo,
     cdkCode: row.cdkCode,
+    credentialType: row.credentialType,
     createdAt: now,
     updatedAt: now,
   }))
 
-  const created = createCdks(normalizedRows)
+  const created = await createCdks(normalizedRows)
 
   return {
     total: normalizedRows.length,
@@ -318,8 +352,8 @@ export function importAdminCdks(payload = {}) {
   }
 }
 
-export function releaseAdminInventoryCdk(cdkId) {
-  const cdk = getRequiredCdk(cdkId)
+export async function releaseAdminInventoryCdk(cdkId) {
+  const cdk = await getRequiredCdk(cdkId)
 
   if (cdk.status !== 'reserved') {
     throw createHttpError('当前 CDK 不是预占状态，不能释放', {
@@ -328,15 +362,15 @@ export function releaseAdminInventoryCdk(cdkId) {
     })
   }
 
-  const updated = releaseReservedCdk(cdk.id, nowIso())
+  const updated = await releaseReservedCdk(cdk.id, nowIso())
 
   return {
-    cdk: mapAdminCdkListItem(updated),
+    cdk: await mapAdminCdkListItem(updated),
   }
 }
 
-export function invalidateAdminCdk(cdkId, payload = {}) {
-  const cdk = getRequiredCdk(cdkId)
+export async function invalidateAdminCdk(cdkId, payload = {}) {
+  const cdk = await getRequiredCdk(cdkId)
 
   if (cdk.status !== 'available') {
     throw createHttpError('只有可用 CDK 才能作废，请先释放预占', {
@@ -346,17 +380,17 @@ export function invalidateAdminCdk(cdkId, payload = {}) {
   }
 
   const reason = String(payload.reason || '').trim() || '后台手动作废'
-  const updated = invalidateCdk(cdk.id, reason, nowIso())
+  const updated = await invalidateCdk(cdk.id, reason, nowIso())
 
   return {
-    cdk: mapAdminCdkListItem(updated),
+    cdk: await mapAdminCdkListItem(updated),
   }
 }
 
-export function getAdminWebhookEvents(query = {}) {
+export async function getAdminWebhookEvents(query = {}) {
   const page = normalizePage(query.page)
   const pageSize = normalizePageSize(query.pageSize)
-  const { items, total } = listWebhookEvents({
+  const { items, total } = await listWebhookEvents({
     page,
     pageSize,
     provider: String(query.provider || '').trim(),
@@ -368,13 +402,13 @@ export function getAdminWebhookEvents(query = {}) {
   })
 
   return {
-    items: items.map((item) => mapAdminWebhookEvent(item)),
+    items: await Promise.all(items.map((item) => mapAdminWebhookEvent(item))),
     pagination: { page, pageSize, total },
   }
 }
 
-export function getAdminWebhookEventDetail(eventId) {
-  const event = getWebhookEventById(Number(eventId))
+export async function getAdminWebhookEventDetail(eventId) {
+  const event = await getWebhookEventById(Number(eventId))
 
   if (!event) {
     throw createHttpError('Webhook 事件不存在', {
@@ -387,7 +421,7 @@ export function getAdminWebhookEventDetail(eventId) {
 }
 
 export async function replayAdminWebhookEvent(eventId) {
-  const event = getWebhookEventById(Number(eventId))
+  const event = await getWebhookEventById(Number(eventId))
 
   if (!event) {
     throw createHttpError('Webhook 事件不存在', {
@@ -412,19 +446,22 @@ export async function replayAdminWebhookEvent(eventId) {
   }
 }
 
-export function getAdminAgisoShopConfigs() {
+export async function getAdminAgisoShopConfigs() {
   const configMap = getAgisoShopConfigMap()
-  const rows = getDb().prepare(`
-    SELECT
-      shop_id,
-      MAX(CASE WHEN trim(shop_name) != '' THEN shop_name ELSE '' END) AS detected_shop_name,
-      MAX(created_at) AS latest_seen_at,
-      COUNT(*) AS webhook_event_count
-    FROM webhook_events
-    WHERE provider = 'agiso' AND trim(shop_id) != ''
-    GROUP BY shop_id
-    ORDER BY latest_seen_at DESC, shop_id DESC
-  `).all()
+  const rowsResult = await query(
+    `
+      SELECT
+        shop_id,
+        MAX(CASE WHEN trim(shop_name) != '' THEN shop_name ELSE '' END) AS detected_shop_name,
+        MAX(created_at) AS latest_seen_at,
+        COUNT(*)::int AS webhook_event_count
+      FROM webhook_events
+      WHERE provider = 'agiso' AND trim(shop_id) != ''
+      GROUP BY shop_id
+      ORDER BY latest_seen_at DESC, shop_id DESC
+    `,
+  )
+  const rows = rowsResult.rows
 
   return {
     filePath: getAgisoShopsFilePath(),
@@ -519,8 +556,8 @@ export function updateAdminAgisoShopConfigs(payload = {}) {
   }
 }
 
-export function retryAdminTask(taskId) {
-  const task = getRequiredTask(taskId)
+export async function retryAdminTask(taskId) {
+  const task = await getRequiredTask(taskId)
   const now = nowIso()
 
   if (!['retry_pending', 'manual_review', 'waiting_inventory'].includes(task.task_status)) {
@@ -530,39 +567,47 @@ export function retryAdminTask(taskId) {
     })
   }
 
-  const orderItem = listOrderItemsByOrderId(task.order_id).find((item) => item.id === task.order_item_id) || null
-  let reservedCdkId = task.reserved_cdk_id
-  let claimTokenId = task.claim_token_id
+  const orderItems = await listOrderItemsByOrderId(task.order_id)
+  const orderItem = orderItems.find((item) => item.id === task.order_item_id) || null
+  const taskContext = parseTaskContext(task)
+  const primaryRequirement = taskContext.primaryRequirement || null
+  let reservedInventoryItemId = getTaskPrimaryInventoryItemId(task)
+  let claimTokenId = getTaskPrimaryClaimTokenId(task)
   let nextStatus = 'link_generated'
   let lastError = ''
-  let expiresAt = task.expires_at
+  let claimExpiresAt = getTaskClaimExpiresAt(task)
   let claimUrl = ''
   let token = ''
 
-  if (!reservedCdkId) {
-    const reserved = reserveCdkForTask(orderItem?.sku_code || '', task.id)
+  if (!reservedInventoryItemId) {
+    const reserved = await reserveCdkForTask({
+      skuCode: orderItem?.sku_code || '',
+      taskId: task.id,
+      credentialType: primaryRequirement?.credentialType || 'tencent_code',
+      roleKey: primaryRequirement?.roleKey || 'primary_code',
+    })
 
     if (!reserved) {
       nextStatus = 'waiting_inventory'
       lastError = '库存不足，等待可用 CDK'
     } else {
-      reservedCdkId = reserved.id
+      reservedInventoryItemId = reserved.id
     }
   }
 
   if (nextStatus === 'link_generated' && !claimTokenId) {
-    const claimToken = createTaskClaimToken(task.id)
+    const claimToken = await createTaskClaimToken(task.id)
     claimTokenId = claimToken.id
-    expiresAt = claimToken.expired_at
+    claimExpiresAt = claimToken.expired_at
     claimUrl = claimToken.claimUrl
     token = claimToken.token
   }
 
-  const updatedTask = updateTask(task.id, {
+  const updatedTask = await updateTask(task.id, {
     task_status: nextStatus,
-    reserved_cdk_id: reservedCdkId,
-    claim_token_id: claimTokenId,
-    expires_at: expiresAt,
+    inventory_status: reservedInventoryItemId ? 'reserved' : 'pending',
+    claim_token: token || task.claim_token || '',
+    claim_expires_at: claimExpiresAt,
     last_error: lastError,
     updated_at: now,
   })
@@ -579,10 +624,11 @@ export function retryAdminTask(taskId) {
   return payload
 }
 
-export function releaseAdminTaskCdk(taskId) {
-  const task = getRequiredTask(taskId)
+export async function releaseAdminTaskCdk(taskId) {
+  const task = await getRequiredTask(taskId)
+  const primaryInventoryItemId = getTaskPrimaryInventoryItemId(task)
 
-  if (!task.reserved_cdk_id) {
+  if (!primaryInventoryItemId) {
     throw createHttpError('当前任务没有预占 CDK', {
       statusCode: 409,
       errorCode: 'admin_task_no_reserved_cdk',
@@ -596,10 +642,10 @@ export function releaseAdminTaskCdk(taskId) {
     })
   }
 
-  releaseReservedCdk(task.reserved_cdk_id, nowIso())
-  const updatedTask = updateTask(task.id, {
-    reserved_cdk_id: null,
+  await releaseReservedCdk(primaryInventoryItemId, nowIso())
+  const updatedTask = await updateTask(task.id, {
     task_status: 'waiting_inventory',
+    inventory_status: 'pending',
     last_error: '已手动释放预占 CDK',
     updated_at: nowIso(),
   })
@@ -609,8 +655,9 @@ export function releaseAdminTaskCdk(taskId) {
   }
 }
 
-export function regenerateAdminTaskClaimLink(taskId) {
-  const task = getRequiredTask(taskId)
+export async function regenerateAdminTaskClaimLink(taskId) {
+  const task = await getRequiredTask(taskId)
+  const primaryClaimTokenId = getTaskPrimaryClaimTokenId(task)
 
   if (['redeemed', 'closed'].includes(task.task_status)) {
     throw createHttpError('当前任务状态不允许重新生成领取链接', {
@@ -619,17 +666,17 @@ export function regenerateAdminTaskClaimLink(taskId) {
     })
   }
 
-  if (task.claim_token_id) {
-    updateClaimToken(task.claim_token_id, {
+  if (primaryClaimTokenId) {
+    await updateClaimToken(primaryClaimTokenId, {
       status: 'revoked',
       updated_at: nowIso(),
     })
   }
 
-  const claimToken = createTaskClaimToken(task.id)
-  const updatedTask = updateTask(task.id, {
-    claim_token_id: claimToken.id,
-    expires_at: claimToken.expired_at,
+  const claimToken = await createTaskClaimToken(task.id)
+  const updatedTask = await updateTask(task.id, {
+    claim_token: claimToken.token,
+    claim_expires_at: claimToken.expired_at,
     task_status: 'link_generated',
     last_error: '',
     updated_at: nowIso(),
@@ -642,8 +689,8 @@ export function regenerateAdminTaskClaimLink(taskId) {
   }
 }
 
-export function closeAdminTask(taskId) {
-  const task = getRequiredTask(taskId)
+export async function closeAdminTask(taskId) {
+  const task = await getRequiredTask(taskId)
 
   if (task.task_status === 'redeemed') {
     throw createHttpError('已兑换任务不能关闭', {
@@ -652,8 +699,9 @@ export function closeAdminTask(taskId) {
     })
   }
 
-  const updatedTask = updateTask(task.id, {
+  const updatedTask = await updateTask(task.id, {
     task_status: 'closed',
+    delivery_status: 'closed',
     last_error: task.last_error || '已手动关闭任务',
     updated_at: nowIso(),
   })
@@ -663,9 +711,9 @@ export function closeAdminTask(taskId) {
   }
 }
 
-export function markAdminTaskManualReview(taskId) {
-  const task = getRequiredTask(taskId)
-  const updatedTask = updateTask(task.id, {
+export async function markAdminTaskManualReview(taskId) {
+  const task = await getRequiredTask(taskId)
+  const updatedTask = await updateTask(task.id, {
     task_status: 'manual_review',
     last_error: task.last_error || '已转人工处理',
     updated_at: nowIso(),
@@ -691,13 +739,13 @@ function mapAdminTaskSummary(task) {
     roleConfirmedAt: task.role_confirmed_at,
     redeemedAt: task.redeemed_at,
     lastError: task.last_error,
-    retryCount: task.retry_count,
+    retryCount: getTaskRetryCount(task),
     createdAt: task.created_at,
     updatedAt: task.updated_at,
   }
 }
 
-function mapAdminWebhookEvent(item, { includeRaw = false } = {}) {
+async function mapAdminWebhookEvent(item, { includeRaw = false } = {}) {
   const headers = normalizeRecord(safeParseJson(item.headers_json))
   const query = normalizeRecord(safeParseJson(item.query_json))
   const body = normalizeRecord(safeParseJson(item.body_json))
@@ -716,7 +764,7 @@ function mapAdminWebhookEvent(item, { includeRaw = false } = {}) {
     payload.buyAmount,
   ])
   const totalAmountFen = parseAmountToFen(rawAmount)
-  const taskCount = item.related_order_id ? listTasksByOrderId(item.related_order_id).length : 0
+  const taskCount = item.related_order_id ? (await listTasksByOrderId(item.related_order_id)).length : 0
 
   const mapped = {
     eventId: item.id,
@@ -835,9 +883,9 @@ function mapAdminWebhookEvent(item, { includeRaw = false } = {}) {
   }
 }
 
-function mapAdminCdkListItem(item) {
-  const task = item.reserved_by_task_id ? getTaskById(item.reserved_by_task_id) : null
-  const order = task?.order_id ? getOrderById(task.order_id) : null
+async function mapAdminCdkListItem(item) {
+  const task = item.reserved_by_task_id ? await getTaskById(item.reserved_by_task_id) : null
+  const order = task?.order_id ? await getOrderById(task.order_id) : null
   const binding = buildTaskBindingState(task)
 
   return {
@@ -845,12 +893,13 @@ function mapAdminCdkListItem(item) {
     skuCode: item.sku_code,
     batchNo: item.batch_no,
     cdkCode: item.cdk_code,
+    credentialType: item.credential_type || 'tencent_code',
     status: item.status,
     reservedByTaskId: item.reserved_by_task_id,
     reservedByTaskNo: task?.task_no || '',
     platformOrderId: order?.platform_order_id || '',
-    systemBindingStatus: item.status === 'delivered' ? 'system_bound' : binding.systemBindingStatus,
-    userBindingStatus: item.status === 'delivered' ? 'binding_completed' : binding.userBindingStatus,
+    systemBindingStatus: item.status === 'consumed' ? 'system_bound' : binding.systemBindingStatus,
+    userBindingStatus: item.status === 'consumed' ? 'binding_completed' : binding.userBindingStatus,
     invalidReason: item.invalid_reason || '',
     deliveredAt: item.delivered_at,
     createdAt: item.created_at,
@@ -859,19 +908,23 @@ function mapAdminCdkListItem(item) {
 }
 
 function mapTaskActionPayload(task) {
+  const inventoryItemId = getTaskPrimaryInventoryItemId(task)
+  const claimTokenId = getTaskPrimaryClaimTokenId(task)
+
   return {
     taskId: task.id,
     taskNo: task.task_no,
     status: task.task_status,
-    reservedCdkId: task.reserved_cdk_id,
-    claimTokenId: task.claim_token_id,
+    inventoryItemId,
+    claimTokenId,
+    reservedCdkId: inventoryItemId,
     lastError: task.last_error,
     updatedAt: task.updated_at,
   }
 }
 
-function getRequiredTask(taskId) {
-  const task = getTaskById(Number(taskId))
+async function getRequiredTask(taskId) {
+  const task = await getTaskById(Number(taskId))
 
   if (!task) {
     throw createHttpError('任务不存在', {
@@ -883,8 +936,8 @@ function getRequiredTask(taskId) {
   return task
 }
 
-function getRequiredCdk(cdkId) {
-  const cdk = getCdkById(Number(cdkId))
+async function getRequiredCdk(cdkId) {
+  const cdk = await getCdkById(Number(cdkId))
 
   if (!cdk) {
     throw createHttpError('CDK 不存在', {
@@ -915,19 +968,21 @@ function mapAdminTaskListItem(task) {
     claimedAt: task.claimed_at,
     roleConfirmedAt: task.role_confirmed_at,
     redeemedAt: task.redeemed_at,
-    retryCount: task.retry_count,
+    retryCount: getTaskRetryCount(task),
     lastError: task.last_error,
     createdAt: task.created_at,
     updatedAt: task.updated_at,
-    reservedCdkCodeMasked: maskCode(task.cdk_code),
-    claimToken: task.claim_token || '',
+    reservedCdkCodeMasked: maskCode(task.primary_inventory_display_value),
+    claimToken: task.primary_claim_token || task.claim_token || '',
     screenshotPath: task.screenshot_path || '',
   }
 }
 
-function mapAdminOrderListItem(item) {
-  const tasks = listTasksByOrderId(item.id)
-  const orderItems = listOrderItemsByOrderId(item.id)
+async function mapAdminOrderListItem(item) {
+  const [tasks, orderItems] = await Promise.all([
+    listTasksByOrderId(item.id),
+    listOrderItemsByOrderId(item.id),
+  ])
   const bindingSummary = buildOrderBindingSummary(tasks)
   const itemSummary = summarizeOrderItems(orderItems)
 
@@ -997,6 +1052,24 @@ function resolveOrderItemTitle(item) {
   ])
 }
 
+function resolveOrderItemDeliveryMode(tasks, orderItemId) {
+  const task = (Array.isArray(tasks) ? tasks : []).find((item) => item.order_item_id === orderItemId)
+
+  if (!task) {
+    return ''
+  }
+
+  if (String(task.executor_key || '').trim() === 'manual_dispatch') {
+    return 'manual_dispatch'
+  }
+
+  if (task.requires_claim || getTaskPrimaryClaimTokenId(task) || task.primary_claim_token || task.claim_token) {
+    return 'claim_link'
+  }
+
+  return String(task.executor_key || '').trim()
+}
+
 function buildOrderBindingSummary(tasks) {
   const normalizedTasks = Array.isArray(tasks) ? tasks : []
   const totalTaskCount = normalizedTasks.length
@@ -1110,7 +1183,33 @@ function buildTaskBindingState(task) {
 }
 
 function isTaskSystemBound(task) {
-  return Boolean(task && (task.reserved_cdk_id || task.claim_token_id))
+  return Boolean(task && (getTaskPrimaryInventoryItemId(task) || getTaskPrimaryClaimTokenId(task)))
+}
+
+function parseTaskContext(task) {
+  try {
+    return JSON.parse(String(task?.context_json || '{}'))
+  } catch {
+    return {}
+  }
+}
+
+function getTaskPrimaryInventoryItemId(task) {
+  const value = Number(task?.primary_inventory_item_id || 0)
+  return Number.isFinite(value) && value > 0 ? value : null
+}
+
+function getTaskPrimaryClaimTokenId(task) {
+  const value = Number(task?.primary_claim_token_id || 0)
+  return Number.isFinite(value) && value > 0 ? value : null
+}
+
+function getTaskClaimExpiresAt(task) {
+  return task?.claim_expires_at || task?.primary_claim_expires_at || null
+}
+
+function getTaskRetryCount(task) {
+  return Number(task?.attempt_count || 0)
 }
 
 function resolveDisplayShopName(provider, shopId, shopName) {
@@ -1144,18 +1243,20 @@ function normalizeCdkImportRows(payload) {
       const skuCode = String(row?.skuCode || '').trim()
       const cdkCode = String(row?.cdkCode || '').trim()
       const batchNo = String(row?.batchNo || '').trim()
+      const credentialType = String(row?.credentialType || payload.credentialType || 'tencent_code').trim() || 'tencent_code'
 
       if (!skuCode || !cdkCode) {
         continue
       }
 
-      rows.push({ skuCode, cdkCode, batchNo })
+      rows.push({ skuCode, cdkCode, batchNo, credentialType })
     }
   }
 
   if (bulkCodes.length > 0) {
     const skuCode = String(payload.skuCode || '').trim()
     const batchNo = String(payload.batchNo || '').trim()
+    const credentialType = String(payload.credentialType || 'tencent_code').trim() || 'tencent_code'
 
     if (!skuCode) {
       throw createHttpError('批量导入时缺少 skuCode', {
@@ -1169,7 +1270,7 @@ function normalizeCdkImportRows(payload) {
       if (!cdkCode) {
         continue
       }
-      rows.push({ skuCode, cdkCode, batchNo })
+      rows.push({ skuCode, cdkCode, batchNo, credentialType })
     }
   }
 
@@ -1181,7 +1282,7 @@ function dedupeRows(rows) {
   const output = []
 
   for (const row of rows) {
-    const key = `${row.skuCode}::${row.cdkCode}`
+    const key = `${row.skuCode}::${row.credentialType || 'tencent_code'}::${row.cdkCode}`
     if (seen.has(key)) {
       continue
     }
@@ -1192,41 +1293,6 @@ function dedupeRows(rows) {
   return output
 }
 
-function normalizePage(rawValue) {
-  const parsed = Number(rawValue)
-  return Number.isFinite(parsed) && parsed > 0 ? Math.floor(parsed) : 1
-}
-
-function normalizePageSize(rawValue) {
-  const parsed = Number(rawValue)
-  if (!Number.isFinite(parsed) || parsed <= 0) {
-    return 20
-  }
-  return Math.min(100, Math.floor(parsed))
-}
-
-function normalizeDateQuery(rawValue, endOfDay = false) {
-  const normalized = String(rawValue || '').trim()
-
-  if (!normalized) {
-    return ''
-  }
-
-  if (/^\d{4}-\d{2}-\d{2}$/.test(normalized)) {
-    return endOfDay ? `${normalized}T23:59:59.999Z` : `${normalized}T00:00:00.000Z`
-  }
-
-  return normalized
-}
-
-function safeParseJson(rawText) {
-  try {
-    return JSON.parse(String(rawText || '{}'))
-  } catch {
-    return {}
-  }
-}
-
 function maskSecret(value) {
   const normalized = String(value || '').trim()
   if (!normalized) {

apps/backend/src/services/bootstrap/fulfillment-bootstrap-service.js

@@ -64,10 +64,7 @@ export async function ensureFulfillmentCatalogBootstrapped() {
     }
   }
 
-  const configuredBindings = normalizeConfiguredBindings(runtimeConfig.orders?.fulfillmentBindings)
-  const bindingsToApply = configuredBindings.length > 0
-    ? configuredBindings
-    : inferDefaultBindingsFromSkuMappings(runtimeConfig.orders?.skuMappings)
+  const bindingsToApply = normalizeConfiguredBindings(runtimeConfig.orders?.fulfillmentBindings)
 
   for (const binding of bindingsToApply) {
     const profile = profileMap[binding.profileKey] || await getFulfillmentProfileByKey(binding.profileKey)
@@ -108,19 +105,3 @@ function normalizeConfiguredBindings(bindings) {
     }))
     .filter((binding) => binding.skuCode)
 }
-
-function inferDefaultBindingsFromSkuMappings(skuMappings) {
-  const values = Object.values(skuMappings || {})
-  const uniqueSkuCodes = [...new Set(values.map((value) => String(value || '').trim()).filter(Boolean))]
-
-  return uniqueSkuCodes.map((skuCode) => ({
-    skuCode,
-    provider: '',
-    platform: '',
-    shopId: '',
-    profileKey: 'tencent_claim_redeem',
-    enabled: true,
-    priority: 100,
-    config: {},
-  }))
-}

apps/backend/src/services/claim/claim-session-service.js

@@ -1,6 +1,7 @@
 import {
   createTencentBrowserSession,
   getTencentBrowserSession,
+  getTencentBrowserSessionSummary,
   getTencentBrowserSessionScreenshotPath,
   redeemTencentBrowserSession,
 } from '../session/session.js'
@@ -36,7 +37,7 @@ export async function createClaimSession(token, payload = {}) {
 
   if (context.task.browser_session_id) {
     const existingSession = await getTencentBrowserSession(context.task.browser_session_id)
-    const syncedTask = syncTaskWithSession(context.task, existingSession)
+    const syncedTask = await syncTaskWithSession(context.task, existingSession)
 
     return buildClaimDetailPayload({
       claimToken: context.claimToken,
@@ -50,10 +51,11 @@ export async function createClaimSession(token, payload = {}) {
   const session = await createTencentBrowserSession({
     loginType: payload.loginType,
   })
-  const updatedTask = updateTask(context.task.id, {
+  const updatedTask = await updateTask(context.task.id, {
     task_status: 'claimed',
     browser_session_id: session.sessionId,
     login_type: session.loginType,
+    user_action_status: 'claimed',
     claimed_at: context.task.claimed_at || nowIso(),
     updated_at: nowIso(),
   })
@@ -78,7 +80,7 @@ export async function getClaimSessionSummary(token) {
   }
 
   const session = await getTencentBrowserSession(context.task.browser_session_id)
-  const syncedTask = syncTaskWithSession(context.task, session)
+  const syncedTask = await syncTaskWithSession(context.task, session)
 
   return buildClaimDetailPayload({
     claimToken: context.claimToken,
@@ -109,13 +111,14 @@ export async function confirmClaimRole(token) {
     })
   }
 
-  const updatedTask = updateTask(context.task.id, {
+  const updatedTask = await updateTask(context.task.id, {
     task_status: 'role_confirmed',
     nickname: String(activityInfo.nickname || ''),
     role_id: String(activityInfo.role.roleId || ''),
     role_name: String(activityInfo.role.roleName || ''),
     area: String(activityInfo.role.area || ''),
     partition_name: String(activityInfo.role.partition || ''),
+    user_action_status: 'role_confirmed',
     role_confirmed_at: nowIso(),
     updated_at: nowIso(),
     last_error: '',
@@ -148,7 +151,7 @@ export async function redeemClaimTask(token) {
     })
   }
 
-  const cdk = context.task.reserved_cdk_id ? getCdkById(context.task.reserved_cdk_id) : null
+  const cdk = context.task.primary_inventory_item_id ? await getCdkById(context.task.primary_inventory_item_id) : null
 
   if (!cdk || !String(cdk.cdk_code || '').trim()) {
     throw createHttpError('当前任务没有可用的预占 CDK', {
@@ -157,8 +160,9 @@ export async function redeemClaimTask(token) {
     })
   }
 
-  updateTask(context.task.id, {
+  await updateTask(context.task.id, {
     task_status: 'redeeming',
+    delivery_status: 'processing',
     updated_at: nowIso(),
     last_error: '',
   })
@@ -168,8 +172,10 @@ export async function redeemClaimTask(token) {
       code: cdk.cdk_code,
     })
     const finalRedeem = session.redeem?.final?.redeem || null
-    const updatedTask = updateTask(context.task.id, {
+    const updatedTask = await updateTask(context.task.id, {
       task_status: 'redeemed',
+      inventory_status: 'consumed',
+      delivery_status: 'delivered',
       result_code: String(finalRedeem?.iRet || finalRedeem?.ret || '0'),
       result_message: String(finalRedeem?.sMsg || finalRedeem?.msg || session.notice || '兑换完成'),
       screenshot_path: session.artifacts?.hasScreenshot ? await getTencentBrowserSessionScreenshotPath(session.sessionId) : '',
@@ -179,7 +185,7 @@ export async function redeemClaimTask(token) {
       last_error: '',
     })
 
-    markCdkDelivered(cdk.id, nowIso())
+    await markCdkDelivered(cdk.id, nowIso())
 
     return buildClaimDetailPayload({
       claimToken: context.claimToken,
@@ -189,10 +195,11 @@ export async function redeemClaimTask(token) {
       session,
     })
   } catch (error) {
-    const nextRetryCount = Number(context.task.retry_count || 0) + 1
-    const failedTask = updateTask(context.task.id, {
+    const nextRetryCount = Number(context.task.attempt_count || 0) + 1
+    const failedTask = await updateTask(context.task.id, {
       task_status: 'retry_pending',
-      retry_count: nextRetryCount,
+      delivery_status: 'pending',
+      attempt_count: nextRetryCount,
       last_error: error instanceof Error ? error.message : String(error || ''),
       updated_at: nowIso(),
     })
@@ -230,7 +237,7 @@ async function getClaimContext(token) {
     })
   }
 
-  const claimToken = findClaimTokenByToken(normalized)
+  const claimToken = await findClaimTokenByToken(normalized)
 
   if (!claimToken) {
     throw createHttpError('领取链接无效或不存在', {
@@ -239,7 +246,7 @@ async function getClaimContext(token) {
     })
   }
 
-  const task = findTaskByClaimTokenId(claimToken.id)
+  const task = await findTaskByClaimTokenId(claimToken.id)
 
   if (!task) {
     throw createHttpError('领取任务不存在', {
@@ -256,7 +263,7 @@ async function getClaimContext(token) {
   }
 
   if (claimToken.expired_at && new Date(claimToken.expired_at).getTime() <= Date.now()) {
-    const expiredContext = expireClaimContext(claimToken, task)
+    const expiredContext = await expireClaimContext(claimToken, task)
 
     throw createHttpError('领取链接已过期', {
       statusCode: 410,
@@ -265,8 +272,10 @@ async function getClaimContext(token) {
     })
   }
 
-  const order = getOrderById(task.order_id)
-  const orderItem = getOrderItemById(task.order_item_id)
+  const [order, orderItem] = await Promise.all([
+    getOrderById(task.order_id),
+    getOrderItemById(task.order_item_id),
+  ])
 
   if (!order || !orderItem) {
     throw createHttpError('领取任务关联订单不完整', {
@@ -292,9 +301,9 @@ function assertTaskCanProceed(task) {
   }
 }
 
-function expireClaimContext(claimToken, task) {
+async function expireClaimContext(claimToken, task) {
   const now = nowIso()
-  const nextClaimToken = updateClaimToken(claimToken.id, {
+  const nextClaimToken = await updateClaimToken(claimToken.id, {
     status: 'expired',
     updated_at: now,
   })
@@ -302,13 +311,14 @@ function expireClaimContext(claimToken, task) {
   let nextTask = task
 
   if (!CLAIM_TERMINAL_STATUSES.has(String(task.task_status || '')) && task.task_status !== 'redeemed') {
-    if (task.reserved_cdk_id) {
-      releaseReservedCdk(task.reserved_cdk_id, now)
+    if (task.primary_inventory_item_id) {
+      await releaseReservedCdk(task.primary_inventory_item_id, now)
     }
 
-    nextTask = updateTask(task.id, {
+    nextTask = await updateTask(task.id, {
       task_status: 'expired',
-      reserved_cdk_id: null,
+      inventory_status: 'pending',
+      user_action_status: 'expired',
       last_error: '领取链接已过期，预占 CDK 已释放',
       updated_at: now,
     })
@@ -330,7 +340,7 @@ async function loadTaskSession(task, { includeQrImage = false } = {}) {
     : getTencentBrowserSessionSummary(task.browser_session_id)
 }
 
-function syncTaskWithSession(task, session) {
+async function syncTaskWithSession(task, session) {
   const activityInfo = session.activityInfo || null
   const patch = {
     login_type: String(session.loginType || task.login_type || ''),
@@ -350,6 +360,7 @@ function syncTaskWithSession(task, session) {
 
   if (task.task_status === 'link_generated') {
     patch.task_status = 'claimed'
+    patch.user_action_status = 'claimed'
     patch.claimed_at = task.claimed_at || nowIso()
   }
 
@@ -372,7 +383,7 @@ function buildClaimDetailPayload({ claimToken, task, order, orderItem, session }
       taskId: task.id,
       taskNo: task.task_no,
       status: task.task_status,
-      expiresAt: task.expires_at,
+      expiresAt: claimToken.expired_at,
       claimedAt: task.claimed_at,
       roleConfirmedAt: task.role_confirmed_at,
       redeemedAt: task.redeemed_at,

apps/backend/src/services/order/delivery-task-service.js

@@ -1,11 +1,16 @@
 import { createTask, listTasksByOrderId, updateTask } from '../../repositories/task-repo.js'
+import {
+  getFulfillmentProfileByKey,
+  listFulfillmentProfileRequirements,
+  resolveFulfillmentBinding,
+} from '../../repositories/fulfillment-profile-repo.js'
 import { reserveCdkForTask } from './cdk-service.js'
 import { createTaskClaimToken } from '../claim/claim-service.js'
 import { nowIso } from '../../utils/time.js'
 import { randomId } from '../../utils/random.js'
 
-export function syncDeliveryTasksForOrder(order, orderItems) {
-  const existingTasks = listTasksByOrderId(order.id)
+export async function syncDeliveryTasksForOrder(order, orderItems) {
+  const existingTasks = await listTasksByOrderId(order.id)
 
   if (existingTasks.length > 0) {
     if (order.pay_status !== 'paid') {
@@ -13,47 +18,72 @@ export function syncDeliveryTasksForOrder(order, orderItems) {
     }
 
     const itemMap = new Map(orderItems.map((item) => [item.id, item]))
-    return existingTasks.map((task) => preparePaidTask({
+    return Promise.all(existingTasks.map((task) => preparePaidTask({
       ...task,
       skuCode: itemMap.get(task.order_item_id)?.sku_code || '',
       skuName: itemMap.get(task.order_item_id)?.sku_name || '',
-    }))
+    })))
   }
 
   const tasks = []
 
   for (const item of orderItems) {
+    const binding = await resolveFulfillmentBinding({
+      skuCode: item.sku_code,
+      provider: order.provider,
+      platform: order.platform,
+      shopId: order.shop_id,
+    })
+    const profile = binding || await getFulfillmentProfileByKey('manual_review')
+    if (!profile) {
+      continue
+    }
+    const requirements = await listFulfillmentProfileRequirements(profile.profile_id || profile.id)
+    const primaryRequirement = requirements.find((requirement) => requirement.is_required !== false) || requirements[0] || null
     const quantity = Math.max(1, Number(item.quantity || 1))
 
     for (let index = 0; index < quantity; index += 1) {
       const createdAt = nowIso()
-      const initialStatus = order.pay_status === 'paid' ? 'paid' : 'pending_payment'
+      const initialStatus = order.pay_status === 'paid'
+        ? resolvePaidTaskStatus(profile)
+        : 'pending_payment'
 
-      const task = createTask({
+      const task = await createTask({
         orderId: order.id,
         orderItemId: item.id,
+        unitIndex: index + 1,
+        provider: order.provider,
+        platform: order.platform,
+        shopId: order.shop_id,
+        shopName: order.shop_name,
         platformOrderId: order.platform_order_id,
         taskNo: randomId('DT'),
+        profileId: Number(profile.profile_id || profile.id),
+        executorKey: String(profile.executor_key || 'manual_dispatch'),
         taskStatus: initialStatus,
-        loginType: '',
-        claimTokenId: null,
-        reservedCdkId: null,
-        browserSessionId: '',
-        nickname: '',
-        roleId: '',
-        roleName: '',
-        area: '',
-        partitionName: '',
+        inventoryStatus: profile.requires_claim ? 'pending' : 'not_required',
+        deliveryStatus: initialStatus === 'redeemed' ? 'delivered' : 'pending',
         resultCode: '',
         resultMessage: '',
-        screenshotPath: '',
-        artifactsJson: '{}',
+        claimToken: '',
+        claimExpiresAt: null,
+        automationMode: profile.auto_dispatch ? 'automatic' : 'manual',
+        requiresClaim: Boolean(profile.requires_claim),
+        userActionStatus: profile.requires_claim ? 'pending_claim' : 'not_required',
+        attemptCount: 0,
         lastError: '',
-        retryCount: 0,
-        expiresAt: null,
-        claimedAt: null,
-        roleConfirmedAt: null,
-        redeemedAt: null,
+        contextJson: JSON.stringify({
+          profileKey: String(profile.profile_key || ''),
+          profileName: String(profile.profile_name || profile.name || ''),
+          skuCode: item.sku_code,
+          skuName: item.sku_name,
+          primaryRequirement: primaryRequirement
+            ? {
+              roleKey: String(primaryRequirement.role_key || primaryRequirement.roleKey || 'primary_code'),
+              credentialType: String(primaryRequirement.credential_type || primaryRequirement.credentialType || 'tencent_code'),
+            }
+            : null,
+        }),
         createdAt,
         updatedAt: createdAt,
       })
@@ -70,16 +100,28 @@ export function syncDeliveryTasksForOrder(order, orderItems) {
     return tasks
   }
 
-  return tasks.map((task) => preparePaidTask(task))
+  return Promise.all(tasks.map((task) => preparePaidTask(task)))
 }
 
-function preparePaidTask(task) {
+async function preparePaidTask(task) {
   const now = nowIso()
+  const taskContext = parseTaskContext(task)
+  const primaryRequirement = taskContext.primaryRequirement || null
 
   if (['link_generated', 'claimed', 'role_confirmed', 'redeeming', 'redeemed'].includes(task.task_status)) {
     return task
   }
 
+  if (!task.requires_claim || String(task.executor_key || '').trim() === 'manual_dispatch') {
+    return updateTask(task.id, {
+      task_status: 'manual_review',
+      inventory_status: 'not_required',
+      user_action_status: 'not_required',
+      last_error: task.last_error || '当前任务需要人工履约处理',
+      updated_at: now,
+    })
+  }
+
   if (!task.skuCode) {
     return updateTask(task.id, {
       task_status: 'manual_review',
@@ -88,7 +130,7 @@ function preparePaidTask(task) {
     })
   }
 
-  if (task.reserved_cdk_id && task.claim_token_id) {
+  if (task.primary_inventory_item_id && task.primary_claim_token_id) {
     return updateTask(task.id, {
       task_status: 'link_generated',
       last_error: '',
@@ -96,24 +138,59 @@ function preparePaidTask(task) {
     })
   }
 
-  const reserved = reserveCdkForTask(task.skuCode, task.id)
+  if (!primaryRequirement?.credentialType) {
+    return updateTask(task.id, {
+      task_status: 'manual_review',
+      last_error: '履约档案未配置库存要求，无法自动分配库存',
+      updated_at: now,
+    })
+  }
+
+  const reserved = await reserveCdkForTask({
+    skuCode: task.skuCode,
+    taskId: task.id,
+    credentialType: primaryRequirement.credentialType,
+    roleKey: primaryRequirement.roleKey || 'primary_code',
+  })
 
   if (!reserved) {
     return updateTask(task.id, {
       task_status: 'waiting_inventory',
+      inventory_status: 'pending',
       last_error: '库存不足，等待可用 CDK',
       updated_at: now,
     })
   }
 
-  const claimToken = createTaskClaimToken(task.id)
+  const claimToken = await createTaskClaimToken(task.id)
 
   return updateTask(task.id, {
     task_status: 'link_generated',
-    reserved_cdk_id: reserved.id,
-    claim_token_id: claimToken.id,
+    inventory_status: 'reserved',
+    claim_token: claimToken.token,
+    claim_expires_at: claimToken.expired_at,
+    user_action_status: 'pending_claim',
     last_error: '',
-    expires_at: claimToken.expired_at,
     updated_at: now,
   })
 }
+
+function resolvePaidTaskStatus(profile) {
+  if (Boolean(profile?.requires_claim)) {
+    return 'paid'
+  }
+
+  if (String(profile?.executor_key || '').trim() === 'manual_dispatch') {
+    return 'manual_review'
+  }
+
+  return 'paid'
+}
+
+function parseTaskContext(task) {
+  try {
+    return JSON.parse(String(task?.context_json || '{}'))
+  } catch {
+    return {}
+  }
+}

apps/backend/src/services/order/order-repair-service.js

@@ -1,222 +0,0 @@
-import { getDb, runInTransaction } from '../../db/client.js'
-import { listOrderItemsByOrderId, replaceOrderItems } from '../../repositories/order-item-repo.js'
-import { enrichAgisoXianyuTradeOrder } from '../platforms/agiso/xianyu/order-detail-service.js'
-import { logInfo } from '../../utils/logger.js'
-import { nowIso } from '../../utils/time.js'
-import { parseJsonObject } from '../../utils/json.js'
-
-export async function repairAgisoOrderData() {
-  const rows = getDb().prepare(`
-    SELECT
-      o.id,
-      o.provider,
-      o.platform,
-      o.shop_id,
-      o.shop_name,
-      o.platform_order_id,
-      o.total_amount,
-      o.raw_payload_json,
-      o.paid_at,
-      o.buyer_id,
-      o.buyer_name,
-      o.receiver_contact,
-      (
-        SELECT we.body_json
-        FROM webhook_events we
-        WHERE we.related_order_id = o.id
-        ORDER BY we.id DESC
-        LIMIT 1
-      ) AS latest_body_json
-    FROM orders o
-    WHERE o.provider = 'agiso' AND o.platform = 'xianyu'
-    ORDER BY o.id ASC
-  `).all()
-
-  if (rows.length === 0) {
-    return
-  }
-
-  let repairedOrderIdCount = 0
-  let repairedAmountCount = 0
-  let repairedOrderItemCount = 0
-
-  for (const row of rows) {
-    const latestRequestBody = parseJsonObject(row.latest_body_json)
-    const rawJson = String(latestRequestBody.json || '').trim()
-    const webhookPayload = rawJson ? parseJsonObject(rawJson, { preserveLargeIntegers: true }) : {}
-    const rawPayload = parseJsonObject(row.raw_payload_json, { preserveLargeIntegers: true })
-    const expectedOrderId = pickFirstNonEmpty([
-      webhookPayload.biz_order_id,
-      webhookPayload.order_id,
-      webhookPayload.orderId,
-      rawPayload.biz_order_id,
-      rawPayload.order_id,
-      rawPayload.orderId,
-    ])
-
-    const parsed = {
-      provider: row.provider,
-      platform: row.platform,
-      shopId: String(row.shop_id || '').trim(),
-      shopName: String(row.shop_name || '').trim(),
-      platformOrderId: expectedOrderId || String(row.platform_order_id || '').trim(),
-      totalAmount: Number(row.total_amount || 0),
-      buyerId: pickFirstNonEmpty([rawPayload.buyer_id, rawPayload.buyerId, rawPayload.BuyerId, row.buyer_id]),
-      buyerName: pickFirstNonEmpty([rawPayload.buyer_name, rawPayload.buyerName, rawPayload.BuyerName, row.buyer_name]),
-      receiverContact: pickFirstNonEmpty([
-        rawPayload.receiver_contact,
-        rawPayload.receiverContact,
-        rawPayload.receiver_mobile,
-        rawPayload.receiverMobile,
-        rawPayload.mobile,
-        rawPayload.phone,
-        row.receiver_contact,
-      ]),
-      paidAt: row.paid_at,
-      rawPayload: Object.keys(webhookPayload).length > 0 ? webhookPayload : rawPayload,
-      items: [],
-    }
-
-    const detailResult = await enrichAgisoXianyuTradeOrder(parsed, {
-      requestId: `repair-order-${row.id}`,
-    })
-
-    const nextOrderId = pickFirstNonEmpty([
-      detailResult.parsed.platformOrderId,
-      expectedOrderId,
-      row.platform_order_id,
-    ])
-    const nextAmount = Number(detailResult.parsed.totalAmount || 0)
-    const nextRawPayloadJson = JSON.stringify(detailResult.parsed.rawPayload || rawPayload || {})
-    const nextShopName = pickFirstNonEmpty([detailResult.parsed.shopName, row.shop_name])
-    const nextBuyerId = pickFirstNonEmpty([detailResult.parsed.buyerId, row.buyer_id])
-    const nextBuyerName = pickFirstNonEmpty([detailResult.parsed.buyerName, row.buyer_name])
-    const nextReceiverContact = pickFirstNonEmpty([detailResult.parsed.receiverContact, row.receiver_contact])
-    const nextPaidAt = detailResult.parsed.paidAt || row.paid_at
-    const currentOrderItems = listOrderItemsByOrderId(row.id)
-    const repairedItems = Array.isArray(detailResult.parsed.items) ? detailResult.parsed.items : []
-    const shouldRepairOrderItems = repairedItems.length > 0
-      && (currentOrderItems.length === 0 || currentOrderItems.length === repairedItems.length)
-      && hasOrderItemChanges(currentOrderItems, repairedItems)
-
-    const orderIdChanged = nextOrderId && nextOrderId !== String(row.platform_order_id || '')
-    const amountChanged = nextAmount > 0 && nextAmount !== Number(row.total_amount || 0)
-    const payloadChanged = nextRawPayloadJson !== String(row.raw_payload_json || '{}')
-    const metadataChanged = nextShopName !== String(row.shop_name || '')
-      || nextBuyerId !== String(row.buyer_id || '')
-      || nextBuyerName !== String(row.buyer_name || '')
-      || nextReceiverContact !== String(row.receiver_contact || '')
-      || nextPaidAt !== row.paid_at
-
-    if (!orderIdChanged && !amountChanged && !payloadChanged && !metadataChanged && !shouldRepairOrderItems) {
-      continue
-    }
-
-    runInTransaction((db) => {
-      db.prepare(`
-        UPDATE orders
-        SET
-          shop_name = ?,
-          platform_order_id = ?,
-          buyer_id = ?,
-          buyer_name = ?,
-          receiver_contact = ?,
-          total_amount = ?,
-          raw_payload_json = ?,
-          paid_at = ?,
-          updated_at = ?
-        WHERE id = ?
-      `).run(
-        nextShopName,
-        nextOrderId,
-        nextBuyerId,
-        nextBuyerName,
-        nextReceiverContact,
-        nextAmount,
-        nextRawPayloadJson,
-        nextPaidAt,
-        nowIso(),
-        row.id,
-      )
-
-      if (shouldRepairOrderItems) {
-        const itemNow = nowIso()
-        replaceOrderItems(
-          row.id,
-          repairedItems.map((item) => ({
-            skuCode: item.skuCode,
-            skuName: item.skuName,
-            quantity: item.quantity,
-            specJson: JSON.stringify(item.spec || {}),
-            deliveryMode: 'claim_link',
-            createdAt: itemNow,
-            updatedAt: itemNow,
-          })),
-        )
-      }
-
-      if (orderIdChanged) {
-        db.prepare('UPDATE delivery_tasks SET platform_order_id = ? WHERE order_id = ?').run(nextOrderId, row.id)
-        db.prepare(`
-          UPDATE message_deliveries
-          SET
-            platform_order_id = ?,
-            recipient_key = CASE
-              WHEN recipient_key = ? THEN ?
-              ELSE recipient_key
-            END,
-            updated_at = ?
-          WHERE order_id = ?
-        `).run(nextOrderId, row.platform_order_id, nextOrderId, nowIso(), row.id)
-      }
-    })
-
-    if (orderIdChanged) {
-      repairedOrderIdCount += 1
-    }
-
-    if (amountChanged) {
-      repairedAmountCount += 1
-    }
-
-    if (shouldRepairOrderItems) {
-      repairedOrderItemCount += 1
-    }
-  }
-
-  if (repairedOrderIdCount > 0 || repairedAmountCount > 0 || repairedOrderItemCount > 0) {
-    logInfo('[startup]', '已自动修复历史 Agiso 咸鱼订单数据', {
-      repairedOrderIdCount,
-      repairedAmountCount,
-      repairedOrderItemCount,
-    })
-  }
-}
-
-function hasOrderItemChanges(currentItems, repairedItems) {
-  if (!Array.isArray(currentItems) || !Array.isArray(repairedItems) || currentItems.length !== repairedItems.length) {
-    return repairedItems.length > 0
-  }
-
-  return repairedItems.some((item, index) => {
-    const current = currentItems[index]
-    const currentSpec = parseJsonObject(current?.spec_json, { preserveLargeIntegers: true })
-    const nextSpec = item?.spec || {}
-
-    return String(current?.sku_code || '').trim() !== String(item?.skuCode || '').trim()
-      || String(current?.sku_name || '').trim() !== String(item?.skuName || '').trim()
-      || Number(current?.quantity || 0) !== Number(item?.quantity || 0)
-      || JSON.stringify(currentSpec) !== JSON.stringify(nextSpec)
-  })
-}
-
-function pickFirstNonEmpty(values) {
-  for (const value of values) {
-    const normalized = String(value || '').trim()
-    if (normalized) {
-      return normalized
-    }
-  }
-
-  return ''
-}

apps/backend/src/services/order/order-service.js

@@ -9,7 +9,7 @@ import { logWebhook } from '../../utils/logger.js'
 
 export async function upsertOrderFromWebhook(event) {
   const now = nowIso()
-  const existing = findOrderByPlatformOrderId({
+  const existing = await findOrderByPlatformOrderId({
     provider: event.provider,
     platform: event.platform,
     shopId: event.shopId,
@@ -43,30 +43,30 @@ export async function upsertOrderFromWebhook(event) {
   }
 
   const order = existing
-    ? updateOrder(existing.id, {
+    ? await updateOrder(existing.id, {
       ...basePayload,
       updatedAt: now,
     })
-    : createOrder({
+    : await createOrder({
       ...basePayload,
       createdAt: now,
       updatedAt: now,
     })
 
-  const orderItems = replaceOrderItems(
+  const orderItems = await replaceOrderItems(
     order.id,
     event.items.map((item) => ({
       skuCode: item.skuCode,
       skuName: item.skuName,
       quantity: item.quantity,
       specJson: JSON.stringify(item.spec || {}),
-      deliveryMode: 'claim_link',
+      itemSnapshotJson: JSON.stringify(item.snapshot || item.spec || {}),
       createdAt: now,
       updatedAt: now,
     })),
   )
 
-  const tasks = syncDeliveryTasksForOrder(order, orderItems)
+  const tasks = await syncDeliveryTasksForOrder(order, orderItems)
   const messageDeliveries = []
 
   logWebhook('[order-service]', 'Webhook 订单 upsert 完成', {
@@ -85,12 +85,12 @@ export async function upsertOrderFromWebhook(event) {
       event.provider !== 'agiso'
       || event.platform !== 'xianyu'
       || String(task.task_status || '') !== 'link_generated'
-      || !task.claim_token_id
+      || !task.primary_claim_token_id
     ) {
       continue
     }
 
-    const claimToken = getClaimTokenById(task.claim_token_id)
+    const claimToken = await getClaimTokenById(task.primary_claim_token_id)
     if (!claimToken) {
       continue
     }

apps/backend/src/services/order/webhook-service.js

@@ -741,23 +741,8 @@ function normalizeProviderDateTime(value) {
 }
 
 function resolveSkuCode(rawKey) {
-  const mappings = runtimeConfig.orders.skuMappings
   const candidates = Array.isArray(rawKey) ? rawKey : [rawKey]
 
-  if (mappings && typeof mappings === 'object') {
-    for (const candidate of candidates) {
-      const normalizedCandidate = String(candidate || '').trim()
-      if (!normalizedCandidate) {
-        continue
-      }
-
-      const direct = mappings[normalizedCandidate]
-      if (typeof direct === 'string' && direct.trim()) {
-        return direct.trim()
-      }
-    }
-  }
-
   for (const candidate of candidates) {
     if (typeof candidate === 'string' && candidate.trim()) {
       return candidate.trim()