@pisell/pisellos 2.3.67 → 2.3.68

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

@@ -192,7 +192,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    * Server 层负责传入完整 schedule 模块，Products 只负责把报价单计算结果转成价格响应形状。
    */
   async setupQuotationPriceBridge(params) {
-    var _a, _b, _c;
+    var _a;
     if (!this.core) {
       this.logWarning("setupQuotationPriceBridge: core 尚未初始化");
       return;
@@ -211,13 +211,13 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         this.quotationScheduleCacheSource = params.scheduleModule;
       }
       this.quotationPriceBridge.setScheduleResolver((id) => {
-        var _a2, _b2, _c2, _d, _e, _f;
+        var _a2, _b, _c, _d, _e, _f;
         const scheduleId = String(id);
         if (this.quotationScheduleCache.has(scheduleId)) {
           return this.quotationScheduleCache.get(scheduleId);
         }
         if (!this.quotationScheduleCacheLoaded) {
-          const scheduleList = ((_b2 = (_a2 = params.scheduleModule).getScheduleList) == null ? void 0 : _b2.call(_a2)) || [];
+          const scheduleList = ((_b = (_a2 = params.scheduleModule).getScheduleList) == null ? void 0 : _b.call(_a2)) || [];
           for (const schedule of scheduleList) {
             this.quotationScheduleCache.set(String(schedule.id), schedule);
           }
@@ -226,21 +226,12 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         if (this.quotationScheduleCache.has(scheduleId)) {
           return this.quotationScheduleCache.get(scheduleId);
         }
-        const schedules = ((_d = (_c2 = params.scheduleModule).getScheduleListByIds) == null ? void 0 : _d.call(_c2, [id])) || ((_f = (_e = params.scheduleModule).getScheduleByIds) == null ? void 0 : _f.call(_e, [id])) || [];
+        const schedules = ((_d = (_c = params.scheduleModule).getScheduleListByIds) == null ? void 0 : _d.call(_c, [id])) || ((_f = (_e = params.scheduleModule).getScheduleByIds) == null ? void 0 : _f.call(_e, [id])) || [];
         if (schedules[0])
           this.quotationScheduleCache.set(scheduleId, schedules[0]);
         return schedules[0];
       });
     }
-    if (params.onQuotationUpdated) {
-      this.quotationBridgeUpdatedCallback = params.onQuotationUpdated;
-    }
-    (_c = (_b = this.quotationPriceBridge).setQuotationListUpdatedListener) == null ? void 0 : _c.call(_b, () => {
-      var _a2;
-      this.quotationBridgeLoadedKey = this.getQuotationBridgeScopeKey();
-      this.clearPriceCache();
-      (_a2 = this.quotationBridgeUpdatedCallback) == null ? void 0 : _a2.call(this);
-    });
     await this.refreshQuotationPriceBridge({ customer_id: params.customer_id });
   }
   /**
@@ -807,20 +798,17 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    */
   clearPriceCache() {
     this.productsPriceCache.clear();
-    this.quotationScheduleCache.clear();
-    this.quotationScheduleCacheLoaded = false;
     console.log("[ProductsModule] 🗑️ 商品价格缓存已清空");
   }
   /**
    * 通过 ProductDataSource SSE 加载完整商品列表
    */
