@pisell/pisellos 2.2.291 → 2.2.293

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

@@ -30,7 +30,7 @@ class ProductsModule extends _BaseModule.BaseModule {
   logger; // LoggerManager 实例
   otherParams = {};
 
-  // 商品价格缓存：Map<日期, 应用了价格的商品列表>
+  // 商品格式化缓存：Map<查询上下文 key, 已应用价格与多语言的商品列表>
   productsPriceCache = new Map();
 
   // 缓存配置
@@ -50,6 +50,7 @@ class ProductsModule extends _BaseModule.BaseModule {
   quotationBridgeLoadedKey = '';
   quotationBridgeRefreshPromise;
   quotationBridgeRefreshKey;
+  quotationBridgeUpdatedCallback;
   quotationScheduleCache = new Map();
   quotationScheduleCacheSource = null;
   quotationScheduleCacheLoaded = false;
@@ -252,6 +253,14 @@ class ProductsModule extends _BaseModule.BaseModule {
         return schedules[0];
       });
     }
+    if (params.onQuotationUpdated) {
+      this.quotationBridgeUpdatedCallback = params.onQuotationUpdated;
+    }
+    this.quotationPriceBridge.setQuotationListUpdatedListener?.(() => {
+      this.quotationBridgeLoadedKey = this.getQuotationBridgeScopeKey();
+      this.clearPriceCache();
+      this.quotationBridgeUpdatedCallback?.();
+    });
     await this.refreshQuotationPriceBridge({
       customer_id: params.customer_id
     });
