@pisell/pisellos 2.2.125 → 2.2.127

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

@@ -252,7 +252,7 @@ export function flattenOrdersToBookings(orders) {
       var booking = bookings[j];
       result.push(_objectSpread(_objectSpread({}, booking), {}, {
         order: orderInfo,
-        products: productsForBooking(order, booking)
+        products: order.products
       }));
     }
   }

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

@@ -136,7 +136,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/core/index.js

@@ -50,6 +50,7 @@ var PisellOSCore = class {
       this.serverOptions = options.server;
     }
     this.initialize(options);
+    console.log("initialize12341");
   }
   initialize(options) {
     if (options == null ? void 0 : options.plugins) {

package/lib/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/lib/server/index.d.ts

@@ -254,6 +254,17 @@ declare class Server {
      * 转发到资源模块去
      */
     private handleResourceList;
+    /**
+     * 代理刷新单个本地订单：
+     * - 入参：order_id（data 或 url query）
+     * - 流程：本地存在性校验 → 调后端 /order/sales/{id}?with[]=... → 覆盖本地 → 落 SQLite → emit onOrdersChanged
+     * - 监听级联：onOrdersChanged 触发订单/预约/bookingRemoteCache 三路订阅者推送
+     */
+    private handleUpdateLocalOrder;
+    /**
+     * 从 url 中解析指定 query 参数，兼容相对路径与绝对路径
+     */
+    private extractQueryParam;
     /**
      * 从 url 或路由 path 解析 pathname（不含 query，去掉末尾 /）
      */

package/lib/server/index.js

@@ -313,6 +313,86 @@ var Server = class {
         status: true
       };
     };
+    /**
+     * 代理刷新单个本地订单：
+     * - 入参：order_id（data 或 url query）
+     * - 流程：本地存在性校验 → 调后端 /order/sales/{id}?with[]=... → 覆盖本地 → 落 SQLite → emit onOrdersChanged
+     * - 监听级联：onOrdersChanged 触发订单/预约/bookingRemoteCache 三路订阅者推送
+     */
+    this.handleUpdateLocalOrder = async ({ url, data }) => {
+      var _a;
+      const rawOrderId = (data && typeof data === "object" ? data.order_id : void 0) ?? this.extractQueryParam(url, "order_id");
+      const orderId = rawOrderId === void 0 || rawOrderId === null || rawOrderId === "" ? null : String(rawOrderId).trim();
+      this.logInfo("handleUpdateLocalOrder: 开始处理", { url, orderId });
+      if (!orderId) {
+        this.logWarning("handleUpdateLocalOrder: order_id 缺失", { url, data });
+        return { code: 400, status: false, message: "order_id 缺失", data: null };
+      }
+      if (!this.order) {
+        this.logError("handleUpdateLocalOrder: Order 模块未注册");
+        return { code: 500, status: false, message: "Order 模块未注册", data: null };
+      }
+      if (!this.order.getOrderByOrderId(orderId)) {
+        this.logInfo("handleUpdateLocalOrder: 本地不存在该订单，忽略", { orderId });
+        return {
+          code: 200,
+          status: true,
+          message: "本地无此订单，已忽略",
+          data: { overwritten: false }
+        };
+      }
+      if (!((_a = this.app) == null ? void 0 : _a.request)) {
+        this.logError("handleUpdateLocalOrder: app.request 不可用");
+        return { code: 500, status: false, message: "app.request 不可用", data: null };
+      }
+      const backendPath = `/shop/order/sales/${encodeURIComponent(
+        orderId
+      )}?with%5B%5D=all`;
+      try {
+        const response = await this.app.request.get(backendPath, void 0, {
+          isShopApi: true
+        });
+        const fresh = (response == null ? void 0 : response.data) ?? response;
+        if (!fresh || typeof fresh !== "object" || fresh.order_id == null) {
+          this.logError("handleUpdateLocalOrder: 后端返回订单为空", {
+            orderId,
+            backendPath
+          });
+          return {
+            code: 500,
+            status: false,
+            message: "后端返回订单为空",
+            data: null
+          };
+        }
+        const { overwritten } = await this.order.overwriteExistingOrder(
+          fresh
+        );
+        this.logInfo("handleUpdateLocalOrder: 覆盖完成", {
+          orderId,
+          overwritten
+        });
+        return {
+          code: 200,
+          status: true,
+          message: "",
+          data: { overwritten, order_id: orderId }
+        };
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        this.logError("handleUpdateLocalOrder: 请求失败", {
+          orderId,
+          backendPath,
+          error: errorMessage
+        });
+        return {
+          code: 500,
+          status: false,
+          message: errorMessage,
+          data: null
+        };
+      }
+    };
     /**
      * GET /shop/schedule/floor-plan* 前缀路由：读本地 store；支持 subscriberId + callback 订阅更新
      */
@@ -958,6 +1038,11 @@ var Server = class {
         method: "get",
         path: "/shop/form/resource/page",
         handler: this.handleResourceList.bind(this)
+      },
+      {
+        method: "get",
+        path: "/update/localOrder",
+        handler: this.handleUpdateLocalOrder.bind(this)
       }
     ]);
     this.registerPrefixRoutes([
@@ -1420,6 +1505,37 @@ var Server = class {
       };
     }
   }
+  /**
+   * 从 url 中解析指定 query 参数，兼容相对路径与绝对路径
+   */
+  extractQueryParam(url, key) {
+    if (!url)
+      return null;
+    try {
+      const target = url.startsWith("http") ? new URL(url) : new URL(url, "http://placeholder.local");
+      const value = target.searchParams.get(key);
+      return value ?? null;
+    } catch {
+      const queryIndex = url.indexOf("?");
+      if (queryIndex < 0)
+        return null;
+      const query = url.slice(queryIndex + 1);
+      for (const pair of query.split("&")) {
+        if (!pair)
+          continue;
+        const [rawKey, rawValue = ""] = pair.split("=");
+        try {
+          if (decodeURIComponent(rawKey) === key) {
+            return decodeURIComponent(rawValue);
+          }
+        } catch {
+          if (rawKey === key)
+            return rawValue;
+        }
+      }
+      return null;
+    }
+  }
   /**
    * 从 url 或路由 path 解析 pathname（不含 query，去掉末尾 /）
    */

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

@@ -40,6 +40,13 @@ export declare class OrderModule extends BaseModule implements Module {
     getOrderByOrderId(orderId: OrderId): OrderData | undefined;
     loadOrdersByServer(): Promise<OrderData[]>;
     getOrdersByResourceId(resourceId: string | number): OrderData[];
+    /**
+     * 仅覆盖本地已存在的订单；不存在则直接跳过，不落库、不 emit。
+     * 适用于"按 order_id 主动刷新本地订单详情"的代理场景。
+     */
+    overwriteExistingOrder(fresh: OrderData): Promise<{
+        overwritten: boolean;
+    }>;
     /**
      * 通过 SSE 按自定义 query 拉取订单（支持 select/with 精简字段）
      */

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/server/modules/order/utils/filterBookings.js

@@ -257,7 +257,7 @@ function flattenOrdersToBookings(orders) {
       result.push({
         ...booking,
         order: orderInfo,
-        products: productsForBooking(order, booking)
+        products: order.products
       });
     }
   }

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

@@ -136,7 +136,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/package.json

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