@pisell/pisellos 2.3.53 → 2.3.55

package/lib/server/index.d.ts

@@ -49,6 +49,10 @@ declare class Server {
     private productQuerySubscribers;
     /** subscriberId → 智能定价变价时间点定时器句柄（与 subscriber 分离存储，便于 clear） */
     private productQueryScheduleTimers;
+    /** 餐牌筛选为空时才触发的菜单/日程缓存自愈，避免每次商品查询都请求远端。 */
+    private menuScheduleRefreshInFlight;
+    private lastMenuScheduleRefreshAt;
+    private readonly MENU_SCHEDULE_REFRESH_COOLDOWN_MS;
     private orderQuerySubscribers;
     private bookingQuerySubscribers;
     private bookingRemoteQuerySubscribers;
@@ -262,6 +266,16 @@ declare class Server {
      * 存储订阅者信息，便于数据变更时推送最新结果
      */
     private handleProductQuery;
+    /**
+     * ProductList callers such as standalone retail pages do not always have a selected schedule.
+     * In that case query against the current local time so menu availability can still be evaluated.
+     */
+    private resolveProductQueryScheduleContext;
+    /**
+     * OpenData 的关联餐牌可能已更新，而 server_menu/server_schedule 仍命中本地持久化缓存。
+     * 仅在当前筛选没有任何生效餐牌时刷新一次，并由调用方重新计算筛选结果。
+     */
+    private refreshMenuScheduleCacheAfterEmptyResult;
     /**
      * 按商品 id 查询单条（GET /shop/product/query/:productId）
      * schedule_date 必填：query 或 data；schedule_datetime 可选。不走订阅。

package/lib/server/index.js

@@ -82,6 +82,10 @@ var Server = class {
     this.productQuerySubscribers = /* @__PURE__ */ new Map();
     /** subscriberId → 智能定价变价时间点定时器句柄（与 subscriber 分离存储，便于 clear） */
     this.productQueryScheduleTimers = /* @__PURE__ */ new Map();
+    /** 餐牌筛选为空时才触发的菜单/日程缓存自愈，避免每次商品查询都请求远端。 */
+    this.menuScheduleRefreshInFlight = null;
+    this.lastMenuScheduleRefreshAt = 0;
+    this.MENU_SCHEDULE_REFRESH_COOLDOWN_MS = 30 * 1e3;
     // ---- 订单 / 预约列表查询订阅者 ----
     this.orderQuerySubscribers = /* @__PURE__ */ new Map();
     this.bookingQuerySubscribers = /* @__PURE__ */ new Map();
@@ -215,7 +219,11 @@ var Server = class {
      */
     this.handleProductQuery = async ({ url, method, data, config }) => {
       console.log("[Server] handleProductQuery:", url, method, data, config);
-      const { menu_list_ids, schedule_datetime, schedule_date, customer_id, ids, extension_type, strategy_context } = data;
+      const { menu_list_ids, customer_id, ids, extension_type, strategy_context } = data;
+      const { schedule_date, schedule_datetime } = this.resolveProductQueryScheduleContext({
+        schedule_date: data.schedule_date,
+        schedule_datetime: data.schedule_datetime
+      });
       const { callback, subscriberId } = config || {};
       this.logInfo("handleProductQuery: 开始处理商品查询请求", {
         menu_list_ids,
@@ -2211,15 +2219,12 @@ var Server = class {
       return;
     const scheduleDate = subscriber.context.schedule_date || (0, import_dayjs.default)().format("YYYY-MM-DD");
     const timerIds = [];
-    for (const timePoint of timePoints) {
-      const delayMs = this.computeScheduleTimePointDelayMs(scheduleDate, timePoint);
-      if (delayMs < 0)
-        continue;
-      const timerId = setTimeout(() => {
-        void this.onScheduleTimePointTimerFire(subscriberId, timerId);
-      }, delayMs);
-      timerIds.push(timerId);
-    }
+    setInterval(() => {
+      const currentTime = (0, import_dayjs.default)().format("hh:mm");
+      if (timePoints.includes(currentTime)) {
+        this.onScheduleTimePointTimerFire(subscriberId);
+      }
+    }, 6e4);
     if (timerIds.length > 0) {
       this.productQueryScheduleTimers.set(subscriberId, timerIds);
       subscriber.scheduleTimerIds = timerIds;
@@ -2234,7 +2239,7 @@ var Server = class {
    * schedule 变价时间点定时器触发：刷新 schedule_datetime 后重算并 callback。
    */
   async onScheduleTimePointTimerFire(subscriberId, timerId) {
-    this.removeScheduleTimerRef(subscriberId, timerId);
+    timerId && this.removeScheduleTimerRef(subscriberId, timerId);
     if (!this.productQuerySubscribers.has(subscriberId))
       return;
     const subscriber = this.productQuerySubscribers.get(subscriberId);
@@ -2277,6 +2282,43 @@ var Server = class {
       this.scheduleSubscriberTimePointReloads(subscriberId, timePoints);
     }
   }
+  /**
+   * ProductList callers such as standalone retail pages do not always have a selected schedule.
+   * In that case query against the current local time so menu availability can still be evaluated.
+   */
+  resolveProductQueryScheduleContext(params) {
+    const now = (0, import_dayjs.default)();
+    const schedule_datetime = typeof params.schedule_datetime === "string" && params.schedule_datetime.trim() ? params.schedule_datetime : now.format("YYYY-MM-DD HH:mm:ss");
+    const schedule_date = typeof params.schedule_date === "string" && params.schedule_date.trim() ? params.schedule_date : (0, import_dayjs.default)(schedule_datetime).isValid() ? (0, import_dayjs.default)(schedule_datetime).format("YYYY-MM-DD") : now.format("YYYY-MM-DD");
+    return { schedule_date, schedule_datetime };
+  }
+  /**
+   * OpenData 的关联餐牌可能已更新，而 server_menu/server_schedule 仍命中本地持久化缓存。
+   * 仅在当前筛选没有任何生效餐牌时刷新一次，并由调用方重新计算筛选结果。
+   */
+  async refreshMenuScheduleCacheAfterEmptyResult() {
+    if (!this.menu || !this.schedule)
+      return false;
+    const now = Date.now();
+    if (now - this.lastMenuScheduleRefreshAt < this.MENU_SCHEDULE_REFRESH_COOLDOWN_MS) {
+      return false;
+    }
+    if (!this.menuScheduleRefreshInFlight) {
+      this.lastMenuScheduleRefreshAt = now;
+      this.menuScheduleRefreshInFlight = Promise.all([
+        this.menu.loadMenuList(),
+        this.schedule.loadAllSchedule()
+      ]).then(() => void 0).catch((error) => {
+        this.logWarning("刷新菜单/日程缓存失败，继续使用现有缓存", {
+          error: error instanceof Error ? error.message : String(error)
+        });
+      }).finally(() => {
+        this.menuScheduleRefreshInFlight = null;
+      });
+    }
+    await this.menuScheduleRefreshInFlight;
+    return true;
+  }
   /**
    * 执行 sales 搜索并登记可见订单号。
    * 搜索参数完全透传后端，OS 不做过滤、筛选、排序。
@@ -3779,10 +3821,22 @@ var Server = class {
           data: (normalized == null ? void 0 : normalized.data) ?? null
         };
       }
-      return this.withSyncedOrderIdInCheckoutResponse(
+      const response = this.withSyncedOrderIdInCheckoutResponse(
         syncResult.normalizedResponse,
         syncResult.syncedOrder
       );
+      const syncedOrder = syncResult.syncedOrder;
+      if (syncedOrder && this.shouldBuildSmallTicketData(syncResult.checkoutData) && this.isSalesOrderFullyPaid(syncedOrder)) {
+        await this.dispatchLocalReceiptPrint({
+          checkoutData: syncResult.checkoutData,
+          order: syncedOrder,
+          response: syncResult.normalizedResponse,
+          requireFullyPaid: true,
+          // print_all 的 type=0 是收据打印；不要沿用同步成功后的券/手环打印 type=99。
+          isManualPrint: true
+        });
+      }
+      return response;
     } catch (error) {
       const backendError = this.extractBackendErrorResponse(error);
       if (backendError) {
@@ -5072,13 +5126,16 @@ var Server = class {
     let activeMenuList = [];
     if (menu_list_ids && Array.isArray(menu_list_ids) && menu_list_ids.length > 0) {
       const tMenu = performance.now();
-      const menuList = this.menu.getMenuByIds(menu_list_ids);
-      activeMenuList = menuList.filter((menu) => {
+      const getActiveMenus = () => this.menu.getMenuByIds(menu_list_ids).filter((menu) => {
         var _a;
         return ((_a = this.schedule) == null ? void 0 : _a.getDateIsInSchedule(schedule_datetime, menu.schedule)) || false;
       });
+      activeMenuList = getActiveMenus();
+      if (!activeMenuList.length && await this.refreshMenuScheduleCacheAfterEmptyResult()) {
+        activeMenuList = getActiveMenus();
+      }
       (0, import_product.perfMark)("computeQuery.filterActiveMenu", performance.now() - tMenu, {
-        totalMenu: menuList.length,
+        totalMenu: menu_list_ids.length,
         activeMenu: activeMenuList.length
       });
     }

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

@@ -290,6 +290,13 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
+    /**
+     * 默认保持 WebPOS 的本地待同步订单模式；需要云端确认后才算成功的渠道可覆盖此策略。
+     * otherParams.checkoutSyncTaskEnabled 优先，便于同一 solution 按入口恢复旧行为。
+     */
+    protected shouldUseCheckoutSyncTask(): boolean;
+    /** 可由特定 solution 为真实 checkout 补充默认收据数据请求。 */
+    protected getDefaultCheckoutSmallTicketDataFlag(): number | undefined;
     printLocalOrderReceipt<T = any>(lookup?: BaseSalesPrintLocalOrderReceiptParams): Promise<T>;
     private getSubmitPaymentStatus;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;

package/lib/solution/BaseSales/index.js

@@ -1041,7 +1041,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     return isChanged;
   }
   async initialize(core, options = {}) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     this.core = core;
     this.initializeOptions = options || {};
     this.paymentNumberDevicePrefix = null;
@@ -1052,10 +1052,9 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     this.request = core.getPlugin("request");
     this.appPlugin = core.getPlugin("app");
     if (!this.appPlugin) {
-      throw new Error("Checkout 解决方案需要 app 插件支持");
     }
-    const app = this.appPlugin.getApp();
-    this.logger = app.logger;
+    const app = (_c = (_b = this.appPlugin) == null ? void 0 : _b.getApp) == null ? void 0 : _c.call(_b);
+    this.logger = app == null ? void 0 : app.logger;
     const targetCacheData = this.readSessionCacheData();
     const moduleNames = this.getRegisteredModuleNames();
     moduleNames.forEach((step) => {
@@ -1080,7 +1079,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (this.store.schedule && !this.isScheduleListLoaded(this.store.schedule)) {
       await this.store.schedule.loadAllSchedule();
     }
-    if (this.store.order && typeof ((_b = this.otherParams) == null ? void 0 : _b.enableTempOrderPersist) === "boolean") {
+    if (this.store.order && typeof ((_d = this.otherParams) == null ? void 0 : _d.enableTempOrderPersist) === "boolean") {
       this.store.order.setEnableTempOrderPersist(
         this.otherParams.enableTempOrderPersist
       );
@@ -1934,6 +1933,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw new Error("BaseSales 解决方案需要 order 模块支持");
     }
     const inferredPaymentStatus = this.getSubmitPaymentStatus(params == null ? void 0 : params.paymentStatus);
+    const smallTicketDataFlag = (params == null ? void 0 : params.smallTicketDataFlag) ?? this.getDefaultCheckoutSmallTicketDataFlag();
     const submitParams = {
       cacheId: this.cacheId,
       platform: (_a = this.otherParams) == null ? void 0 : _a.platform,
@@ -1943,11 +1943,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       request_unique_idempotency_token: this.store.order.generateIdempotencyToken(),
       ...(params == null ? void 0 : params.payments) !== void 0 ? { payments: params.payments } : {},
       ...inferredPaymentStatus !== void 0 ? { paymentStatus: inferredPaymentStatus } : {},
-      ...(params == null ? void 0 : params.smallTicketDataFlag) !== void 0 ? { smallTicketDataFlag: params.smallTicketDataFlag } : {},
+      ...smallTicketDataFlag !== void 0 ? { smallTicketDataFlag } : {},
       ...(params == null ? void 0 : params.confirmPendingVoucherPayments) !== void 0 ? { confirmPendingVoucherPayments: params.confirmPendingVoucherPayments } : {},
       ...(params == null ? void 0 : params.enhancePayload) !== void 0 ? { enhancePayload: params.enhancePayload } : {}
     };
-    return this.store.order.submitTempOrder(submitParams);
+    return this.shouldUseCheckoutSyncTask() ? this.store.order.submitTempOrder(submitParams) : this.store.order.submitTempOrderAsync(submitParams);
   }
   async saveSalesOrderDraft(params) {
     var _a, _b, _c, _d;
@@ -1969,20 +1969,35 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw new Error("BaseSales 解决方案需要 order 模块支持");
     }
     const inferredPaymentStatus = this.getSubmitPaymentStatus(params == null ? void 0 : params.paymentStatus);
+    const smallTicketDataFlag = (params == null ? void 0 : params.smallTicketDataFlag) ?? this.getDefaultCheckoutSmallTicketDataFlag();
     const submitParams = {
       cacheId: this.cacheId,
       platform: (_a = this.otherParams) == null ? void 0 : _a.platform,
       businessCode: ((_b = this.otherParams) == null ? void 0 : _b.businessCode) || ((_c = this.otherParams) == null ? void 0 : _c.business_code),
       channel: this.getSubmitOrderSalesChannel(),
       type: (_d = this.otherParams) == null ? void 0 : _d.type,
+      request_unique_idempotency_token: this.store.order.generateIdempotencyToken(),
       ...(params == null ? void 0 : params.payments) !== void 0 ? { payments: params.payments } : {},
       ...inferredPaymentStatus !== void 0 ? { paymentStatus: inferredPaymentStatus } : {},
-      ...(params == null ? void 0 : params.smallTicketDataFlag) !== void 0 ? { smallTicketDataFlag: params.smallTicketDataFlag } : {},
+      ...smallTicketDataFlag !== void 0 ? { smallTicketDataFlag } : {},
       ...(params == null ? void 0 : params.confirmPendingVoucherPayments) !== void 0 ? { confirmPendingVoucherPayments: params.confirmPendingVoucherPayments } : {},
       ...(params == null ? void 0 : params.enhancePayload) !== void 0 ? { enhancePayload: params.enhancePayload } : {}
     };
     return this.store.order.submitTempOrderAsync(submitParams);
   }
+  /**
+   * 默认保持 WebPOS 的本地待同步订单模式；需要云端确认后才算成功的渠道可覆盖此策略。
+   * otherParams.checkoutSyncTaskEnabled 优先，便于同一 solution 按入口恢复旧行为。
+   */
+  shouldUseCheckoutSyncTask() {
+    var _a;
+    const configured = (_a = this.otherParams) == null ? void 0 : _a.checkoutSyncTaskEnabled;
+    return typeof configured === "boolean" ? configured : true;
+  }
+  /** 可由特定 solution 为真实 checkout 补充默认收据数据请求。 */
+  getDefaultCheckoutSmallTicketDataFlag() {
+    return void 0;
+  }
   async printLocalOrderReceipt(lookup) {
     var _a, _b, _c, _d, _e, _f, _g;
     if (!this.store.order) {
@@ -2042,6 +2057,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     const channel = params.channel ?? this.getSubmitOrderSalesChannel();
     const syncParams = {
       ...params,
+      checkoutSyncTaskEnabled: this.shouldUseCheckoutSyncTask(),
       ...businessCode !== void 0 ? { businessCode } : {},
       ...channel !== void 0 ? { channel } : {}
     };

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

@@ -368,6 +368,9 @@ function getProductLineNoteSignature(product) {
 }
 function getPromotionLineMergeBoundary(product) {
   var _a, _b;
+  if ((product == null ? void 0 : product.product_id) === void 0 || (product == null ? void 0 : product.product_id) === null) {
+    return `custom:${getOrderProductUid(product)}`;
+  }
   if (Number(((_a = product == null ? void 0 : product.product_sku) == null ? void 0 : _a.open_sold_weight) || 0) === 1) {
     return `weighing:${getOrderProductUid(product)}`;
   }

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

@@ -10,6 +10,7 @@ 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;
@@ -126,6 +127,20 @@ 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[]>;
@@ -302,7 +317,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     autoSelectAllProductResources(resources_code: string, timeSlots?: TimeSliceItem): {
         errorList: any[];
     };
-    getTimeSlotByAllResources(resources_code: string): any[];
+    getTimeSlotByAllResources(resources_code: string, split?: number): any[];
     getTimeSlotByAllResourcesForDate({ resources_code, startDate, endDate }: {
         resources_code: string;
         startDate: string;
@@ -311,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingByStep/index.js

@@ -89,6 +89,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     const moduleArr = [
       "accountList",
+      "holder",
       "cart",
       "schedule",
       "summary",
@@ -379,6 +380,27 @@ 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);
@@ -486,6 +508,14 @@ 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}账户`);
@@ -512,10 +542,11 @@ 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 _a;
+      var _a2;
       if (item._origin.resources && item._origin.resources.length) {
         item._origin.resources = item._origin.resources.map((n) => {
           const newResourcesItem = (0, import_lodash_es.cloneDeep)(n);
@@ -525,7 +556,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           return { ...newResourcesItem };
         });
         const { currentCapacity, formatCapacity } = (0, import_capacity.getCapacityInfoByCartItem)(item);
-        if (!((_a = item._origin) == null ? void 0 : _a.metadata)) {
+        if (!((_a2 = item._origin) == null ? void 0 : _a2.metadata)) {
           item._origin.metadata = {};
         }
         item._origin.metadata.capacity = formatCapacity;
@@ -543,6 +574,7 @@ 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
       }
     });
@@ -628,6 +660,15 @@ 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,
@@ -1150,7 +1191,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).isAfter((0, import_dayjs.default)(timeSlots.start_at)) && !(0, import_dayjs.default)(item.time.end_at).isBefore((0, import_dayjs.default)(timeSlots.end_at));
+            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));
             return hasOverlap ? sum + item.pax : sum;
           },
           0
@@ -1232,9 +1273,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       );
       cartItems2.forEach((item, index) => {
-        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
         const { currentCapacity } = (0, import_capacity.getCapacityInfoByCartItem)(item);
-        if (item._origin.start_time && !(timeSlots == null ? void 0 : timeSlots.start_time)) {
+        const hasOriginTimeSlot = Boolean(item._origin.start_time) && Boolean(item._origin.end_time) && !(timeSlots == null ? void 0 : timeSlots.start_time);
+        if (hasOriginTimeSlot) {
           recordTimeSlots = {
             start_time: item._origin.start_time,
             end_time: item._origin.end_time,
@@ -1246,13 +1288,11 @@ 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) {
-            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"
-            );
+          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(
-              ((_h = (_g = item._productOrigin) == null ? void 0 : _g.duration) == null ? void 0 : _h.value) || 10,
+              ((_f = (_e = item._productOrigin) == null ? void 0 : _e.duration) == null ? void 0 : _f.value) || 10,
               "minutes"
             );
             recordTimeSlots = {
@@ -1306,7 +1346,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)(
-            ((_j = (_i = item._productOrigin) == null ? void 0 : _i.product_resource) == null ? void 0 : _j.resources) || []
+            ((_h = (_g = item._productOrigin) == null ? void 0 : _g.product_resource) == null ? void 0 : _h.resources) || []
           );
           const currentResourcesRenderList = [];
           resources2.forEach((n) => {
@@ -1354,11 +1394,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               return recordCount >= currentCapacity;
             });
           });
-          const targetRenderList = (_k = productResources.find(
+          const targetRenderList = (_i = productResources.find(
             (n) => n.code === resources_code
-          )) == null ? void 0 : _k.renderList;
+          )) == null ? void 0 : _i.renderList;
           if (targetRenderList && targetRenderList.length > 0) {
-            if ((_l = item._origin.resources) == null ? void 0 : _l.some(
+            if ((_j = item._origin.resources) == null ? void 0 : _j.some(
               (n) => n.form_id === targetRenderList[0].form_id
             )) {
               return;
@@ -1366,7 +1406,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             const fastestResource = (0, import_timeslots.findFastestAvailableResource)({
               resources: targetRenderList,
               currentCapacity,
-              countMap: selectResourcesMap
+              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
             });
             const targetResource = fastestResource || targetRenderList[0];
             targetResource.capacity = currentCapacity;
@@ -1403,7 +1445,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     return { errorList };
   }
   // 从购物车中获取已经分配好第一步资源的所有时间片
-  getTimeSlotByAllResources(resources_code) {
+  getTimeSlotByAllResources(resources_code, split = 10) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     let dateRange = this.store.date.getDateRange();
     const resources = [];
@@ -1561,7 +1603,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       resourcesMap,
       duration,
       currentDate: dateRange[0].date,
-      split: 10,
+      split,
       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 } from '../../modules';
+import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule, HolderModule } from '../../modules';
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -16,6 +16,7 @@ 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,6 +81,11 @@ 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,8 +49,27 @@ 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,10 +19,12 @@ export declare function calculateResourceAvailableTime({ resource, timeSlots, cu
  * @param countMap 已预约数量映射
  * @returns 最快可用的资源
  */
-export declare function findFastestAvailableResource({ resources, currentCapacity, countMap, }: {
+export declare function findFastestAvailableResource({ resources, currentCapacity, countMap, targetDate, durationMinutes, }: {
     resources: ResourceItem[];
     currentCapacity?: number;
     countMap?: Record<number, number>;
+    targetDate?: string | Dayjs;
+    durationMinutes?: number;
 }): ResourceItem | null;
 /**
  * 给定一个时间列表，通过开始和结束时间过滤出符合条件的时间段