From f8274173ac04a21953305716a8c5406be3480978 Mon Sep 17 00:00:00 2001
From: MSuMshk <2039814060@qq.com>
Date: Wed, 25 Feb 2026 10:51:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=A4=A7SKU=E6=94=B9=E4=B8=BA=E5=8D=95=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=BC=82=E6=AD=A5=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/api/product/index.ts        | 21 ++++++
 .../product-detail-page/data-actions.ts       | 66 +++++++++++--------
 2 files changed, 59 insertions(+), 28 deletions(-)

diff --git a/apps/web-antd/src/api/product/index.ts b/apps/web-antd/src/api/product/index.ts
index 763fc40..4bc0bc5 100644
--- a/apps/web-antd/src/api/product/index.ts
+++ b/apps/web-antd/src/api/product/index.ts
@@ -24,6 +24,13 @@ export type ProductSkuSaveJobStatus =
   | 'running'
   | 'succeeded';
 
+/** 商品异步保存中的 SKU 任务状态。 */
+export type ProductSaveAsyncSkuJobStatus =
+  | 'failed'
+  | 'not_required'
+  | 'queued'
+  | 'running';
+
 /** 分类展示渠道。 */
 export type ProductCategoryChannel = 'dine_in' | 'pickup' | 'wm';
 
@@ -270,6 +277,15 @@ export interface SaveProductDto {
   warningStock?: null | number;
 }
 
+/** 商品异步保存响应。 */
+export interface SaveProductAsyncDto {
+  message: null | string;
+  productId: string;
+  skuJobId: null | string;
+  skuJobStatus: ProductSaveAsyncSkuJobStatus;
+  storeId: string;
+}
+
 /** 创建 SKU 异步保存任务参数。 */
 export interface CreateProductSkuSaveJobDto {
   productId: string;
@@ -727,6 +743,11 @@ export async function saveProductApi(data: SaveProductDto) {
   return requestClient.post<ProductDetailDto>('/product/save', data);
 }
 
+/** 异步保存商品（基础信息落库 + SKU 入队）。 */
+export async function saveProductAsyncApi(data: SaveProductDto) {
+  return requestClient.post<SaveProductAsyncDto>('/product/save-async', data);
+}
+
 /** 创建 SKU 异步保存任务。 */
 export async function createProductSkuSaveJobApi(
   data: CreateProductSkuSaveJobDto,
diff --git a/apps/web-antd/src/views/product/detail/composables/product-detail-page/data-actions.ts b/apps/web-antd/src/views/product/detail/composables/product-detail-page/data-actions.ts
index be06873..bba9763 100644
--- a/apps/web-antd/src/views/product/detail/composables/product-detail-page/data-actions.ts
+++ b/apps/web-antd/src/views/product/detail/composables/product-detail-page/data-actions.ts
@@ -18,7 +18,6 @@ import { message } from 'ant-design-vue';
 
 import { uploadTenantFileApi } from '#/api/files';
 import {
-  createProductSkuSaveJobApi,
   deleteProductApi,
   getProductAddonGroupListApi,
   getProductCategoryListApi,
@@ -26,6 +25,7 @@ import {
   getProductLabelListApi,
   getProductSkuSaveJobApi,
   getProductSpecListApi,
+  saveProductAsyncApi,
   saveProductApi,
 } from '#/api/product';
 
@@ -514,7 +514,7 @@ export function createProductDetailDataActions(
           : [];
 
       const shouldSaveSkuAsync = normalizedSkus.length > ASYNC_SKU_THRESHOLD;
-      const saved = await saveProductApi({
+      const payload = {
         id: form.id,
         storeId: storeId.value,
         categoryId: form.categoryId,
@@ -548,38 +548,48 @@ export function createProductDetailDataActions(
         specTemplateIds: [...form.specTemplateIds],
         addonGroupIds: [...form.addonGroupIds],
         labelIds: [...form.labelIds],
-        skus: shouldSaveSkuAsync ? undefined : normalizedSkus,
+        skus: normalizedSkus,
         comboGroups: normalizedComboGroups,
         tags: [],
-      });
+      };
 
       if (shouldSaveSkuAsync) {
-        try {
-          const createdJob = await createProductSkuSaveJobApi({
-            storeId: storeId.value,
-            productId: saved.id,
-            specTemplateIds: [...form.specTemplateIds],
-            skus: normalizedSkus,
-          });
-          message.success(
-            `商品基础信息已保存，${normalizedSkus.length} 条 SKU 正在后台处理`,
-          );
-          detail.value = saved;
-          void watchSkuSaveJobInBackground(
-            storeId.value,
-            saved.id,
-            createdJob.jobId,
-          );
-        } catch (error) {
-          console.error(error);
-          message.error('商品基础信息已保存，但 SKU 异步任务创建失败');
+        const asyncSaved = await saveProductAsyncApi(payload);
+        if (asyncSaved.productId) {
+          form.id = asyncSaved.productId;
         }
-      } else {
-        message.success('商品详情已保存');
-        detail.value = saved;
-        patchForm(saved);
-        buildSkuRows();
+
+        if (asyncSaved.skuJobStatus === 'queued' || asyncSaved.skuJobStatus === 'running') {
+          if (asyncSaved.skuJobId) {
+            message.success(
+              asyncSaved.message ||
+                `商品基础信息已保存，${normalizedSkus.length} 条 SKU 正在后台处理`,
+            );
+            void watchSkuSaveJobInBackground(
+              storeId.value,
+              asyncSaved.productId || form.id,
+              asyncSaved.skuJobId,
+            );
+          } else {
+            message.warning(asyncSaved.message || 'SKU 任务已创建，请稍后刷新查看状态');
+          }
+          return;
+        }
+
+        if (asyncSaved.skuJobStatus === 'not_required') {
+          message.success(asyncSaved.message || '商品详情已保存');
+          return;
+        }
+
+        message.error(asyncSaved.message || '商品基础信息已保存，但 SKU 异步任务创建失败');
+        return;
       }
+
+      const saved = await saveProductApi(payload);
+      message.success('商品详情已保存');
+      detail.value = saved;
+      patchForm(saved);
+      buildSkuRows();
     } catch (error) {
       console.error(error);
     } finally {