@pisell/pisellos 2.2.210 → 2.2.212

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

@@ -45,7 +45,8 @@ var ORDER_SILENT_REFRESH_MIN_INTERVAL_MS = 3e4;
 var ORDER_BUSINESS_WRITE_SOURCES = /* @__PURE__ */ new Set([
   "upsertOrdersFromRemote",
   "upsertPendingSyncOrders",
-  "overwriteExistingOrder"
+  "overwriteExistingOrder",
+  "markOrderSyncedByExternalSaleNumber"
 ]);
 var OrderModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
@@ -72,7 +73,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async emitOrdersChanged(changedOrders = [], source) {
     const payload = {
       list: this.store.list,
-      changedOrders,
+      changedOrders: changedOrders.map((order) => this.normalizeOrderForMemoryList(order)),
       source
     };
     await this.core.effects.emit(import_types.OrderHooks.onOrdersChanged, payload);
@@ -131,7 +132,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       }
     }
     if (Array.isArray((_b = options == null ? void 0 : options.initialState) == null ? void 0 : _b.list)) {
-      this.store.list = options.initialState.list;
+      this.store.list = options.initialState.list.map((order) => this.normalizeOrderForMemoryList(order));
       this.syncOrdersMap();
       this.emitOrdersChanged([], "initialState");
     } else {
@@ -377,9 +378,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const localOrder = orders.find((order) => this.isOrderLookupMatch(order, key));
     if (!localOrder)
       return null;
-    this.store.list = orders;
+    this.store.list = orders.map((order) => this.normalizeOrderForMemoryList(order));
     this.syncOrdersMap();
-    return localOrder;
+    return this.normalizeOrderForMemoryList(localOrder);
   }
   async loadOrdersByServer() {
     var _a;
@@ -402,16 +403,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         this.markOrderPulledAtNow();
         this.lastServerFullFetchAtMs = Date.now();
       } catch {
-        orderList = [];
-        this.logInfo("loadOrdersByServer-SSE拉取失败，回退为空数组");
+        this.logInfo("loadOrdersByServer-SSE拉取失败，保持当前内存订单");
+        return this.store.list;
       }
     }
-    await this.replaceOrdersSnapshotInSQLite(orderList, "loadOrdersByServer");
+    const mergedOrders = await this.replaceOrdersSnapshotInSQLite(orderList, "loadOrdersByServer");
+    const memoryOrders = mergedOrders.map((order) => this.normalizeOrderForMemoryList(order));
     this.logInfo("loadOrdersByServer-结束", {
-      count: orderList.length
+      count: memoryOrders.length
     });
-    await this.core.effects.emit(import_types.OrderHooks.onOrdersLoaded, orderList);
-    return orderList;
+    await this.core.effects.emit(import_types.OrderHooks.onOrdersLoaded, memoryOrders);
+    return memoryOrders;
   }
   /**
    * 静默全量刷新：后台重新拉取全量 SSE 订单数据并更新本地
@@ -453,6 +455,19 @@ 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);
   }
+  normalizeOrderForMemoryList(order) {
+    const externalSaleNumber = order == null ? void 0 : order.external_sale_number;
+    if ((order == null ? void 0 : order.order_id) !== void 0 && (order == null ? void 0 : order.order_id) !== null && (order == null ? void 0 : order.order_id) !== "") {
+      return order;
+    }
+    if (externalSaleNumber === void 0 || externalSaleNumber === null || externalSaleNumber === "") {
+      return order;
+    }
+    return {
+      ...order,
+      order_id: externalSaleNumber
+    };
+  }
   /**
    * 仅覆盖本地已存在的订单；不存在则直接跳过，不落库、不 emit。
    * 适用于"按 order_id 主动刷新本地订单详情"的代理场景。
@@ -499,6 +514,51 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.logInfo("upsertOrdersFromRemote-开始", { count: freshOrders.length });
     await this.mergeOrdersToStore(freshOrders, "upsertOrdersFromRemote");
   }
+  async markOrderSyncedByExternalSaleNumber(params) {
+    const externalSaleNumber = params.externalSaleNumber;
+    if (externalSaleNumber === void 0 || externalSaleNumber === null || externalSaleNumber === "") {
+      this.logError("markOrderSyncedByExternalSaleNumber-缺少 external_sale_number");
+      return { updated: false };
+    }
+    const key = this.getIdKey(externalSaleNumber);
+    const targetIndex = this.store.list.findIndex((order) => {
+      const value = order == null ? void 0 : order.external_sale_number;
+      if (value === void 0 || value === null || value === "")
+        return false;
+      return this.getIdKey(value) === key;
+    });
+    if (targetIndex < 0) {
+      this.logInfo("markOrderSyncedByExternalSaleNumber-本地订单不存在，跳过", {
+        external_sale_number: externalSaleNumber
+      });
+      return { updated: false };
+    }
+    const existing = this.store.list[targetIndex];
+    const nextOrder = this.normalizeRemoteSyncedOrder({
+      ...existing,
+      ...params.patch || {},
+      external_sale_number: existing.external_sale_number ?? externalSaleNumber,
+      need_sync: 0
+    });
+    const storageKey = this.getOrderStorageKey(nextOrder) || key;
+    this.store.list = this.store.list.map((order, index) => {
+      if (index !== targetIndex)
+        return order;
+      return nextOrder;
+    });
+    this.syncOrdersMap();
+    await this.patchOrdersInSQLite(
+      [nextOrder],
+      "markOrderSyncedByExternalSaleNumber",
+      { [storageKey]: "update" }
+    );
+    this.logInfo("markOrderSyncedByExternalSaleNumber-完成", {
+      external_sale_number: externalSaleNumber,
+      order_id: nextOrder.order_id ?? null
+    });
+    await this.emitOrdersChanged([nextOrder], "markOrderSyncedByExternalSaleNumber");
+    return { updated: true, order: nextOrder };
+  }
   /**
    * 将本地待同步订单按 SQLite storage key 合并进 store 并落库。
    * checkout 离线兜底可能没有 order_id，但通常会有 external_sale_number。
@@ -509,11 +569,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return;
     }
     const pendingMap = /* @__PURE__ */ new Map();
