@pisell/pisellos 2.2.124 → 2.2.126

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

@@ -218,6 +218,40 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const ids = this.resourceIdIndex.get(String(resourceId)) || [];
     return ids.map((id) => this.store.map.get(id)).filter((order) => !!order);
   }
+  /**
+   * 仅覆盖本地已存在的订单；不存在则直接跳过，不落库、不 emit。
+   * 适用于"按 order_id 主动刷新本地订单详情"的代理场景。
+   */
+  async overwriteExistingOrder(fresh) {
+    const orderId = fresh == null ? void 0 : fresh.order_id;
+    if (orderId === void 0 || orderId === null) {
+      this.logError("overwriteExistingOrder-入参缺少 order_id");
+      return { overwritten: false };
+    }
+    const key = this.getIdKey(orderId);
+    if (!this.store.map.has(key)) {
+      this.logInfo("overwriteExistingOrder-本地不存在该订单，跳过", { orderId });
+      return { overwritten: false };
+    }
+    this.logInfo("overwriteExistingOrder-开始覆盖", {
+      orderId,
+      storeOrderCountBefore: this.store.list.length
+    });
+    this.store.list = this.store.list.map((order) => {
+      const id = order == null ? void 0 : order.order_id;
+      if (id === void 0 || id === null)
+        return order;
+      return this.getIdKey(id) === key ? fresh : order;
+    });
+    this.syncOrdersMap();
+    await this.saveOrdersToSQLite(this.store.list);
+    this.logInfo("overwriteExistingOrder-结束", {
+      orderId,
+      storeOrderCountAfter: this.store.list.length
+    });
+    await this.core.effects.emit(import_types.OrderHooks.onOrdersChanged, this.store.list);
+    return { overwritten: true };
+  }
   /**
    * 通过 SSE 按自定义 query 拉取订单（支持 select/with 精简字段）
    */

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

@@ -86,12 +86,41 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      */
     private pickBookingsForCurrentPoint;
     /**
-     * 标准化单条 booking：
-     * - 过滤终态（rejected/cancelled/completed）
-     * - 当 deviceTime 早于 currentTime 时，过滤 end_time 早于 currentTime 的历史数据
-     * - 注入 status / isTimeout / reserved_status
+     * 计算 booking 在 current 时刻的执行进度百分比（0-100）。
+     * - startAt/endAt 非法或 totalMinutes <= 0 返回 0
+     * - current 早于 startAt 返回 0，晚于 endAt 返回 100
+     */
+    private calcProgressPercent;
+    /**
+     * 标准化单条 booking 的分发入口：
+     * - 统一过滤 rejected / cancelled（视为没来过）
+     * - current === deviceCurrent 走实时分支（信任 appointment_status）
+     * - 否则走快照分支（纯时间窗判定，忽略 appointment_status 的 arrived/started/completed 差异）
      */
     private normalizeMatchedBooking;
+    /**
+     * 实时模式（current === deviceCurrent）：信任 appointment_status
+     * - 过滤 new / completed（实时视角下视为非活跃数据）
+     * - status 由 getBookingStatus 映射
+     * - occupied 且 current > endAt 标记 isTimeout + timeoutTime
+     * - reserved 且 current < startAt 标记 not_arrived，否则标记 late
+     */
+    private buildRealtimeBooking;
+    /**
+     * 快照模式（current !== deviceCurrent，过去或未来）：忽略 appointment_status
+     * 的实时态差异，仅按 booking 时间窗判定，为 current 提供时间点快照视图。
+     *
+     * - new：视作尚未成为真实预约，过滤
+     * - locked：保留 status=locked，不计算 timeout/late/progress
+     * - 其他非终态：
+     *   - startAt/endAt 非法 → 过滤
+     *   - current > endAt → 过滤（已结束，不入池）
+     *   - current ∈ [startAt, endAt] → occupied，附带 progressPercent
+     *   - current < startAt → reserved + not_arrived，附带 remainingReserveTime
+     *
+     * 快照模式下 isTimeout 恒为 false，lateTime / timeoutTime 始终置空。
+     */
+    private buildSnapshotBooking;
     getResourceBookingList(currentTime: string, bookingList?: BookingData[], deviceTime?: string): Promise<SalesResourceBookingItem[]>;
 }
 export { SalesImpl as Sales };

package/lib/solution/Sales/index.js

