@pisell/pisellos 2.2.109 → 2.2.111

package/dist/solution/Sales/index.js

@@ -321,7 +321,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getBookingStatus",
     value: function getBookingStatus(appointmentStatus) {
       if (appointmentStatus === 'started') return 'occupied';
-      if (appointmentStatus === 'new' || appointmentStatus === 'confirmed' || appointmentStatus === 'arrived') {
+      if (appointmentStatus === 'confirmed' || appointmentStatus === 'arrived') {
         return 'reserved';
       }
       // TODO: locked 的业务规则后续补充。
@@ -383,6 +383,9 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
           return startAt.isValid() && startAt.valueOf() === nextStartAt;
         });
         if (nextStartGroup.length === 0) return selectedBookings;
+        nextStartGroup.forEach(function (booking) {
+          booking.isNext = true;
+        });
         return [].concat(_toConsumableArray(selectedBookings), _toConsumableArray(nextStartGroup));
       };
 
@@ -431,7 +434,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function normalizeMatchedBooking(current, deviceCurrent, booking) {
       var _ref3, _booking$appointment_;
       var appointmentStatus = String((_ref3 = (_booking$appointment_ = booking.appointment_status) !== null && _booking$appointment_ !== void 0 ? _booking$appointment_ : booking.status) !== null && _ref3 !== void 0 ? _ref3 : '');
-      if (appointmentStatus === 'rejected' || appointmentStatus === 'cancelled' || appointmentStatus === 'completed') {
+      if (appointmentStatus === 'new' || appointmentStatus === 'rejected' || appointmentStatus === 'cancelled' || appointmentStatus === 'completed') {
         return null;
       }
       var endAt = this.toBookingDateTime(booking.end_date, booking.end_time);
@@ -463,6 +466,25 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
           lateTime = Math.max(current.diff(startAt, 'minute'), 0);
         }
       }
+
+      // 未来查询投影：查询时间晚于设备时间时，预留+迟到且 end_time 仍在查询时间之后的预约强制视为占用
+      if (current.isAfter(deviceCurrent) && bookingStatus === 'reserved' && reservedStatus === 'late' && endAt.isValid() && endAt.isAfter(current)) {
+        bookingStatus = 'occupied';
+        reservedStatus = undefined;
+        lateTime = undefined;
+        remainingReserveTime = undefined;
+        isTimeout = false;
+        timeoutTime = undefined;
+        progressPercent = function () {
+          if (!startAt.isValid() || !endAt.isValid()) return 0;
+          var totalMinutes = endAt.diff(startAt, 'minute');
+          if (totalMinutes <= 0) return 0;
+          var elapsedMinutes = current.diff(startAt, 'minute');
+          if (elapsedMinutes <= 0) return 0;
+          if (elapsedMinutes >= totalMinutes) return 100;
+          return Math.floor(elapsedMinutes / totalMinutes * 100);
+        }();
+      }
       return _objectSpread(_objectSpread({}, booking), {}, {
         status: bookingStatus,
         isTimeout: isTimeout,
@@ -533,6 +555,8 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                 return _this3.normalizeMatchedBooking(current, deviceCurrent, booking);
               }).filter(function (booking) {
                 return Boolean(booking);
+              }).filter(function (booking) {
+                return !booking.status;
               }).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();

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

