优化订单履约分流与后台筛选

apps/backend/src/services/admin/admin-order-read-helpers.ts

@@ -1,17 +1,14 @@
-import { listOrderItemsByOrderId } from '../../repositories/order-item-repo.js'
-import { listTasksByOrderId } from '../../repositories/task-repo.js'
 import { formatFenToAmount, normalizeFen } from '../../utils/money.js'
 import { resolveDisplayShopName, resolveOrderItemTitle } from './admin-read-shared-helpers.js'
 import { buildOrderFulfillmentProgress } from './admin-task-read-helpers.js'
 
 import type { AdminOrderListItem } from '../../types/admin/read-models.js'
-import type { OrderItemRow, OrderListRow } from '../../types/repository/rows.js'
+import type { OrderItemRow, OrderListRow, TaskRow } from '../../types/repository/rows.js'
 
-export async function mapAdminOrderListItem(item: OrderListRow): Promise<AdminOrderListItem> {
-  const [tasks, orderItems] = await Promise.all([
-    listTasksByOrderId(item.id),
-    listOrderItemsByOrderId(item.id),
-  ])
+export function mapAdminOrderListItem(
+  item: OrderListRow,
+  { tasks = [], orderItems = [] }: { tasks?: TaskRow[]; orderItems?: OrderItemRow[] } = {},
+): AdminOrderListItem {
   const fulfillmentProgress = buildOrderFulfillmentProgress(tasks)
   const itemSummary = summarizeOrderItems(orderItems)
 
@@ -39,7 +36,7 @@ export async function mapAdminOrderListItem(item: OrderListRow): Promise<AdminOr
       0,
     ),
     itemSummary,
-    taskCount: Number(item.task_count || tasks.length || 0),
+    taskCount: tasks.length,
     resourceStatus: fulfillmentProgress.resourceStatus,
     customerStatus: fulfillmentProgress.customerStatus,
     preparedTaskCount: fulfillmentProgress.preparedTaskCount,

apps/backend/src/services/admin/admin-read-service.ts

@@ -1,9 +1,17 @@
 import { buildClaimUrl } from '../claim/claim-service.js'
 import { buildClaimIdentityAdminSummary } from '../claim/claim-identity.js'
 import { getClaimTokenById } from '../../repositories/claim-token-repo.js'
-import { listOrderItemsByOrderId } from '../../repositories/order-item-repo.js'
+import {
+  listOrderItemsByOrderId,
+  listOrderItemsByOrderIds,
+} from '../../repositories/order-item-repo.js'
 import { getOrderById, listOrders } from '../../repositories/order-repo.js'
-import { getTaskById, listTasks, listTasksByOrderId } from '../../repositories/task-repo.js'
+import {
+  getTaskById,
+  listTasks,
+  listTasksByOrderId,
+  listTasksByOrderIds,
+} from '../../repositories/task-repo.js'
 import { listTaskEventsByTaskId } from '../../repositories/task-event-repo.js'
 import type { JsonRecord } from '../../types/json.js'
 import {
@@ -76,19 +84,46 @@ export async function getAdminOrders(
   const { items, total } = await listOrders({
     page,
     pageSize,
+    keyword: String(query.keyword || '').trim(),
+    provider: String(query.provider || '').trim(),
+    executorKey: String(query.executorKey || '').trim(),
     platformOrderId: String(query.platformOrderId || '').trim(),
     payStatus: String(query.payStatus || '').trim(),
+    taskStatus: String(query.taskStatus || '').trim(),
     skuCode: String(query.skuCode || '').trim(),
     dateFrom: normalizeDateQuery(query.dateFrom),
     dateTo: normalizeDateQuery(query.dateTo, true),
   })
 
+  const orderIds = items.map((item) => item.id)
+  const [orderItems, tasks] = await Promise.all([
+    listOrderItemsByOrderIds(orderIds),
+    listTasksByOrderIds(orderIds),
+  ])
+  const orderItemsByOrderId = groupRowsByOrderId(orderItems)
+  const tasksByOrderId = groupRowsByOrderId(tasks)
+
   return {
-    items: await Promise.all(items.map((item) => mapAdminOrderListItem(item))),
+    items: items.map((item) =>
+      mapAdminOrderListItem(item, {
+        orderItems: orderItemsByOrderId.get(item.id) || [],
+        tasks: tasksByOrderId.get(item.id) || [],
+      }),
+    ),
     pagination: { page, pageSize, total },
   }
 }
 
+function groupRowsByOrderId<T extends { order_id: number }>(rows: T[]): Map<number, T[]> {
+  const grouped = new Map<number, T[]>()
+  for (const row of rows) {
+    const group = grouped.get(row.order_id) || []
+    group.push(row)
+    grouped.set(row.order_id, group)
+  }
+  return grouped
+}
+
 export async function getAdminOrderDetail(
   orderId: AdminEntityIdInput,
   session: AdminViewerSessionInput | null = null,
@@ -196,6 +231,8 @@ export async function getAdminTasks(
   const { items, total } = await listTasks({
     page,
     pageSize,
+    keyword: String(query.keyword || '').trim(),
+    executorKey: String(query.executorKey || '').trim(),
     status: String(query.status || '').trim(),
     platformOrderId: String(query.platformOrderId || '').trim(),
     taskNo: String(query.taskNo || '').trim(),