@pisell/pisellos 2.2.136 → 2.2.137

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

@@ -2,7 +2,7 @@ import dayjs from 'dayjs';
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import type { RequestPlugin } from '../../plugins/request';
-import { SalesState, SalesModuleAPI, Reservation, SalesResourceBookingItem, SalesTimelineHighlights, ChangeBookingStatusParams } from './types';
+import { SalesState, SalesModuleAPI, Reservation, SalesResourceBookingItem, SalesResourceBookingItemWithGroups, SalesTimelineHighlights, ChangeBookingStatusParams, GetResourceBookingItemParams } from './types';
 import type { BookingData } from '../../server/modules/order/types';
 export * from './types';
 /**
@@ -79,6 +79,10 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      */
     private getBookingStatus;
     private getResourceId;
+    private getBookingAppointmentStatus;
+    private getBookingOrderPaymentStatus;
+    private isBookingMatchedResource;
+    private sortMatchedBookings;
     /**
      * 资源下 bookings 的返回裁剪策略：
      * 1) 优先返回当前时刻正在进行中的预约（允许并发返回多条）
@@ -100,6 +104,8 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      * - 否则走快照分支（纯时间窗判定，忽略 appointment_status 的 arrived/started/completed 差异）
      */
     private normalizeMatchedBooking;
+    private normalizeResourceBookings;
+    private buildCompletedBooking;
     /**
      * 实时模式（current === deviceCurrent）：信任 appointment_status
      * - 过滤 new / completed（实时视角下视为非活跃数据）
@@ -124,6 +130,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      */
     private buildSnapshotBooking;
     getResourceBookingList(currentTime: string, bookingList?: BookingData[], deviceTime?: string): Promise<SalesResourceBookingItem[]>;
+    getResourceBookingItem(params: GetResourceBookingItemParams): Promise<SalesResourceBookingItemWithGroups | null>;
 }
 export { SalesImpl as Sales };
 export default SalesImpl;

package/dist/solution/Sales/index.js

@@ -396,6 +396,38 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _ref3, _resource$id;
       return (_ref3 = (_resource$id = resource.id) !== null && _resource$id !== void 0 ? _resource$id : resource.form_record_id) !== null && _ref3 !== void 0 ? _ref3 : '';
     }