@@ -385,8 +394,8 @@ class ProductsModule extends _BaseModule.BaseModule {
 
   /**
    * 获取应用了价格的商品列表（带缓存）
-   * 使用日期作为缓存 key，同一天的商品价格会被缓存
-   * 缓存的是已经应用了价格的完整商品列表，避免重复转换
+   * 使用时间、客户、策略、商品范围和语言作为缓存 key
+   * 缓存的是已经应用了价格与多语言的完整商品列表，避免重复转换
    * @param schedule_date 日期
    * @param extraContext 额外的上下文数据（可选，由 Server 层传入）
    * @param options 可选参数
@@ -591,9 +600,10 @@ class ProductsModule extends _BaseModule.BaseModule {
   }
   getProductsPriceCacheKey(schedule_date, extraContext, productIds) {
     const datetime = extraContext?.schedule_datetime || schedule_date;
+    const locale = extraContext?.locale ?? this.core?.context?.locale ?? '';
     const productScope = productIds ? `:products:${productIds.join(',')}` : '';
     const strategyScope = this.stringifyStable(extraContext?.strategy_context || {});
-    return `${datetime}:customer:${extraContext?.customer_id ?? ''}:strategy:${strategyScope}${productScope}`;
+    return `${datetime}:locale:${locale}:customer:${extraContext?.customer_id ?? ''}` + `:strategy:${strategyScope}${productScope}`;
   }
 
   /**
@@ -822,17 +832,22 @@ class ProductsModule extends _BaseModule.BaseModule {
    */
   clearPriceCache() {
     this.productsPriceCache.clear();
+    this.quotationScheduleCache.clear();
+    this.quotationScheduleCacheLoaded = false;
   }
 
   /**
    * 通过 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();
@@ -844,6 +859,7 @@ class ProductsModule extends _BaseModule.BaseModule {
         count: list.length
       });
       this.logInfo('通过 DataSource SSE 加载商品列表成功', {
+        trigger,
         productCount: list.length,
         duration: `${Math.round(performance.now() - t0)}ms`
       });
@@ -859,6 +875,7 @@ class ProductsModule extends _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
       });
@@ -1044,7 +1061,9 @@ class ProductsModule extends _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) {
       // 服务器返回的数据已经是全新的，无需 cloneDeep
       this.store.list = products;
@@ -1098,20 +1117,23 @@ class ProductsModule extends _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, _product.perfMark)('loadProductsFromIndexDB', performance.now() - t0, {
+      const durationMs = +(performance.now() - startedAt).toFixed(2);
+      (0, _product.perfMark)('loadProductsFromIndexDB', durationMs, {
         count: products?.length ?? 0
       });
       this.logInfo('从 IndexDB 加载商品数据', {
-        productCount: products?.length ?? 0
+        productCount: 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 读取数据失败', {
+        durationMs: +(performance.now() - startedAt).toFixed(2),
         error: errorMessage
       });
       return [];
@@ -1143,23 +1165,45 @@ class ProductsModule extends _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
+          productCount: products.length,
+          queueWaitMs
         });
-        const t0 = performance.now();
-        await this.dbManager.clear(INDEXDB_STORE_NAME);
+        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, _product.perfMark)('replaceProductsSnapshotInIndexDB', performance.now() - t0, {
+        const executeDurationMs = +(performance.now() - operationStartedAt).toFixed(2);
+        (0, _product.perfMark)('replaceProductsSnapshotInIndexDB', executeDurationMs, {
           count: products.length
         });
         this.logInfo('replaceProductsSnapshotInIndexDB 完成', {
           source,
-          productCount: products.length
+          productCount: products.length,
+          queueWaitMs,
+          clearDurationMs,
+          writeDurationMs,
+          executeDurationMs,
+          totalDurationMs: +(performance.now() - enqueuedAt).toFixed(2)
         });
       });
     } catch (error) {
@@ -1167,6 +1211,10 @@ class ProductsModule extends _BaseModule.BaseModule {
       this.logError('全量保存商品到 IndexDB 失败', {
         source,
         productCount: products.length,
+        queueWaitMs,
+        clearDurationMs,
+        writeDurationMs,
+        totalDurationMs: +(performance.now() - enqueuedAt).toFixed(2),
         error: errorMessage
       });
     }
@@ -1261,6 +1309,7 @@ class ProductsModule extends _BaseModule.BaseModule {
           source: 'IndexDB'
         });
         this.logInfo('预加载完成（从 IndexDB）', {
+          trigger: 'preload',
           productCount: cachedData.length,
           duration: `${Math.round(performance.now() - tTotal)}ms`,
           source: 'IndexDB'
@@ -1277,7 +1326,9 @@ class ProductsModule extends _BaseModule.BaseModule {
       });
     }
     const tServer = performance.now();
-    const products = await this.loadProductsByServer();
+    const products = await this.loadProductsByServer({
+      trigger: 'preload'
+    });
     (0, _product.perfMark)('preload.loadFromServer', performance.now() - tServer, {
       count: products?.length ?? 0
     });
@@ -1295,6 +1346,7 @@ class ProductsModule extends _BaseModule.BaseModule {
         source: 'Server'
       });
       this.logInfo('预加载完成（从服务器）', {
+        trigger: 'preload',
         productCount: products.length,
         duration: `${Math.round(performance.now() - tTotal)}ms`,
         source: 'Server'
@@ -1708,17 +1760,33 @@ class ProductsModule extends _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();
@@ -1726,6 +1794,7 @@ class ProductsModule extends _BaseModule.BaseModule {
         this.core.effects.emit(_types.ProductsHooks.onProductsChanged, this.store.list);
         await this.core.effects.emit(_types.ProductsHooks.onProductsSyncCompleted, null);
         this.logInfo('silentRefresh 完成', {
+          trigger,
           productCount: products.length,
           duration: `${Math.round(performance.now() - t0)}ms`
         });
@@ -1739,6 +1808,7 @@ class ProductsModule extends _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

@@ -95,13 +95,23 @@ class ResourceModule extends _BaseModule.BaseModule {
     }
   }
   async preload() {
-    await this.setupResourceSync();
     const cachedResources = await this.loadResourcesFromSQLite();
     if (cachedResources.length > 0) {
       this.store.list = (0, _lodashEs.cloneDeep)(cachedResources).map(item => this.normalizeResource(item));
       this.syncResourcesMap();
       await this.safeEmit(_types.ResourceHooks.onResourcesChanged, this.store.list);
-    } else {
+
+      // 二次启动优先使用 SQLite。pubsub 注册及远端校准继续在后台执行，
+      // setupResourceSync 完成后会合并最新数据并回写 SQLite。
+      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, _lodashEs.cloneDeep)(resources).map(item => this.normalizeResource(item));

package/lib/server/utils/product.d.ts

@@ -11,7 +11,7 @@ export declare function perfMark(label: string, durationMs: number, meta?: Recor
 export declare function applyPriceDataToProducts(products: ProductData[], priceData: LoadProductsPriceData[]): ProductData[];
 export declare const getIsSessionProduct: (product: ProductData) => boolean;
 /**
- * 根据 locale 将商品的 i18n 字段覆盖到对应原始字段
+ * 根据 locale 格式化商品、分类、规格及套餐文案，缺少对应语言时回退 original。
  */
 export declare function applyI18nToProducts(products: ProductData[], locale?: string): ProductData[];
 /**

package/lib/server/utils/product.js

@@ -194,9 +194,139 @@ const I18N_FIELD_MAP = {
   description_i18n: 'description',
   cover_i18n: 'cover'
 };
+/**
+ * 按当前语言读取 i18n 文案；当前语言为空时回退到商家原始文案。
+ */
+function resolveI18nValue(i18nDict, locale) {
+  if (!i18nDict) return undefined;
+  return i18nDict[locale] || i18nDict.original || undefined;
+}
+
+/**
+ * 递归格式化商品分类名称，同时保留未变化节点的引用。
+ */
+function applyI18nToCategory(category, locale) {
+  if (!category || typeof category !== 'object') return category;
+  const localizedName = resolveI18nValue(category.name_i18n, locale);
+  const localizedParent = applyI18nToCategory(category.parent_category, locale);
+  const nameChanged = localizedName !== undefined && localizedName !== category.name;
+  const parentChanged = localizedParent !== category.parent_category;
+  if (!nameChanged && !parentChanged) return category;
+  return {
+    ...category,
+    ...(nameChanged ? {
+      name: localizedName
+    } : {}),
+    ...(parentChanged ? {
+      parent_category: localizedParent
+    } : {})
+  };
+}
+function applyI18nToCategories(categories, locale) {
+  if (!Array.isArray(categories)) return categories;
+  let changed = false;
+  const localizedCategories = categories.map(category => {
+    const localizedCategory = applyI18nToCategory(category, locale);
+    if (localizedCategory !== category) changed = true;
+    return localizedCategory;
+  });
+  return changed ? localizedCategories : categories;
+}
+function applyI18nToNamedItems(items, locale) {
+  if (!Array.isArray(items)) return items;
+  let changed = false;
+  const localizedItems = items.map(item => {
+    if (!item || typeof item !== 'object') return item;
+    const localizedName = resolveI18nValue(item.name_i18n, locale);
+    if (localizedName === undefined || localizedName === item.name) return item;
+    changed = true;
+    return {
+      ...item,
+      name: localizedName
+    };
+  });
+  return changed ? localizedItems : items;
+}
+
+/**
+ * 格式化选项组、规格组及其子项名称，同时保留未变化节点的引用。
+ */
+function applyI18nToNamedGroups(groups, itemKey, locale) {
+  if (!Array.isArray(groups)) return groups;
+  let changed = false;
+  const localizedGroups = groups.map(group => {
+    if (!group || typeof group !== 'object') return group;
+    const localizedName = resolveI18nValue(group.name_i18n, locale);
+    const localizedItems = applyI18nToNamedItems(group[itemKey], locale);
+    const nameChanged = localizedName !== undefined && localizedName !== group.name;
+    const itemsChanged = localizedItems !== group[itemKey];
+    if (!nameChanged && !itemsChanged) return group;
+    changed = true;
+    return {
+      ...group,
+      ...(nameChanged ? {
+        name: localizedName
+      } : {}),
+      ...(itemsChanged ? {
+        [itemKey]: localizedItems
+      } : {})
+    };
+  });
+  return changed ? localizedGroups : groups;
+}
+function applyI18nToBundleItems(items, locale) {
+  if (!Array.isArray(items)) return items;
+  let changed = false;
+  const localizedItems = items.map(item => {
+    if (!item || typeof item !== 'object') return item;
+    const localizedTitle = resolveI18nValue(item.trans_title, locale);
+    const localizedOptionGroups = applyI18nToNamedGroups(item.option_group, 'option_item', locale);
+    const titleChanged = localizedTitle !== undefined && localizedTitle !== item.title;
+    const optionGroupsChanged = localizedOptionGroups !== item.option_group;
+    if (!titleChanged && !optionGroupsChanged) return item;
+    changed = true;
+    return {
+      ...item,
+      ...(titleChanged ? {
+        title: localizedTitle
+      } : {}),
+      ...(optionGroupsChanged ? {
+        option_group: localizedOptionGroups
+      } : {})
+    };
+  });
+  return changed ? localizedItems : items;
+}
 
 /**
- * 根据 locale 将商品的 i18n 字段覆盖到对应原始字段
+ * 格式化套餐组名称、套餐子商品标题及子商品选项，同时保留未变化节点的引用。
+ */
+function applyI18nToBundleGroups(groups, locale) {
+  if (!Array.isArray(groups)) return groups;
+  let changed = false;
+  const localizedGroups = groups.map(group => {
+    if (!group || typeof group !== 'object') return group;
+    const localizedName = resolveI18nValue(group.name_i18n, locale);
+    const localizedItems = applyI18nToBundleItems(group.bundle_item, locale);
+    const nameChanged = localizedName !== undefined && localizedName !== group.name;
+    const itemsChanged = localizedItems !== group.bundle_item;
+    if (!nameChanged && !itemsChanged) return group;
+    changed = true;
+    return {
+      ...group,
+      ...(nameChanged ? {
+        name: localizedName
+      } : {}),
+      ...(itemsChanged ? {
+        bundle_item: localizedItems
+      } : {})
+    };
+  });
+  return changed ? localizedGroups : groups;
+}
+
+/**
+ * 根据 locale 格式化商品、分类、规格及套餐文案，缺少对应语言时回退 original。
  */
 function applyI18nToProducts(products, locale) {
   if (!locale) return products;
@@ -205,14 +335,44 @@ function applyI18nToProducts(products, locale) {
     for (const [i18nKey, originalKey] of Object.entries(I18N_FIELD_MAP)) {
       const i18nDict = product[i18nKey];
       if (!i18nDict) continue;
-      const localizedValue = i18nDict[locale];
-      if (localizedValue) {
+      const localizedValue = resolveI18nValue(i18nDict, locale);
+      if (localizedValue !== undefined && localizedValue !== product[originalKey]) {
         if (!patched) patched = {
           ...product
         };
         patched[originalKey] = localizedValue;
       }
     }
+    for (const categoryKey of ['category', 'categories']) {
+      const categories = product[categoryKey];
+      const localizedCategories = applyI18nToCategories(categories, locale);
+      if (localizedCategories !== categories) {
+        if (!patched) patched = {
+          ...product
+        };
+        patched[categoryKey] = localizedCategories;
+      }
+    }
+    for (const [groupKey, itemKey] of [['option_group', 'option_item'], ['variant_group', 'variant_item']]) {
+      const groups = product[groupKey];
+      const localizedGroups = applyI18nToNamedGroups(groups, itemKey, locale);
+      if (localizedGroups !== groups) {
+        if (!patched) patched = {
+          ...product
+        };
+        patched[groupKey] = localizedGroups;
+      }
+    }
+    for (const bundleGroupKey of ['bundle_group', 'bundle_groups']) {
+      const groups = product[bundleGroupKey];
+      const localizedGroups = applyI18nToBundleGroups(groups, locale);
+      if (localizedGroups !== groups) {
+        if (!patched) patched = {
+          ...product
+        };
+        patched[bundleGroupKey] = localizedGroups;
+      }
+    }
     return patched ?? product;
   });
 }

package/lib/server/utils/small-ticket.d.ts

@@ -35,6 +35,8 @@ export interface SmallTicketProduct {
     original_price: string;
     total_original_price: string;
     extension_list: any[];
+    product_uid?: string | number;
+    booking_uid?: string | number;
     options?: Array<{
         name: string;
         num?: number;
@@ -44,6 +46,11 @@ export interface SmallTicketProduct {
     variant?: string;
     combinations?: any[];
 }
+export interface SmallTicketBookingSnapshot extends Record<string, any> {
+    product_uid?: string | number;
+    booking_uid?: string | number;
+}
+export type SmallTicketAppointment = SmallTicketItem[] | SmallTicketBookingSnapshot[];
 export interface SmallTicketLocaleData {
     base_data: Record<string, any>;
     products: SmallTicketProduct[];
@@ -52,7 +59,7 @@ export interface SmallTicketLocaleData {
         countFee: Record<string, any>;
     };
     customer: SmallTicketItem[];
-    appointment: SmallTicketItem[];
+    appointment: SmallTicketAppointment;
     delivery?: SmallTicketItem[];
     resources: Array<{
         id: string | number;
@@ -61,6 +68,7 @@ export interface SmallTicketLocaleData {
         form_title: string;
     }>;
     payment_data: SmallTicketItem[][];
+    wallets: SmallTicketItem[][];
     tickets: any[];
     source_shop: any[];
     refund_data: any[];