-  async loadProductsByServer(options = {}) {
+  async loadProductsByServer() {
     if (!this.productDataSource) {
       this.logWarning("loadProductsByServer: ProductDataSource 不可用");
       return [];
     }
-    const trigger = options.trigger || "unknown";
-    this.logInfo("开始通过 DataSource SSE 加载商品列表", { trigger });
+    this.logInfo("开始通过 DataSource SSE 加载商品列表");
     const t0 = performance.now();
     try {
       const tSSE = performance.now();
@@ -828,7 +816,6 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       const list = productList || [];
       (0, import_product.perfMark)("loadProductsByServer.SSE", performance.now() - tSSE, { count: list.length });
       this.logInfo("通过 DataSource SSE 加载商品列表成功", {
-        trigger,
         productCount: list.length,
         duration: `${Math.round(performance.now() - t0)}ms`
       });
@@ -842,7 +829,6 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       const errorMessage = error instanceof Error ? error.message : String(error);
       console.error("[Products] 加载商品数据失败:", error);
       this.logError("通过 DataSource SSE 加载商品列表失败", {
-        trigger,
         duration: `${duration}ms`,
         error: errorMessage
       });
@@ -1033,9 +1019,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
   async refreshProducts() {
     const tTotal = performance.now();
     this.logInfo("refreshProducts 开始");
-    const products = await this.loadProductsByServer({
-      trigger: "product_sync"
-    });
+    const products = await this.loadProductsByServer();
     if (products && products.length > 0) {
       this.store.list = products;
       this.syncProductsMap();
@@ -1080,23 +1064,18 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       this.logWarning("loadProductsFromIndexDB: dbManager 不可用");
       return [];
     }
-    const startedAt = performance.now();
     try {
+      const t0 = performance.now();
       const products = await this.dbManager.getAll(INDEXDB_STORE_NAME);
-      const durationMs = +(performance.now() - startedAt).toFixed(2);
-      (0, import_product.perfMark)("loadProductsFromIndexDB", durationMs, { count: (products == null ? void 0 : products.length) ?? 0 });
+      (0, import_product.perfMark)("loadProductsFromIndexDB", performance.now() - t0, { count: (products == null ? void 0 : products.length) ?? 0 });
       this.logInfo("从 IndexDB 加载商品数据", {
-        productCount: (products == null ? void 0 : products.length) ?? 0,
-        durationMs
+        productCount: (products == null ? void 0 : products.length) ?? 0
       });
       return products || [];
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
       console.error("[Products] 从 IndexDB 读取数据失败:", error);
-      this.logError("从 IndexDB 读取数据失败", {
-        durationMs: +(performance.now() - startedAt).toFixed(2),
-        error: errorMessage
-      });
+      this.logError("从 IndexDB 读取数据失败", { error: errorMessage });
       return [];
     }
   }
@@ -1124,54 +1103,22 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       this.logWarning("replaceProductsSnapshotInIndexDB: dbManager 不可用");
       return;
     }
-    const enqueuedAt = performance.now();
-    let queueWaitMs = 0;
-    let clearDurationMs = 0;
-    let writeDurationMs = 0;
     try {
       await this.runInProductIndexDBSaveQueue(async () => {
-        const operationStartedAt = performance.now();
-        queueWaitMs = +(operationStartedAt - enqueuedAt).toFixed(2);
-        this.logInfo("replaceProductsSnapshotInIndexDB 开始", {
-          source,
-          productCount: products.length,
-          queueWaitMs
-        });
-        const clearStartedAt = performance.now();
-        try {
-          await this.dbManager.clear(INDEXDB_STORE_NAME);
-        } finally {
-          clearDurationMs = +(performance.now() - clearStartedAt).toFixed(2);
-        }
+        this.logInfo("replaceProductsSnapshotInIndexDB 开始", { source, productCount: products.length });
+        const t0 = performance.now();
+        await this.dbManager.clear(INDEXDB_STORE_NAME);
         if (products.length > 0) {
-          const writeStartedAt = performance.now();
-          try {
-            await this.dbManager.bulkUpdate(INDEXDB_STORE_NAME, products);
-          } finally {
-            writeDurationMs = +(performance.now() - writeStartedAt).toFixed(2);
-          }
+          await this.dbManager.bulkUpdate(INDEXDB_STORE_NAME, products);
         }
-        const executeDurationMs = +(performance.now() - operationStartedAt).toFixed(2);
-        (0, import_product.perfMark)("replaceProductsSnapshotInIndexDB", executeDurationMs, { count: products.length });
-        this.logInfo("replaceProductsSnapshotInIndexDB 完成", {
-          source,
-          productCount: products.length,
-          queueWaitMs,
-          clearDurationMs,
-          writeDurationMs,
-          executeDurationMs,
-          totalDurationMs: +(performance.now() - enqueuedAt).toFixed(2)
-        });
+        (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);
       this.logError("全量保存商品到 IndexDB 失败", {
         source,
         productCount: products.length,
-        queueWaitMs,
-        clearDurationMs,
-        writeDurationMs,
-        totalDurationMs: +(performance.now() - enqueuedAt).toFixed(2),
         error: errorMessage
       });
     }
@@ -1253,7 +1200,6 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
           source: "IndexDB"
         });
         this.logInfo("预加载完成（从 IndexDB）", {
-          trigger: "preload",
           productCount: cachedData.length,
           duration: `${Math.round(performance.now() - tTotal)}ms`,
           source: "IndexDB"
@@ -1269,9 +1215,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       this.logWarning("从 IndexDB 加载数据失败，准备从服务器加载", { error: errorMessage });
     }
     const tServer = performance.now();
-    const products = await this.loadProductsByServer({
-      trigger: "preload"
-    });
+    const products = await this.loadProductsByServer();
     (0, import_product.perfMark)("preload.loadFromServer", performance.now() - tServer, { count: (products == null ? void 0 : products.length) ?? 0 });
     if (products && products.length > 0) {
       this.store.list = products;
@@ -1284,7 +1228,6 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         source: "Server"
       });
       this.logInfo("预加载完成（从服务器）", {
-        trigger: "preload",
         productCount: products.length,
         duration: `${Math.round(performance.now() - tTotal)}ms`,
         source: "Server"
@@ -1649,31 +1592,17 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    * 拿到完整数据后一次性替换 store，清除价格缓存，触发 onProductsSyncCompleted
    * @returns 刷新后的商品列表
    */
-  async silentRefresh(options = {}) {
+  async silentRefresh() {
     const t0 = performance.now();
     const now = Date.now();
-    const trigger = options.trigger || "background";
-    const elapsedSincePreloadMs = now - this.lastPreloadCompletedAtMs;
-    const elapsedSinceFullFetchMs = now - this.lastServerFullFetchAtMs;
-    if (this.lastPreloadCompletedAtMs > 0 && elapsedSincePreloadMs < PRODUCT_SILENT_REFRESH_MIN_INTERVAL_MS || this.lastServerFullFetchAtMs > 0 && elapsedSinceFullFetchMs < PRODUCT_SILENT_REFRESH_MIN_INTERVAL_MS) {
-      this.logInfo("silentRefresh 跳过全量 SSE", {
-        trigger,
-        reason: "within_min_interval",
-        minIntervalMs: PRODUCT_SILENT_REFRESH_MIN_INTERVAL_MS,
-        elapsedSincePreloadMs,
-        elapsedSinceFullFetchMs,
-        productCount: this.store.list.length
-      });
+    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 开始", {
-      trigger,
-      elapsedSincePreloadMs,
-      elapsedSinceFullFetchMs,
-      productCount: this.store.list.length
-    });
+    this.logInfo("silentRefresh 开始");
     try {
-      const products = await this.loadProductsByServer({ trigger });
+      const products = await this.loadProductsByServer();
       if (products && products.length > 0) {
         this.store.list = products;
         this.syncProductsMap();
@@ -1681,7 +1610,6 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         this.core.effects.emit(import_types.ProductsHooks.onProductsChanged, this.store.list);
         await this.core.effects.emit(import_types.ProductsHooks.onProductsSyncCompleted, null);
         this.logInfo("silentRefresh 完成", {
-          trigger,
           productCount: products.length,
           duration: `${Math.round(performance.now() - t0)}ms`
         });
@@ -1693,7 +1621,6 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
       this.logError("silentRefresh 失败", {
-        trigger,
         duration: `${Math.round(performance.now() - t0)}ms`,
         error: errorMessage
       });

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

@@ -88,18 +88,13 @@ var ResourceModule = class extends import_BaseModule.BaseModule {
     }
   }
   async preload() {
+    await this.setupResourceSync();
     const cachedResources = await this.loadResourcesFromSQLite();
     if (cachedResources.length > 0) {
       this.store.list = (0, import_lodash_es.cloneDeep)(cachedResources).map((item) => this.normalizeResource(item));
       this.syncResourcesMap();
       await this.safeEmit(import_types.ResourceHooks.onResourcesChanged, this.store.list);
-      void this.setupResourceSync().catch((error) => {
-        this.logError("后台初始化资源同步失败", error);
-      });
-      return;
-    }
-    await this.setupResourceSync();
-    if (this.store.list.length === 0) {
+    } else {
       const resources = await this.loadResourcesByServer();
       if (resources.length > 0) {
         this.store.list = (0, import_lodash_es.cloneDeep)(resources).map((item) => this.normalizeResource(item));

package/lib/server/utils/small-ticket.js

@@ -562,7 +562,7 @@ function buildOptionTitleSuffix(options) {
 function formatBundlePrice(bundle, currencySymbol) {
   const value = bundle.bundle_selling_price ?? bundle.bundle_sum_price ?? bundle.price ?? 0;
   const amount = new import_decimal.default(toMoneyNumber(value));
-  const isNegative = bundle.price_type === "markdown" || bundle.price_type === "markup" && bundle.price_type_ext === "product_price";
+  const isNegative = bundle.price_type === "markdown";
   if (isNegative)
     return `-${currencySymbol}${amount.abs().toFixed(2)}`;
   return formatMoney(amount, currencySymbol);

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

@@ -141,7 +141,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * const params = this.buildSubModuleOtherParams();
      * this.core.registerModule(orderModule, { otherParams: params });
      */
-    protected buildSubModuleOtherParams(): Record<string, any>;
+    protected isSessionStoragePersistEnabled(): boolean;
+    protected shouldUseSessionStorageForSubModule(_moduleName?: string): boolean;
+    protected buildSubModuleOtherParams(moduleName?: string): Record<string, any>;
     /**
      * 将父级 otherParams 的变更显式同步给已注册的子模块。
      *

package/lib/solution/BaseSales/index.js

@@ -591,7 +591,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       });
     });
   }
-  async hydrateLatestLoadedSalesDetail(record, loadSequence) {
+  async hydrateLatestLoadedSalesDetail(record, loadSequence, hydrateSource) {
     let hydratedSales = null;
     let skippedBeforeHydrate = false;
     const hydrateTask = async () => {
@@ -601,9 +601,10 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       }
       if (!this.store.order)
         throw new Error("order 模块未初始化");
-      const sales = await this.store.order.hydrateTempOrderFromRecord(record, {
-        recalcOnHydrate: false
-      });
+      const sales = await this.store.order.hydrateTempOrderFromRecord(
+        record,
+        hydrateSource === "sessionStorage" ? { recalcOnHydrate: true, source: "sessionStorage" } : { recalcOnHydrate: false }
+      );
       hydratedSales = sales;
       if (loadSequence !== this.salesDetailLoadSequence)
         return;
@@ -927,12 +928,18 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
    * const params = this.buildSubModuleOtherParams();
    * this.core.registerModule(orderModule, { otherParams: params });
    */
-  buildSubModuleOtherParams() {
+  isSessionStoragePersistEnabled() {
+    return Boolean(this.cacheId);
+  }
+  shouldUseSessionStorageForSubModule(_moduleName) {
+    return this.isSessionStoragePersistEnabled();
+  }
+  buildSubModuleOtherParams(moduleName) {
     return {
       ...this.otherParams,
       salesSummaryModuleName: `${this.name}_salesSummary`,
       fatherModule: this.name,
-      openCache: this.cacheId ? true : false,
+      openCache: this.shouldUseSessionStorageForSubModule(moduleName),
       cacheId: this.cacheId
     };
   }
@@ -943,7 +950,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
    * await this.syncOtherParamsToSubModules({ channel: 'pos' });
    */
   async syncOtherParamsToSubModules(changedParams, { cover = false } = {}) {
-    const nextSubModuleOtherParams = this.buildSubModuleOtherParams();
     await Promise.all(
       Object.entries(this.store).map(async ([moduleName, subModule]) => {
         if (this.reusedSharedSubModuleNames.has(moduleName)) {
@@ -953,6 +959,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         if (!targetModule || typeof targetModule.updateOtherParams !== "function") {
           return;
         }
+        const nextSubModuleOtherParams = this.buildSubModuleOtherParams(moduleName);
         await targetModule.updateOtherParams(nextSubModuleOtherParams, {
           changedParams,
           cover
@@ -965,14 +972,16 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
    * sessionStorage 损坏时静默忽略，按空状态注册。
    */
   readSessionCacheData() {
-    if (!this.cacheId || !this.window)
+    const cacheId = this.cacheId;
+    if (!cacheId || !this.isSessionStoragePersistEnabled() || !this.window) {
       return {};
+    }
     try {
       const sessionData = this.window.sessionStorage.getItem(this.name);
       if (!sessionData)
         return {};
       const data = JSON.parse(sessionData);
-      return data && data[this.cacheId] || {};
+      return data && data[cacheId] || {};
     } catch {
       return {};
     }
@@ -1074,9 +1083,9 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       const hooks = this.getSubModuleHooks(step);
       this.store[step] = targetModule;
       this.core.registerModule(targetModule, {
-        initialState: (targetCacheData == null ? void 0 : targetCacheData[targetModule.name]) || {},
+        initialState: this.shouldUseSessionStorageForSubModule(step) ? (targetCacheData == null ? void 0 : targetCacheData[targetModule.name]) || {} : {},
         ...hooks ? { hooks } : {},
-        otherParams: this.buildSubModuleOtherParams()
+        otherParams: this.buildSubModuleOtherParams(step)
       });
     });
     if (this.store.schedule && !this.isScheduleListLoaded(this.store.schedule)) {
@@ -1143,17 +1152,21 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         const message = loadedRecord && (loadedRecord.message || loadedRecord.msg) || `加载销售详情失败: ${lookup}`;
         throw new Error(message);
       }
-      const remoteRecord = filterPendingPaymentsFromLoadedSalesDetail(
-        preloadedSalesDetail ?? loadedRecord.data
-      );
+      const loadedSalesDetail = preloadedSalesDetail ?? loadedRecord.data;
+      const shouldFilterPendingPayments = params.hydrateSource !== "sessionStorage";
+      const remoteRecord = shouldFilterPendingPayments ? filterPendingPaymentsFromLoadedSalesDetail(loadedSalesDetail) : loadedSalesDetail;
       const currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
       const mergedRecord = params.merge ? mergeSalesDetailRecordWithTempOrder(
         currentTempOrder,
         remoteRecord,
         "preserve-local"
       ) : remoteRecord;
-      const record = filterPendingPaymentsFromLoadedSalesDetail(mergedRecord);
-      return await this.hydrateLatestLoadedSalesDetail(record, loadSequence);
+      const record = shouldFilterPendingPayments ? filterPendingPaymentsFromLoadedSalesDetail(mergedRecord) : mergedRecord;
+      return await this.hydrateLatestLoadedSalesDetail(
+        record,
+        loadSequence,
+        params.hydrateSource
+      );
     } finally {
       this.salesDetailLoadInFlightCount = Math.max(
         0,

package/lib/solution/BaseSales/utils.js

@@ -60,33 +60,44 @@ function createEmptySummary() {
   };
 }
 function buildProductLineFingerprint(productOptionItem, productBundle) {
-  const optArr = Array.isArray(productOptionItem) ? productOptionItem : [];
-  const normalizedOpts = optArr.map((item) => ({
-    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.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;
-    }
-    if (p.option_group_id !== q.option_group_id)
-      return p.option_group_id - q.option_group_id;
-    if (p.num !== q.num)
-      return p.num - q.num;
-    return p.price.localeCompare(q.price);
-  });
+  const normalizeOptions = (options) => {
+    const optionArr = Array.isArray(options) ? options : [];
+    return optionArr.map((item) => ({
+      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.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;
+      }
+      if (p.option_group_id !== q.option_group_id) {
+        return p.option_group_id - q.option_group_id;
+      }
+      if (p.num !== q.num)
+        return p.num - q.num;
+      return p.price.localeCompare(q.price);
+    });
+  };
+  const normalizedOpts = normalizeOptions(productOptionItem);
   const bundleArr = Array.isArray(productBundle) ? productBundle : [];
   const normalizedBundles = bundleArr.map((item) => ({
     bundle_id: Number((item == null ? void 0 : item.bundle_id) ?? (item == null ? void 0 : item.id) ?? 0) || 0,
     product_id: Number(item == null ? void 0 : item.product_id) || 0,
-    num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1
+    product_variant_id: Number((item == null ? void 0 : item.bundle_variant_id) ?? (item == null ? void 0 : item.product_variant_id)) || 0,
+    num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+    option: normalizeOptions(item == null ? void 0 : item.option)
   })).sort((p, q) => {
     if (p.bundle_id !== q.bundle_id)
       return p.bundle_id - q.bundle_id;
     if (p.product_id !== q.product_id)
       return p.product_id - q.product_id;
-    return p.num - q.num;
+    if (p.product_variant_id !== q.product_variant_id) {
+      return p.product_variant_id - q.product_variant_id;
+    }
+    if (p.num !== q.num)
+      return p.num - q.num;
+    return JSON.stringify(p.option).localeCompare(JSON.stringify(q.option));
   });
   return JSON.stringify([normalizedOpts, normalizedBundles]);
 }

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

@@ -29,6 +29,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private addTimeProductsCatalog;
     private orderCustomerDiscountRefreshInFlight;
     private orderCustomerDiscountRefreshCustomerId;
+    private orderCustomerPromotionRefreshInFlight;
     private loadOpenDataConfigInFlight;
     /**
      * 在 BaseSales 默认模块清单（products/order/salesSummary/schedule）基础上追加 customer + bookingContext。
@@ -63,6 +64,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
     private hydrateOrderCustomerFromScanDiscounts;
     private getDiscountCustomerId;
+    resolveCustomerById(customerId: string | number): Promise<ICustomer | null>;
+    /** 兼容既有优惠码扫码逻辑。 */
     private resolveCustomerByDiscountCustomerId;
     private findCustomerById;
     private normalizeCustomer;
@@ -282,7 +285,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     restoreOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
     /** 内部：基于 OrderModule 当前状态构造一份 OrderCustomerChangePayload。 */
     private buildOrderCustomerPayload;
-    private refreshDiscountConfigAfterOrderCustomerChange;
+    protected refreshDiscountConfigAfterOrderCustomerChange(customerId: number | null): Promise<void>;
+    protected waitForOrderCustomerPromotionRefresh(): Promise<void>;
     /**
      * 获取客户分页信息
      * @returns 分页信息
@@ -326,7 +330,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态