@pisell/pisellos 0.0.233 → 0.0.235

package/dist/modules/Order/index.d.ts

@@ -11,7 +11,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     createOrder(params: CommitOrderParams['query']): {
         type: "virtual" | "appointment_booking";
-        platform: "pc" | "h5";
+        platform: string;
         sales_channel: string;
         order_sales_channel: string;
         bookings: any[];

package/dist/modules/Order/index.js

@@ -66,7 +66,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var order = {
         type: (params === null || params === void 0 ? void 0 : params.type) || 'appointment_booking',
         // 要从外面拿，virtual
-        platform: (params === null || params === void 0 ? void 0 : params.platform) || 'pc',
+        platform: (params === null || params === void 0 ? void 0 : params.platform) === 'pc' ? 'PC' : 'H5',
         sales_channel: 'my_pisel',
         order_sales_channel: 'online_store',
         bookings: [],

package/dist/modules/Payment/index.d.ts

@@ -1,7 +1,7 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { RequestPlugin } from '../../plugins';
 import { BaseModule } from '../BaseModule';
-import { PaymentModuleAPI, PaymentMethod, PaymentOrder, PaymentItem, PaymentItemInput, PaymentUpdateFields, PushOrderParams, CashPayment, EftposPayment, WalletPassPayment, RoundingRule, RoundingInterval } from './types';
+import { PaymentModuleAPI, PaymentMethod, PaymentOrder, PaymentItem, PaymentItemInput, PaymentUpdateFields, PushOrderParams, CashPayment, EftposPayment, WalletPassPayment, RoundingRule, RoundingInterval, RoundingResult } from './types';
 export * from './types';
 export { generateRequestUniqueId };
 /**
@@ -176,9 +176,9 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      * @param originalAmount 原始金额
      * @param interval 舍入间隔 (0.05, 0.1, 0.5, 1)
      * @param rule 舍入规则 (standard, standard_down, always_up, always_down)
-     * @returns 舍入后的金额（保留两位小数的字符串）
+     * @returns 舍入结果详情（包含原始金额、舍入后金额和舍入差额）
      */
-    roundAmountAsync(originalAmount: number | string, interval: RoundingInterval | number, rule: RoundingRule | string): Promise<string>;
+    roundAmountAsync(originalAmount: number | string, interval: RoundingInterval | number, rule: RoundingRule | string): Promise<RoundingResult>;
     /**
      * 标准舍入处理（处理中点情况）
      *

package/dist/modules/Payment/index.js

@@ -506,7 +506,64 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
           }
 
           // 检查关键字段是否有变化
-          if (oldMethod.code !== newMethod.code || oldMethod.name !== newMethod.name || oldMethod.type !== newMethod.type || oldMethod.enabled !== newMethod.enabled) {
+          if (oldMethod.code !== newMethod.code || oldMethod.name !== newMethod.name || oldMethod.type !== newMethod.type || oldMethod.description !== newMethod.description || oldMethod.status !== newMethod.status || oldMethod.disable !== newMethod.disable || oldMethod.is_surcharge !== newMethod.is_surcharge || oldMethod.fixed !== newMethod.fixed || oldMethod.percentage !== newMethod.percentage || oldMethod.enabled !== newMethod.enabled || JSON.stringify(oldMethod.channel_application || []) !== JSON.stringify(newMethod.channel_application || []) || JSON.stringify(oldMethod.companies || []) !== JSON.stringify(newMethod.companies || []) || JSON.stringify(oldMethod.metadata || {}) !== JSON.stringify(newMethod.metadata || {})) {
+            console.log("[PaymentModule] \u652F\u4ED8\u65B9\u5F0F ".concat(newMethod.id, " (").concat(newMethod.code, ") \u53D1\u751F\u53D8\u5316:"), {
+              id: newMethod.id,
+              changes: {
+                code: oldMethod.code !== newMethod.code ? {
+                  old: oldMethod.code,
+                  new: newMethod.code
+                } : undefined,
+                name: oldMethod.name !== newMethod.name ? {
+                  old: oldMethod.name,
+                  new: newMethod.name
+                } : undefined,
+                type: oldMethod.type !== newMethod.type ? {
+                  old: oldMethod.type,
+                  new: newMethod.type
+                } : undefined,
+                description: oldMethod.description !== newMethod.description ? {
+                  old: oldMethod.description,
+                  new: newMethod.description
+                } : undefined,
+                status: oldMethod.status !== newMethod.status ? {
+                  old: oldMethod.status,
+                  new: newMethod.status
+                } : undefined,
+                disable: oldMethod.disable !== newMethod.disable ? {
+                  old: oldMethod.disable,
+                  new: newMethod.disable
+                } : undefined,
+                is_surcharge: oldMethod.is_surcharge !== newMethod.is_surcharge ? {
+                  old: oldMethod.is_surcharge,
+                  new: newMethod.is_surcharge
+                } : undefined,
+                fixed: oldMethod.fixed !== newMethod.fixed ? {
+                  old: oldMethod.fixed,
+                  new: newMethod.fixed
+                } : undefined,
+                percentage: oldMethod.percentage !== newMethod.percentage ? {
+                  old: oldMethod.percentage,
+                  new: newMethod.percentage
+                } : undefined,
+                enabled: oldMethod.enabled !== newMethod.enabled ? {
+                  old: oldMethod.enabled,
+                  new: newMethod.enabled
+                } : undefined,
+                channel_application: JSON.stringify(oldMethod.channel_application || []) !== JSON.stringify(newMethod.channel_application || []) ? {
+                  old: oldMethod.channel_application,
+                  new: newMethod.channel_application
+                } : undefined,
+                companies: JSON.stringify(oldMethod.companies || []) !== JSON.stringify(newMethod.companies || []) ? {
+                  old: oldMethod.companies,
+                  new: newMethod.companies
+                } : undefined,
+                metadata: JSON.stringify(oldMethod.metadata || {}) !== JSON.stringify(newMethod.metadata || {}) ? {
+                  old: oldMethod.metadata,
+                  new: newMethod.metadata
+                } : undefined
+              }
+            });
             return true; // 方法属性有变化
           }
         }
@@ -1906,14 +1963,14 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
      * @param originalAmount 原始金额
      * @param interval 舍入间隔 (0.05, 0.1, 0.5, 1)
      * @param rule 舍入规则 (standard, standard_down, always_up, always_down)
-     * @returns 舍入后的金额（保留两位小数的字符串）
+     * @returns 舍入结果详情（包含原始金额、舍入后金额和舍入差额）
      */
     )
   }, {
     key: "roundAmountAsync",
     value: function () {
       var _roundAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(originalAmount, interval, rule) {
-        var amount, roundingInterval, supportedIntervals, intervalValue, baseValue, roundedValue, finalAmount, result;
+        var amount, roundingInterval, supportedIntervals, intervalValue, baseValue, roundedValue, finalAmount, roundedAmountStr, originalAmountStr, roundingDifference, roundingDifferenceStr;
         return _regeneratorRuntime().wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
@@ -1961,19 +2018,26 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
             case 22:
               // 计算最终金额：roundedValue * interval
               finalAmount = roundedValue.mul(roundingInterval);
-              result = finalAmount.toFixed(2);
-              console.log("[PaymentModule] \u820D\u5165\u7ED3\u679C - \u820D\u5165\u503C: ".concat(roundedValue.toString(), ", \u6700\u7EC8\u91D1\u989D: ").concat(result));
-              return _context26.abrupt("return", result);
-            case 28:
-              _context26.prev = 28;
+              roundedAmountStr = finalAmount.toFixed(2);
+              originalAmountStr = amount.toFixed(2); // 计算舍入差额
+              roundingDifference = finalAmount.sub(amount);
+              roundingDifferenceStr = roundingDifference.toFixed(2);
+              console.log("[PaymentModule] \u820D\u5165\u7ED3\u679C - \u539F\u59CB\u91D1\u989D: ".concat(originalAmountStr, ", \u820D\u5165\u540E\u91D1\u989D: ").concat(roundedAmountStr, ", \u820D\u5165\u5DEE\u989D: ").concat(roundingDifferenceStr));
+              return _context26.abrupt("return", {
+                originalAmount: originalAmountStr,
+                roundedAmount: roundedAmountStr,
+                roundingDifference: roundingDifferenceStr
+              });
+            case 31:
+              _context26.prev = 31;
               _context26.t1 = _context26["catch"](0);
               console.error('[PaymentModule] 金额舍入失败:', _context26.t1);
               throw new Error("\u91D1\u989D\u820D\u5165\u5931\u8D25: ".concat(_context26.t1 instanceof Error ? _context26.t1.message : String(_context26.t1)));
-            case 32:
+            case 35:
             case "end":
               return _context26.stop();
           }
-        }, _callee26, this, [[0, 28]]);
+        }, _callee26, this, [[0, 31]]);
       }));
       function roundAmountAsync(_x28, _x29, _x30) {
         return _roundAmountAsync.apply(this, arguments);

package/dist/modules/Payment/types.d.ts

@@ -36,7 +36,7 @@ export declare enum TaskRunStatus {
  */
 export declare enum RoundingRule {
     /** 标准舍入（中点向上） */
-    Standard = "standard",
+    Standard = "standard_rounding",
     /** 标准舍入（中点向下） */
     StandardDown = "standard_down",
     /** 总是向上舍入 */
@@ -44,6 +44,17 @@ export declare enum RoundingRule {
     /** 总是向下舍入 */
     AlwaysDown = "always_down"
 }
+/**
+ * 舍入结果
+ */
+export interface RoundingResult {
+    /** 原始金额 */
+    originalAmount: string;
+    /** 舍入后的金额 */
+    roundedAmount: string;
+    /** 舍入差额（舍入后金额 - 原始金额） */
+    roundingDifference: string;
+}
 /**
  * 舍入间隔枚举
  */
@@ -306,7 +317,7 @@ export interface WalletPassPayment {
     /** 查询用户识别码列表（异步获取并缓存） */
     getUserIdentificationCodeListAsync: (params: UserIdentificationCodeParams) => Promise<UserIdentificationCodeItem[]>;
     /** 搜索识别码信息 */
-    searchIdentificationCodeAsync: (params: SearchIdentificationCodeParams) => Promise<SearchIdentificationCodeItem[]>;
+    searchIdentificationCodeAsync: (params: SearchIdentificationCodeParams) => Promise<SearchIdentificationCodeResult>;
     /** 获取缓存的搜索结果列表 */
     getSearchResults: () => SearchIdentificationCodeItem[];
     /** 根据识别码查找搜索结果 */
@@ -371,7 +382,7 @@ export interface PaymentModuleAPI {
      * @param rule 舍入规则 (standard, standard_down, always_up, always_down)
      * @returns 舍入后的金额
      */
-    roundAmountAsync: (originalAmount: number | string, interval: RoundingInterval | number, rule: RoundingRule | string) => Promise<string>;
+    roundAmountAsync: (originalAmount: number | string, interval: RoundingInterval | number, rule: RoundingRule | string) => Promise<RoundingResult>;
     /** 提交支付 */
     submitPayAsync: (orderUuid?: string) => Promise<{
         status: 'success' | 'failed';
@@ -636,6 +647,16 @@ export interface SearchIdentificationCodeResponse {
     /** 响应数据 */
     data?: SearchIdentificationCodeItem[];
 }
+/**
+ * 搜索识别码结果类型
+ */
+export type SearchIdentificationCodeResult = {
+    type: 'walletCode';
+    data: SearchIdentificationCodeItem[];
+} | {
+    type: 'normalCode';
+    data: SearchIdentificationCodeItem[];
+};
 /**
  * 搜索识别码项目
  */

package/dist/modules/Payment/types.js

@@ -38,13 +38,17 @@ export var TaskRunStatus = /*#__PURE__*/function (TaskRunStatus) {
  * 舍入规则枚举
  */
 export var RoundingRule = /*#__PURE__*/function (RoundingRule) {
-  RoundingRule["Standard"] = "standard";
+  RoundingRule["Standard"] = "standard_rounding";
   RoundingRule["StandardDown"] = "standard_down";
   RoundingRule["AlwaysUp"] = "always_up";
   RoundingRule["AlwaysDown"] = "always_down";
   return RoundingRule;
 }({});
 
+/**
+ * 舍入结果
+ */
+
 /**
  * 舍入间隔枚举
  */
@@ -225,6 +229,10 @@ export var PaymentHooks = /*#__PURE__*/function (PaymentHooks) {
  * 搜索识别码响应数据
  */
 
+/**
+ * 搜索识别码结果类型
+ */
+
 /**
  * 搜索识别码项目
  */

package/dist/modules/Payment/utils.js

@@ -11,7 +11,7 @@ export var formatWalletPassList2PreparePayments = function formatWalletPassList2
   return (list || []).map(function (item) {
     return {
       voucher_id: item.id || 0,
-      amount: Number(getAvailableMaxAmount(item)) || 0,
+      amount: Number(item.edit_current_amount || getAvailableMaxAmount(item)) || 0,
       tag: item.tag || ''
     };
   });

package/dist/modules/Payment/walletpass.d.ts

@@ -1,4 +1,4 @@
-import { WalletPassPayment, WalletDeductionRecommendParams, WalletRecommendItem, UserIdentificationCodeParams, UserIdentificationCodeItem, SearchIdentificationCodeParams, SearchIdentificationCodeItem, WalletInitBusinessData } from './types';
+import { WalletPassPayment, WalletDeductionRecommendParams, WalletRecommendItem, UserIdentificationCodeParams, UserIdentificationCodeItem, SearchIdentificationCodeParams, SearchIdentificationCodeItem, SearchIdentificationCodeResult, WalletInitBusinessData } from './types';
 import type { PaymentModule } from './index';
 /**
  * 钱包支付实现
@@ -57,8 +57,11 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
      * 搜索识别码信息
      * 通过识别码搜索相关的钱包通行证信息
      * 基于 WalletDeductionRecommendParams 参数结构
+     * 特殊逻辑：当识别码长度为9位且前3位为"000"时，调用 /wallet/detail/search 接口
      */
-    searchIdentificationCodeAsync(params: SearchIdentificationCodeParams): Promise<SearchIdentificationCodeItem[]>;
+    searchIdentificationCodeAsync(params: SearchIdentificationCodeParams, config?: {
+        noCache?: boolean;
+    }): Promise<SearchIdentificationCodeResult>;
     processWalletPayment(amount: number, orderUuid: string, voucherId?: string): Promise<void>;
     getWalletBalance(voucherId: string): Promise<number>;
     /**

package/dist/modules/Payment/walletpass.js

@@ -274,16 +274,55 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
      * 搜索识别码信息
      * 通过识别码搜索相关的钱包通行证信息
      * 基于 WalletDeductionRecommendParams 参数结构
+     * 特殊逻辑：当识别码长度为9位且前3位为"000"时，调用 /wallet/detail/search 接口
      */
   }, {
     key: "searchIdentificationCodeAsync",
     value: (function () {
       var _searchIdentificationCodeAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params) {
-        var baseWalletParams, searchParams, response, searchResults, _this$searchResults, existingCodes, newResults;
+        var config,
+          code,
+          isWalletCode,
+          walletDetailParams,
+          _response,
+          _searchResults,
+          baseWalletParams,
+          searchParams,
+          response,
+          searchResults,
+          _this$searchResults,
+          existingCodes,
+          newResults,
+          _args5 = arguments;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context5.prev = 0;
+              config = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : {};
+              _context5.prev = 1;
+              code = params.code; // 检查识别码是否为9位且前3位为"000"
+              // const isWalletCode = code.length === 9 && code.startsWith('000');
+              // 测试环境先使用 WL
+              isWalletCode = code.startsWith('WL');
+              if (!isWalletCode) {
+                _context5.next = 11;
+                break;
+              }
+              // 钱包识别码直接调用专门接口，不缓存，直接返回
+              walletDetailParams = {
+                code: code,
+                with_customer: 1,
+                with: ['latestWalletDetail.wallet']
+              };
+              _context5.next = 8;
+              return this.paymentModule.request.post('/wallet/detail/search', walletDetailParams);
+            case 8:
+              _response = _context5.sent;
+              _searchResults = (_response === null || _response === void 0 ? void 0 : _response.data) || [];
+              return _context5.abrupt("return", {
+                type: 'walletCode',
+                data: _searchResults
+              });
+            case 11:
               // 合并钱包参数和搜索参数
               baseWalletParams = this.walletParams; // 构建完整的搜索参数，包含钱包扣款推荐的所有参数
               searchParams = {
@@ -300,11 +339,21 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 // 搜索特有参数
                 code: params.code
               };
-              _context5.next = 5;
+              _context5.next = 15;
               return this.paymentModule.request.post('/machinecode/prepare/deduction/search', searchParams);
-            case 5:
+            case 15:
               response = _context5.sent;
-              searchResults = (response === null || response === void 0 ? void 0 : response.data) || []; // 将搜索结果存储到缓存数组中
+              searchResults = (response === null || response === void 0 ? void 0 : response.data) || [];
+              if (!config.noCache) {
+                _context5.next = 19;
+                break;
+              }
+              return _context5.abrupt("return", {
+                type: 'normalCode',
+                data: searchResults
+              });
+            case 19:
+              // 将搜索结果存储到缓存数组中
               if (searchResults.length > 0) {
                 // 避免重复存储相同的识别码
                 existingCodes = new Set(this.searchResults.map(function (item) {
@@ -323,17 +372,20 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 cachedSearchResults: _toConsumableArray(this.searchResults),
                 searchParams: params
               });
-              return _context5.abrupt("return", searchResults);
-            case 12:
-              _context5.prev = 12;
-              _context5.t0 = _context5["catch"](0);
+              return _context5.abrupt("return", {
+                type: 'normalCode',
+                data: searchResults
+              });
+            case 24:
+              _context5.prev = 24;
+              _context5.t0 = _context5["catch"](1);
               console.error('[WalletPass] 搜索识别码信息失败:', _context5.t0);
               throw _context5.t0;
-            case 16:
+            case 28:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[0, 12]]);
+        }, _callee5, this, [[1, 24]]);
       }));
       function searchIdentificationCodeAsync(_x5) {
         return _searchIdentificationCodeAsync.apply(this, arguments);

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

@@ -107,29 +107,29 @@ export function findFastestAvailableResource(_ref2) {
     _step2;
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var resource = _step2.value;
+      var _resource = _step2.value;
       // 获取资源当天且还在工作时间内的时间段
-      var todayTimes = resource.times.filter(function (time) {
+      var todayTimes = _resource.times.filter(function (time) {
         var isToday = dayjs(time.start_at).isSame(currentTime, 'day');
         var isStillWorking = dayjs(time.end_at).isAfter(currentTime);
         return isToday && isStillWorking;
       });
       if (todayTimes.length === 0) {
-        console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(resource.id, "(").concat(resource.main_field, ") \u4ECA\u65E5\u65E0\u53EF\u7528\u65F6\u95F4\u6BB5"));
+        console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(_resource.id, "(").concat(_resource.main_field, ") \u4ECA\u65E5\u65E0\u53EF\u7528\u65F6\u95F4\u6BB5"));
         continue;
       }
-      var _iterator3 = _createForOfIteratorHelper(todayTimes),
-        _step3;
+      var _iterator4 = _createForOfIteratorHelper(todayTimes),
+        _step4;
       try {
         var _loop = function _loop() {
             var _time$event_list, _time$event_list2;
-            var time = _step3.value;
+            var time = _step4.value;
             var workStartTime = dayjs(time.start_at);
             var workEndTime = dayjs(time.end_at);
 
             // 确定检查的起始时间（当前时间 vs 工作开始时间）
             var nextAvailableTime = currentTime.isBefore(workStartTime) ? workStartTime : currentTime;
-            console.log("[TimeslotUtils] \u68C0\u67E5\u8D44\u6E90 ".concat(resource.id, "(").concat(resource.main_field, "):"), {
+            console.log("[TimeslotUtils] \u68C0\u67E5\u8D44\u6E90 ".concat(_resource.id, "(").concat(_resource.main_field, "):"), {
               workTime: "".concat(workStartTime.format('HH:mm'), "-").concat(workEndTime.format('HH:mm')),
               checkStartTime: nextAvailableTime.format('HH:mm:ss'),
               eventCount: ((_time$event_list = time.event_list) === null || _time$event_list === void 0 ? void 0 : _time$event_list.length) || 0
@@ -148,40 +148,40 @@ export function findFastestAvailableResource(_ref2) {
 
             // 检查从 nextAvailableTime 开始的可用性
             var finalAvailableTime = nextAvailableTime;
-            var _iterator4 = _createForOfIteratorHelper(relevantEvents),
-              _step4;
+            var _iterator5 = _createForOfIteratorHelper(relevantEvents),
+              _step5;
             try {
-              for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-                var event = _step4.value;
-                var eventStart = dayjs(event.start_at);
-                var eventEnd = dayjs(event.end_at);
+              for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                var _event = _step5.value;
+                var _eventStart = dayjs(_event.start_at);
+                var _eventEnd = dayjs(_event.end_at);
                 console.log("[TimeslotUtils] \u68C0\u67E5\u4E8B\u4EF6\u51B2\u7A81:", {
-                  resourceId: resource.id,
-                  eventTime: "".concat(eventStart.format('HH:mm'), "-").concat(eventEnd.format('HH:mm')),
+                  resourceId: _resource.id,
+                  eventTime: "".concat(_eventStart.format('HH:mm'), "-").concat(_eventEnd.format('HH:mm')),
                   checkTime: finalAvailableTime.format('HH:mm:ss'),
-                  pax: event.pax || 1
+                  pax: _event.pax || 1
                 });
 
                 // 检查资源类型和容量
-                if (resource.resourceType === 'single' || (resource.capacity || 1) === 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(30, 'minute'))) {
                     // 有冲突，使用事件结束时间
-                    finalAvailableTime = eventEnd;
+                    finalAvailableTime = _eventEnd;
                     console.log("[TimeslotUtils] \u53D1\u73B0\u65F6\u95F4\u51B2\u7A81\uFF0C\u8C03\u6574\u5230: ".concat(finalAvailableTime.format('HH:mm:ss')));
                   }
                 } else {
                   // 多人预约资源：检查容量
-                  var totalCapacity = resource.capacity || 0;
-                  var currentUsedCapacity = countMap[resource.id] || 0;
-                  var eventUsedCapacity = event.pax || 1;
+                  var totalCapacity = _resource.capacity || 0;
+                  var currentUsedCapacity = countMap[_resource.id] || 0;
+                  var eventUsedCapacity = _event.pax || 1;
 
                   // 如果在事件时间范围内，检查容量是否足够
-                  if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(30, 'minute'))) {
+                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(30, 'minute'))) {
                     var totalRequiredCapacity = currentUsedCapacity + currentCapacity + eventUsedCapacity;
                     if (totalRequiredCapacity > totalCapacity) {
                       // 容量不足，使用事件结束时间
-                      finalAvailableTime = eventEnd;
+                      finalAvailableTime = _eventEnd;
                       console.log("[TimeslotUtils] \u5BB9\u91CF\u4E0D\u8DB3\uFF0C\u8C03\u6574\u5230: ".concat(finalAvailableTime.format('HH:mm:ss')));
                     }
                   }
@@ -190,38 +190,38 @@ export function findFastestAvailableResource(_ref2) {
 
               // 确保可用时间在工作时间内
             } catch (err) {
-              _iterator4.e(err);
+              _iterator5.e(err);
             } finally {
-              _iterator4.f();
+              _iterator5.f();
             }
             if (finalAvailableTime.isAfter(workEndTime)) {
-              console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(resource.id, " \u53EF\u7528\u65F6\u95F4\u8D85\u51FA\u5DE5\u4F5C\u65F6\u95F4\uFF0C\u8DF3\u8FC7"));
+              console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(_resource.id, " \u53EF\u7528\u65F6\u95F4\u8D85\u51FA\u5DE5\u4F5C\u65F6\u95F4\uFF0C\u8DF3\u8FC7"));
               return 0; // continue
             }
-            console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(resource.id, "(").concat(resource.main_field, ") \u6700\u5FEB\u53EF\u7528\u65F6\u95F4: ").concat(finalAvailableTime.format('HH:mm:ss')));
+            console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(_resource.id, "(").concat(_resource.main_field, ") \u6700\u5FEB\u53EF\u7528\u65F6\u95F4: ").concat(finalAvailableTime.format('HH:mm:ss')));
 
             // 更新最快可用时间和资源
             if (!fastestTime || finalAvailableTime.isBefore(fastestTime)) {
               fastestTime = finalAvailableTime;
-              fastestResources = [resource];
-              console.log("[TimeslotUtils] \u66F4\u65B0\u6700\u5FEB\u65F6\u95F4: ".concat(fastestTime.format('HH:mm:ss'), ", \u8D44\u6E90: ").concat(resource.main_field));
+              fastestResources = [_resource];
+              console.log("[TimeslotUtils] \u66F4\u65B0\u6700\u5FEB\u65F6\u95F4: ".concat(fastestTime.format('HH:mm:ss'), ", \u8D44\u6E90: ").concat(_resource.main_field));
             } else if (finalAvailableTime.isSame(fastestTime)) {
-              fastestResources.push(resource);
-              console.log("[TimeslotUtils] \u6DFB\u52A0\u76F8\u540C\u65F6\u95F4\u8D44\u6E90: ".concat(resource.main_field));
+              fastestResources.push(_resource);
+              console.log("[TimeslotUtils] \u6DFB\u52A0\u76F8\u540C\u65F6\u95F4\u8D44\u6E90: ".concat(_resource.main_field));
             }
             return 1; // break
             // 每个资源只需要计算一次
           },
           _ret;
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
           _ret = _loop();
           if (_ret === 0) continue;
           if (_ret === 1) break;
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator3.f();
+        _iterator4.f();
       }
     }
 
@@ -243,10 +243,60 @@ export function findFastestAvailableResource(_ref2) {
     return fastestResources[0];
   }
 
-  // 如果有多个最快可用的资源，选择第一个或根据其他逻辑选择
-  // 这里简化处理，直接返回第一个
+  // 如果有多个最快可用的资源，选择空闲时间最长的资源
   var selectedResource = fastestResources[0];
-  console.log("[TimeslotUtils] \u8FD4\u56DE\u591A\u4E2A\u8D44\u6E90\u4E2D\u7684\u7B2C\u4E00\u4E2A: ".concat(selectedResource.main_field));
+  var maxIdleTime = 0;
+  console.log("[TimeslotUtils] \u6BD4\u8F83 ".concat(fastestResources.length, " \u4E2A\u8D44\u6E90\u7684\u7A7A\u95F2\u65F6\u95F4:"));
+  for (var _i2 = 0, _fastestResources = fastestResources; _i2 < _fastestResources.length; _i2++) {
+    var _workingTime$event_li;
+    var resource = _fastestResources[_i2];
+    // 找到该资源当天且还在工作的时间段
+    var workingTime = resource.times.find(function (time) {
+      var isToday = dayjs(time.start_at).isSame(fastestTime, 'day');
+      var isStillWorking = dayjs(time.end_at).isAfter(fastestTime);
+      return isToday && isStillWorking;
+    });
+    if (!workingTime) continue;
+    var workEndTime = dayjs(workingTime.end_at);
+
+    // 计算从最快可用时间到工作结束时间的空闲时长（分钟）
+    var totalIdleTime = workEndTime.diff(fastestTime, 'minute');
+
+    // 减去已有预约占用的时间
+    var relevantEvents = ((_workingTime$event_li = workingTime.event_list) === null || _workingTime$event_li === void 0 ? void 0 : _workingTime$event_li.filter(function (event) {
+      var eventStart = dayjs(event.start_at);
+      var eventEnd = dayjs(event.end_at);
+      // 只计算在最快可用时间之后的预约
+      return eventEnd.isAfter(fastestTime) && eventStart.isAfter(fastestTime);
+    })) || [];
+    var _iterator3 = _createForOfIteratorHelper(relevantEvents),
+      _step3;
+    try {
+      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+        var event = _step3.value;
+        var eventStart = dayjs(event.start_at);
+        var eventEnd = dayjs(event.end_at);
+        var eventDuration = eventEnd.diff(eventStart, 'minute');
+        totalIdleTime -= eventDuration;
+      }
+    } catch (err) {
+      _iterator3.e(err);
+    } finally {
+      _iterator3.f();
+    }
+    console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(resource.id, "(").concat(resource.main_field, "):"), {
+      工作结束时间: workEndTime.format('HH:mm'),
+      总工作时长: workEndTime.diff(fastestTime, 'minute') + '分钟',
+      预约占用时长: workEndTime.diff(fastestTime, 'minute') - totalIdleTime + '分钟',
+      实际空闲时长: totalIdleTime + '分钟'
+    });
+    if (totalIdleTime > maxIdleTime) {
+      maxIdleTime = totalIdleTime;
+      selectedResource = resource;
+      console.log("[TimeslotUtils] \u66F4\u65B0\u6700\u4F73\u9009\u62E9: ".concat(resource.main_field, " (\u7A7A\u95F2").concat(totalIdleTime, "\u5206\u949F)"));
+    }
+  }
+  console.log("[TimeslotUtils] \u6700\u7EC8\u9009\u62E9\u8D44\u6E90: ".concat(selectedResource.main_field, " (\u6700\u957F\u7A7A\u95F2").concat(maxIdleTime, "\u5206\u949F)"));
   return selectedResource;
 }
 

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

@@ -131,6 +131,14 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
     scanCustomerListener(callback: (data: IScanResult) => void): {
         remove: () => void;
     };
+    /**
+     * @title 通用扫描监听
+     * @description 直接将扫描结果返回给调用方
+     * @param callback 回调
+     */
+    scanUniversalListener(callback: (data: IScanResult) => void, key: string): {
+        remove: () => void;
+    };
     /**
      * 调用摄像头
      * @param data 用户自定义数据