@pisell/pisellos 0.0.491 → 0.0.493

package/lib/modules/ScanOrderLogger/index.js

@@ -0,0 +1,135 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/ScanOrderLogger/index.ts
+var ScanOrderLogger_exports = {};
+__export(ScanOrderLogger_exports, {
+  ScanOrderLoggerModule: () => ScanOrderLoggerModule
+});
+module.exports = __toCommonJS(ScanOrderLogger_exports);
+var import_dayjs = __toESM(require("dayjs"));
+var import_BaseModule = require("../BaseModule");
+var import_feishu = require("./providers/feishu");
+var import_grafana = require("./providers/grafana");
+__reExport(ScanOrderLogger_exports, require("./types"), module.exports);
+var defaultProviderConfig = {
+  feishu: {
+    webhook: "https://open.feishu.cn/open-apis/bot/v2/hook/REPLACE_ME"
+  },
+  grafana: {
+    endpoint: "https://grafana.example.com/collect"
+  }
+};
+var providerMap = {
+  feishu: import_feishu.feishuLoggerProvider,
+  grafana: import_grafana.grafanaLoggerProvider
+};
+var ScanOrderLoggerModule = class extends import_BaseModule.BaseModule {
+  constructor() {
+    super(...arguments);
+    this.defaultName = "scanOrderLogger";
+    this.defaultVersion = "1.0.0";
+  }
+  async initialize(core, options = {}) {
+    var _a, _b, _c;
+    this.core = core;
+    this.store = options.store;
+    const provider = ((_a = options.otherParams) == null ? void 0 : _a.provider) || "feishu";
+    const providerConfig = ((_b = options.otherParams) == null ? void 0 : _b.providerConfig) || {};
+    const context = ((_c = options.otherParams) == null ? void 0 : _c.context) || {};
+    this.store.provider = provider;
+    this.store.providerConfig = {
+      ...defaultProviderConfig,
+      ...providerConfig,
+      feishu: {
+        ...defaultProviderConfig.feishu,
+        ...providerConfig.feishu || {}
+      },
+      grafana: {
+        ...defaultProviderConfig.grafana,
+        ...providerConfig.grafana || {}
+      }
+    };
+    this.store.context = context;
+  }
+  setContext(context) {
+    this.store.context = {
+      ...this.store.context,
+      ...context
+    };
+  }
+  setProvider(provider) {
+    this.store.provider = provider;
+  }
+  setProviderConfig(providerConfig) {
+    this.store.providerConfig = {
+      ...this.store.providerConfig,
+      ...providerConfig,
+      feishu: {
+        ...this.store.providerConfig.feishu || {},
+        ...providerConfig.feishu || {}
+      },
+      grafana: {
+        ...this.store.providerConfig.grafana || {},
+        ...providerConfig.grafana || {}
+      }
+    };
+  }
+  buildRecord(params) {
+    return {
+      level: params.level || "info",
+      title: params.title,
+      timestamp: params.timestamp || (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss"),
+      payload: params.payload || {},
+      extra: params.extra || {},
+      context: this.store.context || {}
+    };
+  }
+  async addLog(params) {
+    if (!params.title) {
+      console.warn("[ScanOrderLogger] 缺少日志标题，已跳过");
+      return;
+    }
+    const provider = providerMap[this.store.provider] || import_feishu.feishuLoggerProvider;
+    const record = this.buildRecord(params);
+    try {
+      await provider.send({
+        record,
+        providerConfig: this.store.providerConfig
+      });
+    } catch (error) {
+      console.warn("[ScanOrderLogger] 日志上报失败", error);
+    }
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ScanOrderLoggerModule,
+  ...require("./types")
+});

package/lib/modules/ScanOrderLogger/providers/feishu.d.ts

@@ -0,0 +1,2 @@
+import { ScanOrderLoggerProvider } from '../types';
+export declare const feishuLoggerProvider: ScanOrderLoggerProvider;

package/lib/modules/ScanOrderLogger/providers/feishu.js

@@ -0,0 +1,82 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/ScanOrderLogger/providers/feishu.ts
+var feishu_exports = {};
+__export(feishu_exports, {
+  feishuLoggerProvider: () => feishuLoggerProvider
+});
+module.exports = __toCommonJS(feishu_exports);
+function safeStringify(payload) {
+  if (payload === void 0 || payload === null)
+    return "";
+  try {
+    return JSON.stringify(payload);
+  } catch (error) {
+    return `[unserializable: ${String(error)}]`;
+  }
+}
+function createFeishuMessageContent(contentArr) {
+  return JSON.stringify(
+    contentArr.map((item) => [
+      { tag: "text", text: `${item.key}: ` },
+      { tag: "text", text: item.value }
+    ])
+  );
+}
+var feishuLoggerProvider = {
+  async send(payload) {
+    var _a, _b;
+    const webhook = (_b = (_a = payload.providerConfig) == null ? void 0 : _a.feishu) == null ? void 0 : _b.webhook;
+    if (webhook && webhook.includes("REPLACE_ME"))
+      return;
+    if (!webhook) {
+      console.warn("[ScanOrderLogger] Feishu webhook 未配置，跳过日志上报");
+      return;
+    }
+    if (typeof fetch !== "function") {
+      console.warn("[ScanOrderLogger] 当前环境不支持 fetch，跳过 Feishu 日志上报");
+      return;
+    }
+    const { record } = payload;
+    const contentArr = [
+      { key: "日志级别", value: record.level },
+      { key: "日志时间", value: record.timestamp },
+      { key: "日志标题", value: record.title },
+      { key: "缓存标识", value: record.context.cacheId || "" },
+      { key: "日志来源", value: safeStringify(record.context) },
+      { key: "日志内容", value: safeStringify(record.payload) },
+      { key: "扩展信息", value: safeStringify(record.extra) }
+    ];
+    const contentStr = createFeishuMessageContent(contentArr);
+    await fetch(webhook, {
+      headers: {
+        "Content-Type": "application/json"
+      },
+      method: "POST",
+      body: JSON.stringify({
+        msg_type: "post",
+        content: `{"post":{"zh_cn":{"title":"${record.title}","content":${contentStr}}}}`
+      })
+    });
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  feishuLoggerProvider
+});

package/lib/modules/ScanOrderLogger/providers/grafana.d.ts

@@ -0,0 +1,2 @@
+import { ScanOrderLoggerProvider } from '../types';
+export declare const grafanaLoggerProvider: ScanOrderLoggerProvider;

package/lib/modules/ScanOrderLogger/providers/grafana.js

@@ -0,0 +1,52 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/ScanOrderLogger/providers/grafana.ts
+var grafana_exports = {};
+__export(grafana_exports, {
+  grafanaLoggerProvider: () => grafanaLoggerProvider
+});
+module.exports = __toCommonJS(grafana_exports);
+var grafanaLoggerProvider = {
+  async send(payload) {
+    var _a, _b, _c, _d;
+    const endpoint = (_b = (_a = payload.providerConfig) == null ? void 0 : _a.grafana) == null ? void 0 : _b.endpoint;
+    if (!endpoint) {
+      console.warn("[ScanOrderLogger] Grafana endpoint 未配置，跳过日志上报");
+      return;
+    }
+    if (typeof fetch !== "function") {
+      console.warn("[ScanOrderLogger] 当前环境不支持 fetch，跳过 Grafana 日志上报");
+      return;
+    }
+    await fetch(endpoint, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        ...((_d = (_c = payload.providerConfig) == null ? void 0 : _c.grafana) == null ? void 0 : _d.headers) || {}
+      },
+      body: JSON.stringify({
+        record: payload.record
+      })
+    });
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  grafanaLoggerProvider
+});