+  }, {
+    key: "getBookingAppointmentStatus",
+    value: function getBookingAppointmentStatus(booking) {
+      var _ref4, _booking$appointment_2;
+      return String((_ref4 = (_booking$appointment_2 = booking.appointment_status) !== null && _booking$appointment_2 !== void 0 ? _booking$appointment_2 : booking.status) !== null && _ref4 !== void 0 ? _ref4 : '');
+    }
+  }, {
+    key: "getBookingOrderPaymentStatus",
+    value: function getBookingOrderPaymentStatus(booking) {
+      var _booking$order$paymen, _booking$order;
+      return String((_booking$order$paymen = (_booking$order = booking.order) === null || _booking$order === void 0 ? void 0 : _booking$order.payment_status) !== null && _booking$order$paymen !== void 0 ? _booking$order$paymen : '');
+    }
+  }, {
+    key: "isBookingMatchedResource",
+    value: function isBookingMatchedResource(booking, resourceId) {
+      if (!Array.isArray(booking.resources)) return false;
+      return booking.resources.some(function (resource) {
+        var relationId = resource === null || resource === void 0 ? void 0 : resource.relation_id;
+        if (relationId === undefined || relationId === null) return false;
+        return String(relationId) === String(resourceId);
+      });
+    }
+  }, {
+    key: "sortMatchedBookings",
+    value: function sortMatchedBookings(bookings) {
+      var _this2 = this;
+      return _toConsumableArray(bookings).sort(function (left, right) {
+        var leftStartAt = _this2.toBookingDateTime(left.start_date, left.start_time).valueOf();
+        var rightStartAt = _this2.toBookingDateTime(right.start_date, right.start_time).valueOf();
+        return leftStartAt - rightStartAt;
+      });
+    }
 
     /**
      * 资源下 bookings 的返回裁剪策略：
@@ -407,17 +439,17 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "pickBookingsForCurrentPoint",
     value: function pickBookingsForCurrentPoint(current, bookings) {
-      var _this2 = this;
+      var _this3 = this;
       if (bookings.length === 0) return [];
       var currentDayStart = current.startOf('day');
       var currentDayEnd = current.endOf('day');
 
       // 仅保留与 current 当天有时间交集的预约，避免跨天误命中
       var dayScopedBookings = bookings.filter(function (booking) {
-        var startAt = _this2.toBookingDateTime(booking.start_date, booking.start_time);
-        var endAt = _this2.toBookingDateTime(booking.end_date, booking.end_time);
+        var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
+        var endAt = _this3.toBookingDateTime(booking.end_date, booking.end_time);
         if (!startAt.isValid() || !endAt.isValid()) return false;
-        return _this2.isSameOrBefore(startAt, currentDayEnd) && _this2.isSameOrAfter(endAt, currentDayStart);
+        return _this3.isSameOrBefore(startAt, currentDayEnd) && _this3.isSameOrAfter(endAt, currentDayStart);
       });
       if (dayScopedBookings.length === 0) return [];
       var appendNextStartGroupIfNeeded = function appendNextStartGroupIfNeeded(selectedBookings) {
@@ -427,21 +459,21 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
         });
         if (!shouldAppendNextGroup) return selectedBookings;
         var selectedStartValues = new Set(selectedBookings.map(function (booking) {
-          return _this2.toBookingDateTime(booking.start_date, booking.start_time);
+          return _this3.toBookingDateTime(booking.start_date, booking.start_time);
         }).filter(function (startAt) {
           return startAt.isValid();
         }).map(function (startAt) {
           return startAt.valueOf();
         }));
         var futureCandidates = dayScopedBookings.filter(function (booking) {
-          var startAt = _this2.toBookingDateTime(booking.start_date, booking.start_time);
+          var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
           if (!startAt.isValid()) return false;
           return startAt.isAfter(current) && !selectedStartValues.has(startAt.valueOf());
         });
         if (futureCandidates.length === 0) return selectedBookings;
-        var nextStartAt = _this2.toBookingDateTime(futureCandidates[0].start_date, futureCandidates[0].start_time).valueOf();
+        var nextStartAt = _this3.toBookingDateTime(futureCandidates[0].start_date, futureCandidates[0].start_time).valueOf();
         var nextStartGroup = futureCandidates.filter(function (booking) {
-          var startAt = _this2.toBookingDateTime(booking.start_date, booking.start_time);
+          var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
           return startAt.isValid() && startAt.valueOf() === nextStartAt;
         });
         if (nextStartGroup.length === 0) return selectedBookings;
@@ -453,10 +485,10 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
 
       // active: current 处于 [startAt, endAt] 区间
       var activeBookings = dayScopedBookings.filter(function (booking) {
-        var startAt = _this2.toBookingDateTime(booking.start_date, booking.start_time);
-        var endAt = _this2.toBookingDateTime(booking.end_date, booking.end_time);
+        var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
+        var endAt = _this3.toBookingDateTime(booking.end_date, booking.end_time);
         if (!startAt.isValid() || !endAt.isValid()) return false;
-        return _this2.isSameOrAfter(current, startAt) && _this2.isSameOrBefore(current, endAt);
+        return _this3.isSameOrAfter(current, startAt) && _this3.isSameOrBefore(current, endAt);
       });
       if (activeBookings.length > 0) return appendNextStartGroupIfNeeded(activeBookings);
 
@@ -468,13 +500,13 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
 
       // upcoming: 从未来预约里只取最早那一组（同 start_time）
       var upcoming = dayScopedBookings.filter(function (booking) {
-        var startAt = _this2.toBookingDateTime(booking.start_date, booking.start_time);
+        var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
         return startAt.isValid() && startAt.isAfter(current) && startAt.isSame(current, 'day');
       });
       if (upcoming.length > 0) {
         var firstStartAt = this.toBookingDateTime(upcoming[0].start_date, upcoming[0].start_time).valueOf();
         var upcomingStartGroup = upcoming.filter(function (booking) {
-          var startAt = _this2.toBookingDateTime(booking.start_date, booking.start_time);
+          var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
           return startAt.valueOf() === firstStartAt;
         });
         return appendNextStartGroupIfNeeded(upcomingStartGroup);
@@ -511,16 +543,58 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeMatchedBooking",
     value: function normalizeMatchedBooking(current, deviceCurrent, booking) {
-      var _ref4, _booking$appointment_2;
-      var appointmentStatus = String((_ref4 = (_booking$appointment_2 = booking.appointment_status) !== null && _booking$appointment_2 !== void 0 ? _booking$appointment_2 : booking.status) !== null && _ref4 !== void 0 ? _ref4 : '');
+      var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+      var appointmentStatus = this.getBookingAppointmentStatus(booking);
       if (appointmentStatus === 'rejected' || appointmentStatus === 'cancelled') return null;
       var startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
       var endAt = this.toBookingDateTime(booking.end_date, booking.end_time);
+      if (appointmentStatus === 'completed' && options.includeCompleted) {
+        return this.buildCompletedBooking(current, booking, startAt, endAt);
+      }
       if (current.isSame(deviceCurrent)) {
         return this.buildRealtimeBooking(current, booking, appointmentStatus, startAt, endAt);
       }
       return this.buildSnapshotBooking(current, booking, appointmentStatus, startAt, endAt);
     }
+  }, {
+    key: "normalizeResourceBookings",
+    value: function normalizeResourceBookings(current, deviceCurrent, bookingList) {
+      var _this4 = this;
+      var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+      var normalizedBookings = bookingList.map(function (booking) {
+        return _this4.normalizeMatchedBooking(current, deviceCurrent, booking, options);
+      }).filter(function (booking) {
+        return Boolean(booking);
+      }).filter(function (booking) {
+        return booking.status;
+      });
+      return this.sortMatchedBookings(normalizedBookings);
+    }
+  }, {
+    key: "buildCompletedBooking",
+    value: function buildCompletedBooking(current, booking, startAt, endAt) {
+      if (!startAt.isValid() || !endAt.isValid()) return null;
+      if (current.isBefore(startAt)) {
+        return _objectSpread(_objectSpread({}, booking), {}, {
+          status: 'reserved',
+          isTimeout: false,
+          timeoutTime: undefined,
+          progressPercent: 0,
+          lateTime: undefined,
+          reserved_status: 'not_arrived',
+          remainingReserveTime: Math.max(startAt.diff(current, 'minute'), 0)
+        });
+      }
+      return _objectSpread(_objectSpread({}, booking), {}, {
+        status: 'occupied',
+        isTimeout: false,
+        timeoutTime: undefined,
+        progressPercent: this.isSameOrAfter(current, endAt) ? 100 : this.calcProgressPercent(current, startAt, endAt),
+        lateTime: undefined,
+        reserved_status: undefined,
+        remainingReserveTime: undefined
+      });
+    }
 
     /**
      * 实时模式（current === deviceCurrent）：信任 appointment_status
@@ -618,7 +692,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _getResourceBookingList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(currentTime) {
         var _resourceResponse$dat,
           _resourceResponse$dat2,
-          _this3 = this;
+          _this5 = this;
         var bookingList,
           deviceTime,
           current,
@@ -669,20 +743,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
               return _context5.abrupt("return", []);
             case 14:
               // 全局先做 booking 标准化 + start_time 升序，后续映射直接复用
-              normalizedBookings = bookingList.map(function (booking) {
-                return _this3.normalizeMatchedBooking(current, deviceCurrent, booking);
-              }).filter(function (booking) {
-                return Boolean(booking);
-              }).sort(function (left, right) {
-                var leftStartAt = _this3.toBookingDateTime(left.start_date, left.start_time).valueOf();
-                var rightStartAt = _this3.toBookingDateTime(right.start_date, right.start_time).valueOf();
-                return leftStartAt - rightStartAt;
-              }); // 过滤掉没有 status 的 booking
-              normalizedBookings = normalizedBookings.filter(function (booking) {
-                return booking.status;
-              });
-
-              // 建立 resourceId -> bookings[] 倒排索引，加速资源匹配
+              normalizedBookings = this.normalizeResourceBookings(current, deviceCurrent, bookingList); // 建立 resourceId -> bookings[] 倒排索引，加速资源匹配
               bookingMap = new Map();
               normalizedBookings.forEach(function (booking) {
                 if (!Array.isArray(booking.resources)) return;
@@ -698,9 +759,9 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 输出：每个资源都返回；bookings 可能是 0 / 1 / 多条（并发场景）
               list = resourceList.map(function (resource) {
-                var resourceId = _this3.getResourceId(resource);
+                var resourceId = _this5.getResourceId(resource);
                 var matchedBookings = bookingMap.get(String(resourceId)) || [];
-                var bookings = _this3.pickBookingsForCurrentPoint(current, matchedBookings);
+                var bookings = _this5.pickBookingsForCurrentPoint(current, matchedBookings);
                 return _objectSpread(_objectSpread({}, resource), {}, {
                   resource_id: resourceId,
                   bookings: bookings
@@ -717,7 +778,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
               return _context5.abrupt("return", list);
-            case 21:
+            case 20:
             case "end":
               return _context5.stop();
           }
@@ -728,6 +789,105 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       }
       return getResourceBookingList;
     }()
+  }, {
+    key: "getResourceBookingItem",
+    value: function () {
+      var _getResourceBookingItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
+        var _resourceResponse$dat3,
+          _resourceResponse$dat4,
+          _this6 = this,
+          _params$bookingList;
+        var current, deviceCurrent, resourceResponse, resourceList, targetResource, resourceId, matchedBookingList, completedBookingList, unpaidBookingList, bookings, completedBookings, unpaidBookings;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              current = dayjs(params.currentTime);
+              if (current.isValid()) {
+                _context6.next = 3;
+                break;
+              }
+              return _context6.abrupt("return", null);
+            case 3:
+              deviceCurrent = dayjs(params.deviceTime || params.currentTime);
+              if (deviceCurrent.isValid()) {
+                _context6.next = 6;
+                break;
+              }
+              return _context6.abrupt("return", null);
+            case 6:
+              _context6.next = 8;
+              return this.request.get('/shop/form/resource/page', {
+                skip: 1,
+                num: 999
+              },
+              // @ts-ignore
+              {
+                osServer: true,
+                isShopApi: true
+              });
+            case 8:
+              resourceResponse = _context6.sent;
+              resourceList = (_resourceResponse$dat3 = resourceResponse === null || resourceResponse === void 0 || (_resourceResponse$dat4 = resourceResponse.data) === null || _resourceResponse$dat4 === void 0 ? void 0 : _resourceResponse$dat4.list) !== null && _resourceResponse$dat3 !== void 0 ? _resourceResponse$dat3 : [];
+              if (!(!Array.isArray(resourceList) || resourceList.length === 0)) {
+                _context6.next = 12;
+                break;
+              }
+              return _context6.abrupt("return", null);
+            case 12:
+              targetResource = resourceList.find(function (resource) {
+                return String(_this6.getResourceId(resource)) === String(params.resourceId);
+              });
+              if (targetResource) {
+                _context6.next = 15;
+                break;
+              }
+              return _context6.abrupt("return", null);
+            case 15:
+              resourceId = this.getResourceId(targetResource);
+              matchedBookingList = params.bookingList.filter(function (booking) {
+                return _this6.isBookingMatchedResource(booking, resourceId);
+              });
+              completedBookingList = matchedBookingList.filter(function (booking) {
+                return _this6.getBookingAppointmentStatus(booking) === 'completed';
+              });
+              unpaidBookingList = matchedBookingList.filter(function (booking) {
+                return _this6.getBookingOrderPaymentStatus(booking) === 'unpaid';
+              });
+              bookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList));
+              completedBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, completedBookingList, {
+                includeCompleted: true
+              }));
+              unpaidBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList));
+              this.logger.addLog({
+                type: 'info',
+                title: 'getResourceBookingItem',
+                metadata: {
+                  currentTime: params.currentTime,
+                  deviceTime: params.deviceTime || params.currentTime,
+                  resourceId: resourceId,
+                  bookingList: (_params$bookingList = params.bookingList) === null || _params$bookingList === void 0 ? void 0 : _params$bookingList.length,
+                  bookings: bookings.length,
+                  completedBookings: completedBookings.length,
+                  unpaidBookings: unpaidBookings.length
+                }
+              });
+              return _context6.abrupt("return", _objectSpread(_objectSpread({}, targetResource), {}, {
+                resource_id: resourceId,
+                bookings: bookings,
+                completedBookings: completedBookings,
+                unpaidBookings: unpaidBookings
+              }));
+            case 24:
+            case "end":
+              return _context6.stop();
+          }
+        }, _callee6, this);
+      }));
+      function getResourceBookingItem(_x5) {
+        return _getResourceBookingItem.apply(this, arguments);
+      }
+      return getResourceBookingItem;
+    }()
   }]);
   return SalesImpl;
 }(BaseModule);

package/dist/solution/Sales/types.d.ts

@@ -32,11 +32,21 @@ export interface SalesResourceBookingItem extends Omit<ResourceData, 'bookings'>
     resource_id: ResourceId;
     bookings: SalesResourceMatchedBooking[];
 }
+export interface SalesResourceBookingItemWithGroups extends SalesResourceBookingItem {
+    completedBookings: SalesResourceMatchedBooking[];
+    unpaidBookings: SalesResourceMatchedBooking[];
+}
 export type SalesTimelineHighlights = number[];
 export interface ChangeBookingStatusParams {
     booking_id: number | string;
     appointment_status: string;
 }
+export interface GetResourceBookingItemParams {
+    resourceId: ResourceId;
+    currentTime: string;
+    bookingList: BookingData[];
+    deviceTime?: string;
+}
 /**
  * Sales 解决方案状态
  *
@@ -71,6 +81,8 @@ export interface SalesModuleAPI {
     changeBookingStatus: (params: ChangeBookingStatusParams) => Promise<any>;
     /** 获取资源维度的预约占用列表 */
     getResourceBookingList: (currentTime: string, bookingList: BookingData[], deviceTime?: string) => Promise<SalesResourceBookingItem[]>;
+    /** 获取单个资源维度的预约占用、已完成、未支付列表 */
+    getResourceBookingItem: (params: GetResourceBookingItemParams) => Promise<SalesResourceBookingItemWithGroups | null>;
     /** 获取时间轴每个时间片的预约数量 */
     getTimelineHighlights: (bookingList: BookingData[], startDateTime?: string, endDateTime?: string) => SalesTimelineHighlights;
 }

