@pisell/pisellos 2.3.62 → 2.3.64

package/lib/server/modules/products/index.d.ts

@@ -25,7 +25,6 @@ export declare class ProductsModule extends BaseModule implements Module {
     private quotationBridgeLoadedKey?;
     private quotationBridgeRefreshPromise?;
     private quotationBridgeRefreshKey?;
-    private quotationBridgeUpdatedCallback?;
     private quotationScheduleCache;
     private quotationScheduleCacheSource;
     private quotationScheduleCacheLoaded;
@@ -73,7 +72,6 @@ export declare class ProductsModule extends BaseModule implements Module {
         scheduleModule?: any;
         channel?: string;
         customer_id?: number | string;
-        onQuotationUpdated?: () => void;
     }): Promise<void>;
     /**
      * 刷新桥接器内的报价单列表。
@@ -183,9 +181,7 @@ export declare class ProductsModule extends BaseModule implements Module {
     /**
      * 通过 ProductDataSource SSE 加载完整商品列表
      */
-    loadProductsByServer(options?: {
-        trigger?: string;
-    }): Promise<any>;
+    loadProductsByServer(): Promise<any>;
     /**
      * 纯请求方法：通过 HTTP 接口获取商品列表（无副作用，不触发事件、不写 IndexDB）
      * @param params 查询参数
@@ -335,9 +331,7 @@ export declare class ProductsModule extends BaseModule implements Module {
      * 拿到完整数据后一次性替换 store，清除价格缓存，触发 onProductsSyncCompleted
      * @returns 刷新后的商品列表
      */
-    silentRefresh(options?: {
-        trigger?: string;
-    }): Promise<ProductData[]>;
+    silentRefresh(): Promise<ProductData[]>;
     /**
      * 销毁同步资源（取消 pubsub 订阅、清除定时器）
      */

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/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -230,6 +230,7 @@ function transformBaseProductToOrderProduct(params) {
     },
     product_bundle: productBundle,
     discount_list: manualDiscountList,
+    ...payload.bundle_edit !== void 0 ? { bundle_edit: payload.bundle_edit } : {},
     // 折后行价由 normalizeOrderProduct 按 main + bundle 合成；手动改价时 bundle 已为分摊后单价
     selling_price: lineCompositeTotal,
     original_price: lineOriginalPrice,

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

@@ -63,6 +63,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;

package/lib/solution/BookingTicket/index.js

@@ -396,7 +396,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     }
     return null;
   }
-  async resolveCustomerByDiscountCustomerId(customerId) {
+  async resolveCustomerById(customerId) {
     var _a;
     const localCustomers = this.store.customer.getCustomers();
     const localCustomer = this.findCustomerById(localCustomers, customerId);
@@ -410,7 +410,23 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       num: 1
     });
     const remoteCustomer = this.findCustomerById((result == null ? void 0 : result.list) || [], customerId) || ((_a = result == null ? void 0 : result.list) == null ? void 0 : _a[0]) || null;
-    return remoteCustomer ? this.normalizeCustomer(remoteCustomer) : null;
+    if (remoteCustomer) {
+      return this.normalizeCustomer(remoteCustomer);
+    }
+    try {
+      const detailCustomer = await this.store.customer.queryCustomerDetail(customerId);
+      return detailCustomer ? this.normalizeCustomer(detailCustomer) : null;
+    } catch (error) {
+      console.warn(
+        "[BookingTicket] resolveCustomerById detail request failed",
+        { customerId, error }
+      );
+      return null;
+    }
+  }
+  /** 兼容既有优惠码扫码逻辑。 */
+  resolveCustomerByDiscountCustomerId(customerId) {
+    return this.resolveCustomerById(customerId);
   }
   findCustomerById(customers = [], customerId) {
     return customers.find((customer) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.3.62",
+  "version": "2.3.64",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",