package/lib/modules/ScanOrderLogger/types.d.ts

@@ -0,0 +1,46 @@
+export type ScanOrderLogLevel = 'info' | 'warning' | 'error' | 'debug';
+export type ScanOrderLoggerProviderType = 'feishu' | 'grafana';
+export interface ScanOrderLoggerProviderFeishuConfig {
+    webhook?: string;
+}
+export interface ScanOrderLoggerProviderGrafanaConfig {
+    endpoint?: string;
+    headers?: Record<string, string>;
+}
+export interface ScanOrderLoggerProviderConfig {
+    feishu?: ScanOrderLoggerProviderFeishuConfig;
+    grafana?: ScanOrderLoggerProviderGrafanaConfig;
+}
+export interface ScanOrderLoggerContext {
+    cacheId?: string;
+    solutionName?: string;
+    moduleName?: string;
+    [key: string]: any;
+}
+export interface ScanOrderLogInput {
+    level?: ScanOrderLogLevel;
+    title: string;
+    payload?: Record<string, any>;
+    extra?: Record<string, any>;
+    timestamp?: string;
+}
+export interface ScanOrderLogRecord {
+    level: ScanOrderLogLevel;
+    title: string;
+    timestamp: string;
+    payload: Record<string, any>;
+    extra: Record<string, any>;
+    context: ScanOrderLoggerContext;
+}
+export interface ScanOrderLoggerDispatchPayload {
+    record: ScanOrderLogRecord;
+    providerConfig?: ScanOrderLoggerProviderConfig;
+}
+export interface ScanOrderLoggerProvider {
+    send: (payload: ScanOrderLoggerDispatchPayload) => Promise<void>;
+}
+export interface ScanOrderLoggerState {
+    provider: ScanOrderLoggerProviderType;
+    providerConfig: ScanOrderLoggerProviderConfig;
+    context: ScanOrderLoggerContext;
+}

package/lib/modules/ScanOrderLogger/types.js

@@ -0,0 +1,17 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/ScanOrderLogger/types.ts
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/lib/modules/Summary/utils.d.ts