+    const memoryPendingMap = /* @__PURE__ */ new Map();
     for (const order of pendingOrders) {
       const storageKey = this.getOrderStorageKey(order);
       if (!storageKey)
         continue;
       pendingMap.set(storageKey, order);
+      memoryPendingMap.set(storageKey, this.normalizeOrderForMemoryList(order));
     }
     if (pendingMap.size === 0) {
       this.logError("upsertPendingSyncOrders-订单缺少可落库标识", {
@@ -528,12 +590,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       const storageKey = this.getOrderStorageKey(order);
       if (!storageKey || !pendingMap.has(storageKey))
         return order;
-      const pendingOrder = pendingMap.get(storageKey);
+      const pendingOrder = memoryPendingMap.get(storageKey);
       pendingMap.delete(storageKey);
+      memoryPendingMap.delete(storageKey);
       mergeActions[storageKey] = "update";
       return pendingOrder;
     });
-    for (const [storageKey, order] of pendingMap.entries()) {
+    for (const [storageKey, order] of memoryPendingMap.entries()) {
       mergeActions[storageKey] = "insert";
       updatedList.push(order);
     }
@@ -545,6 +608,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       storeOrderCountAfter: this.store.list.length
     });
     this.emitOrdersChanged(patchedOrders, "upsertPendingSyncOrders");
