@pisell/pisellos 2.3.68 → 2.3.69

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;
+    var _a, _b, _c;
     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, _b, _c, _d, _e, _f;
+        var _a2, _b2, _c2, _d, _e, _f;
         const scheduleId = String(id);
         if (this.quotationScheduleCache.has(scheduleId)) {
           return this.quotationScheduleCache.get(scheduleId);
         }
         if (!this.quotationScheduleCacheLoaded) {
-          const scheduleList = ((_b = (_a2 = params.scheduleModule).getScheduleList) == null ? void 0 : _b.call(_a2)) || [];
+          const scheduleList = ((_b2 = (_a2 = params.scheduleModule).getScheduleList) == null ? void 0 : _b2.call(_a2)) || [];
           for (const schedule of scheduleList) {
             this.quotationScheduleCache.set(String(schedule.id), schedule);
           }
@@ -226,12 +226,21 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         if (this.quotationScheduleCache.has(scheduleId)) {
           return this.quotationScheduleCache.get(scheduleId);
         }
-        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])) || [];
+        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])) || [];
         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 });
   }
   /**
@@ -798,17 +807,20 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    */
   clearPriceCache() {
     this.productsPriceCache.clear();
+    this.quotationScheduleCache.clear();
+    this.quotationScheduleCacheLoaded = false;
     console.log("[ProductsModule] 🗑️ 商品价格缓存已清空");
   }
   /**
    * 通过 ProductDataSource SSE 加载完整商品列表
    */
