@pisell/pisellos 2.2.190 → 2.2.192

package/lib/server/modules/products/index.js

@@ -28,6 +28,7 @@ var import_types = require("./types");
 var import_product = require("../../utils/product");
 var INDEXDB_STORE_NAME = "products";
 var PRODUCT_SYNC_DEBOUNCE_MS = 1e4;
+var PRODUCT_SILENT_REFRESH_MIN_INTERVAL_MS = 3e4;
 var ProductsModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -46,6 +47,12 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     this.isPriceFormatterRegistered = false;
     this.quotationBridgeLoadedKey = "";
     this.pendingSyncMessages = [];
+    /** 最近一次 SSE 全量拉取完成时间 */
+    this.lastServerFullFetchAtMs = 0;
+    /** 最近一次 preload 完成时间（含 IndexDB 命中） */
+    this.lastPreloadCompletedAtMs = 0;
+    /** IndexDB 写入串行队列，避免快照与 patch 并发交错 */
+    this.productIndexDBSaveQueue = Promise.resolve();
   }
   async initialize(core, options) {
     var _a;
@@ -714,7 +721,8 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         productCount: list.length,
         duration: `${Math.round(performance.now() - t0)}ms`
       });
-      await this.saveProductsToIndexDB(list);
+      await this.replaceProductsSnapshotInIndexDB(list, "loadProductsByServer");
+      this.lastServerFullFetchAtMs = Date.now();
       await this.core.effects.emit(import_types.ProductsHooks.onProductsLoaded, list);
       (0, import_product.perfMark)("loadProductsByServer", performance.now() - t0, { count: list.length });
       return list;
@@ -813,7 +821,8 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
   async loadProductsByServerHttp(params) {
     const productList = await this.fetchProductsByHttp(params);
     if (productList.length > 0) {
-      await this.saveProductsToIndexDB(productList);
+      await this.replaceProductsSnapshotInIndexDB(productList, "loadProductsByServerHttp");
+      this.lastServerFullFetchAtMs = Date.now();
       await this.core.effects.emit(import_types.ProductsHooks.onProductsLoaded, productList);
     }
     return productList;
@@ -952,33 +961,86 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     }
   }
   /**
-   * 保存商品数据到 IndexDB（平铺存储）
-   * @private
+   * 串行执行商品 IndexDB 写入，避免快照替换与增量 patch 并发交错。
+   *
+   * @example
+   * await this.runInProductIndexDBSaveQueue(async () => {
+   *   await this.dbManager.bulkUpdate(INDEXDB_STORE_NAME, products)
+   * })
    */