package/lib/model/strategy/adapter/promotion/index.js

@@ -1,49 +0,0 @@
-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 __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/model/strategy/adapter/promotion/index.ts
-var promotion_exports = {};
-__export(promotion_exports, {
-  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter: () => import_adapter.PromotionAdapter,
-  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
-  default: () => import_adapter2.default
-});
-module.exports = __toCommonJS(promotion_exports);
-var import_evaluator = require("./evaluator");
-var import_adapter = require("./adapter");
-var import_adapter2 = __toESM(require("./adapter"));
-var import_examples = require("./examples");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

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

@@ -2,7 +2,7 @@ import dayjs from 'dayjs';
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import type { RequestPlugin } from '../../plugins/request';
-import { SalesState, SalesModuleAPI, Reservation, SalesResourceBookingItem, SalesTimelineHighlights, ChangeBookingStatusParams } from './types';
+import { SalesState, SalesModuleAPI, Reservation, SalesResourceBookingItem, SalesResourceBookingItemWithGroups, SalesTimelineHighlights, ChangeBookingStatusParams, GetResourceBookingItemParams } from './types';
 import type { BookingData } from '../../server/modules/order/types';
 export * from './types';
 /**
@@ -79,6 +79,10 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      */
     private getBookingStatus;
     private getResourceId;