@@ -7,8 +7,8 @@ export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[], i
  * @param item
  */
 export declare const getBundleDiscountList: (bundle: any[]) => any[];
-export declare const calcDiscountListDifference: (discountList: any[]) => any;
-export declare const getProductDiscountProductDiscountDifference: (item: CartItem) => any;
+export declare const calcDiscountListDifference: (discountList: any[]) => number;
+export declare const getProductDiscountProductDiscountDifference: (item: CartItem) => number;
 /**
  * 计算订单税费（折扣前/折扣后），并把单品税费信息回写到商品数据上（用于明细展示/后续计算）。
  *
@@ -100,7 +100,7 @@ export declare const calculateDeposit: (items: CartItem[]) => {
 export declare const getSurchargeAmount: ({ bookingDetail, bookingId }: {
     bookingDetail?: any;
     bookingId?: number | undefined;
-}, surcharge: any[], options: any) => any;
+}, surcharge: any[], options: any) => number;
 /**
  * 订单附加费各项信息
  *

package/lib/modules/Summary/utils.js

@@ -91,8 +91,8 @@ var getBundleDiscountList = (bundle) => {
 var calcDiscountListDifference = (discountList) => {
   return discountList.reduce((pre, cur) => {
     var _a;
-    return pre + (((_a = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a.product_discount_difference) || 0);
-  }, 0);
+    return pre.plus(((_a = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a.product_discount_difference) || 0);
+  }, new import_decimal.default(0)).toNumber();
 };
 var getProductDiscountProductDiscountDifference = (item) => {
   var _a, _b, _c, _d;
@@ -422,8 +422,8 @@ var getSurchargeAmount = ({ bookingDetail, bookingId }, surcharge, options) => {
   if (!Array.isArray(surcharge))
     return 0;
   return surcharge.reduce((total, item) => {
-    return total + (item.value || 0);
-  }, 0);
+    return total.plus(item.value || 0);
+  }, new import_decimal.default(0)).toNumber();
 };
 var getBundleItemIsOriginalPrice = (item) => {
   return (item == null ? void 0 : item.price_type) === "markup" && (item == null ? void 0 : item.price_type_ext) === "product_price";

package/lib/modules/index.d.ts

@@ -11,4 +11,8 @@ export * from './Payment';
 export * from './Resource';
 export * from './Step';
 export * from './Summary';
+export * from './SalesSummary';
 export * from './Schedule';
+export * from './Quotation';
+export * from './ScanOrderLogger';
+export * from './OpenData';

package/lib/modules/index.js

@@ -29,7 +29,11 @@ __reExport(modules_exports, require("./Payment"), module.exports);
 __reExport(modules_exports, require("./Resource"), module.exports);
 __reExport(modules_exports, require("./Step"), module.exports);
 __reExport(modules_exports, require("./Summary"), module.exports);
+__reExport(modules_exports, require("./SalesSummary"), module.exports);
 __reExport(modules_exports, require("./Schedule"), module.exports);
+__reExport(modules_exports, require("./Quotation"), module.exports);
+__reExport(modules_exports, require("./ScanOrderLogger"), module.exports);
+__reExport(modules_exports, require("./OpenData"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./Product"),
@@ -45,5 +49,9 @@ __reExport(modules_exports, require("./Schedule"), module.exports);
   ...require("./Resource"),
   ...require("./Step"),
   ...require("./Summary"),
-  ...require("./Schedule")
+  ...require("./SalesSummary"),
+  ...require("./Schedule"),
+  ...require("./Quotation"),
+  ...require("./ScanOrderLogger"),
+  ...require("./OpenData")
 });

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

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

package/lib/solution/BookingByStep/index.js

@@ -1237,7 +1237,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       );
       cartItems2.forEach((item, index) => {
-        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
         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) {
@@ -1370,7 +1370,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;

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

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, ScheduleModule } 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;
@@ -14,6 +14,8 @@ export interface BookingByStepState {
     currentProduct?: ProductData;
     currentProductMeta?: Record<string, any>;
     schedule: ScheduleModule;
+    salesSummary?: SalesSummaryModule;
+    scanOrderLogger?: ScanOrderLoggerModule;
 }
 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

@@ -36,6 +36,11 @@ function createModule(moduleName, solutionName, name, version) {
         `${solutionName}_${name || moduleName}`,
         version
       );
+    case "salesSummary":
+      return new import_modules.SalesSummaryModule(
+        `${solutionName}_${name || moduleName}`,
+        version
+      );
     case "step":
       return new import_modules.StepModule(
         `${solutionName}_${name || moduleName}`,
@@ -71,6 +76,11 @@ function createModule(moduleName, solutionName, name, version) {
         `${solutionName}_${name || moduleName}`,
         version
       );
+    case "scanOrderLogger":
+      return new import_modules.ScanOrderLoggerModule(
+        `${solutionName}_${name || moduleName}`,
+        version
+      );
     default:
       throw new Error(`Unknown module type: ${moduleName}`);
   }

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

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

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

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

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