-  async saveProductsToIndexDB(products) {
+  async runInProductIndexDBSaveQueue(task) {
+    const queuedTask = this.productIndexDBSaveQueue.then(task, task);
+    this.productIndexDBSaveQueue = queuedTask.then(() => void 0, () => void 0);
+    return queuedTask;
+  }
+  /**
+   * 全量快照写入 IndexDB：clear + bulkUpdate，仅用于 SSE/HTTP 全量拉取。
+   *
+   * @example
+   * await this.replaceProductsSnapshotInIndexDB(list, 'loadProductsByServer')
+   */
+  async replaceProductsSnapshotInIndexDB(products, source) {
     if (!this.dbManager) {
-      this.logWarning("saveProductsToIndexDB: dbManager 不可用");
+      this.logWarning("replaceProductsSnapshotInIndexDB: dbManager 不可用");
       return;
     }
-    this.logInfo("开始保存商品数据到 IndexDB", { productCount: products.length });
     try {
-      const t0 = performance.now();
-      await this.dbManager.clear(INDEXDB_STORE_NAME);
-      await this.dbManager.bulkUpdate(INDEXDB_STORE_NAME, products);
-      (0, import_product.perfMark)("saveProductsToIndexDB", performance.now() - t0, { count: products.length });
-      console.log(
-        `[Products] 已将 ${products.length} 个商品平铺保存到 IndexDB`
-      );
-      this.logInfo("商品数据已保存到 IndexDB", { productCount: products.length });
+      await this.runInProductIndexDBSaveQueue(async () => {
+        this.logInfo("replaceProductsSnapshotInIndexDB 开始", { source, productCount: products.length });
+        const t0 = performance.now();
+        await this.dbManager.clear(INDEXDB_STORE_NAME);
+        if (products.length > 0) {
+          await this.dbManager.bulkUpdate(INDEXDB_STORE_NAME, products);
+        }
+        (0, import_product.perfMark)("replaceProductsSnapshotInIndexDB", performance.now() - t0, { count: products.length });
+        this.logInfo("replaceProductsSnapshotInIndexDB 完成", { source, productCount: products.length });
+      });
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
-      console.error("[Products] 保存数据到 IndexDB 失败:", error);
-      this.logError("保存数据到 IndexDB 失败", {
+      this.logError("全量保存商品到 IndexDB 失败", {
+        source,
         productCount: products.length,
         error: errorMessage
       });
     }
   }
+  /**
+   * 增量 upsert 商品到 IndexDB，不清空表；用于 pubsub 批次合并后的变更商品。
+   *
+   * @example
+   * await this.patchProductsInIndexDB(changedProducts, 'pubsub.processProductSyncMessages', mergeActions)
+   */
+  async patchProductsInIndexDB(products, source, mergeActions = {}) {
+    if (!this.dbManager || products.length === 0) {
+      return;
+    }
+    const validProducts = products.filter((p) => (p == null ? void 0 : p.id) !== void 0 && (p == null ? void 0 : p.id) !== null);
+    if (validProducts.length === 0) {
+      return;
+    }
+    try {
+      await this.runInProductIndexDBSaveQueue(async () => {
+        this.logInfo("patchProductsInIndexDB 开始", { source, count: validProducts.length });
+        const t0 = performance.now();
+        if (typeof this.dbManager.bulkUpdate === "function") {
+          await this.dbManager.bulkUpdate(INDEXDB_STORE_NAME, validProducts);
+        } else if (typeof this.dbManager.update === "function") {
+          for (const product of validProducts) {
+            await this.dbManager.update(INDEXDB_STORE_NAME, product);
+          }
+        }
+        (0, import_product.perfMark)("patchProductsInIndexDB", performance.now() - t0, { count: validProducts.length });
+        this.logInfo("patchProductsInIndexDB 完成", { source, count: validProducts.length });
+      });
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      this.logError("增量保存商品到 IndexDB 失败", {
+        source,
+        error: errorMessage,
+        productCount: validProducts.length
+      });
+    }
+  }
   /**
    * 同步更新商品 Map 缓存
    * 将 list 中的商品同步到 map，以 id 为 key
@@ -1023,6 +1085,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
           duration: `${Math.round(performance.now() - tTotal)}ms`,
           source: "IndexDB"
         });
+        this.lastPreloadCompletedAtMs = Date.now();
         return;
       }
       console.log("[Products] IndexDB 中没有缓存数据，从服务器加载...");
@@ -1050,6 +1113,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         duration: `${Math.round(performance.now() - tTotal)}ms`,
         source: "Server"
       });
+      this.lastPreloadCompletedAtMs = Date.now();
     } else {
       (0, import_product.perfMark)("preload(empty)", performance.now() - tTotal, { source: "empty" });
       this.logWarning("预加载完成但未获取到数据", {
@@ -1205,19 +1269,50 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     if (uniqueDeleteIds.length > 0) {
       await this.removeProductsByIds(uniqueDeleteIds);
     }
+    const patchProductMap = /* @__PURE__ */ new Map();
+    const patchMergeActions = {};
+    let storeMutated = uniqueDeleteIds.length > 0;
     if (bodyUpdates.size > 0) {
-      await this.applyBodyUpdatesToStore(bodyUpdates);
+      const bodyResult = await this.applyBodyUpdatesToStore(bodyUpdates, {
+        skipIndexDB: true,
+        skipEmit: true
+      });
+      for (const product of bodyResult.changedProducts) {
+        patchProductMap.set(product.id, product);
+        patchMergeActions[product.id] = bodyResult.mergeActions[product.id];
+      }
+      storeMutated = true;
     }
+    let freshProducts = [];
     if (uniqueSSEIds.length > 0) {
-      const freshProducts = await this.fetchProductsBySSE(uniqueSSEIds);
+      freshProducts = await this.fetchProductsBySSE(uniqueSSEIds);
       if (freshProducts.length > 0) {
-        await this.mergeProductsToStore(freshProducts);
+        const mergeResult = await this.mergeProductsToStore(freshProducts, {
+          skipIndexDB: true,
+          skipEmit: true
+        });
+        for (const product of mergeResult.changedProducts) {
+          patchProductMap.set(product.id, product);
+          patchMergeActions[product.id] = mergeResult.mergeActions[product.id];
+        }
+        storeMutated = true;
       }
       this.logInfo("processProductSyncMessages: SSE 增量更新完成123", {
         requestedCount: uniqueSSEIds.length,
         receivedCount: freshProducts.length
       });
     }
+    const patchProducts = [...patchProductMap.values()];
+    if (patchProducts.length > 0) {
+      await this.patchProductsInIndexDB(
+        patchProducts,
+        "pubsub.processProductSyncMessages",
+        patchMergeActions
+      );
+    }
+    if (storeMutated) {
+      this.core.effects.emit(import_types.ProductsHooks.onProductsChanged, this.store.list);
+    }
     const allChangedIds = [.../* @__PURE__ */ new Set([
       ...Array.from(bodyUpdates.keys()),
       ...uniqueSSEIds,
@@ -1281,19 +1376,26 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
   /**
    * 将 body 完整数据直接覆盖到本地 store（不调用报价单接口）
    * 已存在的 → 直接替换；不存在的 → 追加
-   * 同时更新 Map 缓存、IndexDB，触发 onProductsChanged
-   * 价格缓存由 processProductSyncMessages 末尾统一清除
+   *
+   * @example
+   * await this.applyBodyUpdatesToStore(bodyUpdates, { skipIndexDB: true })
    */
-  async applyBodyUpdatesToStore(bodyUpdates) {
+  async applyBodyUpdatesToStore(bodyUpdates, options) {
+    const changedProductIds = [...bodyUpdates.keys()];
     this.logInfo("applyBodyUpdatesToStore: 开始", { count: bodyUpdates.size });
     let updatedCount = 0;
     let newCount = 0;
     const appliedIds = /* @__PURE__ */ new Set();
+    const mergeActions = {};
+    const changedProducts = [];
     this.store.list = this.store.list.map((p) => {
       if (bodyUpdates.has(p.id)) {
         updatedCount++;
         appliedIds.add(p.id);
-        return bodyUpdates.get(p.id);
+        mergeActions[p.id] = "update";
+        const next = bodyUpdates.get(p.id);
+        changedProducts.push(next);
+        return next;
       }
       return p;
     });
@@ -1301,31 +1403,44 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       if (!appliedIds.has(id)) {
         this.store.list.push(body);
         newCount++;
+        mergeActions[id] = "insert";
+        changedProducts.push(body);
       }
     }
     this.syncProductsMap();
-    await this.saveProductsToIndexDB(this.store.list);
-    this.core.effects.emit(import_types.ProductsHooks.onProductsChanged, this.store.list);
+    if (!(options == null ? void 0 : options.skipIndexDB)) {
+      await this.patchProductsInIndexDB(changedProducts, "pubsub.bodyUpdate", mergeActions);
+    }
+    if (!(options == null ? void 0 : options.skipEmit)) {
+      this.core.effects.emit(import_types.ProductsHooks.onProductsChanged, this.store.list);
+    }
     this.logInfo("applyBodyUpdatesToStore: 完成", {
       updatedCount,
       newCount,
       totalCount: this.store.list.length
     });
+    return { changedProducts, mergeActions, updatedCount, newCount };
   }
   /**
    * 将增量拉取的商品合并到 store
    * 已存在的 → 替换；新的 → 追加
-   * 同时更新 store.map、IndexDB，触发 onProductsChanged
+   *
+   * @example
+   * await this.mergeProductsToStore(freshProducts, { skipIndexDB: true })
    */
-  async mergeProductsToStore(freshProducts) {
+  async mergeProductsToStore(freshProducts, options) {
     const freshMap = /* @__PURE__ */ new Map();
     for (const p of freshProducts) {
       freshMap.set(p.id, p);
     }
+    const mergeActions = {};
+    const changedProducts = [];
     const updatedList = this.store.list.map((p) => {
       if (freshMap.has(p.id)) {
         const fresh = freshMap.get(p.id);
         freshMap.delete(p.id);
+        mergeActions[p.id] = "update";
+        changedProducts.push(fresh);
         return fresh;
       }
       return p;
@@ -1333,17 +1448,25 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     const newCount = freshMap.size;
     for (const p of freshMap.values()) {
       updatedList.push(p);
+      mergeActions[p.id] = "insert";
+      changedProducts.push(p);
     }
     const updatedCount = freshProducts.length - newCount;
+    const changedProductIds = freshProducts.map((p) => p.id);
     this.store.list = updatedList;
     this.syncProductsMap();
-    await this.saveProductsToIndexDB(this.store.list);
+    if (!(options == null ? void 0 : options.skipIndexDB)) {
+      await this.patchProductsInIndexDB(changedProducts, "pubsub.mergeProductsToStore", mergeActions);
+    }
+    if (!(options == null ? void 0 : options.skipEmit)) {
+      this.core.effects.emit(import_types.ProductsHooks.onProductsChanged, this.store.list);
+    }
     this.logInfo("mergeProductsToStore: 合并完成", {
       updatedCount,
       newCount,
       totalCount: this.store.list.length
     });
-    this.core.effects.emit(import_types.ProductsHooks.onProductsChanged, this.store.list);
+    return { changedProducts, mergeActions, updatedCount, newCount };
   }
   /**
    * 静默全量刷新：后台重新拉取全量 SSE 数据并更新本地
@@ -1352,6 +1475,12 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    */
   async silentRefresh() {
     const t0 = performance.now();
+    const now = Date.now();
+    const elapsedSincePreload = now - this.lastPreloadCompletedAtMs;
+    const elapsedSinceFullFetch = now - this.lastServerFullFetchAtMs;
+    if (this.lastPreloadCompletedAtMs > 0 && elapsedSincePreload < PRODUCT_SILENT_REFRESH_MIN_INTERVAL_MS || this.lastServerFullFetchAtMs > 0 && elapsedSinceFullFetch < PRODUCT_SILENT_REFRESH_MIN_INTERVAL_MS) {
+      return this.store.list;
+    }
     this.logInfo("silentRefresh 开始");
     try {
       const products = await this.loadProductsByServer();

package/lib/solution/BaseSales/index.js

@@ -266,7 +266,16 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       product_variant_id: product.product_variant_id ?? authoritativeProduct.product_variant_id ?? 0,
       num: product.num ?? product.quantity ?? authoritativeProduct.num,
       quantity: product.quantity ?? product.num ?? authoritativeProduct.quantity,
-      product_option_item: product.product_option_item ?? authoritativeProduct.product_option_item,
+      product_sku: (() => {
+        const authoritativeSku = (0, import_utils.ensureProductSku)(authoritativeProduct);
+        const productSku = (0, import_utils.ensureProductSku)(product);
+        const hasProductSku = product.product_sku && typeof product.product_sku === "object";
+        return {
+          ...authoritativeSku,
+          ...productSku,
+          option: hasProductSku ? productSku.option : authoritativeSku.option
+        };
+      })(),
       product_bundle: productBundle,
       metadata: product.metadata ?? authoritativeProduct.metadata
     };
@@ -823,7 +832,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
           (sum, pd) => sum + Number(pd.amount || 0),
           0
         );
-        const optionSum = (0, import_utils.sumOptionUnitPrice)(product.product_option_item);
+        const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(product));
         const sourcePrice = ((_t = product.metadata) == null ? void 0 : _t.source_product_price) ?? (((_u = product.metadata) == null ? void 0 : _u.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
         const newSourceSellingPrice = new import_decimal.default(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
         const newMainSellingPrice = new import_decimal.default(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
@@ -1002,7 +1011,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
           (sum, pd) => sum + (pd.amount || 0),
           0
         );
-        const optionSum = (0, import_utils.sumOptionUnitPrice)(product.product_option_item);
+        const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(product));
         const sourcePrice = ((_h = product.metadata) == null ? void 0 : _h.source_product_price) ?? (((_i = product.metadata) == null ? void 0 : _i.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
         const newSourceSellingPrice = new import_decimal.default(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
         const newMainSellingPrice = new import_decimal.default(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
@@ -1455,8 +1464,8 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       if (identity.unique_identification_number !== void 0) {
         params.unique_identification_number = identity.unique_identification_number;
       }
-      if (identity.product_option_item !== void 0) {
-        params.product_option_item = identity.product_option_item;
+      if (identity.product_sku !== void 0) {
+        params.product_sku = identity.product_sku;
       }
       if (identity.product_bundle !== void 0)
         params.product_bundle = identity.product_bundle;

package/lib/solution/BaseSales/types.d.ts

@@ -41,16 +41,20 @@ export interface BaseSalesOrderProductIdentity {
     identity_key?: string;
     unique_identification_number?: string;
     /** 参与合并/匹配；与 remove 通配语义见 isSkuOnlyDeleteIdentity */
-    product_option_item?: any[];
+    product_sku?: BaseSalesProductSku;
     product_bundle?: any[];
 }
+export interface BaseSalesProductSku {
+    option: any[];
+    [key: string]: any;
+}
 export interface BaseSalesUpdateOrderProductQuantityParams extends BaseSalesOrderProductIdentity {
     num: number;
 }
 export interface BaseSalesOrderProduct extends BaseSalesOrderProductIdentity {
     order_detail_id: number | null;
     num: number;
-    product_option_item: any[];
+    product_sku: BaseSalesProductSku;
     /**
      * 券后 **行 composite 单价** = `metadata.main_product_selling_price`
      *   + Σ((bundle.bundle_selling_price ?? bundle.price) × (bundle.num ?? 1))
@@ -96,9 +100,8 @@ export interface BaseSalesOrderProduct extends BaseSalesOrderProductIdentity {
  * 出站 payload 版本的商品行。
  *
  * 与 tempOrder 内部 `BaseSalesOrderProduct` 的字段差异：
- * - `product_option_item[*]`：内部为 `{ option_group_item_id, option_group_id, num, price, ... }`，
- *   出站保留 `{ option_group_item_id, option_group_id, num }`
- *   （后端 checkout 协议；丢弃 `price` 等运行时辅助字段）。
+ * - `product_sku.option[*]`：内部直接维护统一 Sales 协议字段；
+ *   提交时仅规范 `add_price`，保留传入/恢复得到的展示字段。
  * - `product_bundle[*].option[*]`：同上重命名规则。
  *
  * 运行时（UI 显示、加购合并、指纹、持久化）与提交边界统一消费字段名

package/lib/solution/BaseSales/utils/cartPromotion.js

@@ -48,7 +48,7 @@ var import_utils = require("../../../modules/Order/utils");
 var import_utils2 = require("../../ScanOrder/utils");
 function getOrderProductBasePrice(product) {
   const metadata = (product == null ? void 0 : product.metadata) || {};
-  const optionSum = (0, import_utils.sumOptionUnitPrice)(product == null ? void 0 : product.product_option_item).toNumber();
+  const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(product)).toNumber();
   if (metadata.source_product_price !== void 0) {
     const v2 = Number(metadata.source_product_price);
     return Number.isFinite(v2) ? v2 : 0;
@@ -63,7 +63,7 @@ function getOrderProductBasePrice(product) {
 function getOrderProductOriginalPriceForPromotion(product) {
   var _a;
   const metadata = (product == null ? void 0 : product.metadata) || {};
-  const optionSum = (0, import_utils.sumOptionUnitPrice)(product == null ? void 0 : product.product_option_item).toNumber();
+  const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(product)).toNumber();
   if (metadata.main_product_original_price !== void 0 && metadata.main_product_original_price !== null && metadata.main_product_original_price !== "") {
     const v = Number(metadata.main_product_original_price) - optionSum;
     if (Number.isFinite(v) && v >= 0)
@@ -101,7 +101,7 @@ function updatePromotionDiscountList(item, promotionDiscount) {
 var X_ITEMS_FOR_Y_PRICE = "X_ITEMS_FOR_Y_PRICE";
 function applyPromoUnitPriceToLine(item, input) {
   const metadata = item.metadata || (item.metadata = {});
-  const optionSum = (0, import_utils.sumOptionUnitPrice)(item.product_option_item).toNumber();
+  const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(item)).toNumber();
   const promoUnitPrice = new import_decimal.default(Number(input.promoUnitPrice) || 0).toDecimalPlaces(2).toFixed(2);
   const mainSelling = new import_decimal.default(Number(promoUnitPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
   const catalogSource = new import_decimal.default(input.originalBasePrice).toDecimalPlaces(2).toFixed(2);
@@ -169,7 +169,7 @@ function mergeIdenticalPromotionCartLines(products) {
       continue;
     }
     const fingerprint = (0, import_utils2.buildProductLineFingerprint)(
-      line.product_option_item,
+      (0, import_utils.getProductSkuOptions)(line),
       line.product_bundle
     );
     const unitPrice = String(
@@ -340,7 +340,7 @@ function getProductBundleForEvaluator(product) {
 function buildConsolidateKeyForPromotion(item) {
   var _a;
   const fingerprint = (0, import_utils2.buildProductLineFingerprint)(
-    item.product_option_item,
+    (0, import_utils.getProductSkuOptions)(item),
     item.product_bundle
   );
   const bookingUid = (item == null ? void 0 : item.booking_uid) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.booking_uid);
@@ -795,7 +795,7 @@ function processCartPromotion(list, evaluator, options) {
           strategyTitle: (_b = priced.strategyMetadata) == null ? void 0 : _b.name
         });
       } else {
-        const optionSum = (0, import_utils.sumOptionUnitPrice)(newItem.product_option_item).toNumber();
+        const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(newItem)).toNumber();
         const sourceRestore = new import_decimal.default(originalBasePrice).toDecimalPlaces(2).toFixed(2);
         const mainRestore = new import_decimal.default(Number(sourceRestore) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
         metadata.source_product_price = sourceRestore;

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.d.ts

@@ -23,6 +23,7 @@ export interface BaseProductDetailPayload {
     option?: BaseProductDetailOptionItem[];
     options?: BaseProductDetailOptionItem[];
     product_option_item?: BaseProductDetailOptionItem[];
+    product_sku?: Record<string, any>;
     bundle?: BaseProductDetailBundleItem[];
     product_bundle?: BaseProductDetailBundleItem[];
     unique?: string;

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -54,13 +54,15 @@ function normalizeOptionItems(optionItems) {
   if (!Array.isArray(optionItems))
     return [];
   return optionItems.map((optionItem) => {
-    const optionGroupItemId = toNumber(optionItem == null ? void 0 : optionItem.id);
+    const optionGroupItemId = toNumber((optionItem == null ? void 0 : optionItem.option_group_item_id) ?? (optionItem == null ? void 0 : optionItem.id));
     const price = (optionItem == null ? void 0 : optionItem.price) ?? (optionItem == null ? void 0 : optionItem.add_price) ?? 0;
     return {
+      ...optionItem,
       option_group_item_id: optionGroupItemId,
       option_group_id: toNumber(optionItem == null ? void 0 : optionItem.option_group_id),
       num: toSafePositiveInt((optionItem == null ? void 0 : optionItem.num) ?? (optionItem == null ? void 0 : optionItem.quantity), 1),
-      price: toNumber(price, 0)
+      add_price: toNumber(price, 0),
+      price: void 0
     };
   });
 }
@@ -89,7 +91,7 @@ function findVariantById(origin, variantId) {
   return variants.find((variant) => Number(variant == null ? void 0 : variant.id) === variantId) || null;
 }
 function transformBaseProductToOrderProduct(params) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   const { payload, fallbackProductId = null } = params;
   if (!payload || typeof payload !== "object")
     return null;
@@ -118,8 +120,10 @@ function transformBaseProductToOrderProduct(params) {
     sourceProductPrice
   );
   const hasPriceOverride = payload.price_override !== void 0 && payload.price_override !== null && payload.price_override !== "";
-  const productOptionItem = normalizeOptionItems(
-    payload.option ?? payload.options ?? payload.product_option_item
+  const productOptionItem = (0, import_utils.normalizeProductSkuOptions)(
+    normalizeOptionItems(
+      ((_d = payload.product_sku) == null ? void 0 : _d.option) ?? payload.option ?? payload.options ?? payload.product_option_item
+    )
   );
   const productBundle = normalizeBundleItems(
     payload.bundle ?? payload.product_bundle,
@@ -129,19 +133,19 @@ function transformBaseProductToOrderProduct(params) {
   const resolvedQuantity = toSafePositiveInt(payload.quantity ?? payload.num, 1);
   const originTotal = (0, import_manualProductDiscount.resolveManualDiscountOriginTotal)({
     originTotal: payload.origin_total,
-    extendOriginTotal: (_d = payload._extend) == null ? void 0 : _d.origin_total,
-    originExtendOriginTotal: (_e = origin == null ? void 0 : origin._extend) == null ? void 0 : _e.origin_total,
-    sourceExtendOriginTotal: (_f = sourceProduct == null ? void 0 : sourceProduct._extend) == null ? void 0 : _f.origin_total,
+    extendOriginTotal: (_e = payload._extend) == null ? void 0 : _e.origin_total,
+    originExtendOriginTotal: (_f = origin == null ? void 0 : origin._extend) == null ? void 0 : _f.origin_total,
+    sourceExtendOriginTotal: (_g = sourceProduct == null ? void 0 : sourceProduct._extend) == null ? void 0 : _g.origin_total,
     catalogUnitPrice: (origin == null ? void 0 : origin.base_price) ?? (origin == null ? void 0 : origin.price) ?? (sourceProduct == null ? void 0 : sourceProduct.base_price) ?? (sourceProduct == null ? void 0 : sourceProduct.price),
     quantity: resolvedQuantity
   });
   const sellingTotal = Number(
-    payload.line_total ?? payload.total ?? ((_g = payload._extend) == null ? void 0 : _g.total) ?? lineCompositeTotal
+    payload.line_total ?? payload.total ?? ((_h = payload._extend) == null ? void 0 : _h.total) ?? lineCompositeTotal
   );
   const discountReason = (0, import_manualProductDiscount.resolveManualDiscountReasonFromSources)({
     discountReason: payload.discount_reason,
-    extendDiscountReason: (_h = payload._extend) == null ? void 0 : _h.discount_reason,
-    originExtendDiscountReason: (_i = origin == null ? void 0 : origin._extend) == null ? void 0 : _i.discount_reason
+    extendDiscountReason: (_i = payload._extend) == null ? void 0 : _i.discount_reason,
+    originExtendDiscountReason: (_j = origin == null ? void 0 : origin._extend) == null ? void 0 : _j.discount_reason
   });
   const lineOriginalPrice = hasPriceOverride && Number.isFinite(originTotal) ? toPriceString(originTotal) : lineCompositeTotal;
   const manualDiscountList = (0, import_manualProductDiscount.shouldBuildManualProductDiscount)({
@@ -155,8 +159,8 @@ function transformBaseProductToOrderProduct(params) {
       sellingTotal: Number.isFinite(sellingTotal) ? sellingTotal : Number(lineCompositeTotal),
       quantity: resolvedQuantity,
       message: discountReason,
-      discountway: (_j = payload._extend) == null ? void 0 : _j.discountway,
-      discount_per: (_k = payload._extend) == null ? void 0 : _k.discount_per
+      discountway: (_k = payload._extend) == null ? void 0 : _k.discountway,
+      discount_per: (_l = payload._extend) == null ? void 0 : _l.discount_per
     })
   ) : payload.discount_list || [];
   const optionSum = (0, import_utils.sumOptionUnitPrice)(productOptionItem).toNumber();
@@ -195,7 +199,10 @@ function transformBaseProductToOrderProduct(params) {
     product_variant_id: productVariantId,
     unique_identification_number: uniqueIdentificationNumber ? String(uniqueIdentificationNumber) : void 0,
     num: resolvedQuantity,
-    product_option_item: productOptionItem,
+    product_sku: {
+      ...payload.product_sku && typeof payload.product_sku === "object" ? payload.product_sku : {},
+      option: productOptionItem
+    },
     product_bundle: productBundle,
     discount_list: manualDiscountList,
     // 折后行价由 normalizeOrderProduct 按 main + bundle 合成；手动改价时 bundle 已为分摊后单价

package/lib/solution/BaseSales/utils.d.ts

@@ -12,7 +12,7 @@ export declare function buildProductLineFingerprint(productOptionItem?: unknown,
 export declare function getSafeProductNum(num?: number): number;
 /**
  * removeProductFromOrder 仅传 SKU 时的通配 identity（对象上未声明选项键）。
- * 与显式 `product_option_item: []` 区分：后者只匹配「无选项」行。
+ * 与显式 `product_sku: { option: [] }` 区分：后者只匹配「无选项」行。
  */
 export declare function isSkuOnlyDeleteIdentity(x: BaseSalesOrderProductIdentity): boolean;
 /**

package/lib/solution/BaseSales/utils.js

@@ -65,7 +65,7 @@ function buildProductLineFingerprint(productOptionItem, productBundle) {
     option_group_item_id: Number(item == null ? void 0 : item.option_group_item_id) || 0,
     option_group_id: Number(item == null ? void 0 : item.option_group_id) || 0,
     num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
-    price: String((item == null ? void 0 : item.price) ?? "")
+    price: String((item == null ? void 0 : item.add_price) ?? (item == null ? void 0 : item.price) ?? "")
   })).sort((p, q) => {
     if (p.option_group_item_id !== q.option_group_item_id) {
       return p.option_group_item_id - q.option_group_item_id;
@@ -100,10 +100,10 @@ function getSafeProductNum(num) {
 function isSkuOnlyDeleteIdentity(x) {
   if (x.identity_key)
     return false;
-  return !("product_option_item" in x) && !("product_bundle" in x);
+  return !("product_sku" in x) && !("product_bundle" in x);
 }
 function normalizeOrderProduct(product) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g;
   const metadata = { ...product.metadata || {} };
   const resolvedIdentityKey = ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ? String(product.metadata.unique_identification_number) : product.unique_identification_number && String(product.unique_identification_number).length > 0 ? String(product.unique_identification_number) : product.identity_key && String(product.identity_key).length > 0 ? String(product.identity_key) : (0, import_utils.createUuidV4)();
   metadata.unique_identification_number = resolvedIdentityKey;
@@ -142,12 +142,16 @@ function normalizeOrderProduct(product) {
     price_type: item.price_type ?? item.custom_price_type ?? "",
     price_type_ext: item.price_type_ext ?? item.custom_price_type_ext ?? ""
   }));
-  const normalizedOptions = product.product_option_item || [];
+  const normalizedOptions = (0, import_utils.normalizeProductSkuOptions)((_e = product.product_sku) == null ? void 0 : _e.option);
   const optionSum = (0, import_utils.sumOptionUnitPrice)(normalizedOptions);
+  const productSku = {
+    ...(0, import_utils.ensureProductSku)(product),
+    option: normalizedOptions
+  };
   const isV2 = metadata.price_schema_version === 2 || metadata.price_schema_version === "2";
   const variantId = Number(product.product_variant_id || 0);
-  const variantList = variantId ? (_e = metadata == null ? void 0 : metadata.origin) == null ? void 0 : _e.variant : null;
-  const variantPrice = Array.isArray(variantList) ? (_f = variantList.find((v) => Number(v == null ? void 0 : v.id) === variantId)) == null ? void 0 : _f.price : void 0;
+  const variantList = variantId ? (_f = metadata == null ? void 0 : metadata.origin) == null ? void 0 : _f.variant : null;
+  const variantPrice = Array.isArray(variantList) ? (_g = variantList.find((v) => Number(v == null ? void 0 : v.id) === variantId)) == null ? void 0 : _g.price : void 0;
   const resolvedSource = (() => {
     var _a2, _b2;
     if (metadata.source_product_price !== void 0) {
@@ -219,7 +223,7 @@ function normalizeOrderProduct(product) {
     product_id: product.product_id,
     num: getSafeProductNum(product.num),
     product_variant_id: product.product_variant_id,
-    product_option_item: normalizedOptions,
+    product_sku: productSku,
     selling_price: composedSellingPrice,
     original_price: finalOriginalPrice,
     tax_fee: product.tax_fee || "0.00",

package/lib/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 5 | 1 | 4 | 2 | 3 | 6;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.d.ts

@@ -279,7 +279,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态