+    private getBookingAppointmentStatus;
+    private getBookingOrderPaymentStatus;
+    private isBookingMatchedResource;
+    private sortMatchedBookings;
     /**
      * 资源下 bookings 的返回裁剪策略：
      * 1) 优先返回当前时刻正在进行中的预约（允许并发返回多条）
@@ -100,6 +104,8 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      * - 否则走快照分支（纯时间窗判定，忽略 appointment_status 的 arrived/started/completed 差异）
      */
     private normalizeMatchedBooking;
+    private normalizeResourceBookings;
+    private buildCompletedBooking;
     /**
      * 实时模式（current === deviceCurrent）：信任 appointment_status
      * - 过滤 new / completed（实时视角下视为非活跃数据）
@@ -124,6 +130,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      */
     private buildSnapshotBooking;
     getResourceBookingList(currentTime: string, bookingList?: BookingData[], deviceTime?: string): Promise<SalesResourceBookingItem[]>;
+    getResourceBookingItem(params: GetResourceBookingItemParams): Promise<SalesResourceBookingItemWithGroups | null>;
 }
 export { SalesImpl as Sales };
 export default SalesImpl;

package/lib/solution/Sales/index.js

@@ -247,6 +247,30 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
   getResourceId(resource) {
     return resource.id ?? resource.form_record_id ?? "";
   }