@@ -315,39 +315,54 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     return fallback ? [fallback] : [];
   }
   /**
-   * 标准化单条 booking：
-   * - 过滤终态（rejected/cancelled/completed）
-   * - 当 deviceTime 早于 currentTime 时，过滤 end_time 早于 currentTime 的历史数据
-   * - 注入 status / isTimeout / reserved_status
+   * 计算 booking 在 current 时刻的执行进度百分比（0-100）。
+   * - startAt/endAt 非法或 totalMinutes <= 0 返回 0
+   * - current 早于 startAt 返回 0，晚于 endAt 返回 100
+   */
+  calcProgressPercent(current, startAt, endAt) {
+    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);
+  }
+  /**
+   * 标准化单条 booking 的分发入口：
+   * - 统一过滤 rejected / cancelled（视为没来过）
+   * - current === deviceCurrent 走实时分支（信任 appointment_status）
+   * - 否则走快照分支（纯时间窗判定，忽略 appointment_status 的 arrived/started/completed 差异）
    */
   normalizeMatchedBooking(current, deviceCurrent, booking) {
     const appointmentStatus = String(booking.appointment_status ?? booking.status ?? "");
-    if (appointmentStatus === "new" || appointmentStatus === "rejected" || appointmentStatus === "cancelled" || appointmentStatus === "completed") {
+    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);
-    const shouldFilterHistoryByCurrent = deviceCurrent.isBefore(current);
-    if (shouldFilterHistoryByCurrent && endAt.isValid() && endAt.isBefore(current))
+    if (current.isSame(deviceCurrent)) {
+      return this.buildRealtimeBooking(current, booking, appointmentStatus, startAt, endAt);
+    }
+    return this.buildSnapshotBooking(current, booking, appointmentStatus, startAt, endAt);
+  }
+  /**
+   * 实时模式（current === deviceCurrent）：信任 appointment_status
+   * - 过滤 new / completed（实时视角下视为非活跃数据）
+   * - status 由 getBookingStatus 映射
+   * - occupied 且 current > endAt 标记 isTimeout + timeoutTime
+   * - reserved 且 current < startAt 标记 not_arrived，否则标记 late
+   */
+  buildRealtimeBooking(current, booking, appointmentStatus, startAt, endAt) {
+    if (appointmentStatus === "new" || appointmentStatus === "completed")
       return null;
-    let bookingStatus = this.getBookingStatus(appointmentStatus);
-    const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
-    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())
-        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);
-    })();
+    const bookingStatus = this.getBookingStatus(appointmentStatus);
+    const isTimeout = bookingStatus === "occupied" && endAt.isValid() && current.isAfter(endAt);
+    const timeoutTime = isTimeout ? current.diff(endAt, "minute") : void 0;
+    const progressPercent = bookingStatus === "occupied" ? this.calcProgressPercent(current, startAt, endAt) : 0;
     let reservedStatus;
     let lateTime;
     let remainingReserveTime;
@@ -360,27 +375,6 @@ 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.isSameOrAfter(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,
@@ -392,6 +386,62 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
       remainingReserveTime
     };
   }
+  /**
+   * 快照模式（current !== deviceCurrent，过去或未来）：忽略 appointment_status
+   * 的实时态差异，仅按 booking 时间窗判定，为 current 提供时间点快照视图。
+   *
+   * - new：视作尚未成为真实预约，过滤
+   * - locked：保留 status=locked，不计算 timeout/late/progress
+   * - 其他非终态：
+   *   - startAt/endAt 非法 → 过滤
+   *   - current > endAt → 过滤（已结束，不入池）
+   *   - current ∈ [startAt, endAt] → occupied，附带 progressPercent
+   *   - current < startAt → reserved + not_arrived，附带 remainingReserveTime
+   *
+   * 快照模式下 isTimeout 恒为 false，lateTime / timeoutTime 始终置空。
+   */
+  buildSnapshotBooking(current, booking, appointmentStatus, startAt, endAt) {
+    if (appointmentStatus === "new")
+      return null;
+    if (appointmentStatus === "locked") {
+      return {
+        ...booking,
+        status: "locked",
+        isTimeout: false,
+        timeoutTime: void 0,
+        progressPercent: 0,
+        lateTime: void 0,
+        reserved_status: void 0,
+        remainingReserveTime: void 0
+      };
+    }
+    if (!startAt.isValid() || !endAt.isValid())
+      return null;
+    if (current.isAfter(endAt))
+      return null;
+    if (this.isSameOrAfter(current, startAt) && this.isSameOrBefore(current, endAt)) {
+      return {
+        ...booking,
+        status: "occupied",
+        isTimeout: false,
+        timeoutTime: void 0,
+        progressPercent: this.calcProgressPercent(current, startAt, endAt),
+        lateTime: void 0,
+        reserved_status: void 0,
+        remainingReserveTime: void 0
+      };
+    }
+    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)
+    };
+  }
   async getResourceBookingList(currentTime, bookingList = [], deviceTime = currentTime) {
     var _a;
     const current = (0, import_dayjs.default)(currentTime);

package/package.json

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