-  async loadProductsByServer() {
+  async loadProductsByServer(options = {}) {
     if (!this.productDataSource) {
       this.logWarning("loadProductsByServer: ProductDataSource 不可用");
       return [];
     }
-    this.logInfo("开始通过 DataSource SSE 加载商品列表");
+    const trigger = options.trigger || "unknown";
+    this.logInfo("开始通过 DataSource SSE 加载商品列表", { trigger });
     const t0 = performance.now();
     try {
       const tSSE = performance.now();
@@ -816,6 +828,7 @@ 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`
       });
@@ -829,6 +842,7 @@ 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
       });
@@ -1019,7 +1033,9 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
   async refreshProducts() {
     const tTotal = performance.now();
     this.logInfo("refreshProducts 开始");
-    const products = await this.loadProductsByServer();
+    const products = await this.loadProductsByServer({
+      trigger: "product_sync"
+    });
     if (products && products.length > 0) {
       this.store.list = products;
       this.syncProductsMap();
@@ -1064,18 +1080,23 @@ 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);
-      (0, import_product.perfMark)("loadProductsFromIndexDB", performance.now() - t0, { count: (products == null ? void 0 : products.length) ?? 0 });
+      const durationMs = +(performance.now() - startedAt).toFixed(2);
+      (0, import_product.perfMark)("loadProductsFromIndexDB", durationMs, { count: (products == null ? void 0 : products.length) ?? 0 });
       this.logInfo("从 IndexDB 加载商品数据", {
-        productCount: (products == null ? void 0 : products.length) ?? 0
+        productCount: (products == null ? void 0 : products.length) ?? 0,
+        durationMs
       });
       return products || [];
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
       console.error("[Products] 从 IndexDB 读取数据失败:", error);
-      this.logError("从 IndexDB 读取数据失败", { error: errorMessage });
+      this.logError("从 IndexDB 读取数据失败", {
+        durationMs: +(performance.now() - startedAt).toFixed(2),
+        error: errorMessage
+      });
       return [];
     }
   }
@@ -1103,22 +1124,54 @@ 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 () => {
-        this.logInfo("replaceProductsSnapshotInIndexDB 开始", { source, productCount: products.length });
-        const t0 = performance.now();
-        await this.dbManager.clear(INDEXDB_STORE_NAME);
+        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);
+        }
         if (products.length > 0) {
-          await this.dbManager.bulkUpdate(INDEXDB_STORE_NAME, products);
+          const writeStartedAt = performance.now();
+          try {
+            await this.dbManager.bulkUpdate(INDEXDB_STORE_NAME, products);
+          } finally {
+            writeDurationMs = +(performance.now() - writeStartedAt).toFixed(2);
+          }
         }
-        (0, import_product.perfMark)("replaceProductsSnapshotInIndexDB", performance.now() - t0, { count: products.length });
-        this.logInfo("replaceProductsSnapshotInIndexDB 完成", { source, productCount: products.length });
+        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)
+        });
       });
     } 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
       });
     }
@@ -1200,6 +1253,7 @@ 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"
@@ -1215,7 +1269,9 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       this.logWarning("从 IndexDB 加载数据失败，准备从服务器加载", { error: errorMessage });
     }
     const tServer = performance.now();
-    const products = await this.loadProductsByServer();
+    const products = await this.loadProductsByServer({
+      trigger: "preload"
+    });
     (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;
@@ -1228,6 +1284,7 @@ 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"
@@ -1592,17 +1649,31 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    * 拿到完整数据后一次性替换 store，清除价格缓存，触发 onProductsSyncCompleted
    * @returns 刷新后的商品列表
    */
-  async silentRefresh() {
+  async silentRefresh(options = {}) {
     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) {
+    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
+      });
       return this.store.list;
     }
-    this.logInfo("silentRefresh 开始");
+    this.logInfo("silentRefresh 开始", {
+      trigger,
+      elapsedSincePreloadMs,
+      elapsedSinceFullFetchMs,
+      productCount: this.store.list.length
+    });
     try {
-      const products = await this.loadProductsByServer();
+      const products = await this.loadProductsByServer({ trigger });
       if (products && products.length > 0) {
         this.store.list = products;
         this.syncProductsMap();
@@ -1610,6 +1681,7 @@ 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`
         });
@@ -1621,6 +1693,7 @@ 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,13 +88,18 @@ 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);
-    } else {
+      void this.setupResourceSync().catch((error) => {
+        this.logError("后台初始化资源同步失败", error);
+      });
+      return;
+    }
+    await this.setupResourceSync();
+    if (this.store.list.length === 0) {
       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/index.d.ts

@@ -119,6 +119,15 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * application_code 仅作为接口兼容字段，不能替代 channel / business_code。
      */
     private getPriceQueryStrategyContext;
+    /**
+     * 子类可在商品重报价前准备客户维度的策略上下文，例如等待 Wallet/优惠资产加载。
+     */
+    protected prepareProductPriceQueryContext(_customerId?: number | string): Promise<void>;
+    /**
+     * 默认保留 BaseSales 的 legacy quotation 行为；已由 /product/query 统一完成
+     * 智能定价与报价合并的业务可在子类中覆盖，避免二次覆盖权威价格。
+     */
+    protected preferAuthoritativeProductQueryPrice(): boolean;
     private getPriceQuerySchedule;
     private loadProductsForPriceQuery;
     private loadProductForPriceQuery;
@@ -436,6 +445,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     transformBaseProductToOrderProduct(params: TransformBaseProductToOrderProductParams): import("./utils/transformBaseProductToOrderProduct").BaseProductOrderProductInput | null;
     calculateProductBookingPrice(params: BaseSalesCalculateProductBookingPriceParams): Promise<BaseSalesProductBookingPriceResult>;
     getQuotationCustomerScopeInfo(): BaseSalesQuotationCustomerScopeInfo;
+    private hasSmartPricingStrategies;
     shouldRecalculateProductBookingPricesForContextChange(params: BaseSalesPriceRecalculationContextChange): boolean;
     calculateProductBookingPrices(paramsList: BaseSalesCalculateProductBookingPriceParams[]): Promise<BaseSalesProductBookingPriceResult[]>;
     addProductToOrder(product: Partial<BaseSalesOrderProduct> & BaseSalesOrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions): Promise<import("../../modules/Order/types").OrderProduct[]>;

package/lib/solution/BaseSales/index.js

@@ -734,8 +734,24 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (businessCode !== void 0 && businessCode !== null && String(businessCode).trim() !== "") {
       strategyContext.business_code = String(businessCode).trim();
     }
+    const availableWalletIds = this.getAvailableWalletIds();
+    if (availableWalletIds.length > 0 && !Array.isArray(strategyContext.available_wallet_ids)) {
+      strategyContext.available_wallet_ids = availableWalletIds;
+    }
     return strategyContext;
   }