+    await this.core.effects.emit(import_types.OrderHooks.onOrdersChanged, {
+      list: this.store.list,
+      changedOrders: patchedOrders.map((order) => this.normalizeOrderForMemoryList(order)),
+      source: "upsertPendingSyncOrders"
+    });
   }
   /**
    * 通过 SSE 按自定义 query 拉取订单（支持 select/with 精简字段）
@@ -581,21 +649,38 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.store.map.clear();
     this.resourceIdIndex.clear();
     for (const order of this.store.list) {
-      const id = order.order_id;
-      if (id === void 0 || id === null)
+      const identityKeys = this.getOrderIdentityKeys(order);
+      if (identityKeys.length === 0)
         continue;
-      this.store.map.set(this.getIdKey(id), order);
+      for (const identityKey of identityKeys) {
+        this.store.map.set(identityKey, order);
+      }
       const resourceIds = this.extractResourceIds(order);
+      const primaryIdentity = identityKeys[0];
       for (const resourceId of resourceIds) {
         const key = String(resourceId);
         const existing = this.resourceIdIndex.get(key) || [];
-        if (existing.some((eid) => this.getIdKey(eid) === this.getIdKey(id)))
+        if (existing.some((eid) => this.getIdKey(eid) === primaryIdentity))
           continue;
-        existing.push(id);
+        existing.push(primaryIdentity);
         this.resourceIdIndex.set(key, existing);
       }
     }
   }
+  getOrderIdentityKeys(order) {
+    const keys = [];
+    const id = order.order_id;
+    if (id !== void 0 && id !== null && id !== "") {
+      keys.push(this.getIdKey(id));
+    }
+    const externalSaleNumber = order == null ? void 0 : order.external_sale_number;
+    if (externalSaleNumber !== void 0 && externalSaleNumber !== null && externalSaleNumber !== "") {
+      const externalKey = this.getIdKey(externalSaleNumber);
+      if (!keys.includes(externalKey))
+        keys.push(externalKey);
+    }
+    return keys;
+  }
   extractResourceIds(order) {
     const ids = /* @__PURE__ */ new Set();
     const visitResources = (resources) => {
@@ -1190,9 +1275,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    */
   async replaceOrdersSnapshotInSQLite(orderList, source) {
     if (!this.dbManager) {
-      return;
+      return orderList.map((order) => this.normalizeRemoteSyncedOrder(order));
     }
     const remoteSnapshot = (0, import_lodash_es.cloneDeep)(orderList);
+    let mergedSnapshot = remoteSnapshot.map((order) => this.normalizeRemoteSyncedOrder(order));
     try {
       await this.runInOrderSQLiteSaveQueue(async () => {
         const existingOrders = typeof this.dbManager.getAll === "function" ? await this.dbManager.getAll(INDEXDB_STORE_NAME) : [];
@@ -1200,6 +1286,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           remoteSnapshot,
           existingOrders || []
         );
+        mergedSnapshot = orderListSnapshot;
         this.logInfo("replaceOrdersSnapshotInSQLite-开始", {
           source,
           count: orderListSnapshot.length,
@@ -1226,6 +1313,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         orderList: remoteSnapshot.length
       });
     }
+    return mergedSnapshot;
   }
   /**
    * 清空订单模块的内存数据和本地 SQLite 订单表。

package/lib/server/modules/order/utils/filterBookings.js

@@ -71,6 +71,21 @@ function bookingDateTimeString(datePart, timePart) {
   }
   return `${d} ${t}`.trim();
 }
+function resolveBookingTimeRange(booking) {
+  const start = toTimestamp(bookingDateTimeString(booking.start_date, booking.start_time));
+  if (!start)
+    return null;
+  const end = toTimestamp(
+    bookingDateTimeString(
+      booking.end_date || booking.start_date,
+      booking.end_time || booking.start_time
+    )
+  ) || start;
+  return end >= start ? [start, end] : [end, start];
+}
+function isRangeOverlapping(left, right) {
+  return left[0] <= right[1] && left[1] >= right[0];
+}
 function parseDateRange(range) {
   if (!Array.isArray(range) || range.length < 2)
     return null;
@@ -178,8 +193,8 @@ function matchBooking(booking, orderInfo, ctx) {
   if (ctx.appointmentStatusSet && !ctx.appointmentStatusSet.has(getBookingAppointmentStatus(booking)))
     return false;
   if (ctx.bookingTimeRange) {
-    const ts = toTimestamp(bookingDateTimeString(booking.start_date, booking.start_time));
-    if (ts < ctx.bookingTimeRange[0] || ts > ctx.bookingTimeRange[1])
+    const bookingRange = resolveBookingTimeRange(booking);
+    if (!bookingRange || !isRangeOverlapping(bookingRange, ctx.bookingTimeRange))
       return false;
   }
   if (ctx.afterExecutionTimeMs != null) {

package/lib/server/modules/order/utils/filterOrders.js

@@ -335,8 +335,9 @@ function filterOrders(orders, filters) {
       }
     }
     if (safeFilters.start_time || safeFilters.end_time) {
+      const isCreatedIsUndefined = order.created_at === void 0;
       const orderTime = order.created_at ? typeof order.created_at === "number" ? order.created_at : (0, import_dayjs.default)(String(order.created_at)).valueOf() : 0;
-      if (safeFilters.start_time) {
+      if (safeFilters.start_time && !isCreatedIsUndefined) {
         const startTs = (0, import_dayjs.default)(safeFilters.start_time).startOf("day").valueOf();
         if (orderTime < startTs) {
           rejected.push({
@@ -351,7 +352,7 @@ function filterOrders(orders, filters) {
           return false;
         }
       }
-      if (safeFilters.end_time) {
+      if (safeFilters.end_time && !isCreatedIsUndefined) {
         const endTs = (0, import_dayjs.default)(safeFilters.end_time).endOf("day").valueOf();
         if (orderTime > endTs) {
           rejected.push({