@pisell/pisellos 2.3.84 → 2.3.86

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 | 1 | 2 | 5 | 3 | 4 | 6;
+        weekNum: 0 | 1 | 5 | 2 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/UnifiedBookingSales/index.js

@@ -1068,6 +1068,7 @@ var POS_OVERRIDABLE_AVAILABILITY_CONFLICT_CODES = new Set(['past', 'booking_cuto
 // as missing_resource at group level. Structural validation below still
 // rejects a genuinely missing selection.
 'missing_resource']);
+var POS_NO_RESOURCE_ID = 0;
 function matchesForcedSelectionGroup(selection, group) {
   var hasGroupId = typeof selection.requirementGroupId === 'string' && selection.requirementGroupId.trim().length > 0;
   var hasFormId = selection.formId !== undefined && selection.formId !== null;
@@ -1153,7 +1154,21 @@ function buildPosForcedAvailabilityAssignments(params) {
       return;
     }
     selectedResourceIds.forEach(function (resourceId) {
-      var _group$resourceIds2, _group$formId, _candidate$primarySch5, _candidate$primarySch6;
+      var _group$resourceIds2, _group$formId2, _candidate$primarySch7, _candidate$primarySch8;
+      if (sameAvailabilityId(resourceId, POS_NO_RESOURCE_ID)) {
+        var _group$formId, _candidate$primarySch5, _candidate$primarySch6;
+        assignments.push({
+          productId: product.id,
+          resourceId: POS_NO_RESOURCE_ID,
+          formId: (_group$formId = group.formId) !== null && _group$formId !== void 0 ? _group$formId : selection.formId,
+          startAt: candidate.bookingStartAt || candidate.startAt,
+          endAt: candidate.bookingEndAt || candidate.endAt,
+          capacityRequired: Math.max(1, partySize),
+          scheduleId: (_candidate$primarySch5 = candidate.primaryScheduleRef) === null || _candidate$primarySch5 === void 0 ? void 0 : _candidate$primarySch5.scheduleId,
+          timeSlotId: (_candidate$primarySch6 = candidate.primaryScheduleRef) === null || _candidate$primarySch6 === void 0 ? void 0 : _candidate$primarySch6.timeSlotId
+        });
+        return;
+      }
       var resource = resources.find(function (item) {
         return sameAvailabilityId(item.id, resourceId);
       });
@@ -1171,12 +1186,12 @@ function buildPosForcedAvailabilityAssignments(params) {
       assignments.push({
         productId: product.id,
         resourceId: resourceId,
-        formId: (_group$formId = group.formId) !== null && _group$formId !== void 0 ? _group$formId : resource.formId,
+        formId: (_group$formId2 = group.formId) !== null && _group$formId2 !== void 0 ? _group$formId2 : resource.formId,
         startAt: candidate.bookingStartAt || candidate.startAt,
         endAt: candidate.bookingEndAt || candidate.endAt,
         capacityRequired: Math.max(1, partySize),
-        scheduleId: (_candidate$primarySch5 = candidate.primaryScheduleRef) === null || _candidate$primarySch5 === void 0 ? void 0 : _candidate$primarySch5.scheduleId,
-        timeSlotId: (_candidate$primarySch6 = candidate.primaryScheduleRef) === null || _candidate$primarySch6 === void 0 ? void 0 : _candidate$primarySch6.timeSlotId
+        scheduleId: (_candidate$primarySch7 = candidate.primaryScheduleRef) === null || _candidate$primarySch7 === void 0 ? void 0 : _candidate$primarySch7.scheduleId,
+        timeSlotId: (_candidate$primarySch8 = candidate.primaryScheduleRef) === null || _candidate$primarySch8 === void 0 ? void 0 : _candidate$primarySch8.timeSlotId
       });
     });
   });

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

@@ -1,46 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.ITEM_REWARD_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "PromotionAdapter", {
-  enumerable: true,
-  get: function () {
-    return _adapter.PromotionAdapter;
-  }
-});
-Object.defineProperty(exports, "PromotionEvaluator", {
-  enumerable: true,
-  get: function () {
-    return _evaluator.PromotionEvaluator;
-  }
-});
-Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function () {
-    return _adapter.default;
-  }
-});
-var _evaluator = require("./evaluator");
-var _adapter = _interopRequireWildcard(require("./adapter"));
-var _examples = require("./examples");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+"use strict";

package/lib/server/index.js