+  getBookingAppointmentStatus(booking) {
+    return String(booking.appointment_status ?? booking.status ?? "");
+  }
+  getBookingOrderPaymentStatus(booking) {
+    var _a;
+    return String(((_a = booking.order) == null ? void 0 : _a.payment_status) ?? "");
+  }
+  isBookingMatchedResource(booking, resourceId) {
+    if (!Array.isArray(booking.resources))
+      return false;
+    return booking.resources.some((resource) => {
+      const relationId = resource == null ? void 0 : resource.relation_id;
+      if (relationId === void 0 || relationId === null)
+        return false;
+      return String(relationId) === String(resourceId);
+    });
+  }
+  sortMatchedBookings(bookings) {
+    return [...bookings].sort((left, right) => {
+      const leftStartAt = this.toBookingDateTime(left.start_date, left.start_time).valueOf();
+      const rightStartAt = this.toBookingDateTime(right.start_date, right.start_time).valueOf();
+      return leftStartAt - rightStartAt;
+    });
+  }
   /**
    * 资源下 bookings 的返回裁剪策略：
    * 1) 优先返回当前时刻正在进行中的预约（允许并发返回多条）
@@ -355,17 +379,50 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
    * - current === deviceCurrent 走实时分支（信任 appointment_status）
    * - 否则走快照分支（纯时间窗判定，忽略 appointment_status 的 arrived/started/completed 差异）
    */
