增加履约高级配置

2026-05-26 22:56:41 +08:00
parent 5377f8893d
commit e8010728a4
18 changed files with 858 additions and 62 deletions
@@ -131,6 +131,12 @@ export async function syncDeliveryTasksForOrderWithDeps(
    const cloudtentaclesConfig = parseJsonObject(fulfillmentConfig.cloudtentacles)
    const kuaishouConsumeConfig = parseJsonObject(fulfillmentConfig.kuaishouConsume)
    const kuaishouShopConfig = parseJsonObject(fulfillmentConfig.kuaishouShop)
+    const deliveryItems = normalizeCloudDeliveryItems(cloudtentaclesConfig)
+    const primaryDeliveryItem = deliveryItems[0] || {
+      cloudSkuId: Number(cloudtentaclesConfig.skuId || 0) || 0,
+      cloudSkuName: String(cloudtentaclesConfig.skuName || '').trim(),
+      quantity: 1,
+    }

    for (let index = 0; index < quantity; index += 1) {
      const createdAt = getNowIso()
@@ -172,6 +178,7 @@ export async function syncDeliveryTasksForOrderWithDeps(
              configId: String(fulfillmentConfig.configId || '').trim(),
              internalSkuCode: item.sku_code,
              internalSkuName: item.sku_name,
+              deliveryItems,
              ticket: {
                code: '',
                status: 'pending',
@@ -186,8 +193,8 @@ export async function syncDeliveryTasksForOrderWithDeps(
              binding: {
                prepareStatus: 'pending',
                cloudSourceKeys: normalizeStringArray(cloudtentaclesConfig.cloudSourceKeys),
-                skuId: Number(cloudtentaclesConfig.skuId || 0) || 0,
-                skuName: String(cloudtentaclesConfig.skuName || '').trim(),
+                skuId: primaryDeliveryItem.cloudSkuId,
+                skuName: primaryDeliveryItem.cloudSkuName,
                vnKey: '1',
                vnId: 0,
                vnPhone: '',
@@ -394,6 +401,68 @@ function normalizeStringArray(value: unknown): string[] {
  )
 }

+function normalizeCloudDeliveryItems(value: JsonObject): Array<{
+  cloudSkuId: number
+  cloudSkuName: string
+  quantity: number
+}> {
+  const rawItems = Array.isArray(value.deliveryItems) ? value.deliveryItems : []
+  const items = rawItems
+    .map((item) => normalizeCloudDeliveryItem(item))
+    .filter((item): item is { cloudSkuId: number; cloudSkuName: string; quantity: number } => Boolean(item))
+
+  if (items.length > 0) {
+    return mergeCloudDeliveryItems(items)
+  }
+
+  const cloudSkuId = Number(value.skuId || 0) || 0
+  if (!cloudSkuId) {
+    return []
+  }
+
+  return [{
+    cloudSkuId,
+    cloudSkuName: String(value.skuName || '').trim(),
+    quantity: 1,
+  }]
+}
+
+function normalizeCloudDeliveryItem(value: unknown) {
+  const source = value && typeof value === 'object' && !Array.isArray(value)
+    ? value as JsonObject
+    : {}
+  const cloudSkuId = Number(source.cloudSkuId || source.skuId || 0) || 0
+  if (!Number.isInteger(cloudSkuId) || cloudSkuId <= 0) {
+    return null
+  }
+
+  const quantity = Number(source.quantity || 1) || 1
+  return {
+    cloudSkuId,
+    cloudSkuName: String(source.cloudSkuName || source.skuName || '').trim(),
+    quantity: Number.isInteger(quantity) && quantity > 0 ? quantity : 1,
+  }
+}
+
+function mergeCloudDeliveryItems(
+  items: Array<{ cloudSkuId: number; cloudSkuName: string; quantity: number }>,
+) {
+  const merged = new Map<number, { cloudSkuId: number; cloudSkuName: string; quantity: number }>()
+
+  for (const item of items) {
+    const existing = merged.get(item.cloudSkuId)
+    if (existing) {
+      existing.quantity += item.quantity
+      existing.cloudSkuName = existing.cloudSkuName || item.cloudSkuName
+      continue
+    }
+
+    merged.set(item.cloudSkuId, { ...item })
+  }
+
+  return Array.from(merged.values())
+}
+
 function isTaskRow(task: TaskRow | DeliveryTaskRow | null | undefined): task is TaskRow {
  return Boolean(task && Number(task.id || 0) > 0)
 }