@pisell/pisellos 2.2.96 → 2.2.98

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

@@ -344,7 +344,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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

@@ -131,7 +131,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/model/strategy/adapter/walletPass/type.d.ts

@@ -41,7 +41,7 @@ export interface Voucher {
         allowCrossProduct: boolean;
         /** 可用商品数量上限 （仅多商品） 默认为0，表示不限制商品数量。 */
         applicableProductLimit: number;
-        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品行最多抵扣次数）。默认为 0，表示不限制。 */
+        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品的每个 unit 最多抵扣次数，总上限 = maxPassesPerItem × quantity）。默认为 0，表示不限制。 */
         maxPassesPerItem: number;
     };
 }
@@ -129,7 +129,7 @@ export interface EvaluatorInput {
         allowCrossProduct: boolean;
         /** 可用商品数量上限 （仅多商品） 默认为0，表示不限制商品数量。 */
         applicableProductLimit: number;
-        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品行最多抵扣次数）。默认为 0，表示不限制。 */
+        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品的每个 unit 最多抵扣次数，总上限 = maxPassesPerItem × quantity）。默认为 0，表示不限制。 */
         maxPassesPerItem: number;
     }>[];
 }

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

@@ -82,6 +82,9 @@ var getApplicableProducts = (voucher, productsData) => {
   }
   return productsData.filter((p) => applicableProductIds.includes(p.product_id));
 };
+var getTotalQuantityByProductId = (allProducts, productId) => {
+  return allProducts.filter((p) => p.product_id === productId).reduce((sum, p) => sum + getProductQuantity(p), 0);
+};
 function processVouchers(applicableVouchers, orderTotalAmount, products) {
   console.log(products, "products123");
   const productsCopy = expandProductsWithBundleItems(products, true);
@@ -90,18 +93,18 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
     var _a;
     return ((_a = usageMap.get(walletPassProductId)) == null ? void 0 : _a.get(orderItemProductId)) || 0;
   };