-  normalizeMatchedBooking(current, deviceCurrent, booking) {
-    const appointmentStatus = String(booking.appointment_status ?? booking.status ?? "");
+  normalizeMatchedBooking(current, deviceCurrent, booking, options = {}) {
+    const appointmentStatus = this.getBookingAppointmentStatus(booking);
     if (appointmentStatus === "rejected" || appointmentStatus === "cancelled")
       return null;
     const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
     const endAt = this.toBookingDateTime(booking.end_date, booking.end_time);
+    if (appointmentStatus === "completed" && options.includeCompleted) {
+      return this.buildCompletedBooking(current, booking, startAt, endAt);
+    }
     if (current.isSame(deviceCurrent)) {
       return this.buildRealtimeBooking(current, booking, appointmentStatus, startAt, endAt);
     }
     return this.buildSnapshotBooking(current, booking, appointmentStatus, startAt, endAt);
   }
+  normalizeResourceBookings(current, deviceCurrent, bookingList, options = {}) {
+    const normalizedBookings = bookingList.map((booking) => this.normalizeMatchedBooking(current, deviceCurrent, booking, options)).filter((booking) => Boolean(booking)).filter((booking) => booking.status);
+    return this.sortMatchedBookings(normalizedBookings);
+  }
+  buildCompletedBooking(current, booking, startAt, endAt) {
+    if (!startAt.isValid() || !endAt.isValid())
+      return null;
+    if (current.isBefore(startAt)) {
+      return {
+        ...booking,
+        status: "reserved",
+        isTimeout: false,
+        timeoutTime: void 0,
+        progressPercent: 0,
+        lateTime: void 0,
+        reserved_status: "not_arrived",
+        remainingReserveTime: Math.max(startAt.diff(current, "minute"), 0)
+      };
+    }
+    return {
+      ...booking,
+      status: "occupied",
+      isTimeout: false,
+      timeoutTime: void 0,
+      progressPercent: this.isSameOrAfter(current, endAt) ? 100 : this.calcProgressPercent(current, startAt, endAt),
+      lateTime: void 0,
+      reserved_status: void 0,
+      remainingReserveTime: void 0
+    };
+  }
   /**
    * 实时模式（current === deviceCurrent）：信任 appointment_status
    * - 过滤 new / completed（实时视角下视为非活跃数据）
@@ -476,12 +533,7 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     const resourceList = ((_a = resourceResponse == null ? void 0 : resourceResponse.data) == null ? void 0 : _a.list) ?? [];
     if (!Array.isArray(resourceList) || resourceList.length === 0)
       return [];
-    let normalizedBookings = bookingList.map((booking) => this.normalizeMatchedBooking(current, deviceCurrent, booking)).filter((booking) => Boolean(booking)).sort((left, right) => {
-      const leftStartAt = this.toBookingDateTime(left.start_date, left.start_time).valueOf();
-      const rightStartAt = this.toBookingDateTime(right.start_date, right.start_time).valueOf();
-      return leftStartAt - rightStartAt;
-    });
-    normalizedBookings = normalizedBookings.filter((booking) => booking.status);
+    const normalizedBookings = this.normalizeResourceBookings(current, deviceCurrent, bookingList);
     const bookingMap = /* @__PURE__ */ new Map();
     normalizedBookings.forEach((booking) => {
       if (!Array.isArray(booking.resources))
@@ -518,6 +570,73 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     });
     return list;
   }
