@pisell/pisellos 2.3.40 → 2.3.41

package/lib/solution/BaseSales/types.d.ts

@@ -3,6 +3,7 @@ import { OrderModule, ProductList, QuotationModule, SalesSummaryModule, ScanOrde
 import type { ScanOrderLogInput as BaseSalesLogInput, ScanOrderLoggerProviderConfig as BaseSalesLoggerProviderConfig, ScanOrderLoggerProviderType as BaseSalesLoggerProviderType } from '../../modules/ScanOrderLogger/types';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { QuotationCustomerScopeInfo } from '../../modules/Quotation/types';
+import type { PaymentMethod } from '../../modules/Payment/types';
 /**
  * BaseSales 流程 hook 后缀。
  * 完整事件名应由当前模块名动态拼接，避免多个实例共享固定事件 key。
@@ -16,11 +17,62 @@ export declare const BaseSalesHookNames: {
     readonly onPaymentSyncStart: "onPaymentSyncStart";
     readonly onPaymentSyncEnd: "onPaymentSyncEnd";
     readonly onDepositPaymentSyncEnd: "onDepositPaymentSyncEnd";
+    readonly onWalletAssetsStateChanged: "onWalletAssetsStateChanged";
 };
 export type BaseSalesHookName = typeof BaseSalesHookNames[keyof typeof BaseSalesHookNames];
 export declare function createBaseSalesHook(moduleName: string, hookName: BaseSalesHookName): string;
 export type BaseSalesStatus = 'idle' | 'initializing' | 'ready' | 'error';
 export type BaseSalesPaymentStatus = 'paid' | 'partially_paid' | 'unpaid' | 'payment_processing' | string;
+export interface BaseSalesCashPaymentConfig {
+    available: boolean;
+    paymentMethod?: PaymentMethod;
+    amountDue: number;
+    recommendedAmounts: number[];
+}
+export interface BaseSalesPayCashParams {
+    /** 实际计入订单的现金支付金额（部分支付时小于待付金额）。 */
+    amount: number;
+    /** 顾客实际交付现金；可大于 amount。 */
+    actualPaidAmount?: number;
+    changeAmount?: number;
+    roundingAmount?: number;
+}
+export interface BaseSalesPayCashResult {
+    payment: Record<string, any>;
+    payments: Record<string, any>[];
+    syncResult: Record<string, any>;
+    isOrderFullyPaid: boolean;
+}
+export interface BaseSalesCommitPaymentMethodParams {
+    /** 支付方式 id；与 paymentMethodCode 至少传一个。 */
+    paymentMethodId?: number | string;
+    /** 支付方式 code，大小写不敏感。 */
+    paymentMethodCode?: string;
+    /** 本次计入订单的支付金额。 */
+    amount: number;
+    /** 支付设备返回的原始金额；缺省时与 amount 相同。 */
+    originAmount?: number;
+    /** 支付设备返回的实际手续费配置。 */
+    serviceCharge?: {
+        amount?: string | number;
+        percentage?: string | number;
+    } | null;
+    /** 支付设备返回的唯一流水号等扩展信息。 */
+    metadata?: Record<string, any>;
+    /** 少数支付方式需要透传的额外 payment 字段。 */
+    paymentData?: Record<string, any>;
+}
+export interface BaseSalesCommitPaymentMethodResult {
+    payment: Record<string, any>;
+    payments: Record<string, any>[];
+    syncResult: Record<string, any>;
+    isOrderFullyPaid: boolean;
+}
+export interface BaseSalesConfirmWalletPaymentResult<T = Record<string, any>> {
+    submitResult: T;
+    payments: Record<string, any>[];
+    isOrderFullyPaid: boolean;
+}
 export interface BaseSalesEntryContext {
     biz: string;
     mode: 'scan' | 'append';

package/lib/solution/BaseSales/types.js

@@ -31,7 +31,8 @@ var BaseSalesHookNames = {
   onCartValidationChanged: "onCartValidationChanged",
   onPaymentSyncStart: "onPaymentSyncStart",
   onPaymentSyncEnd: "onPaymentSyncEnd",
-  onDepositPaymentSyncEnd: "onDepositPaymentSyncEnd"
+  onDepositPaymentSyncEnd: "onDepositPaymentSyncEnd",
+  onWalletAssetsStateChanged: "onWalletAssetsStateChanged"
 };
 function createBaseSalesHook(moduleName, hookName) {
   return `${moduleName}:${hookName}`;

package/lib/solution/BaseSales/utils/cartPromotion.d.ts

@@ -78,6 +78,7 @@ export interface CartPromotionEvaluator {
         }>;
         hasApplicableStrategy: boolean;
     }>;
+    getStrategyConfigs?: () => unknown[];
 }
 /** 单个赠品减量项 */
 export interface GiftReduceItem {
@@ -267,7 +268,8 @@ export declare function appendPromotionTags<T extends Record<string, any>>(produ
  * 处理购物车的促销计算与赠品差异化。
  *
  * 流程：
- * 1. 分离 main / gift / edit-product 三类（带 `booking_id` 的编辑态商品不参与促销）
+ * 1. 分离 main / gift / edit-product 三类（普通促销下带 `booking_id` 的编辑态商品不参与；
+ *    配置 ITEM_REWARD 时，编辑态商品也参与商品奖励重算）
  * 2. 转 PromotionProduct 喂评估器 → 拿到 `evaluateCartWithPricing` 与 `getProductsApplicableStrategies`
  * 3. 把 PricedProduct 映射回 OrderProduct 形态：
  *    - 参与促销的，写 `metadata._promotion` + 调整 `selling_price` / `main_product_selling_price`

package/lib/solution/BaseSales/utils/cartPromotion.js

@@ -77,19 +77,43 @@ function getOrderProductOriginalPriceForPromotion(product) {
   }
   return getOrderProductBasePrice(product);
 }
-function updatePromotionDiscountList(item, promotionDiscount) {
+var X_ITEMS_FOR_Y_PRICE = "X_ITEMS_FOR_Y_PRICE";
+var ITEM_REWARD = "ITEM_REWARD";
+function isItemRewardPromotionDiscountItem(item) {
+  var _a, _b;
+  return (item == null ? void 0 : item.type) === "product" && ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.source) === "promotion" && ((_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.actionType) === ITEM_REWARD;
+}
+function isManagedPromotionDiscountItem(item) {
+  if ((item == null ? void 0 : item.type) === "promotion")
+    return true;
+  return isItemRewardPromotionDiscountItem(item);
+}
+function wasInPromotionBeforeEvaluation(item) {
+  var _a, _b;
+  if (((_b = (_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a._promotion) == null ? void 0 : _b.inPromotion) === true)
+    return true;
+  return Array.isArray(item == null ? void 0 : item.discount_list) && item.discount_list.some(isItemRewardPromotionDiscountItem);
+}
+function updatePromotionDiscountList(item, promotionDiscount, options) {
   let discountList = Array.isArray(item.discount_list) ? [...item.discount_list] : [];
-  discountList = discountList.filter((d) => (d == null ? void 0 : d.type) !== "promotion");
+  discountList = discountList.filter((d) => !isManagedPromotionDiscountItem(d));
   if (promotionDiscount) {
+    const discountType = (options == null ? void 0 : options.discountType) || "promotion";
     discountList.push({
-      type: "promotion",
+      type: discountType,
       amount: promotionDiscount.amount,
       discount: {
         original_amount: promotionDiscount.original_amount,
         fixed_amount: promotionDiscount.fixed_amount,
         title: promotionDiscount.title,
         resource_id: ""
-      }
+      },
+      ...discountType === "product" ? {
+        metadata: {
+          source: "promotion",
+          actionType: (options == null ? void 0 : options.actionType) || ITEM_REWARD
+        }
+      } : {}
     });
   }
   if (discountList.length > 0) {
@@ -98,7 +122,15 @@ function updatePromotionDiscountList(item, promotionDiscount) {
     delete item.discount_list;
   }
 }
-var X_ITEMS_FOR_Y_PRICE = "X_ITEMS_FOR_Y_PRICE";
+function evaluatorHasActionType(evaluator, actionType) {
+  var _a;
+  const configs = (_a = evaluator == null ? void 0 : evaluator.getStrategyConfigs) == null ? void 0 : _a.call(evaluator);
+  if (!Array.isArray(configs))
+    return false;
+  return configs.some(
+    (config) => ((config == null ? void 0 : config.actions) || []).some((action) => (action == null ? void 0 : action.type) === actionType)
+  );
+}
 function applyPromoUnitPriceToLine(item, input) {
   const metadata = item.metadata || (item.metadata = {});
   const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(item)).toNumber();
@@ -125,6 +157,9 @@ function applyPromoUnitPriceToLine(item, input) {
       amount: discountAmount,
       original_amount: catalogSource,
       fixed_amount: discountAmount
+    }, {
+      actionType: input.actionType,
+      discountType: input.actionType === ITEM_REWARD ? "product" : "promotion"
     });
   } else {
     updatePromotionDiscountList(item, null);
@@ -396,14 +431,13 @@ function buildConsolidateKeyForPromotion(item) {
   ].join("#");
 }
 function consolidateMainProductsForPromotion(entries) {
-  var _a, _b;
   if (!Array.isArray(entries) || entries.length <= 1) {
     return [...entries || []];
   }
   const groups = /* @__PURE__ */ new Map();
   for (const { item, originalListIndex } of entries) {
     const key = buildConsolidateKeyForPromotion(item);
-    const wasInPromotion = ((_b = (_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a._promotion) == null ? void 0 : _b.inPromotion) === true;
+    const wasInPromotion = wasInPromotionBeforeEvaluation(item);
     const existing = groups.get(key);
     if (!existing) {
       const mergedItem = (0, import_lodash_es.cloneDeep)(item);
@@ -469,6 +503,9 @@ function splitXItemsPromoLinesByGroup(lines, strategyActionMap) {
 function generateNumericId() {
   return Math.floor(Math.random() * 1e9) + Date.now();
 }
+function isBookingEditProductLine(product) {
+  return (product == null ? void 0 : product.booking_id) !== void 0 && (product == null ? void 0 : product.booking_id) !== null && product.booking_id !== 0 && product.booking_id !== "0";
+}
 function convertToPromotionProduct(product, index) {
   const metadata = (product == null ? void 0 : product.metadata) || {};
   const numericId = generateNumericId();
@@ -481,6 +518,7 @@ function convertToPromotionProduct(product, index) {
     price: getOrderProductOriginalPriceForPromotion(product),
     quantity: Number((product == null ? void 0 : product.num) ?? 1) || 1,
     bundle: getProductBundleForEvaluator(product),
+    _promotionOnlyForItemReward: isBookingEditProductLine(product),
     _originalItem: originalItem,
     _originalId: getOrderProductUid(product),
     _originalIndex: index
@@ -582,6 +620,9 @@ function resolveStrategyRequiredQuantity(matched) {
   if (matched.actionType === "BUY_X_GET_Y_FREE") {
     return Number(detail.buyQuantity) || 1;
   }
+  if (matched.actionType === "ITEM_REWARD") {
+    return Number(detail.triggerQuantity) || 1;
+  }
   return 1;
 }
 function resolveStrategyEligibleProducts(matched) {
@@ -692,6 +733,10 @@ function processCartPromotion(list, evaluator, options) {
   };
   if (!list || list.length === 0 || !evaluator)
     return empty;
+  const shouldIncludeEditProductsForItemReward = evaluatorHasActionType(
+    evaluator,
+    ITEM_REWARD
+  );
   const mainProductsWithIndex = [];
   const existingGiftsWithIndex = [];
   const editProductsWithIndex = [];
@@ -702,8 +747,12 @@ function processCartPromotion(list, evaluator, options) {
       editProductsWithIndex.push({ item, originalListIndex: i });
     } else if (giftInfo) {
       existingGiftsWithIndex.push({ item, originalListIndex: i });
-    } else if ((item == null ? void 0 : item.booking_id) !== void 0 && (item == null ? void 0 : item.booking_id) !== null && item.booking_id !== 0 && item.booking_id !== "0") {
-      editProductsWithIndex.push({ item, originalListIndex: i });
+    } else if (isBookingEditProductLine(item)) {
+      if (shouldIncludeEditProductsForItemReward) {
+        mainProductsWithIndex.push({ item, originalListIndex: i });
+      } else {
+        editProductsWithIndex.push({ item, originalListIndex: i });
+      }
     } else {
       mainProductsWithIndex.push({ item, originalListIndex: i });
     }
@@ -746,7 +795,8 @@ function processCartPromotion(list, evaluator, options) {
       name: ((_a2 = item == null ? void 0 : item.metadata) == null ? void 0 : _a2.product_name) || (item == null ? void 0 : item.title) || "",
       price: getOrderProductBasePrice(item),
       quantity: Number((item == null ? void 0 : item.num) ?? 1) || 1,
-      bundle: getProductBundleForEvaluator(item)
+      bundle: getProductBundleForEvaluator(item),
+      _promotionOnlyForItemReward: isBookingEditProductLine(item)
     };
   });
   for (let i = 0; i < consolidatedMainProductsWithIndex.length; i++) {
@@ -815,7 +865,7 @@ function processCartPromotion(list, evaluator, options) {
     const metadata = newItem.metadata || {};
     const sourceCartNum = (0, import_utils2.getSafeProductNum)(originalItem.num);
     newItem._sourceCartNum = sourceCartNum;
-    const wasInPromotion = ((_a = metadata._promotion) == null ? void 0 : _a.inPromotion) === true || originalItem._wasInPromotionBeforeConsolidate === true;
+    const wasInPromotion = wasInPromotionBeforeEvaluation(originalItem) || originalItem._wasInPromotionBeforeConsolidate === true;
     delete metadata._promotion;
     if (Array.isArray(newItem.product_bundle)) {
       for (const b of newItem.product_bundle) {
@@ -832,7 +882,8 @@ function processCartPromotion(list, evaluator, options) {
         applyPromoUnitPriceToLine(newItem, {
           promoUnitPrice,
           originalBasePrice,
-          strategyTitle: (_b = priced.strategyMetadata) == null ? void 0 : _b.name
+          strategyTitle: (_a = priced.strategyMetadata) == null ? void 0 : _a.name,
+          actionType: priced.strategyId ? (_b = strategyActionMap.get(priced.strategyId)) == null ? void 0 : _b.actionType : void 0
         });
       } else {
         const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(newItem)).toNumber();

package/lib/solution/BaseSales/utils/parseSalesResponse.d.ts

@@ -82,8 +82,13 @@ export interface ISalesBooking {
     metadata?: Record<string, any> | null;
     [key: string]: any;
 }
+export interface ISalesPaymentMetadata extends Record<string, any> {
+    /** 刷卡机设备快照；OS 不解析内部字段 */
+    card_reader_snapshot?: Record<string, unknown>;
+}
 export interface ISalesPayment {
     order_payment_id?: number | null;
+    payment_number?: string;
     custom_payment_id?: number;
     code?: string;
     name?: string;
@@ -95,7 +100,7 @@ export interface ISalesPayment {
     status?: string;
     payment_time?: string | null;
     service_charge?: Record<string, any> | null;
-    metadata?: Record<string, any> | null;
+    metadata?: ISalesPaymentMetadata | null;
     [key: string]: any;
 }
 export interface ISalesSurcharge {

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

@@ -10,7 +10,6 @@ import { ITime } from '../../modules/Date/types';
 import dayjs from 'dayjs';
 import { LoadScheduleAvailableDateParams } from '../../modules/Schedule/types';
 import { IHolder, IFetchHolderAccountsParams } from '../../modules/AccountList/types';
-import { IAppendFormRecordParams } from '../../modules/Holder/types';
 export declare class BookingByStepImpl extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -127,20 +126,6 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * @param params
      */
     fetchHolderAccountsAsync(params: IFetchHolderAccountsParams): Promise<void>;
-    /**
-     * 获取 holder 表单 map
-     */
-    getHolderFormMap(): import("../../modules").HolderFormMap;
-    /**
-     * 登录后或外部触发时，按当前 holderMap 批量刷新所有表单的 records
-     */
-    refreshAllHolderFormRecords(params?: {
-        customer_id?: number;
-    }): Promise<import("../../modules").HolderFormMap>;
-    /**
-     * 添加表单记录
-     */
-    appendFormRecord(params: IAppendFormRecordParams): import("../../modules").IFormRecord;
     setDateRange(dateRange: ITime[]): Promise<void>;
     clearDateRange(): void;
     getDateRange(): Promise<ITime[]>;
@@ -317,7 +302,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     autoSelectAllProductResources(resources_code: string, timeSlots?: TimeSliceItem): {
         errorList: any[];
     };
-    getTimeSlotByAllResources(resources_code: string, split?: number): any[];
+    getTimeSlotByAllResources(resources_code: string): any[];
     getTimeSlotByAllResourcesForDate({ resources_code, startDate, endDate }: {
         resources_code: string;
         startDate: string;
@@ -326,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 5 | 2 | 4 | 3 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingByStep/index.js

@@ -89,7 +89,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     const moduleArr = [
       "accountList",
-      "holder",
       "cart",
       "schedule",
       "summary",
@@ -380,27 +379,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     return this.store.accountList.fetchHolderAccounts(params);
   }
-  /**
-   * 获取 holder 表单 map
-   */
-  getHolderFormMap() {
-    return this.store.holder.getHolderFormMap();
-  }
-  /**
-   * 登录后或外部触发时，按当前 holderMap 批量刷新所有表单的 records
-   */
-  async refreshAllHolderFormRecords(params) {
-    return this.store.holder.refreshAllFormRecords({
-      customer_id: params == null ? void 0 : params.customer_id,
-      useCache: false
-    });
-  }
-  /**
-   * 添加表单记录
-   */
-  appendFormRecord(params) {
-    return this.store.holder.appendFormRecord(params);
-  }
   // 设置日期范围,注入到日期模块中
   async setDateRange(dateRange) {
     this.store.date.setDateRange(dateRange);
@@ -508,14 +486,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           date = (normalProductCartItem == null ? void 0 : normalProductCartItem.start_date) || "";
         }
         this.updateQuotationPriceAndCart(date);
-        try {
-          const customerId = Number(accountInfo.id);
-          await this.refreshAllHolderFormRecords({
-            customer_id: customerId
-          });
-        } catch (error) {
-          console.error("[BookingByStep] 登录后刷新 holder 表单失败", error);
-        }
       }
     } else {
       throw new Error(`没有找到${accountId}账户`);
@@ -542,11 +512,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 购物车提交订单
   async submitOrder(extraData) {
-    var _a;
     const cartItems = this.store.cart.getItems();
     const newCartItems = (0, import_lodash_es.cloneDeep)(cartItems);
     newCartItems.forEach((item) => {
-      var _a2;
+      var _a;
       if (item._origin.resources && item._origin.resources.length) {
         item._origin.resources = item._origin.resources.map((n) => {
           const newResourcesItem = (0, import_lodash_es.cloneDeep)(n);
@@ -556,7 +525,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           return { ...newResourcesItem };
         });
         const { currentCapacity, formatCapacity } = (0, import_capacity.getCapacityInfoByCartItem)(item);
-        if (!((_a2 = item._origin) == null ? void 0 : _a2.metadata)) {
+        if (!((_a = item._origin) == null ? void 0 : _a.metadata)) {
           item._origin.metadata = {};
         }
         item._origin.metadata.capacity = formatCapacity;
@@ -574,7 +543,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         cartItems: newCartItems,
         type,
         platform: this.platform,
-        business_code: (_a = this.otherParams) == null ? void 0 : _a.business_code,
         extraData
       }
     });
@@ -660,15 +628,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         account = activeAccount;
       }
     }
-    try {
-      this.store.holder.ensureFormByProduct({
-        product: productData,
-        shop_id: (productData == null ? void 0 : productData.shop_id) || "",
-        useCache: true
-      });
-    } catch (error) {
-      console.error("[BookingByStep] 加载 holder 表单失败", error);
-    }
     const flag = this.store.cart.mergeCartItemByRowKey({
       rowKey,
       quantity,
@@ -1191,7 +1150,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
         const totalCapacity = (countMap[n.id] || []).reduce(
           (sum, item) => {
-            const hasOverlap = (0, import_dayjs.default)(item.time.start_at).isBefore((0, import_dayjs.default)(timeSlots.end_at)) && (0, import_dayjs.default)(item.time.end_at).isAfter((0, import_dayjs.default)(timeSlots.start_at));
+            const hasOverlap = !(0, import_dayjs.default)(item.time.start_at).isAfter((0, import_dayjs.default)(timeSlots.start_at)) && !(0, import_dayjs.default)(item.time.end_at).isBefore((0, import_dayjs.default)(timeSlots.end_at));
             return hasOverlap ? sum + item.pax : sum;
           },
           0
@@ -1273,10 +1232,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       );
       cartItems2.forEach((item, index) => {
-        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
         const { currentCapacity } = (0, import_capacity.getCapacityInfoByCartItem)(item);
-        const hasOriginTimeSlot = Boolean(item._origin.start_time) && Boolean(item._origin.end_time) && !(timeSlots == null ? void 0 : timeSlots.start_time);
-        if (hasOriginTimeSlot) {
+        if (item._origin.start_time && !(timeSlots == null ? void 0 : timeSlots.start_time)) {
           recordTimeSlots = {
             start_time: item._origin.start_time,
             end_time: item._origin.end_time,
@@ -1288,13 +1246,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           const currentResourceConfig = (_c = (_b = (_a2 = item._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b.resources) == null ? void 0 : _c.find(
             (n) => n.code === resources_code
           );
-          if (index !== 0 && recordTimeSlots && (currentResourceConfig == null ? void 0 : currentResourceConfig.type) === "single" && ((_d = item._productOrigin) == null ? void 0 : _d.duration) && !hasFlexibleProduct && !hasOriginTimeSlot) {
-            const recordEndAt = recordTimeSlots.end_at ? (0, import_dayjs.default)(recordTimeSlots.end_at) : (0, import_dayjs.default)(`${item.start_date} ${recordTimeSlots.end_time}`);
-            let start_at = recordEndAt;
-            let end_at = start_at.add(
+          if (index !== 0 && recordTimeSlots && (currentResourceConfig == null ? void 0 : currentResourceConfig.type) === "single" && ((_d = item._productOrigin) == null ? void 0 : _d.duration) && !hasFlexibleProduct) {
+            let start_at = (0, import_dayjs.default)(recordTimeSlots.end_time).add(
               ((_f = (_e = item._productOrigin) == null ? void 0 : _e.duration) == null ? void 0 : _f.value) || 10,
               "minutes"
             );
+            let end_at = start_at.add(
+              ((_h = (_g = item._productOrigin) == null ? void 0 : _g.duration) == null ? void 0 : _h.value) || 10,
+              "minutes"
+            );
             recordTimeSlots = {
               start_time: start_at.format("HH:mm"),
               end_time: end_at.format("HH:mm"),
@@ -1346,7 +1306,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           const allCartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
           let selectedResources = [];
           const resources2 = (0, import_lodash_es.cloneDeep)(
-            ((_h = (_g = item._productOrigin) == null ? void 0 : _g.product_resource) == null ? void 0 : _h.resources) || []
+            ((_j = (_i = item._productOrigin) == null ? void 0 : _i.product_resource) == null ? void 0 : _j.resources) || []
           );
           const currentResourcesRenderList = [];
           resources2.forEach((n) => {
@@ -1394,11 +1354,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               return recordCount >= currentCapacity;
             });
           });
-          const targetRenderList = (_i = productResources.find(
+          const targetRenderList = (_k = productResources.find(
             (n) => n.code === resources_code
-          )) == null ? void 0 : _i.renderList;
+          )) == null ? void 0 : _k.renderList;
           if (targetRenderList && targetRenderList.length > 0) {
-            if ((_j = item._origin.resources) == null ? void 0 : _j.some(
+            if ((_l = item._origin.resources) == null ? void 0 : _l.some(
               (n) => n.form_id === targetRenderList[0].form_id
             )) {
               return;
@@ -1406,9 +1366,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             const fastestResource = (0, import_timeslots.findFastestAvailableResource)({
               resources: targetRenderList,
               currentCapacity,
-              countMap: selectResourcesMap,
-              targetDate: (_k = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _k.date,
-              durationMinutes: ((_l = item == null ? void 0 : item.duration) == null ? void 0 : _l.value) || ((_n = (_m = item == null ? void 0 : item._productOrigin) == null ? void 0 : _m.duration) == null ? void 0 : _n.value) || 10
+              countMap: selectResourcesMap
             });
             const targetResource = fastestResource || targetRenderList[0];
             targetResource.capacity = currentCapacity;
@@ -1445,7 +1403,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     return { errorList };
   }
   // 从购物车中获取已经分配好第一步资源的所有时间片
-  getTimeSlotByAllResources(resources_code, split = 10) {
+  getTimeSlotByAllResources(resources_code) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     let dateRange = this.store.date.getDateRange();
     const resources = [];
@@ -1603,7 +1561,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       resourcesMap,
       duration,
       currentDate: dateRange[0].date,
-      split,
+      split: 10,
       resourcesUseableMap,
       capacity: maxCapacity,
       cut_off_time: maxCutOffTime,

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

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule, HolderModule } from '../../modules';
+import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule } from '../../modules';
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -16,7 +16,6 @@ export interface BookingByStepState {
     schedule: ScheduleModule;
     salesSummary?: SalesSummaryModule;
     scanOrderLogger?: ScanOrderLoggerModule;
-    holder: HolderModule;
 }
 export declare function createModule<T extends keyof BookingByStepState>(moduleName: T, solutionName: string, name?: string, version?: string): BookingByStepState[T];
 export declare enum BookingByStepHooks {

package/lib/solution/BookingByStep/types.js

@@ -81,11 +81,6 @@ function createModule(moduleName, solutionName, name, version) {
         `${solutionName}_${name || moduleName}`,
         version
       );
-    case "holder":
-      return new import_modules.HolderModule(
-        `${solutionName}_${name || moduleName}`,
-        version
-      );
     default:
       throw new Error(`Unknown module type: ${moduleName}`);
   }

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

@@ -49,27 +49,8 @@ var formatDefaultCapacitys = ({
       const id = d.bundle_product_id;
       const variantId = d.bundle_variant_id;
       const item = ((capacity == null ? void 0 : capacity.package) || []).find(
-        (item2) => item2.product_id == id || item2.product_id == variantId
+        (item2) => item2.product_id === id || item2.product_id === variantId
       );
-      if (!item && (window == null ? void 0 : window.sendWarningLog)) {
-        window.sendWarningLog({
-          title: "未找到套餐 capacity 配置",
-          content: [
-            {
-              key: "product_id",
-              value: id
-            },
-            {
-              key: "variant_id",
-              value: variantId
-            },
-            {
-              key: "package",
-              value: JSON.stringify((capacity == null ? void 0 : capacity.package) || [])
-            }
-          ]
-        });
-      }
       return {
         id,
         value: item ? d.num || 0 : 0,

package/lib/solution/BookingByStep/utils/timeslots.d.ts

@@ -19,12 +19,10 @@ export declare function calculateResourceAvailableTime({ resource, timeSlots, cu
  * @param countMap 已预约数量映射
  * @returns 最快可用的资源
  */
-export declare function findFastestAvailableResource({ resources, currentCapacity, countMap, targetDate, durationMinutes, }: {
+export declare function findFastestAvailableResource({ resources, currentCapacity, countMap, }: {
     resources: ResourceItem[];
     currentCapacity?: number;
     countMap?: Record<number, number>;
-    targetDate?: string | Dayjs;
-    durationMinutes?: number;
 }): ResourceItem | null;
 /**
  * 给定一个时间列表，通过开始和结束时间过滤出符合条件的时间段