@@ -20,6 +20,7 @@ export type SalesBookingStatus = 'reserved' | 'occupied' | 'locked' | undefined;
 export type SalesReservedStatus = 'not_arrived' | 'late' | undefined;
 export interface SalesResourceMatchedBooking extends Omit<BookingData, 'status'> {
     status: SalesBookingStatus;
+    isNext?: boolean;
     isTimeout: boolean;
     timeoutTime?: number;
     progressPercent?: number;

package/lib/solution/Sales/index.js

@@ -218,7 +218,7 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
   getBookingStatus(appointmentStatus) {
     if (appointmentStatus === "started")
       return "occupied";
-    if (appointmentStatus === "new" || appointmentStatus === "confirmed" || appointmentStatus === "arrived") {
+    if (appointmentStatus === "confirmed" || appointmentStatus === "arrived") {
       return "reserved";
     }
     if (appointmentStatus === "locked")
@@ -278,6 +278,9 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
       });
       if (nextStartGroup.length === 0)
         return selectedBookings;
+      nextStartGroup.forEach((booking) => {
+        booking.isNext = true;
+      });
       return [...selectedBookings, ...nextStartGroup];
     };
     const activeBookings = dayScopedBookings.filter((booking) => {
@@ -317,18 +320,18 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
    */
   normalizeMatchedBooking(current, deviceCurrent, booking) {
     const appointmentStatus = String(booking.appointment_status ?? booking.status ?? "");
-    if (appointmentStatus === "rejected" || appointmentStatus === "cancelled" || appointmentStatus === "completed") {
+    if (appointmentStatus === "new" || appointmentStatus === "rejected" || appointmentStatus === "cancelled" || appointmentStatus === "completed") {
       return null;
     }
     const endAt = this.toBookingDateTime(booking.end_date, booking.end_time);
     const shouldFilterHistoryByCurrent = deviceCurrent.isBefore(current);
     if (shouldFilterHistoryByCurrent && endAt.isValid() && endAt.isBefore(current))
       return null;
-    const bookingStatus = this.getBookingStatus(appointmentStatus);
+    let bookingStatus = this.getBookingStatus(appointmentStatus);
     const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
-    const isTimeout = bookingStatus === "occupied" && endAt.isValid() && current.isAfter(endAt);
-    const timeoutTime = isTimeout ? current.diff(endAt, "minute") : void 0;
-    const progressPercent = (() => {
+    let isTimeout = bookingStatus === "occupied" && endAt.isValid() && current.isAfter(endAt);
+    let timeoutTime = isTimeout ? current.diff(endAt, "minute") : void 0;
+    let progressPercent = (() => {
       if (bookingStatus !== "occupied")
         return 0;
       if (!startAt.isValid() || !endAt.isValid())
@@ -355,6 +358,27 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
         lateTime = Math.max(current.diff(startAt, "minute"), 0);
       }
     }
+    if (current.isAfter(deviceCurrent) && bookingStatus === "reserved" && reservedStatus === "late" && endAt.isValid() && endAt.isAfter(current)) {
+      bookingStatus = "occupied";
+      reservedStatus = void 0;
+      lateTime = void 0;
+      remainingReserveTime = void 0;
+      isTimeout = false;
+      timeoutTime = void 0;
+      progressPercent = (() => {
+        if (!startAt.isValid() || !endAt.isValid())
+          return 0;
+        const totalMinutes = endAt.diff(startAt, "minute");
+        if (totalMinutes <= 0)
+          return 0;
+        const elapsedMinutes = current.diff(startAt, "minute");
+        if (elapsedMinutes <= 0)
+          return 0;
+        if (elapsedMinutes >= totalMinutes)
+          return 100;
+        return Math.floor(elapsedMinutes / totalMinutes * 100);
+      })();
+    }
     return {
       ...booking,
       status: bookingStatus,
@@ -383,7 +407,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 [];
-    const normalizedBookings = bookingList.map((booking) => this.normalizeMatchedBooking(current, deviceCurrent, booking)).filter((booking) => Boolean(booking)).sort((left, right) => {
+    const normalizedBookings = bookingList.map((booking) => this.normalizeMatchedBooking(current, deviceCurrent, booking)).filter((booking) => Boolean(booking)).filter((booking) => !booking.status).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;

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

@@ -20,6 +20,7 @@ export type SalesBookingStatus = 'reserved' | 'occupied' | 'locked' | undefined;
 export type SalesReservedStatus = 'not_arrived' | 'late' | undefined;
 export interface SalesResourceMatchedBooking extends Omit<BookingData, 'status'> {
     status: SalesBookingStatus;
+    isNext?: boolean;
     isTimeout: boolean;
     timeoutTime?: number;
     progressPercent?: number;

package/package.json

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