+  async getResourceBookingItem(params) {
+    var _a, _b;
+    const current = (0, import_dayjs.default)(params.currentTime);
+    if (!current.isValid())
+      return null;
+    const deviceCurrent = (0, import_dayjs.default)(params.deviceTime || params.currentTime);
+    if (!deviceCurrent.isValid())
+      return null;
+    const resourceResponse = await this.request.get(
+      "/shop/form/resource/page",
+      { skip: 1, num: 999 },
+      // @ts-ignore
+      { osServer: true, isShopApi: true }
+    );
+    const resourceList = ((_a = resourceResponse == null ? void 0 : resourceResponse.data) == null ? void 0 : _a.list) ?? [];
+    if (!Array.isArray(resourceList) || resourceList.length === 0)
+      return null;
+    const targetResource = resourceList.find(
+      (resource) => String(this.getResourceId(resource)) === String(params.resourceId)
+    );
+    if (!targetResource)
+      return null;
+    const resourceId = this.getResourceId(targetResource);
+    const matchedBookingList = params.bookingList.filter(
+      (booking) => this.isBookingMatchedResource(booking, resourceId)
+    );
+    const completedBookingList = matchedBookingList.filter(
+      (booking) => this.getBookingAppointmentStatus(booking) === "completed"
+    );
+    const unpaidBookingList = matchedBookingList.filter(
+      (booking) => this.getBookingOrderPaymentStatus(booking) === "unpaid"
+    );
+    const bookings = this.pickBookingsForCurrentPoint(
+      current,
+      this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList)
+    );
+    const completedBookings = this.pickBookingsForCurrentPoint(
+      current,
+      this.normalizeResourceBookings(current, deviceCurrent, completedBookingList, {
+        includeCompleted: true
+      })
+    );
+    const unpaidBookings = this.pickBookingsForCurrentPoint(
+      current,
+      this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList)
+    );
+    this.logger.addLog({
+      type: "info",
+      title: "getResourceBookingItem",
+      metadata: {
+        currentTime: params.currentTime,
+        deviceTime: params.deviceTime || params.currentTime,
+        resourceId,
+        bookingList: (_b = params.bookingList) == null ? void 0 : _b.length,
+        bookings: bookings.length,
+        completedBookings: completedBookings.length,
+        unpaidBookings: unpaidBookings.length
+      }
+    });
+    return {
+      ...targetResource,
+      resource_id: resourceId,
+      bookings,
+      completedBookings,
+      unpaidBookings
+    };
+  }
 };
 var Sales_default = SalesImpl;
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -32,11 +32,21 @@ export interface SalesResourceBookingItem extends Omit<ResourceData, 'bookings'>
     resource_id: ResourceId;
     bookings: SalesResourceMatchedBooking[];
 }
+export interface SalesResourceBookingItemWithGroups extends SalesResourceBookingItem {
+    completedBookings: SalesResourceMatchedBooking[];
+    unpaidBookings: SalesResourceMatchedBooking[];
+}
 export type SalesTimelineHighlights = number[];
 export interface ChangeBookingStatusParams {
     booking_id: number | string;
     appointment_status: string;
 }
+export interface GetResourceBookingItemParams {
+    resourceId: ResourceId;
+    currentTime: string;
+    bookingList: BookingData[];
+    deviceTime?: string;
+}
 /**
  * Sales 解决方案状态
  *
@@ -71,6 +81,8 @@ export interface SalesModuleAPI {
     changeBookingStatus: (params: ChangeBookingStatusParams) => Promise<any>;
     /** 获取资源维度的预约占用列表 */
     getResourceBookingList: (currentTime: string, bookingList: BookingData[], deviceTime?: string) => Promise<SalesResourceBookingItem[]>;
+    /** 获取单个资源维度的预约占用、已完成、未支付列表 */
+    getResourceBookingItem: (params: GetResourceBookingItemParams) => Promise<SalesResourceBookingItemWithGroups | null>;
     /** 获取时间轴每个时间片的预约数量 */
     getTimelineHighlights: (bookingList: BookingData[], startDateTime?: string, endDateTime?: string) => SalesTimelineHighlights;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.2.136",
+  "version": "2.2.137",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",