解耦接单与履约订单处理

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

@@ -118,29 +118,8 @@ export async function upsertOrderFromSource(
       }),
     ),
   )
-  const configuredItems = (resolvedItems as FulfillmentOrderItem[]).filter(
-    (item) => item.isConfigured,
-  )
-
-  if (configuredItems.length === 0) {
-    logIntegration('[order-service]', `${sourceLabel} 订单已忽略：未命中任何已配置履约商品`, {
-      provider: event.provider,
-      platform: event.platform,
-      shopId: event.shopId,
-      shopName: event.shopName,
-      platformOrderId: event.platformOrderId,
-      existingOrderId: existing?.id || null,
-      rawItemCount: event.items.length,
-    })
-
-    return {
-      ignored: true,
-      ignoreReason: 'unconfigured_items',
-      order: null,
-      orderItems: [],
-      tasks: [],
-    }
-  }
+  const resolvedFulfillmentItems = resolvedItems as FulfillmentOrderItem[]
+  const configuredItems = resolvedFulfillmentItems.filter((item) => item.isConfigured)
 
   const basePayload = {
     provider: event.provider,
@@ -182,7 +161,7 @@ export async function upsertOrderFromSource(
 
   const orderItems = await replaceOrderItems(
     order.id,
-    configuredItems.map((item) => ({
+    resolvedFulfillmentItems.map((item) => ({
       skuCode: item.skuCode,
       skuName: item.skuName,
       quantity: item.quantity,
@@ -193,7 +172,11 @@ export async function upsertOrderFromSource(
     })),
   )
 
-  const readiness = await resolveOrderFulfillmentReadiness(order)
+  const configuredOrderItems = orderItems.filter(isOrderItemConfiguredForFulfillment)
+  const readiness =
+    configuredOrderItems.length > 0
+      ? await resolveOrderFulfillmentReadiness(order)
+      : { allowed: true as const, voucherCount: 0, reason: '', blockReason: '' }
   if (!readiness.allowed) {
     logIntegration(
       '[order-service]',
@@ -209,6 +192,10 @@ export async function upsertOrderFromSource(
       { level: 'warn' },
     )
 
+    await syncWorkerOrdersForSourceOrder(order, orderItems, {
+      source: `${sourceLabel}_order_upsert`,
+      autoOnly: true,
+    })
     return {
       ignoreReason: readiness.blockReason || 'fulfillment_not_ready',
       order,
@@ -217,7 +204,10 @@ export async function upsertOrderFromSource(
     }
   }
 
-  const tasks = await syncDeliveryTasksForOrder(order, orderItems)
+  const tasks =
+    configuredOrderItems.length > 0
+      ? await syncDeliveryTasksForOrder(order, configuredOrderItems)
+      : []
   await syncOrderFulfillmentAttachments(order, tasks, {
     source: `${sourceLabel}_order_upsert`,
     now,
@@ -293,6 +283,20 @@ export function mergeSourceOrderState(
   }
 }
 
+function isOrderItemConfiguredForFulfillment(item: OrderItemRow): boolean {
+  try {
+    const snapshot = JSON.parse(String(item.item_snapshot_json || '{}'))
+    return Boolean(
+      snapshot &&
+      typeof snapshot === 'object' &&
+      !Array.isArray(snapshot) &&
+      snapshot.isConfigured === true,
+    )
+  } catch {
+    return false
+  }
+}
+
 function chooseHigherPriorityStatus(
   existingValue: string,
   incomingValue: string,