@pisell/pisellos 2.3.97 → 2.3.98

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

@@ -0,0 +1,9 @@
+// 导出评估器
+export { PromotionEvaluator } from "./evaluator";
+
+// 导出适配器
+export { PromotionAdapter } from "./adapter";
+export { default } from "./adapter";
+
+// 导出策略配置示例常量
+export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, ITEM_REWARD_STRATEGY } from "./examples";

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 5 | 3 | 1 | 2 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -90,6 +90,13 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private groupBookingsByResource;
     private isBookingMatchedResource;
     private sortMatchedBookings;
+    /** Unpaid：与 Current 重合的订单沿用 Current 顺序，其余欠款订单按开始时间降序追加。 */
+    private sortUnpaidBookings;
+    /**
+     * 构造资源详情的 Unpaid 列表：复用旧版当前/未来订单的展示计算，再补齐被预约状态/时间漏掉的欠款订单。
+     * Unpaid 的成员资格由调用方按付款状态筛好；这里仅负责展示字段与顺序。
+     */
+    private buildUnpaidBookings;
     /**
      * 资源下 bookings 的返回裁剪策略：
      * 1) 优先返回当前时刻正在进行中的预约（允许并发返回多条）

package/dist/solution/Sales/index.js

@@ -485,6 +485,64 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       });
     }
 
+    /** Unpaid：与 Current 重合的订单沿用 Current 顺序，其余欠款订单按开始时间降序追加。 */
+  }, {
+    key: "sortUnpaidBookings",
+    value: function sortUnpaidBookings(bookings, currentBookings) {
+      var _this4 = this;
+      var currentOrderIndexes = new Map(currentBookings.map(function (booking, index) {
+        return [String(booking.order.order_id), index];
+      }));
+      return _toConsumableArray(bookings).sort(function (left, right) {
+        var leftIndex = currentOrderIndexes.get(String(left.order.order_id));
+        var rightIndex = currentOrderIndexes.get(String(right.order.order_id));
+        if (leftIndex !== undefined || rightIndex !== undefined) {
+          if (leftIndex === undefined) return 1;
+          if (rightIndex === undefined) return -1;
+          return leftIndex - rightIndex;
+        }
+        var leftStartAt = _this4.toBookingDateTime(left.start_date, left.start_time).valueOf();
+        var rightStartAt = _this4.toBookingDateTime(right.start_date, right.start_time).valueOf();
+        return rightStartAt - leftStartAt;
+      });
+    }
+
+    /**
+     * 构造资源详情的 Unpaid 列表：复用旧版当前/未来订单的展示计算，再补齐被预约状态/时间漏掉的欠款订单。
+     * Unpaid 的成员资格由调用方按付款状态筛好；这里仅负责展示字段与顺序。
+     */
+  }, {
+    key: "buildUnpaidBookings",
+    value: function buildUnpaidBookings(current, deviceCurrent, unpaidBookingList, currentBookings) {
+      var _this5 = this;
+      var legacyPrioritizedBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList), {
+        includeAllFuture: true
+      });
+      var allBookings = this.sortMatchedBookings(unpaidBookingList.map(function (booking) {
+        var normalized = _this5.normalizeMatchedBooking(current, deviceCurrent, booking, {
+          includeCompleted: true
+        });
+        if (normalized) return normalized;
+        var appointmentStatus = _this5.getBookingAppointmentStatus(booking);
+        var status = appointmentStatus === 'started' ? 'occupied' : appointmentStatus === 'completed' ? 'completed' : 'reserved';
+        return _objectSpread(_objectSpread({}, booking), {}, {
+          status: status,
+          isTimeout: false,
+          timeoutTime: undefined,
+          progressPercent: undefined,
+          lateTime: undefined,
+          reserved_status: undefined,
+          remainingReserveTime: undefined
+        });
+      }));
+      var legacyOrderIds = new Set(legacyPrioritizedBookings.map(function (booking) {
+        return String(booking.order.order_id);
+      }));
+      return this.sortUnpaidBookings([].concat(_toConsumableArray(legacyPrioritizedBookings), _toConsumableArray(allBookings.filter(function (booking) {
+        return !legacyOrderIds.has(String(booking.order.order_id));
+      }))), currentBookings);
+    }
+
     /**
      * 资源下 bookings 的返回裁剪策略：
      * 1) 优先返回当前时刻正在进行中的预约（允许并发返回多条）
@@ -496,7 +554,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "pickBookingsForCurrentPoint",
     value: function pickBookingsForCurrentPoint(current, bookings) {
-      var _this4 = this;
+      var _this6 = this;
       var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       if (bookings.length === 0) return [];
       var _this$getOperatingDay = this.getOperatingDayRange(current),
@@ -505,17 +563,17 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
 
       // 仅保留与 current 所属营业日窗口有时间交集的预约，避免跨营业日误命中
       var dayScopedBookings = bookings.filter(function (booking) {
-        var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
-        var endAt = _this4.toBookingDateTime(booking.end_date, booking.end_time);
+        var startAt = _this6.toBookingDateTime(booking.start_date, booking.start_time);
+        var endAt = _this6.toBookingDateTime(booking.end_date, booking.end_time);
         if (!startAt.isValid() || !endAt.isValid()) return false;
-        return startAt.isBefore(operatingDayEndExclusive) && _this4.isSameOrAfter(endAt, operatingDayStart);
+        return startAt.isBefore(operatingDayEndExclusive) && _this6.isSameOrAfter(endAt, operatingDayStart);
       });
       if (dayScopedBookings.length === 0) return [];
       var appendNextStartGroupIfNeeded = function appendNextStartGroupIfNeeded(selectedBookings) {
         if (selectedBookings.length === 0) return selectedBookings;
         if (options.includeAllFuture) {
           var allFutureBookings = dayScopedBookings.filter(function (booking) {
-            var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
+            var startAt = _this6.toBookingDateTime(booking.start_date, booking.start_time);
             return startAt.isValid() && startAt.isAfter(current);
           });
           return [].concat(_toConsumableArray(selectedBookings), _toConsumableArray(allFutureBookings));
@@ -525,21 +583,21 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
         });
         if (!shouldAppendNextGroup) return selectedBookings;
         var selectedStartValues = new Set(selectedBookings.map(function (booking) {
-          return _this4.toBookingDateTime(booking.start_date, booking.start_time);
+          return _this6.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 = _this4.toBookingDateTime(booking.start_date, booking.start_time);
+          var startAt = _this6.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 = _this4.toBookingDateTime(futureCandidates[0].start_date, futureCandidates[0].start_time).valueOf();
+        var nextStartAt = _this6.toBookingDateTime(futureCandidates[0].start_date, futureCandidates[0].start_time).valueOf();
         var nextStartGroup = futureCandidates.filter(function (booking) {
-          var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
+          var startAt = _this6.toBookingDateTime(booking.start_date, booking.start_time);
           return startAt.isValid() && startAt.valueOf() === nextStartAt;
         });
         if (nextStartGroup.length === 0) return selectedBookings;
@@ -551,10 +609,10 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
 
       // active: current 处于 [startAt, endAt] 区间
       var activeBookings = dayScopedBookings.filter(function (booking) {
-        var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
-        var endAt = _this4.toBookingDateTime(booking.end_date, booking.end_time);
+        var startAt = _this6.toBookingDateTime(booking.start_date, booking.start_time);
+        var endAt = _this6.toBookingDateTime(booking.end_date, booking.end_time);
         if (!startAt.isValid() || !endAt.isValid()) return false;
-        return _this4.isSameOrAfter(current, startAt) && _this4.isSameOrBefore(current, endAt);
+        return _this6.isSameOrAfter(current, startAt) && _this6.isSameOrBefore(current, endAt);
       });
       if (activeBookings.length > 0) return appendNextStartGroupIfNeeded(activeBookings);
 
@@ -566,14 +624,14 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
 
       // upcoming: 从未来预约里只取最早那一组（同 start_time）
       var upcoming = dayScopedBookings.filter(function (booking) {
-        var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
+        var startAt = _this6.toBookingDateTime(booking.start_date, booking.start_time);
         return startAt.isValid() && startAt.isAfter(current);
       });
       if (upcoming.length > 0) {
         if (options.includeAllFuture) return upcoming;
         var firstStartAt = this.toBookingDateTime(upcoming[0].start_date, upcoming[0].start_time).valueOf();
         var upcomingStartGroup = upcoming.filter(function (booking) {
-          var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
+          var startAt = _this6.toBookingDateTime(booking.start_date, booking.start_time);
           return startAt.valueOf() === firstStartAt;
         });
         return appendNextStartGroupIfNeeded(upcomingStartGroup);
@@ -626,10 +684,10 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeResourceBookings",
     value: function normalizeResourceBookings(current, deviceCurrent, bookingList) {
-      var _this5 = this;
+      var _this7 = this;
       var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
       var normalizedBookings = bookingList.map(function (booking) {
-        return _this5.normalizeMatchedBooking(current, deviceCurrent, booking, options);
+        return _this7.normalizeMatchedBooking(current, deviceCurrent, booking, options);
       }).filter(function (booking) {
         return Boolean(booking);
       }).filter(function (booking) {
@@ -759,7 +817,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _getResourceBookingList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(currentTime) {
         var _resourceResponse$dat,
           _resourceResponse$dat2,
-          _this6 = this;
+          _this8 = this;
         var bookingList,
           deviceTime,
           current,
@@ -815,16 +873,16 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
               rawBookingMap = this.groupBookingsByResource(bookingList);
               bookingMap = this.groupBookingsByResource(normalizedBookings); // 输出：每个资源都返回；bookings 可能是 0 / 1 / 多条（并发场景）
               list = resourceList.map(function (resource) {
-                var resourceId = _this6.getResourceId(resource);
+                var resourceId = _this8.getResourceId(resource);
                 var rawMatchedBookings = rawBookingMap.get(String(resourceId)) || [];
                 var matchedBookings = bookingMap.get(String(resourceId)) || [];
                 var statsBookings = rawMatchedBookings.filter(function (booking) {
-                  return _this6.isBookingIncludedInStats(booking);
+                  return _this8.isBookingIncludedInStats(booking);
                 });
-                var orderCount = _this6.countBookingOrders(statsBookings);
+                var orderCount = _this8.countBookingOrders(statsBookings);
                 var bookingCount = statsBookings.length;
-                var compeleteBookingCount = _this6.countCompletedBookings(statsBookings);
-                var bookings = _this6.pickBookingsForCurrentPoint(current, matchedBookings);
+                var compeleteBookingCount = _this8.countCompletedBookings(statsBookings);
+                var bookings = _this8.pickBookingsForCurrentPoint(current, matchedBookings);
                 return _objectSpread(_objectSpread({}, resource), {}, {
                   resource_id: resourceId,
                   orderCount: orderCount,
@@ -861,7 +919,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _getResourceBookingItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
         var _resourceResponse$dat3,
           _resourceResponse$dat4,
-          _this7 = this,
+          _this9 = this,
           _params$bookingList;
         var current, deviceCurrent, resourceResponse, resourceList, targetResource, resourceId, matchedBookingList, statsBookingList, completedBookingList, unpaidBookingList, bookings, completedBookings, unpaidBookings, orderCount, bookingCount, compeleteBookingCount;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
@@ -901,7 +959,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
               return _context6.abrupt("return", null);
             case 12:
               targetResource = resourceList.find(function (resource) {
-                return String(_this7.getResourceId(resource)) === String(params.resourceId);
+                return String(_this9.getResourceId(resource)) === String(params.resourceId);
               });
               if (targetResource) {
                 _context6.next = 15;
@@ -911,18 +969,18 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 15:
               resourceId = this.getResourceId(targetResource);
               matchedBookingList = params.bookingList.filter(function (booking) {
-                return _this7.isBookingMatchedResource(booking, resourceId);
+                return _this9.isBookingMatchedResource(booking, resourceId);
               });
               statsBookingList = matchedBookingList.filter(function (booking) {
-                return _this7.isBookingIncludedInStats(booking);
+                return _this9.isBookingIncludedInStats(booking);
               });
               completedBookingList = matchedBookingList.filter(function (booking) {
-                return _this7.getBookingAppointmentStatus(booking) === 'completed';
+                return _this9.getBookingAppointmentStatus(booking) === 'completed';
               }); // const unpaidBookingList = matchedBookingList.filter(
               //   (booking) => this.getBookingOrderPaymentStatus(booking) === 'unpaid' || this.getBookingOrderPaymentStatus(booking) === 'payment_processing',
               // );
               unpaidBookingList = matchedBookingList.filter(function (booking) {
-                return _this7.isUnpaidBooking(booking);
+                return _this9.isUnpaidBooking(booking);
               });
               bookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList), {
                 includeAllFuture: true
@@ -938,9 +996,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                   remainingReserveTime: undefined
                 });
               });
-              unpaidBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList), {
-                includeAllFuture: true
-              });
+              unpaidBookings = this.buildUnpaidBookings(current, deviceCurrent, unpaidBookingList, bookings);
               orderCount = this.countBookingOrders(statsBookingList);
               bookingCount = statsBookingList.length;
               compeleteBookingCount = this.countCompletedBookings(statsBookingList);

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 5 | 3 | 1 | 2 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -90,6 +90,13 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private groupBookingsByResource;
     private isBookingMatchedResource;
     private sortMatchedBookings;
+    /** Unpaid：与 Current 重合的订单沿用 Current 顺序，其余欠款订单按开始时间降序追加。 */
+    private sortUnpaidBookings;
+    /**
+     * 构造资源详情的 Unpaid 列表：复用旧版当前/未来订单的展示计算，再补齐被预约状态/时间漏掉的欠款订单。
+     * Unpaid 的成员资格由调用方按付款状态筛好；这里仅负责展示字段与顺序。
+     */
+    private buildUnpaidBookings;
     /**
      * 资源下 bookings 的返回裁剪策略：
      * 1) 优先返回当前时刻正在进行中的预约（允许并发返回多条）

package/lib/solution/Sales/index.js

@@ -340,6 +340,53 @@ class SalesImpl extends _BaseModule.BaseModule {
     });
   }
 
+  /** Unpaid：与 Current 重合的订单沿用 Current 顺序，其余欠款订单按开始时间降序追加。 */
+  sortUnpaidBookings(bookings, currentBookings) {
+    const currentOrderIndexes = new Map(currentBookings.map((booking, index) => [String(booking.order.order_id), index]));
+    return [...bookings].sort((left, right) => {
+      const leftIndex = currentOrderIndexes.get(String(left.order.order_id));
+      const rightIndex = currentOrderIndexes.get(String(right.order.order_id));
+      if (leftIndex !== undefined || rightIndex !== undefined) {
+        if (leftIndex === undefined) return 1;
+        if (rightIndex === undefined) return -1;
+        return leftIndex - rightIndex;
+      }
+      const leftStartAt = this.toBookingDateTime(left.start_date, left.start_time).valueOf();
+      const rightStartAt = this.toBookingDateTime(right.start_date, right.start_time).valueOf();
+      return rightStartAt - leftStartAt;
+    });
+  }
+
+  /**
+   * 构造资源详情的 Unpaid 列表：复用旧版当前/未来订单的展示计算，再补齐被预约状态/时间漏掉的欠款订单。
+   * Unpaid 的成员资格由调用方按付款状态筛好；这里仅负责展示字段与顺序。
+   */
+  buildUnpaidBookings(current, deviceCurrent, unpaidBookingList, currentBookings) {
+    const legacyPrioritizedBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList), {
+      includeAllFuture: true
+    });
+    const allBookings = this.sortMatchedBookings(unpaidBookingList.map(booking => {
+      const normalized = this.normalizeMatchedBooking(current, deviceCurrent, booking, {
+        includeCompleted: true
+      });
+      if (normalized) return normalized;
+      const appointmentStatus = this.getBookingAppointmentStatus(booking);
+      const status = appointmentStatus === 'started' ? 'occupied' : appointmentStatus === 'completed' ? 'completed' : 'reserved';
+      return {
+        ...booking,
+        status,
+        isTimeout: false,
+        timeoutTime: undefined,
+        progressPercent: undefined,
+        lateTime: undefined,
+        reserved_status: undefined,
+        remainingReserveTime: undefined
+      };
+    }));
+    const legacyOrderIds = new Set(legacyPrioritizedBookings.map(booking => String(booking.order.order_id)));
+    return this.sortUnpaidBookings([...legacyPrioritizedBookings, ...allBookings.filter(booking => !legacyOrderIds.has(String(booking.order.order_id)))], currentBookings);
+  }
+
   /**
    * 资源下 bookings 的返回裁剪策略：
    * 1) 优先返回当前时刻正在进行中的预约（允许并发返回多条）
@@ -679,9 +726,7 @@ class SalesImpl extends _BaseModule.BaseModule {
         remainingReserveTime: undefined
       };
     });
-    const unpaidBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList), {
-      includeAllFuture: true
-    });
+    const unpaidBookings = this.buildUnpaidBookings(current, deviceCurrent, unpaidBookingList, bookings);
     const orderCount = this.countBookingOrders(statsBookingList);
     const bookingCount = statsBookingList.length;
     const compeleteBookingCount = this.countCompletedBookings(statsBookingList);

package/package.json

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