@pisell/pisellos 2.1.38 → 2.2.1

package/lib/solution/BookingByStep/utils/capacity.js

@@ -68,12 +68,12 @@ var formatDefaultCapacitys = ({
   }
   return [{ id: 0, value: 1, name: "" }];
 };
-var getSumCapacity = ({ capacity, num = 1 }) => {
+var getSumCapacity = ({ capacity }) => {
   let sum = 0;
   for (let item of capacity || []) {
     sum += item.value;
   }
-  return sum * num;
+  return sum;
 };
 function getCapacityInfoByCartItem(targetCartItem) {
   var _a;
@@ -81,7 +81,7 @@ function getCapacityInfoByCartItem(targetCartItem) {
     capacity: (_a = targetCartItem._productOrigin) == null ? void 0 : _a.capacity,
     product_bundle: targetCartItem._origin.product.product_bundle
   });
-  const currentCapacity = getSumCapacity({ capacity: formatCapacity, num: (targetCartItem == null ? void 0 : targetCartItem.num) || 1 });
+  const currentCapacity = getSumCapacity({ capacity: formatCapacity });
   return {
     formatCapacity,
     currentCapacity
@@ -194,7 +194,7 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
       );
       if (needsThisResourceType) {
         if (selectType === "single") {
-          requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + ((cartItem == null ? void 0 : cartItem.num) || 1);
+          requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + 1;
         } else {
           requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + currentCapacity;
         }
@@ -238,18 +238,13 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
       console.log(`capacity.ts - 资源类型 ${formId} 多个预约检查: 总容量 ${totalAvailableCapacity}, 需求 ${requiredCapacity}`);
       if (totalAvailableCapacity < requiredCapacity) {
         console.log(`资源类型 ${formId} 容量不足: 需要 ${requiredCapacity}, 可用 ${totalAvailableCapacity}`);
-        return {
-          success: false,
-          required: requiredCapacity,
-          available: totalAvailableCapacity
-        };
+        return false;
       }
     } else {
       let availableResourceCount = 0;
       resourcesInType.forEach((resource) => {
         const availableTimes = resource.times.filter((time) => {
-          var _a2;
-          return !(0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && !(0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") || (0, import_dayjs.default)(time.start_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") && (0, import_dayjs.default)(time.end_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && ((_a2 = time.event_list) == null ? void 0 : _a2.length) === 0;
+          return !(0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && !(0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") || (0, import_dayjs.default)(time.start_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") && (0, import_dayjs.default)(time.end_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute");
         });
         if (availableTimes.length > 0) {
           availableResourceCount++;
@@ -258,19 +253,11 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
       console.log(`capacity.ts - 资源类型 ${formId} 单个预约检查: 可用资源数 ${availableResourceCount}, 需求 ${requiredCapacity}`);
       if (availableResourceCount < requiredCapacity) {
         console.log(`资源类型 ${formId} 数量不足: 需要 ${requiredCapacity}, 可用 ${availableResourceCount}`);
-        return {
-          success: false,
-          required: requiredCapacity,
-          available: availableResourceCount
-        };
+        return false;
       }
     }
   }
-  return {
-    success: true,
-    required: 0,
-    available: 0
-  };
+  return true;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -22,11 +22,23 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * @returns 商品列表
      */
     loadProducts(params?: ILoadProductsParams): Promise<any>;
+    /**
+     * 初始化外设扫码结果监听
+     */
+    initPeripheralsListener(): void;
     /**
      * 获取商品列表（不加载到模块中）
      * @returns 商品列表
      */
     getProducts(): Promise<ProductData[]>;
+    /**
+     * 获取日程时间段点
+     * @param params 参数
+     * @returns 日程时间段点
+     */
+    getScheduleTimePoints(params: {
+        menu_list_ids: number[];
+    }): Promise<any>;
     /**
      * 获取客户列表
      * @param params 查询参数

package/lib/solution/BookingTicket/index.js

@@ -99,7 +99,7 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
         throw new Error(`模块 ${step} 不存在`);
       }
     });
-    this.core.effects.emit(import_types.BookingTicketHooks.onInited, {});
+    this.core.effects.emit(`${this.name}:onInited`, {});
   }
   /**
    * 获取商品列表
@@ -115,13 +115,19 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
         ...params,
         cacheId: this.cacheId
       });
-      this.core.effects.emit(import_types.BookingTicketHooks.onProductsLoaded, result);
+      this.core.effects.emit(`${this.name}:onProductsLoaded`, result);
       return result;
     } catch (error) {
       console.error("Failed to load products:", error);
       throw error;
     }
   }
+  /**
+   * 初始化外设扫码结果监听
+   */
+  initPeripheralsListener() {
+    this.scan.initPeripheralsListener();
+  }
   /**
    * 获取商品列表（不加载到模块中）
    * @returns 商品列表
@@ -129,6 +135,19 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
   async getProducts() {
     return this.store.products.getProducts();
   }
+  /**
+   * 获取日程时间段点
+   * @param params 参数
+   * @returns 日程时间段点
+   */
+  async getScheduleTimePoints(params) {
+    const result = await this.request.post("/menu/schedule-time-points", {
+      menu_list_ids: params.menu_list_ids
+    }, {
+      osServer: true
+    });
+    return result.data || [];
+  }
   /**
    * 获取客户列表
    * @param params 查询参数
@@ -149,7 +168,7 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
    */
   setActiveCustomer(customer) {
     this.store.customer.setSelectedCustomer(customer);
-    this.core.effects.emit(import_types.BookingTicketHooks.onCustomerSelected, {
+    this.core.effects.emit(`${this.name}:onCustomerSelected`, {
       customer
     });
   }
@@ -168,7 +187,7 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
     const customer = this.store.customer.getCustomerById(customerId);
     if (customer) {
       this.store.customer.setSelectedCustomer(customer);
-      this.core.effects.emit(import_types.BookingTicketHooks.onCustomerSelected, {
+      this.core.effects.emit(`${this.name}:onCustomerSelected`, {
         customer
       });
     }
@@ -248,7 +267,7 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
   async loadMoreCustomers() {
     try {
       const result = await this.store.customer.loadMoreCustomers();
-      this.core.effects.emit(import_types.BookingTicketHooks.onCustomerListUpdate, result);
+      this.core.effects.emit(`${this.name}:onCustomerListUpdate`, result);
       return result;
     } catch (error) {
       console.error("Failed to load more customers:", error);
@@ -263,7 +282,7 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
   async resetAndLoadCustomers(params = {}) {
     try {
       const result = await this.store.customer.resetAndLoadCustomers(params);
-      this.core.effects.emit(import_types.BookingTicketHooks.onCustomerListReset, result);
+      this.core.effects.emit(`${this.name}:onCustomerListReset`, result);
       return result;
     } catch (error) {
       console.error("Failed to reset and load customers:", error);

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

@@ -18,6 +18,10 @@ export default class Scan {
     private watchKey;
     private listenerConfig;
     constructor(solution: BookingTicketImpl, watchKey: string);
+    /**
+     * 初始化外设扫码结果监听
+     */
+    initPeripheralsListener(): void;
     /**
      * 处理扫码事件
      * @param eventKey 事件key

package/lib/solution/BookingTicket/utils/scan/index.js

@@ -37,9 +37,15 @@ var import_task = __toESM(require("../../../../utils/task"));
 var Scan = class {
   constructor(solution, watchKey) {
     this.listenerConfig = /* @__PURE__ */ new Map();
-    var _a, _b, _c, _d, _e;
     this.solution = solution;
     this.watchKey = watchKey;
+    this.initPeripheralsListener();
+  }
+  /**
+   * 初始化外设扫码结果监听
+   */
+  initPeripheralsListener() {
+    var _a, _b, _c, _d, _e;
     (_e = (_d = (_c = (_b = (_a = this.solution) == null ? void 0 : _a.window) == null ? void 0 : _b.interaction) == null ? void 0 : _c.utils) == null ? void 0 : _d.mountFunction) == null ? void 0 : _e.call(
       _d,
       "global",

package/lib/solution/BuyTickets/index.js

@@ -24,7 +24,6 @@ __export(BuyTickets_exports, {
 });
 module.exports = __toCommonJS(BuyTickets_exports);
 var import_modules = require("../../modules/");
-var import_types = require("./types");
 var import_BaseModule = require("../../modules/BaseModule");
 __reExport(BuyTickets_exports, require("./types"), module.exports);
 var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
@@ -49,7 +48,7 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
     if (this.otherParams.prodctIds) {
       await this.loadProductsByIds(this.otherParams.prodctIds);
     }
-    await this.core.effects.emit(import_types.BuyTicketsHooks.onInited, {});
+    await this.core.effects.emit(`${this.name}:onInited`, {});
   }
   // 通过 ids 获取产品，在当前解决方案下，获取到的就是主商品
   async loadProductsByIds(ids) {
@@ -69,13 +68,13 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
       }
     });
     this.store.mainProducts = mainProducts;
-    await this.core.effects.emit(import_types.BuyTicketsHooks.onMainProductsLoaded, {});
+    await this.core.effects.emit(`${this.name}:onMainProductsLoaded`, {});
   }
   // 通过 ids 获取产品，在当前解决方案下，获取到的就是其他商品
   async loadProductsByCategory(categoryId) {
   }
   async destroy() {
-    await this.core.effects.emit(import_types.BuyTicketsHooks.onDestroy, {});
+    await this.core.effects.emit(`${this.name}:onDestroy`, {});
     console.log("[BuyTickets] 已销毁");
   }
   // 获取当前绑定的所有商品
@@ -83,7 +82,7 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
     var _a;
     const mainData = await this.store.mainProducts.getProducts() || [];
     const otherData = await ((_a = this.store.otherProducts) == null ? void 0 : _a.getProducts()) || [];
-    await this.core.effects.emit(import_types.BuyTicketsHooks.OnGetProducts, [
+    await this.core.effects.emit(`${this.name}:onGetProducts`, [
       ...mainData,
       ...otherData
     ]);
@@ -102,7 +101,7 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
   }
   // 商品列表页提交
   async listSubmit(data) {
-    const res = await this.core.effects.emit(import_types.BuyTicketsHooks.onListSubmit, {
+    const res = await this.core.effects.emit(`${this.name}:onListSubmit`, {
       ...data,
       products: this.getProducts()
     });
@@ -116,14 +115,14 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
   }
   // 购物车提交
   async cartSubmit(data) {
-    await this.core.effects.emit(import_types.BuyTicketsHooks.onCartSubmit, {
+    await this.core.effects.emit(`${this.name}:onCartSubmit`, {
       ...data,
       products: this.getProducts()
     });
   }
   // 结算提交
   async checkoutSubmit(data) {
-    await this.core.effects.emit(import_types.BuyTicketsHooks.onCheckoutSubmit, {
+    await this.core.effects.emit(`${this.name}:onCheckoutSubmit`, {
       ...data,
       products: this.getProducts()
     });

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

@@ -19,7 +19,6 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
     private store;
     private otherParams;
     private logger;
-    private calculationCache;
     order: OrderModule;
     payment: PaymentModule;
     constructor(name?: string, version?: string);
@@ -303,46 +302,16 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 删除本地 IndexDB 中超过指定天数且已同步到后端的订单数据
      */
     private cleanupExpiredOrdersAsync;
-    /**
-     * 清除计算缓存
-     */
-    private clearCalculationCache;
-    /**
-     * 批量获取订单数据（用于性能优化）
-     * 一次性获取所有需要的数据，避免重复查询
-     */
-    private fetchOrderDataBatch;
-    /**
-     * 从支付项数组计算已支付金额（纯计算，不查询数据库）
-     */
-    private calculatePaidAmountFromItems;
     /**
      * 计算已支付金额（从 Payment 模块获取最新数据）
-     *
-     * 注意：此方法保持独立性，可以单独调用。
-     * 在 updateStateAmountToRemaining 等批量操作中会使用缓存优化。
      */
     private calculatePaidAmountAsync;
-    /**
-     * 从订单和支付项计算剩余金额（纯计算，不查询数据库）
-     */
-    private calculateRemainingAmountFromData;
-    /**
-     * 从订单和支付项计算剩余总金额（纯计算，排除定金）
-     */
-    private calculateRemainingTotalAmountFromData;
     /**
      * 计算剩余未支付金额（从 Payment 模块获取最新数据）
-     *
-     * 注意：此方法保持独立性，可以单独调用。
-     * 在 updateStateAmountToRemaining 等批量操作中会使用缓存优化。
      */
     private calculateRemainingAmountAsync;
     /**
      * 计算剩余未支付金额（排除定金计算，始终使用订单总金额）
-     *
-     * 注意：此方法保持独立性，可以单独调用。
-     * 在 updateStateAmountToRemaining 等批量操作中会使用缓存优化。
      */
     private calculateRemainingTotalAmountAsync;
     /**
@@ -351,24 +320,12 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
     private updateBalanceDueAmount;
     /**
      * 更新 stateAmount 为当前剩余未支付金额
-     *
-     * 优化版本：批量获取数据，避免重复查询数据库
      */
     private updateStateAmountToRemaining;
-    /**
-     * 检查订单支付是否完成（优化版，复用已获取的数据）
-     *
-     * @param paymentItems 已获取的支付项数据
-     * @param remainingAmount 已计算的剩余金额
-     */
-    private checkOrderPaymentCompletionOptimized;
     /**
      * 检查订单支付是否完成
      *
      * 当剩余待付款金额 <= 0 时，触发订单支付完成事件
-     *
-     * 注意：此方法保持独立性，可以单独调用。
-     * 在 updateStateAmountToRemaining 中会使用优化版本。
      */
     private checkOrderPaymentCompletion;
     /**
@@ -424,8 +381,6 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 重置 store 状态
      *
      * 在创建新订单前调用，确保状态完全干净
-     *
-     * 🚀 性能优化：改为同步方法，事件发射不阻塞主流程
      */
-    private resetStoreState;
+    private resetStoreStateAsync;
 }