-  const incrementItemPassUsage = (usageMap, walletPassProductId, orderItemProductId) => {
+  const incrementItemPassUsage = (usageMap, walletPassProductId, orderItemProductId, count = 1) => {
     if (!usageMap.has(walletPassProductId)) {
       usageMap.set(walletPassProductId, /* @__PURE__ */ new Map());
     }
     const innerMap = usageMap.get(walletPassProductId);
-    innerMap.set(orderItemProductId, (innerMap.get(orderItemProductId) || 0) + 1);
+    innerMap.set(orderItemProductId, (innerMap.get(orderItemProductId) || 0) + count);
   };
-  const filterByMaxPassesPerItem = (products2, usageMap, walletPassProductId, maxPassesPerItem) => {
+  const filterByMaxPassesPerItem = (products2, allProducts, usageMap, walletPassProductId, maxPassesPerItem) => {
     if (maxPassesPerItem <= 0)
       return products2;
     return products2.filter(
-      (p) => getItemPassUsage(usageMap, walletPassProductId, p.product_id) < maxPassesPerItem
+      (p) => getItemPassUsage(usageMap, walletPassProductId, p.product_id) < maxPassesPerItem * getTotalQuantityByProductId(allProducts, p.product_id)
     );
   };
   const calculateAvailableMaxAmount = (voucher, productsData, itemPassUsage) => {
@@ -116,7 +119,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
     const amountField = deductTaxAndFee ? "remainingAmountWithTax" : "remainingAmountPure";
     let applicableProducts = getApplicableProducts(voucher, productsData).filter((p) => p[amountField].greaterThan(0));
     if (itemPassUsage) {
-      applicableProducts = filterByMaxPassesPerItem(applicableProducts, itemPassUsage, voucher.product_id, maxPassesPerItem);
+      applicableProducts = filterByMaxPassesPerItem(applicableProducts, productsData, itemPassUsage, voucher.product_id, maxPassesPerItem);
     }
     if (applicableProducts.length === 0) {
       return new import_decimal.default(0);
@@ -146,14 +149,16 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       }
     } else {
       const maxProduct = applicableProducts.reduce(
-        (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
-      );
-      const currentAvailableQty = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
-      const deductQty = applicableProductLimit > 0 ? Math.min(currentAvailableQty, applicableProductLimit) : currentAvailableQty;
-      finalApplicableAmount = import_decimal.default.min(
-        maxProduct[unitPriceField].times(deductQty),
-        maxProduct[amountField]
+        (max, p) => p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max
       );
+      if (maxPassesPerItem > 0) {
+        finalApplicableAmount = import_decimal.default.min(
+          maxProduct[unitPriceField].times(maxPassesPerItem),
+          maxProduct[amountField]
+        );
+      } else {
+        finalApplicableAmount = maxProduct[amountField];
+      }
     }
     return import_decimal.default.min(baseAmount, finalApplicableAmount, remainingOrderAmount);
   };
@@ -180,7 +185,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
     if (maxPassesPerItem > 0 && itemPassUsage) {
       const deductTaxAndFee = (config == null ? void 0 : config.deductTaxAndFee) ?? true;
       const amountField = deductTaxAndFee ? "remainingAmountWithTax" : "remainingAmountPure";
-      const availableAfterPassLimit = getApplicableProducts(voucher, productsData).filter((p) => p[amountField].greaterThan(0)).filter((p) => getItemPassUsage(itemPassUsage, product_id, p.product_id) < maxPassesPerItem);
+      const availableAfterPassLimit = getApplicableProducts(voucher, productsData).filter((p) => p[amountField].greaterThan(0)).filter((p) => getItemPassUsage(itemPassUsage, product_id, p.product_id) < maxPassesPerItem * getTotalQuantityByProductId(productsData, p.product_id));
       if (availableAfterPassLimit.length === 0) {
         return { isAvailable: false, reasonCode: "max_passes_per_item_reached" };
       }
@@ -230,7 +235,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       voucher,
       productsForRecommendation
     ).filter((p) => p[amountField].greaterThan(0));
-    applicableProducts = filterByMaxPassesPerItem(applicableProducts, itemPassUsageMap, product_id, maxPassesPerItem);
+    applicableProducts = filterByMaxPassesPerItem(applicableProducts, productsForRecommendation, itemPassUsageMap, product_id, maxPassesPerItem);
     if (applicableProducts.length === 0)
       return false;
     const usageAmount = typeof voucher.edit_current_amount === "number" ? voucher.edit_current_amount : getRecommendedAmount(voucher);
@@ -263,14 +268,16 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       }
     } else {
       const maxProduct = applicableProducts.reduce(
-        (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
-      );
-      const currentAvailableQty = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
-      const deductQty = applicableProductLimit > 0 ? Math.min(currentAvailableQty, applicableProductLimit) : currentAvailableQty;
-      calculatedAvailableMaxAmount = import_decimal.default.min(
-        maxProduct[unitPriceField].times(deductQty),
-        maxProduct[amountField]
+        (max, p) => p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max
       );
+      if (maxPassesPerItem > 0) {
+        calculatedAvailableMaxAmount = import_decimal.default.min(
+          maxProduct[unitPriceField].times(maxPassesPerItem),
+          maxProduct[amountField]
+        );
+      } else {
+        calculatedAvailableMaxAmount = maxProduct[amountField];
+      }
     }
     const availableMaxAmount = import_decimal.default.min(
       baseAmount,
@@ -314,14 +321,15 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       }
     } else {
       const targetProduct = applicableProducts.reduce(
-        (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
-      );
-      const currentAvailableQty = Math.ceil(targetProduct[amountField].dividedBy(targetProduct[unitPriceField]).toNumber());
-      const availableQty = applicableProductLimit > 0 ? Math.min(currentAvailableQty, applicableProductLimit) : currentAvailableQty;
-      const maxDeductForProduct = import_decimal.default.min(
-        targetProduct[unitPriceField].times(availableQty),
-        targetProduct[amountField]
+        (max, p) => p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max
       );
+      let maxDeductForProduct = targetProduct[amountField];
+      if (maxPassesPerItem > 0) {
+        maxDeductForProduct = import_decimal.default.min(
+          targetProduct[unitPriceField].times(maxPassesPerItem),
+          targetProduct[amountField]
+        );
+      }
       const actualDeductAmount = import_decimal.default.min(deductionLeft, maxDeductForProduct);
       const actualDeductQty = Math.ceil(actualDeductAmount.dividedBy(targetProduct[unitPriceField]).toNumber());
       targetProduct[amountField] = targetProduct[amountField].minus(actualDeductAmount);
@@ -331,9 +339,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
         parent_product_id: targetProduct.parent_product_id || null,
         is_bundle_item: targetProduct.is_bundle_item || false,
         deductAmount: actualDeductAmount.toNumber(),
-        // 转换为数字
         deductQuantity: actualDeductQty
-        // 抵扣涉及的数量（用于记录）
       });
     }
     const totalDeducted = maxDeduction.minus(deductionLeft);
