@pisell/pisellos 2.3.67 → 2.3.68

package/dist/solution/UnifiedBookingSales/types.d.ts

@@ -11,6 +11,13 @@ export declare enum UnifiedBookingSalesHooks {
 export interface UnifiedBookingSalesState extends BookingTicketState {
     resourcePlanner: ResourcePlannerModule;
 }
+export interface UnifiedBookingSalesOtherParams extends Record<string, any> {
+    /**
+     * Persist the active order workspace in sessionStorage, partitioned by cacheId.
+     * Disabled by default and ignored when cacheId is missing.
+     */
+    enableSessionStoragePersist?: boolean;
+}
 /** Explicit OpenData target used by page-level UnifiedBookingSales skins. */
 export interface UnifiedBookingSalesLoadOpenDataParams {
     businessCode: string;

package/lib/core/index.d.ts

@@ -12,15 +12,8 @@ declare class PisellOSCore implements PisellCore {
     context: BusinessContext;
     server: any;
     serverOptions?: ServerOptions;
-    private serverModulePromise?;
     constructor(options?: PisellOSOptions);
     private initialize;
-    /**
-     * 仅预加载 Server 模块代码，不创建实例、不注册模块、不请求业务数据。
-     * 导入失败会清空 Promise，正式 initializeServer 时仍可重新尝试。
-     */
-    preloadServerModule(): Promise<void>;
-    private loadServerModule;
     /**
      * 初始化 Server（公开方法，需要外部显式调用并等待）
      * Server 配置从构造函数传入的 options.server 中获取

package/lib/core/index.js

@@ -36,6 +36,7 @@ module.exports = __toCommonJS(core_exports);
 var import_createStore = require("../store/createStore");
 var import_effects = require("../effects");
 var PisellOSCore = class {
+  // 保存 Server 配置
   constructor(options) {
     this.plugins = /* @__PURE__ */ new Map();
     this.modules = /* @__PURE__ */ new Map();
@@ -49,7 +50,6 @@ var PisellOSCore = class {
       this.serverOptions = options.server;
     }
     this.initialize(options);
-    console.log("constructor123456");
   }
   initialize(options) {
     if (options == null ? void 0 : options.plugins) {
@@ -64,24 +64,6 @@ var PisellOSCore = class {
     }
     this.log("[PisellOS] 核心初始化完成");
   }
-  /**
-   * 仅预加载 Server 模块代码，不创建实例、不注册模块、不请求业务数据。
-   * 导入失败会清空 Promise，正式 initializeServer 时仍可重新尝试。
-   */
-  async preloadServerModule() {
-    if (this.server || !this.serverOptions)
-      return;
-    await this.loadServerModule();
-  }
-  loadServerModule() {
-    if (!this.serverModulePromise) {
-      this.serverModulePromise = import("../server").catch((error) => {
-        this.serverModulePromise = void 0;
-        throw error;
-      });
-    }
-    return this.serverModulePromise;
-  }
   /**
    * 初始化 Server（公开方法，需要外部显式调用并等待）
    * Server 配置从构造函数传入的 options.server 中获取
@@ -96,7 +78,7 @@ var PisellOSCore = class {
       return;
     }
     try {
-      const ServerModule = await this.loadServerModule();
+      const ServerModule = await import("../server");
       const Server = ServerModule.default;
       this.server = new Server(this);
       this.log("Server 实例已创建");

package/lib/model/strategy/adapter/walletPass/evaluator.js

@@ -415,7 +415,6 @@ var WalletPassEvaluator = class {
    * 计算适用商品的总金额和数量
    */
   calculateApplicableProducts(products, applicableProductIds, deductTaxAndFee) {
-    console.log(products, "products1234");
     let total = 0;
     let count = 0;
     if (applicableProductIds !== null && applicableProductIds.length === 0) {

package/lib/model/strategy/adapter/walletPass/utils.js

@@ -166,7 +166,6 @@ var getApplicableProducts = (voucher, productsData) => {
   return productsData.filter((p) => applicableProductIds.includes(p.product_id));
 };
 function processVouchers(applicableVouchers, orderTotalAmount, products) {
-  console.log(products, "products123");
   const productsCopy = expandProductsWithBundleItems(products, true);
   let remainingOrderAmount = new import_decimal.default(orderTotalAmount);
   const getItemPassUsage = (usageMap, walletPassProductId, lineKey) => {

package/lib/modules/BaseModule.d.ts

@@ -8,6 +8,7 @@ export declare class BaseModule {
     protected core: PisellCore;
     constructor(name?: string, version?: string);
     destroy(): void;
+    private isRecord;
     checkSaveCache({ cacheId, fatherModule, store, cacheKey, }: {
         cacheId: string | undefined;
         fatherModule: string | undefined;

package/lib/modules/BaseModule.js

@@ -34,6 +34,9 @@ var BaseModule = class {
     this.core.effects.offByModuleDestroy(this.name);
     this.core.unregisterModule(this);
   }
+  isRecord(value) {
+    return !!value && typeof value === "object" && !Array.isArray(value);
+  }
   // 提供统一的缓存 module 里的数据的方法
   checkSaveCache({
     cacheId,
@@ -41,45 +44,29 @@ var BaseModule = class {
     store,
     cacheKey
   }) {
-    const window = this.core.getPlugin("window");
-    if (cacheId) {
+    if (!cacheId)
+      return;
+    try {
+      const window = this.core.getPlugin("window");
+      const sessionStorage = window == null ? void 0 : window.sessionStorage;
+      if (!sessionStorage)
+        return;
+      const storageKey = fatherModule || cacheId;
+      const rawCacheData = sessionStorage.getItem(storageKey);
+      const parsedCacheData = rawCacheData ? JSON.parse(rawCacheData) : {};
+      if (!this.isRecord(parsedCacheData))
+        return;
+      const cacheBucket = fatherModule ? this.isRecord(parsedCacheData[cacheId]) ? parsedCacheData[cacheId] : {} : parsedCacheData;
+      const moduleBucket = this.isRecord(cacheBucket[this.name]) ? cacheBucket[this.name] : {};
+      cacheKey.forEach((key) => {
+        moduleBucket[key] = store == null ? void 0 : store[key];
+      });
+      cacheBucket[this.name] = moduleBucket;
       if (fatherModule) {
-        const currentCacheData = window.sessionStorage.getItem(fatherModule);
-        let currentCacheDataObj = JSON.parse(currentCacheData || "{}");
-        if (!currentCacheData || !currentCacheDataObj[cacheId]) {
-          currentCacheDataObj = {
-            [cacheId]: {
-              [this.name]: {}
-            }
-          };
-        }
-        if (!currentCacheDataObj[cacheId][this.name]) {
-          currentCacheDataObj[cacheId][this.name] = {};
-        }
-        cacheKey.forEach((key) => {
-          currentCacheDataObj[cacheId][this.name][key] = store == null ? void 0 : store[key];
-        });
-        window.sessionStorage.setItem(
-          fatherModule,
-          JSON.stringify(currentCacheDataObj)
-        );
-      } else {
-        let currentCacheData = window.sessionStorage.getItem(cacheId);
-        let currentCacheDataObj = JSON.parse(currentCacheData || "{}");
-        if (!currentCacheDataObj) {
-          currentCacheDataObj = {};
-        }
-        if (!currentCacheDataObj[this.name]) {
-          currentCacheDataObj[this.name] = {};
-        }
-        cacheKey.forEach((key) => {
-          currentCacheDataObj[this.name][key] = store[key];
-        });
-        window.sessionStorage.setItem(
-          cacheId,
-          JSON.stringify(currentCacheDataObj)
-        );
+        parsedCacheData[cacheId] = cacheBucket;
       }
+      sessionStorage.setItem(storageKey, JSON.stringify(parsedCacheData));
+    } catch {
     }
   }
   effectsOn(eventType, callback) {

package/lib/modules/Customer/index.d.ts

@@ -44,6 +44,10 @@ export declare class CustomerModule extends BaseModule implements Module, Custom
      * 用于按 ID 补齐客户等内部查询，避免把临时的 num/searchParams 污染到滚动列表。
      */
     queryCustomerList(params?: ShopGetCustomerListParams): Promise<ICustomerListResponse>;
+    /**
+     * 查询单个客户详情，不写入 customerList / pagination 状态。
+     */
+    queryCustomerDetail(id: string | number): Promise<ShopCustomer | null>;
     /**
      * 获取客户列表
      * @param params 查询参数

package/lib/modules/Customer/index.js

@@ -201,6 +201,17 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       pageSize
     };
   }
+  /**
+   * 查询单个客户详情，不写入 customerList / pagination 状态。
+   */
+  async queryCustomerDetail(id) {
+    var _a;
+    const result = await this.request.get(`/customer/info/${id}`, {
+      with_trashed: 1
+    });
+    const customer = ((_a = result == null ? void 0 : result.data) == null ? void 0 : _a.customer) || (result == null ? void 0 : result.data) || (result == null ? void 0 : result.customer) || null;
+    return customer && typeof customer === "object" ? customer : null;
+  }
   /**
    * 获取客户列表
    * @param params 查询参数

package/lib/modules/Customer/types.d.ts

@@ -112,6 +112,8 @@ export interface CustomerModuleAPI {
     getCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
     /** 查询客户列表但不更新列表分页状态 */
     queryCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
+    /** 查询单个客户详情但不修改客户列表状态 */
+    queryCustomerDetail: (id: string | number) => Promise<ShopCustomer | null>;
     /** 设置客户列表 */
     setCustomerList: (customers: ShopCustomer[], total?: number) => void;
     /** 设置当前选择的客户 */

package/lib/modules/Order/index.d.ts

@@ -16,6 +16,10 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private window;
     private appPlugin;
     private cacheId;
+    private fatherModule;
+    private openCache;
+    private sessionStoragePersistEnabled;
+    private sessionStorageRestoreRecord;
     private salesSummaryModuleName;
     private rulesHooksOverride?;
     private moduleHooksOverride?;
@@ -46,6 +50,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     static populateSavedAmounts(productList: Array<Record<string, any>>, discountList: Array<Record<string, any>>): void;
     private applyProductDiscountPrices;
     constructor(name?: string, version?: string);
+    private syncSessionStorageOptions;
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     destroy(): Promise<void>;
     /**
@@ -137,7 +142,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     }): void;
     /**
      * 控制 IndexedDB 草稿（saveDraft）是否写入。
-     * localStorage 版 tempOrder 持久化已废弃，此方法仅影响 saveDraft。
+     * 此开关仅影响 saveDraft；可选 sessionStorage 会话恢复由
+     * enableSessionStoragePersist 独立控制。
      *
      * @example
      * order.setEnableTempOrderPersist(false); // BigSale 弹窗：跳过 ~1s 的 dbUpdate
@@ -145,8 +151,19 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     setEnableTempOrderPersist(enabled: boolean): void;
     /** 是否允许 saveDraft 写入 IndexedDB 草稿。 */
     isTempOrderPersistEnabled(): boolean;
-    /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化；草稿保存请使用 IndexedDB saveDraft。 */
+    /**
+     * 在 UnifiedBookingSales 显式开启会话恢复时，将完整 tempOrder 写入
+     * sessionStorage 的 cacheId 分桶。写入失败由 BaseModule 静默降级。
+     */
     persistTempOrder(): void;
+    /**
+     * 终止当前模块实例的 sessionStorage 订单恢复会话。
+     *
+     * 支付跳转等终态场景需要同时删除当前 cacheId 的 tempOrder 快照，并关闭
+     * 本实例后续异步任务的再次写入；新模块实例初始化时会按 otherParams 重新启用。
+     */
+    clearSessionStoragePersistedTempOrder(): void;
+    consumeSessionStorageRestore(): Record<string, any> | null;
     notifyTempOrderChanged(): void;
     private createDefaultTempOrderInstance;
     private createExternalSaleNumber;
@@ -178,6 +195,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         orderExpectedAmount: string;
     };
     private calculateDepositPaidAmount;
+    private hasPaidNormalPayment;
     private resolveNextOrderPaymentType;
     private getPaymentNumberAppData;
     private getPaymentNumberDevicePrefixSync;
@@ -227,6 +245,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private sanitizeOrderProductForTempOrder;
     private sanitizeTempOrderProducts;
     private ensureExtend;
+    private repairDuplicateProductLineIdentities;
     private captureProductRuntime;
     private createLinkedProductAndBooking;
     /**
@@ -543,6 +562,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      */
     hydrateTempOrderFromRecord(record: Record<string, any>, options?: {
         recalcOnHydrate?: boolean;
+        source?: 'salesDetail' | 'sessionStorage';
     }): Promise<OrderTempOrder>;
     /**
      * 兼容后端详情将 holder 放在 metadata.holder 的历史形态，统一补到运行时展示路径。