@@ -1481,7 +1481,7 @@ class Server {
     //   timerIds.push(timerId);
     // }
     setInterval(() => {
-      const currentTime = (0, _dayjs.default)().format('hh:mm');
+      const currentTime = (0, _dayjs.default)().format('HH:mm');
       if (timePoints.includes(currentTime)) {
         this.onScheduleTimePointTimerFire(subscriberId);
       }

package/lib/server/modules/order/index.d.ts

@@ -20,6 +20,8 @@ export declare class OrderModule extends BaseModule implements Module {
     private storage;
     private orderSQLiteSaveQueue; /** 按 storageKey 记录最近一次 SQLite 写入来源与时间，用于去重 */
     private recentSqliteWriteByStorageKey;
+    /** 最近一次清理过期 SQLite 去重记录的时间，避免每次写入都遍历 Map */
+    private lastRecentSqliteWriteCleanupAtMs;
     /** 最近一次 SSE 全量拉取完成时间 */
     private lastServerFullFetchAtMs;
     constructor(name?: string, version?: string);
@@ -58,6 +60,12 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     private mergeAuthoritativeOrderCollection;
     private reconcileOverwriteOrderCollections;
+    /**
+     * 惰性清理已经超过去重窗口的 SQLite 写入记录。
+     *
+     * 清理频率与去重窗口一致，既限制 Map 长期增长，也不会移除仍参与去重的记录。
+     */
+    private cleanupExpiredRecentSqliteWrites;
     /**
      * 记录订单最近一次 SQLite 写入，供 pubsub 回声去重使用。
      *

package/lib/server/modules/order/index.js

@@ -57,6 +57,8 @@ class OrderModule extends _BaseModule.BaseModule {
   storage;
   orderSQLiteSaveQueue = Promise.resolve(); /** 按 storageKey 记录最近一次 SQLite 写入来源与时间，用于去重 */
   recentSqliteWriteByStorageKey = new Map();
+  /** 最近一次清理过期 SQLite 去重记录的时间，避免每次写入都遍历 Map */
+  lastRecentSqliteWriteCleanupAtMs = 0;
   /** 最近一次 SSE 全量拉取完成时间 */
   lastServerFullFetchAtMs = 0;
   constructor(name, version) {
@@ -292,6 +294,24 @@ class OrderModule extends _BaseModule.BaseModule {
     return this.normalizeOrderCollectionsForIngress((0, _orderCollectionIdentity.applyOrderCollectionUidRemaps)(reconciled, uidRemaps), 'overwriteExistingOrder.reconciled');
   }
 
+  /**
+   * 惰性清理已经超过去重窗口的 SQLite 写入记录。
+   *
+   * 清理频率与去重窗口一致，既限制 Map 长期增长，也不会移除仍参与去重的记录。
+   */
+  cleanupExpiredRecentSqliteWrites(now) {
+    const elapsedSinceCleanup = now - this.lastRecentSqliteWriteCleanupAtMs;
+    if (this.lastRecentSqliteWriteCleanupAtMs > 0 && elapsedSinceCleanup >= 0 && elapsedSinceCleanup < ORDER_SQLITE_DEDUPE_MS) {
+      return;
+    }
+    for (const [storageKey, recentWrite] of this.recentSqliteWriteByStorageKey) {
+      if (now - recentWrite.ts >= ORDER_SQLITE_DEDUPE_MS) {
+        this.recentSqliteWriteByStorageKey.delete(storageKey);
+      }
+    }
+    this.lastRecentSqliteWriteCleanupAtMs = now;
+  }
+
   /**
    * 记录订单最近一次 SQLite 写入，供 pubsub 回声去重使用。
    *
@@ -300,6 +320,7 @@ class OrderModule extends _BaseModule.BaseModule {
    */
   recordRecentSqliteWrite(source, orders) {
     const now = Date.now();
+    this.cleanupExpiredRecentSqliteWrites(now);
     for (const order of orders) {
       const storageKey = this.getOrderStorageKey(order);
       if (!storageKey) continue;
@@ -1264,6 +1285,8 @@ class OrderModule extends _BaseModule.BaseModule {
     }
     this.isProcessingSyncBatch = false;
     this.pendingSyncMessages = [];
+    this.recentSqliteWriteByStorageKey.clear();
+    this.lastRecentSqliteWriteCleanupAtMs = 0;
     if (this.orderDataSource?.destroy) this.orderDataSource.destroy();
     super.destroy();
   }

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 | 1 | 2 | 5 | 3 | 4 | 6;
+        weekNum: 0 | 1 | 5 | 2 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/UnifiedBookingSales/index.js

@@ -986,6 +986,7 @@ const POS_OVERRIDABLE_AVAILABILITY_CONFLICT_CODES = new Set(['past', 'booking_cu
 // as missing_resource at group level. Structural validation below still
 // rejects a genuinely missing selection.
 'missing_resource']);
+const POS_NO_RESOURCE_ID = 0;
 function matchesForcedSelectionGroup(selection, group) {
   const hasGroupId = typeof selection.requirementGroupId === 'string' && selection.requirementGroupId.trim().length > 0;
   const hasFormId = selection.formId !== undefined && selection.formId !== null;
@@ -1066,6 +1067,19 @@ function buildPosForcedAvailabilityAssignments(params) {
       return;
     }
     selectedResourceIds.forEach(resourceId => {
+      if (sameAvailabilityId(resourceId, POS_NO_RESOURCE_ID)) {
+        assignments.push({
+          productId: product.id,
+          resourceId: POS_NO_RESOURCE_ID,
+          formId: group.formId ?? selection.formId,
+          startAt: candidate.bookingStartAt || candidate.startAt,
+          endAt: candidate.bookingEndAt || candidate.endAt,
+          capacityRequired: Math.max(1, partySize),
+          scheduleId: candidate.primaryScheduleRef?.scheduleId,
+          timeSlotId: candidate.primaryScheduleRef?.timeSlotId
+        });
+        return;
+      }
       const resource = resources.find(item => sameAvailabilityId(item.id, resourceId));
       const belongsToGroup = Boolean(resource && !(group.formId !== undefined && resource.formId !== undefined && !sameAvailabilityId(group.formId, resource.formId)) && !(group.resourceIds?.length && !group.resourceIds.some(id => sameAvailabilityId(id, resourceId))));
       if (!resource || !belongsToGroup) {

package/package.json

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