@pisell/pisellos 2.3.44 → 2.3.45

package/lib/solution/BaseSales/index.js

@@ -1008,7 +1008,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     return isChanged;
   }
   async initialize(core, options = {}) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     this.core = core;
     this.initializeOptions = options || {};
     this.paymentNumberDevicePrefix = null;
@@ -1019,9 +1019,10 @@ 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 = (_c = (_b = this.appPlugin) == null ? void 0 : _b.getApp) == null ? void 0 : _c.call(_b);
-    this.logger = app == null ? void 0 : app.logger;
+    const app = this.appPlugin.getApp();
+    this.logger = app.logger;
     const targetCacheData = this.readSessionCacheData();
     const moduleNames = this.getRegisteredModuleNames();
     moduleNames.forEach((step) => {
@@ -1046,7 +1047,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 ((_d = this.otherParams) == null ? void 0 : _d.enableTempOrderPersist) === "boolean") {
+    if (this.store.order && typeof ((_b = this.otherParams) == null ? void 0 : _b.enableTempOrderPersist) === "boolean") {
       this.store.order.setEnableTempOrderPersist(
         this.otherParams.enableTempOrderPersist
       );
@@ -1900,7 +1901,6 @@ 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,
@@ -1910,11 +1910,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 } : {},
-      ...smallTicketDataFlag !== void 0 ? { smallTicketDataFlag } : {},
+      ...(params == null ? void 0 : params.smallTicketDataFlag) !== void 0 ? { smallTicketDataFlag: params.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.shouldUseCheckoutSyncTask() ? this.store.order.submitTempOrder(submitParams) : this.store.order.submitTempOrderAsync(submitParams);
+    return this.store.order.submitTempOrder(submitParams);
   }
   async saveSalesOrderDraft(params) {
     var _a, _b, _c, _d;
@@ -1936,35 +1936,20 @@ 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 } : {},
-      ...smallTicketDataFlag !== void 0 ? { smallTicketDataFlag } : {},
+      ...(params == null ? void 0 : params.smallTicketDataFlag) !== void 0 ? { smallTicketDataFlag: params.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) {
@@ -2024,7 +2009,6 @@ 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/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;

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;
 /**
  * 给定一个时间列表，通过开始和结束时间过滤出符合条件的时间段

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

@@ -77,15 +77,10 @@ function calculateResourceAvailableTime({
 function findFastestAvailableResource({
   resources,
   currentCapacity = 1,
-  countMap = {},
-  targetDate,
-  durationMinutes = 30
+  countMap = {}
 }) {
   var _a, _b, _c;
   const currentTime = (0, import_dayjs.default)();
-  const resolvedDuration = durationMinutes > 0 ? durationMinutes : 30;
-  const targetDay = targetDate ? (0, import_dayjs.default)(targetDate) : currentTime;
-  const isTargetDayToday = targetDay.isSame(currentTime, "day");
   let fastestTime = null;
   let fastestResources = [];
   console.log("[TimeslotUtils] 查找最快可用资源:", {
@@ -95,22 +90,19 @@ function findFastestAvailableResource({
     countMap
   });
   for (const resource of resources) {
-    const targetDayTimes = resource.times.filter((time) => {
-      const isSameTargetDay = (0, import_dayjs.default)(time.start_at).isSame(targetDay, "day");
-      if (!isSameTargetDay)
-        return false;
-      if (!isTargetDayToday)
-        return true;
-      return (0, import_dayjs.default)(time.end_at).isAfter(currentTime);
+    const todayTimes = resource.times.filter((time) => {
+      const isToday = (0, import_dayjs.default)(time.start_at).isSame(currentTime, "day");
+      const isStillWorking = (0, import_dayjs.default)(time.end_at).isAfter(currentTime);
+      return isToday && isStillWorking;
     });
-    if (targetDayTimes.length === 0) {
+    if (todayTimes.length === 0) {
       console.log(`[TimeslotUtils] 资源 ${resource.id}(${resource.main_field}) 今日无可用时间段`);
       continue;
     }
-    for (const time of targetDayTimes) {
+    for (const time of todayTimes) {
       const workStartTime = (0, import_dayjs.default)(time.start_at);
       const workEndTime = (0, import_dayjs.default)(time.end_at);
-      let nextAvailableTime = isTargetDayToday && currentTime.isAfter(workStartTime) ? currentTime : workStartTime;
+      let nextAvailableTime = currentTime.isBefore(workStartTime) ? workStartTime : currentTime;
       console.log(`[TimeslotUtils] 检查资源 ${resource.id}(${resource.main_field}):`, {
         workTime: `${workStartTime.format("HH:mm")}-${workEndTime.format("HH:mm")}`,
         checkStartTime: nextAvailableTime.format("HH:mm:ss"),
@@ -134,7 +126,7 @@ function findFastestAvailableResource({
           pax: event.pax || 1
         });
         if (resource.resourceType === "single" || (resource.capacity || 1) === 1) {
-          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(resolvedDuration, "minute"))) {
+          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(30, "minute"))) {
             finalAvailableTime = eventEnd;
             console.log(`[TimeslotUtils] 发现时间冲突，调整到: ${finalAvailableTime.format("HH:mm:ss")}`);
           }
@@ -142,7 +134,7 @@ function findFastestAvailableResource({
           const totalCapacity = resource.capacity || 0;
           const currentUsedCapacity = countMap[resource.id] || 0;
           const eventUsedCapacity = event.pax || 1;
-          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(resolvedDuration, "minute"))) {
+          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(30, "minute"))) {
             const totalRequiredCapacity = currentUsedCapacity + currentCapacity + eventUsedCapacity;
             if (totalRequiredCapacity > totalCapacity) {
               finalAvailableTime = eventEnd;
@@ -151,7 +143,7 @@ function findFastestAvailableResource({
           }
         }
       }
-      if (finalAvailableTime.add(resolvedDuration, "minute").isAfter(workEndTime)) {
+      if (finalAvailableTime.isAfter(workEndTime)) {
         console.log(`[TimeslotUtils] 资源 ${resource.id} 可用时间超出工作时间，跳过`);
         continue;
       }

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

@@ -326,7 +326,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态
@@ -445,19 +445,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
-        action: "reloadCatalog";
-    } | {
-        action: "add";
-        cacheItem: any;
-    } | {
-        action: "requiresDetail";
-        payload: AddProductRequiresDetailPayload;
-    } | {
-        action: "requiresBookingEdit";
-        cacheItem: any;
-        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
-    };
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/lib/solution/BookingTicket/index.js

@@ -1093,11 +1093,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
    */
   scanGlobalListener(callback) {
     const localSearch = (v) => this.store.products.findProductsByCodeOrBarcode(v);
-    const scanCallback = (0, import_handleScan.handleGlobalScan)(
-      this.request,
-      localSearch,
-      this.getSubmitOrderSalesChannel()
-    );
+    const scanCallback = (0, import_handleScan.handleGlobalScan)(this.request, localSearch);
     const safeCallback = (d) => {
       try {
         callback(d);
@@ -1426,11 +1422,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     }
     try {
       const localSearch = (v) => this.store.products.findProductsByCodeOrBarcode(v);
-      const scanCallback = (0, import_handleScan.handleGlobalScan)(
-        this.request,
-        localSearch,
-        this.getSubmitOrderSalesChannel()
-      );
+      const scanCallback = (0, import_handleScan.handleGlobalScan)(this.request, localSearch);
       const raw = await scanCallback({ type: "nativeScanner", value: trimmed });
       const formatted = (0, import_formatGlobalScan.formatGlobalScanResult)(raw, trimmed);
       if (!formatted) {

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

@@ -2,11 +2,9 @@ import { RequestPlugin } from '../../../../plugins';
 /**
  * 处理全局扫码
  * @param request 请求插件
- * @param localSearch 本地商品搜索
- * @param channel 当前销售渠道
  * @returns 处理结果
  */
-export declare const handleGlobalScan: (request: RequestPlugin, localSearch: (v: string) => any[], channel?: string) => (scanResult: {
+export declare const handleGlobalScan: (request: RequestPlugin, localSearch: (v: string) => any[]) => (scanResult: {
     type: string;
     value: string;
 }) => Promise<any>;

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

@@ -102,14 +102,14 @@ var handleScanFn = (getRequestList, localSearch) => {
     }
   };
 };
-var handleGlobalScan = (request, localSearch, channel) => {
+var handleGlobalScan = (request, localSearch) => {
   const getRequestList = (value) => {
     let requestList = [];
     if (value.startsWith("WL")) {
       requestList = [(0, import_cloudSearch.searchWallet)(request, value)];
     } else {
       requestList = [
-        ...channel === "kiosk" ? [] : [(0, import_cloudSearch.searchOrder)(request, value)],
+        (0, import_cloudSearch.searchOrder)(request, value),
         (0, import_cloudSearch.searchWalletPass)(request, value),
         (0, import_cloudSearch.searchWallet)(request, value),
         (0, import_cloudSearch.searchProduct)(request, value)