+  /**
+   * 子类可在商品重报价前准备客户维度的策略上下文，例如等待 Wallet/优惠资产加载。
+   */
+  async prepareProductPriceQueryContext(_customerId) {
+  }
+  /**
+   * 默认保留 BaseSales 的 legacy quotation 行为；已由 /product/query 统一完成
+   * 智能定价与报价合并的业务可在子类中覆盖，避免二次覆盖权威价格。
+   */
+  preferAuthoritativeProductQueryPrice() {
+    return false;
+  }
   getPriceQuerySchedule(params) {
     const booking = params.booking || {};
     if (typeof booking.start_date === "string" && booking.start_date.trim()) {
@@ -3129,6 +3145,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   async calculateProductBookingPrice(params) {
     const quotation = this.store.quotation;
     const customerId = params.customer_id ?? this.getCurrentOrderCustomerId();
+    await this.prepareProductPriceQueryContext(customerId);
     const authoritativeProduct = await this.loadProductForPriceQuery(params, customerId);
     const product = this.mergeProductForPriceQuery(params.product, authoritativeProduct);
     await this.loadQuotationForPriceQuery({
@@ -3141,7 +3158,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       product,
       fallback_price: authoritativeProduct ? void 0 : params.fallback_price,
       customer_id: customerId,
-      quotation
+      quotation: authoritativeProduct && this.preferAuthoritativeProductQueryPrice() ? void 0 : quotation
     });
   }
   getQuotationCustomerScopeInfo() {
@@ -3178,11 +3195,23 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       quotationScopes
     };
   }
+  hasSmartPricingStrategies() {
+    var _a, _b;
+    const evaluator = (_b = (_a = this.core) == null ? void 0 : _a.context) == null ? void 0 : _b.dataVariantEvaluator;
+    if (!evaluator || typeof evaluator.getStrategyConfigs !== "function") {
+      return false;
+    }
+    const configs = evaluator.getStrategyConfigs();
+    return Array.isArray(configs) && configs.length > 0;
+  }
   shouldRecalculateProductBookingPricesForContextChange(params) {
     const scopeInfo = this.getQuotationCustomerScopeInfo();
     const scopedCustomerIds = new Set(scopeInfo.customerIds.map((id) => String(id)));
     const previousCustomerId = this.normalizePriceContextCustomerId(params.previousCustomerId);
     const nextCustomerId = this.normalizePriceContextCustomerId(params.nextCustomerId);
+    if (this.hasSmartPricingStrategies()) {
+      return previousCustomerId !== nextCustomerId;
+    }
     const previousInScope = previousCustomerId ? scopedCustomerIds.has(previousCustomerId) : false;
     const nextInScope = nextCustomerId ? scopedCustomerIds.has(nextCustomerId) : false;
     let shouldRecalculate = false;
@@ -3203,6 +3232,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       return [];
     const quotation = this.store.quotation;
     const customerId = ((_a = paramsList[0]) == null ? void 0 : _a.customer_id) ?? this.getCurrentOrderCustomerId();
+    await this.prepareProductPriceQueryContext(customerId);
     const productMapsByGroup = /* @__PURE__ */ new Map();
     const groups = /* @__PURE__ */ new Map();
     paramsList.forEach((params) => {
@@ -3260,7 +3290,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         product,
         fallback_price: authoritativeProduct ? void 0 : params.fallback_price,
         customer_id: customerId,
-        quotation
+        quotation: authoritativeProduct && this.preferAuthoritativeProductQueryPrice() ? void 0 : quotation
       });
     });
   }

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

@@ -287,6 +287,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private buildOrderCustomerPayload;
     protected refreshDiscountConfigAfterOrderCustomerChange(customerId: number | null): Promise<void>;
     protected waitForOrderCustomerPromotionRefresh(): Promise<void>;
+    protected prepareProductPriceQueryContext(customerId?: number | string): Promise<void>;
+    protected preferAuthoritativeProductQueryPrice(): boolean;
     /**
      * 获取客户分页信息
      * @returns 分页信息
@@ -330,7 +332,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 客户状态

package/lib/solution/BookingTicket/index.js

@@ -1036,6 +1036,18 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
   waitForOrderCustomerPromotionRefresh() {
     return this.orderCustomerPromotionRefreshInFlight || Promise.resolve();
   }
+  async prepareProductPriceQueryContext(customerId) {
+    await Promise.resolve();
+    const normalizedCustomerId = Number(customerId || 0);
+    const refreshTask = this.orderCustomerDiscountRefreshInFlight;
+    const shouldWait = normalizedCustomerId > 1 && this.orderCustomerDiscountRefreshCustomerId === normalizedCustomerId && Boolean(refreshTask);
+    if (shouldWait && refreshTask) {
+      await refreshTask;
+    }
+  }
+  preferAuthoritativeProductQueryPrice() {
+    return true;
+  }
   /**
    * 获取客户分页信息
    * @returns 分页信息

package/package.json

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