@@ -341,7 +347,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       remainingOrderAmount = remainingOrderAmount.minus(totalDeducted);
       usedVoucherCounts.set(product_id, (usedVoucherCounts.get(product_id) || 0) + 1);
       deductionDetails.forEach((detail) => {
-        incrementItemPassUsage(itemPassUsageMap, product_id, detail.product_id);
+        incrementItemPassUsage(itemPassUsageMap, product_id, detail.product_id, detail.deductQuantity);
       });
       recommendedVouchers.push({
         ...voucher,
@@ -389,18 +395,18 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
     var _a;
     return ((_a = itemPassUsageMap.get(walletPassProductId)) == null ? void 0 : _a.get(orderItemProductId)) || 0;
   };
-  const incrementItemPassUsage = (walletPassProductId, orderItemProductId) => {
+  const incrementItemPassUsage = (walletPassProductId, orderItemProductId, count = 1) => {
     if (!itemPassUsageMap.has(walletPassProductId)) {
       itemPassUsageMap.set(walletPassProductId, /* @__PURE__ */ new Map());
     }
     const innerMap = itemPassUsageMap.get(walletPassProductId);
-    innerMap.set(orderItemProductId, (innerMap.get(orderItemProductId) || 0) + 1);
+    innerMap.set(orderItemProductId, (innerMap.get(orderItemProductId) || 0) + count);
   };
   const filterByMaxPassesPerItem = (products2, walletPassProductId, maxPassesPerItem) => {
     if (maxPassesPerItem <= 0)
       return products2;
     return products2.filter(
-      (p) => getItemPassUsage(walletPassProductId, p.product_id) < maxPassesPerItem
+      (p) => getItemPassUsage(walletPassProductId, p.product_id) < maxPassesPerItem * getTotalQuantityByProductId(productsForCalc, p.product_id)
     );
   };
   selectedVouchers.forEach((selectedVoucher) => {
@@ -463,14 +469,15 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
       }
     } else {
       const targetProduct = applicableProducts.reduce(
-        (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
-      );
-      const currentAvailableQty = Math.ceil(targetProduct[amountField].dividedBy(targetProduct[unitPriceField]).toNumber());
-      const availableQty = applicableProductLimit > 0 ? Math.min(currentAvailableQty, applicableProductLimit) : currentAvailableQty;
-      const maxDeductForProduct = import_decimal.default.min(
-        targetProduct[unitPriceField].times(availableQty),
-        targetProduct[amountField]
+        (max, p) => p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max
       );
+      let maxDeductForProduct = targetProduct[amountField];
+      if (maxPassesPerItem > 0) {
+        maxDeductForProduct = import_decimal.default.min(
+          targetProduct[unitPriceField].times(maxPassesPerItem),
+          targetProduct[amountField]
+        );
+      }
       const actualDeductAmount = import_decimal.default.min(deductionLeft, maxDeductForProduct);
       const actualDeductQty = Math.ceil(actualDeductAmount.dividedBy(targetProduct[unitPriceField]).toNumber());
       targetProduct[amountField] = targetProduct[amountField].minus(actualDeductAmount);
@@ -480,15 +487,13 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
         parent_product_id: targetProduct.parent_product_id || null,
         is_bundle_item: targetProduct.is_bundle_item || false,
         deductAmount: actualDeductAmount.toNumber(),
-        // 转换为数字
         deductQuantity: actualDeductQty
-        // 抵扣涉及的数量（用于记录）
       });
     }
     const totalDeducted = maxDeduction.minus(deductionLeft);
     remainingOrderAmount = remainingOrderAmount.minus(totalDeducted);
     deductionDetails.forEach((detail) => {
-      incrementItemPassUsage(selectedVoucher.product_id, detail.product_id);
+      incrementItemPassUsage(selectedVoucher.product_id, detail.product_id, detail.deductQuantity);
     });
     selectedWithDetails.push({
       ...selectedVoucher,
@@ -572,14 +577,16 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
             }
           } else {
             const maxProduct = applicableProducts.reduce(
-              (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
-            );
-            const currentAvailableQty = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
-            const deductQty = applicableProductLimit > 0 ? Math.min(currentAvailableQty, applicableProductLimit) : currentAvailableQty;
-            calculatedMaxAmount = import_decimal.default.min(
-              maxProduct[unitPriceField].times(deductQty),
-              maxProduct[amountField]
+              (max, p) => p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max
             );
+            if (maxPassesPerItem > 0) {
+              calculatedMaxAmount = import_decimal.default.min(
+                maxProduct[unitPriceField].times(maxPassesPerItem),
+                maxProduct[amountField]
+              );
+            } else {
+              calculatedMaxAmount = maxProduct[amountField];
+            }
           }
           calculatedMaxAmount = import_decimal.default.min(
             baseAmount,

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

@@ -50,15 +50,12 @@ export declare class ResourceModule extends BaseModule implements Module {
     /**
      * 创建预订
      */
-    createBooking(booking: Partial<ResourceBooking>): ResourceBooking;
     /**
      * 更新预订
      */
-    updateBooking(id: ResourceId, data: Partial<ResourceBooking>): ResourceBooking | undefined;
     /**
      * 删除预订
      */
-    deleteBooking(id: ResourceId): boolean;
     /**
      * 清空缓存
      */
@@ -73,8 +70,6 @@ export declare class ResourceModule extends BaseModule implements Module {
     private loadResourcesByServer;
     private loadResourcesFromSQLite;
     private saveResourcesToSQLite;
-    private loadBookingsFromSQLite;
-    private saveBookingsToSQLite;
     private initResourceDataSource;
     private setupResourceSync;
     private processSyncMessages;

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

@@ -29,7 +29,6 @@ var import_BaseModule = require("../../../modules/BaseModule");
 var import_types = require("./types");
 var import_types2 = require("./types");
 var RESOURCE_STORE_NAME = "resources";
-var BOOKING_STORE_NAME = "resource_bookings";
 var DEFAULT_PAGE_SIZE = 999;
 var RESOURCE_SYNC_DEBOUNCE_MS = 1e4;
 var ResourceModule = class extends import_BaseModule.BaseModule {
@@ -103,11 +102,6 @@ var ResourceModule = class extends import_BaseModule.BaseModule {
         await this.safeEmit(import_types.ResourceHooks.onResourcesChanged, this.store.list);
       }
     }
-    const cachedBookings = await this.loadBookingsFromSQLite();
-    if (cachedBookings.length > 0) {
-      this.store.bookings = (0, import_lodash_es.cloneDeep)(cachedBookings);
-      this.syncBookingsIndex();
-    }
   }
   getRoutes() {
     return [];
@@ -205,54 +199,49 @@ var ResourceModule = class extends import_BaseModule.BaseModule {
   /**
    * 创建预订
    */
-  createBooking(booking) {
-    const id = (booking == null ? void 0 : booking.id) ?? Date.now();
-    const normalized = {
-      id,
-      ...booking
-    };
-    this.store.bookings.push(normalized);
-    const rid = normalized.resource_id ?? normalized.resourceId;
-    if (rid !== void 0) {
-      const existing = this.resourceIdIndex.get(rid) || [];
-      existing.push(normalized);
-      this.resourceIdIndex.set(rid, existing);
-    }
-    this.saveBookingsToSQLite(this.store.bookings).catch(() => {
-    });
-    this.safeEmit(import_types.ResourceHooks.onBookingsChanged, this.store.bookings);
-    return normalized;
-  }
+  // createBooking(booking: Partial<ResourceBooking>): ResourceBooking {
+  //   const id = booking?.id ?? Date.now()
+  //   const normalized: ResourceBooking = {
+  //     id,
+  //     ...booking,
+  //   } as ResourceBooking
+  //   this.store.bookings.push(normalized)
+  //   const rid = normalized.resource_id ?? normalized.resourceId
+  //   if (rid !== undefined) {
+  //     const existing = this.resourceIdIndex.get(rid) || []
+  //     existing.push(normalized)
+  //     this.resourceIdIndex.set(rid, existing)
+  //   }
+  //   this.saveBookingsToSQLite(this.store.bookings).catch(() => {})
+  //   this.safeEmit(ResourceHooks.onBookingsChanged, this.store.bookings)
+  //   return normalized
+  // }
   /**
    * 更新预订
    */
-  updateBooking(id, data) {
-    const index = this.store.bookings.findIndex((b) => this.getIdKey(b.id) === this.getIdKey(id));
-    if (index === -1)
-      return void 0;
-    const old = this.store.bookings[index];
-    const updated = { ...old, ...data, id: old.id };
-    this.store.bookings[index] = updated;
-    this.rebuildBookingsIndex();
-    this.saveBookingsToSQLite(this.store.bookings).catch(() => {
-    });
-    this.safeEmit(import_types.ResourceHooks.onBookingsChanged, this.store.bookings);
-    return updated;
-  }
+  // updateBooking(id: ResourceId, data: Partial<ResourceBooking>): ResourceBooking | undefined {
+  //   const index = this.store.bookings.findIndex(b => this.getIdKey(b.id) === this.getIdKey(id))
+  //   if (index === -1) return undefined
+  //   const old = this.store.bookings[index]
+  //   const updated: ResourceBooking = { ...old, ...data, id: old.id } as ResourceBooking
+  //   this.store.bookings[index] = updated
+  //   this.rebuildBookingsIndex()
+  //   this.saveBookingsToSQLite(this.store.bookings).catch(() => {})
+  //   this.safeEmit(ResourceHooks.onBookingsChanged, this.store.bookings)
+  //   return updated
+  // }
   /**
    * 删除预订
    */
-  deleteBooking(id) {
-    const index = this.store.bookings.findIndex((b) => this.getIdKey(b.id) === this.getIdKey(id));
-    if (index === -1)
-      return false;
-    this.store.bookings.splice(index, 1);
-    this.rebuildBookingsIndex();
-    this.saveBookingsToSQLite(this.store.bookings).catch(() => {
-    });
-    this.safeEmit(import_types.ResourceHooks.onBookingsChanged, this.store.bookings);
-    return true;
-  }
+  // deleteBooking(id: ResourceId): boolean {
+  //   const index = this.store.bookings.findIndex(b => this.getIdKey(b.id) === this.getIdKey(id))
+  //   if (index === -1) return false
+  //   this.store.bookings.splice(index, 1)
+  //   this.rebuildBookingsIndex()
+  //   this.saveBookingsToSQLite(this.store.bookings).catch(() => {})
+  //   this.safeEmit(ResourceHooks.onBookingsChanged, this.store.bookings)
+  //   return true
+  // }
   /**
    * 清空缓存
    */
@@ -396,31 +385,29 @@ var ResourceModule = class extends import_BaseModule.BaseModule {
       });
     }
   }
-  async loadBookingsFromSQLite() {
-    if (!this.dbManager)
-      return [];
-    try {
-      const bookings = await this.dbManager.getAll(BOOKING_STORE_NAME);
-      return bookings || [];
-    } catch {
-      return [];
-    }
-  }
-  async saveBookingsToSQLite(bookings) {
-    if (!this.dbManager)
-      return;
-    try {
-      await this.dbManager.clear(BOOKING_STORE_NAME);
-      if (bookings.length === 0)
-        return;
-      if (this.dbManager.bulkAdd) {
-        await this.dbManager.bulkAdd(BOOKING_STORE_NAME, bookings);
-        return;
-      }
-      await Promise.all(bookings.map((b) => this.dbManager.add(BOOKING_STORE_NAME, b)));
-    } catch {
-    }
-  }
+  // private async loadBookingsFromSQLite(): Promise<ResourceBooking[]> {
+  //   if (!this.dbManager) return []
+  //   try {
+  //     const bookings = await this.dbManager.getAll(BOOKING_STORE_NAME)
+  //     return bookings || []
+  //   } catch {
+  //     return []
+  //   }
+  // }
+  // private async saveBookingsToSQLite(bookings: ResourceBooking[]): Promise<void> {
+  //   if (!this.dbManager) return
+  //   try {
+  //     await this.dbManager.clear(BOOKING_STORE_NAME)
+  //     if (bookings.length === 0) return
+  //     if (this.dbManager.bulkAdd) {
+  //       await this.dbManager.bulkAdd(BOOKING_STORE_NAME, bookings)
+  //       return
+  //     }
+  //     await Promise.all(bookings.map(b => this.dbManager.add(BOOKING_STORE_NAME, b)))
+  //   } catch {
+  //     // 忽略 SQLite 异常
+  //   }
+  // }
   // ─────────────────────────────────────────────────────────────────
   // pubsub 同步
   // ─────────────────────────────────────────────────────────────────

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

@@ -344,7 +344,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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

@@ -131,7 +131,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/package.json

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