@pisell/pisellos 2.3.69 → 2.3.71

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/index.js

@@ -1494,13 +1494,13 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     const hasDraftProduct = params.products.some((product) => !this.isPersistedOrderProduct(product));
     if (hasDraftProduct)
       return false;
-    const hasSelectedDiscount = params.currentDiscountList.some(
-      (discount) => discount.isSelected || discount.isEditMode || discount.isManualSelect
+    const hasRuntimeDiscountSelection = params.currentDiscountList.some(
+      (discount) => !discount.isEditMode && (discount.isSelected || discount.isManualSelect)
     );
-    if (hasSelectedDiscount)
+    if (hasRuntimeDiscountSelection)
       return false;
     return !params.nextDiscountList.some(
-      (discount) => discount.isSelected || discount.isEditMode || discount.isManualSelect
+      (discount) => !discount.isEditMode && (discount.isSelected || discount.isManualSelect)
     );
   }
   mergeCurrentDiscountSelectionState(discountList, currentDiscountList) {

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

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

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

@@ -3,7 +3,7 @@ import { BookingTicketCartView, BookingTicketProductCatalogView, BookingTicketSt
 import type { ProductData } from '../../modules';
 import type { OpenDataConfig } from '../../modules/OpenData';
 import { type BookingContextConfig, type BookingContextDateInput, type BookingContextResource, type BookingContextResourceMap, type BookingContextState, type InitBookingContextParams, type LoadBookingConfigParams, type LoadBookingResourcesParams, type ResourceError, type BookingCalcContext } from '../../modules/BookingContext';
-import type { OrderCustomerView } from '../../modules/Order/types';
+import type { OrderCustomerView, OrderCustomerChangePayload } from '../../modules/Order/types';
 import { BaseSalesImpl } from '../BaseSales';
 import type { BaseSalesScanCodeResult } from '../BaseSales/types';
 import type { ISalesDetail } from '../BaseSales/utils/parseSalesResponse';
@@ -260,7 +260,9 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 同时透传 OrderModule 内部 emit 的 `order:onOrderCustomerChange` 之外，
      * 在 BookingTicket 命名空间也 emit 一次，方便上层统一从 Solution 订阅。
      */
-    setOrderCustomer(customer: ICustomer | null): void;
+    setOrderCustomer(customer: ICustomer | null, options?: {
+        source?: OrderCustomerChangePayload['source'];
+    }): void;
     /**
      * 读取 tempOrder 上的下单客户协议字段；customer_id 缺失时返回 null。
      */
@@ -451,19 +453,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
-        action: "reloadCatalog";
-    } | {
-        action: "add";
-        cacheItem: any;
-    } | {
-        action: "requiresDetail";
-        payload: AddProductRequiresDetailPayload;
-    } | {
-        action: "requiresBookingEdit";
-        cacheItem: any;
-        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
-    };
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/lib/solution/BookingTicket/index.js

@@ -343,7 +343,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
         country_calling_code: selectedCustomer == null ? void 0 : selectedCustomer.country_calling_code
       };
       customerModule.setSelectedCustomer(customer);
-      this.setOrderCustomer(customer);
+      this.setOrderCustomer(customer, { source: "detailHydrate" });
     }
     return sales;
   }
@@ -392,7 +392,11 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
   }
   getDiscountCustomerId(discounts) {
     for (const item of discounts) {
-      const topLevelId = Number(item.customer_id);
+      const rawCustomerId = item.customer_id;
+      if (!rawCustomerId || (0, import_cartView.isWalkInCustomer)({ id: rawCustomerId })) {
+        continue;
+      }
+      const topLevelId = Number(rawCustomerId);
       if (Number.isFinite(topLevelId) && topLevelId > 0) {
         return topLevelId;
       }
@@ -891,7 +895,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
    * 同时透传 OrderModule 内部 emit 的 `order:onOrderCustomerChange` 之外，
    * 在 BookingTicket 命名空间也 emit 一次，方便上层统一从 Solution 订阅。
    */
-  setOrderCustomer(customer) {
+  setOrderCustomer(customer, options) {
     var _a;
     if (!customer) {
       this.clearOrderCustomer();
@@ -911,12 +915,18 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       const snapshotReplenished = !snapshotBeforeSet && Boolean(snapshotAfterOrderSet);
       if (snapshotReplenished) {
         const next2 = this.buildOrderCustomerPayload();
-        this.core.effects.emit(`${this.name}:onOrderCustomerChange`, next2);
+        this.core.effects.emit(
+          `${this.name}:onOrderCustomerChange`,
+          next2 && (options == null ? void 0 : options.source) ? { ...next2, source: options.source } : next2
+        );
       }
       return;
     }
     const next = this.buildOrderCustomerPayload();
-    this.core.effects.emit(`${this.name}:onOrderCustomerChange`, next);
+    this.core.effects.emit(
+      `${this.name}:onOrderCustomerChange`,
+      next && (options == null ? void 0 : options.source) ? { ...next, source: options.source } : next
+    );
     this.refreshDiscountConfigAfterOrderCustomerChange(patch.customer_id);
     const promotionRefreshTask = this.store.order.applyPromotion().then(() => void 0);
     this.orderCustomerPromotionRefreshInFlight = promotionRefreshTask;

package/package.json

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