@pisell/pisellos 2.2.191 → 2.2.193

package/lib/server/index.js

@@ -452,34 +452,55 @@ var Server = class {
         };
       }
     };
+    this.handleOrderSalesCheckout = async ({ data }) => {
+      return this.handleOrderCheckoutSubmit({
+        backendPath: "/shop/order/sales/checkout",
+        data,
+        title: "handleOrderSalesCheckout"
+      });
+    };
+    this.handleOrderCheckout = async ({ data }) => {
+      return this.handleOrderCheckoutSubmit({
+        backendPath: "/order/checkout",
+        data,
+        title: "handleOrderCheckout"
+      });
+    };
     this.handleOrderSalesDetail = async ({ url, data, path }) => {
       var _a;
       const requestPath = this.parseRequestPath(url, path);
-      const orderId = this.extractOrderSalesDetailId(requestPath);
-      this.logInfo("handleOrderSalesDetail: 开始处理", { url, path: requestPath, orderId });
-      if (!orderId) {
-        this.logWarning("handleOrderSalesDetail: order_id 缺失", { url, path: requestPath });
-        return { code: 400, status: false, message: "order_id 缺失", data: null };
+      const lookup = this.extractOrderSalesDetailLookup(requestPath);
+      this.logInfo("handleOrderSalesDetail: 开始处理", { url, path: requestPath, lookup });
+      if (!lookup) {
+        this.logWarning("handleOrderSalesDetail: lookup 缺失", { url, path: requestPath });
+        return { code: 400, status: false, message: "订单 lookup 缺失", data: null };
       }
       if (!this.order) {
         this.logError("handleOrderSalesDetail: Order 模块未注册");
         return { code: 500, status: false, message: "Order 模块未注册", data: null };
       }
-      const localOrder = await this.order.getLocalOrderByOrderId(orderId);
-      if (localOrder) {
-        this.logInfo("handleOrderSalesDetail: 命中本地订单", { orderId });
-        return {
-          code: 200,
-          status: true,
-          message: "",
-          data: localOrder
-        };
+      if (!this.shouldForceRemoteSalesDetail(data)) {
+        const localOrder = await this.order.getLocalOrderByLookup(lookup);
+        if (localOrder) {
+          this.logInfo("handleOrderSalesDetail: 命中本地订单", { lookup });
+          return {
+            code: 200,
+            status: true,
+            message: "",
+            data: localOrder
+          };
+        }
       }
       if (!((_a = this.app) == null ? void 0 : _a.request)) {
         this.logError("handleOrderSalesDetail: app.request 不可用");
-        return { code: 500, status: false, message: "app.request 不可用", data: null };
+        return {
+          code: 500,
+          status: false,
+          message: "app.request 不可用",
+          data: null
+        };
       }
-      const backendPath = this.buildOrderSalesDetailBackendPath(orderId, data);
+      const backendPath = this.buildOrderSalesDetailBackendPath(lookup, data);
       try {
         const response = await this.app.request.get(backendPath, {
           lookup_mode: "multi"
@@ -491,7 +512,7 @@ var Server = class {
         const fresh = (response == null ? void 0 : response.data) ?? response;
         if (!fresh || typeof fresh !== "object" || fresh.order_id == null) {
           this.logError("handleOrderSalesDetail: 后端返回订单为空", {
-            orderId,
+            lookup,
             backendPath
           });
           return {
@@ -502,9 +523,9 @@ var Server = class {
           };
         }
         await this.order.upsertOrdersFromRemote([fresh]);
-        const savedOrder = await this.order.getLocalOrderByOrderId(orderId);
+        const savedOrder = await this.order.getLocalOrderByLookup(lookup);
         if (!savedOrder) {
-          this.logError("handleOrderSalesDetail: 订单写入后回读失败", { orderId });
+          this.logError("handleOrderSalesDetail: 订单写入后回读失败", { lookup });
           return {
             code: 500,
             status: false,
@@ -512,7 +533,7 @@ var Server = class {
             data: null
           };
         }
-        this.logInfo("handleOrderSalesDetail: 远端订单已同步到本地", { orderId });
+        this.logInfo("handleOrderSalesDetail: 远端订单已同步到本地", { lookup });
         return {
           code: 200,
           status: true,
@@ -522,7 +543,7 @@ var Server = class {
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
         this.logError("handleOrderSalesDetail: 请求失败", {
-          orderId,
+          lookup,
           backendPath,
           error: errorMessage
         });
@@ -1240,6 +1261,16 @@ var Server = class {
         method: "get",
         path: "/update/localOrder",
         handler: this.handleUpdateLocalOrder.bind(this)
+      },
+      {
+        method: "post",
+        path: "/shop/order/sales/checkout",
+        handler: this.handleOrderSalesCheckout.bind(this)
+      },
+      {
+        method: "post",
+        path: "/shop/order/checkout",
+        handler: this.handleOrderCheckout.bind(this)
       }
     ]);
     this.registerPrefixRoutes([
@@ -1707,6 +1738,49 @@ var Server = class {
       };
     }
   }
+  async handleOrderCheckoutSubmit(params) {
+    var _a;
+    const { backendPath, data, title } = params;
+    this.logInfo(`${title}: 开始处理`, {
+      backendPath,
+      order_id: data == null ? void 0 : data.order_id,
+      external_sale_number: data == null ? void 0 : data.external_sale_number,
+      order_number: data == null ? void 0 : data.order_number
+    });
+    if (!((_a = this.app) == null ? void 0 : _a.request)) {
+      this.logError(`${title}: app.request 不可用`);
+      return { code: 500, status: false, message: "app.request 不可用", data: null };
+    }
+    try {
+      const response = await this.app.request.post(backendPath, data, {
+        isShopApi: true,
+        customToast: () => {
+        }
+      });
+      const fresh = this.extractOrderDataFromCheckoutResponse(response);
+      if (fresh && this.order) {
+        await this.order.upsertOrdersFromRemote([fresh]);
+        this.logInfo(`${title}: 订单已同步到本地`, {
+          order_id: fresh.order_id,
+          external_sale_number: fresh.external_sale_number,
+          order_number: fresh.order_number
+        });
+      } else {
+        this.logWarning(`${title}: checkout 返回未包含可同步订单`, {
+          hasOrderModule: !!this.order,
+          backendPath
+        });
+      }
+      return this.normalizeCheckoutResponse(response);
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      this.logError(`${title}: 请求失败`, { backendPath, error: errorMessage });
+      const backendError = this.extractBackendErrorResponse(error);
+      if (backendError)
+        return backendError;
+      return { code: 500, status: false, message: errorMessage, data: null };
+    }
+  }
   /**
    * 解析 order_ids 入参，兼容 url query / data 字段、字符串(csv) / 数组两种形态。
    * 自动 trim、去空、按字符串去重，输出归一化后的字符串数组。
@@ -1859,12 +1933,15 @@ var Server = class {
       return null;
     }
   }
-  extractOrderSalesDetailId(url) {
+  extractOrderSalesDetailLookup(url) {
     const path = this.parseRequestPath(url);
     const match = path.match(/^\/shop\/order\/sales\/([^/?#]+)$/);
     return (match == null ? void 0 : match[1]) ? decodeURIComponent(match[1]) : null;
   }
-  buildOrderSalesDetailBackendPath(orderId, data) {
+  shouldForceRemoteSalesDetail(data) {
+    return (data == null ? void 0 : data.forceRemote) === true || (data == null ? void 0 : data.force_remote) === true;
+  }
+  buildOrderSalesDetailBackendPath(lookup, data) {
     const rawWith = data && typeof data === "object" ? data.with : void 0;
     const withFields = Array.isArray(rawWith) && rawWith.length > 0 ? rawWith : ["products", "scheduleEvents"];
     const searchParams = new URLSearchParams();
@@ -1875,7 +1952,49 @@ var Server = class {
     });
     searchParams.append("lookup_mode", "multi");
     const query = searchParams.toString();
-    return `/shop/order/sales/${encodeURIComponent(orderId)}${query ? `?${query}` : ""}`;
+    return `/shop/order/sales/${encodeURIComponent(lookup)}${query ? `?${query}` : ""}`;
+  }
+  extractOrderDataFromCheckoutResponse(response) {
+    var _a, _b;
+    const candidates = [
+      (_a = response == null ? void 0 : response.data) == null ? void 0 : _a.order,
+      (_b = response == null ? void 0 : response.data) == null ? void 0 : _b.sales,
+      response == null ? void 0 : response.data,
+      response == null ? void 0 : response.order,
+      response == null ? void 0 : response.sales,
+      response
+    ];
+    for (const candidate of candidates) {
+      if (!candidate || typeof candidate !== "object")
+        continue;
+      if (candidate.order_id !== void 0 && candidate.order_id !== null) {
+        return candidate;
+      }
+    }
+    return null;
+  }
+  normalizeCheckoutResponse(response) {
+    if (response && typeof response === "object" && (response.code !== void 0 || response.status !== void 0)) {
+      return response;
+    }
+    return {
+      code: 200,
+      status: true,
+      message: "",
+      data: response
+    };
+  }
+  extractBackendErrorResponse(error) {
+    var _a, _b;
+    const candidates = [
+      (_a = error == null ? void 0 : error.response) == null ? void 0 : _a.data,
+      error == null ? void 0 : error.data,
+      (_b = error == null ? void 0 : error.response) == null ? void 0 : _b.body,
+      error == null ? void 0 : error.body
+    ];
+    return candidates.find(
+      (candidate) => candidate && typeof candidate === "object"
+    ) || null;
   }
   /**
    * 从 url 或路由 path 解析 pathname（不含 query，去掉末尾 /）

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

@@ -2,44 +2,6 @@ import { Module, ModuleOptions, PisellCore } from '../../../types';
 import { BaseModule } from '../../../modules/BaseModule';
 import type { RouteDefinition } from '../../types';
 import { OrderData, OrderId } from './types';
-/** 订单模块流程调试日志条目 */
-interface OrderFlowLogEntry {
-    ts: string;
-    step: string;
-    metadata?: Record<string, unknown>;
-}
-/** 单笔订单 SQLite 写入记录 */
-interface OrderWriteStatEntry {
-    ts: string;
-    writeSeq: number;
-    source: string;
-    writeMethod: string;
-    orderId: OrderId | null;
-    storageKey: string;
-    mergeAction?: 'insert' | 'update' | 'snapshot' | 'singleUpdate';
-}
-declare global {
-    interface Window {
-        /** 订单模块流程调试日志，可在 DevTools 直接查看 */
-        __orderModuleFlowLogs?: OrderFlowLogEntry[];
-        /** 按 storageKey 聚合的 SQLite 写入次数，便于排查重复写 */
-        __orderModuleWriteStats?: Record<string, OrderWriteStatEntry[]>;
-        /** 清空订单流程调试日志 */
-        clearOrderModuleFlowLogs?: () => void;
-        /** 导出订单流程调试日志 JSON 字符串 */
-        exportOrderModuleFlowLogs?: () => string;
-        /** 导出按订单聚合的写入统计 */
-        exportOrderModuleWriteStats?: () => string;
-        /** 汇总写入次数 Top N（默认 20） */
-        summarizeOrderModuleWrites?: (topN?: number) => Array<{
-            storageKey: string;
-            orderId: OrderId | null;
-            writeCount: number;
-            sources: string[];
-            lastWriteAt: string;
-        }>;
-    }
-}
 /**
  * Order 模块 - 基础框架
  */
@@ -56,10 +18,7 @@ export declare class OrderModule extends BaseModule implements Module {
     private resourceIdIndex;
     private logger;
     private storage;
-    private orderSQLiteSaveQueue;
-    /** 全局递增的 SQLite 写入序号，便于日志关联同一次操作 */
-    private orderFlowWriteSeq;
-    /** 按 storageKey 记录最近一次 SQLite 写入来源与时间，用于去重 */
+    private orderSQLiteSaveQueue; /** 按 storageKey 记录最近一次 SQLite 写入来源与时间，用于去重 */
     private recentSqliteWriteByStorageKey;
     /** 最近一次 SSE 全量拉取完成时间 */
     private lastServerFullFetchAtMs;
@@ -77,31 +36,6 @@ export declare class OrderModule extends BaseModule implements Module {
      * @param metadata 日志元数据
      */
     private logError;
-    /**
-     * 初始化 window 上的订单流程调试日志数组及辅助方法。
-     *
-     * @example
-     * window.clearOrderModuleFlowLogs()
-     * // 操作完成后：
-     * copy(window.exportOrderModuleFlowLogs?.() || '[]')
-     */
-    private initOrderFlowLogs;
-    /**
-     * 写入 window 订单流程调试日志。
-     *
-     * @example
-     * this.pushOrderFlowLog('mergeOrdersToStore.start', { count: 3 })
-     */
-    private pushOrderFlowLog;
-    /** 当前内存 store 快照信息，供流程日志使用 */
-    private getOrderStoreSnapshot;
-    /**
-     * 记录一次 SQLite 写入到 window 统计，用于排查同一订单被多次写入的原因。
-     *
-     * @example
-     * this.trackOrderWrite('upsertOrdersFromRemote', 'bulkUpdate', orders, 'insert')
-     */
-    private trackOrderWrite;
     /**
      * 记录订单最近一次 SQLite 写入，供 pubsub 回声去重使用。
      *
@@ -135,9 +69,9 @@ export declare class OrderModule extends BaseModule implements Module {
     preload(): Promise<void>;
     getOrders(): OrderData[];
     getOrderById(id: OrderId): OrderData | undefined;
-    /** 按 order_id 查询（推荐） */
+    /** 按 order_id 查询内存订单。 */
     getOrderByOrderId(orderId: OrderId): OrderData | undefined;
-    getLocalOrderByOrderId(orderId: OrderId): Promise<OrderData | null>;
+    getLocalOrderByLookup(lookup: OrderId): Promise<OrderData | null>;
     loadOrdersByServer(): Promise<OrderData[]>;
     /**
      * 静默全量刷新：后台重新拉取全量 SSE 订单数据并更新本地
@@ -218,6 +152,7 @@ export declare class OrderModule extends BaseModule implements Module {
     private normalizeOrderSyncPayload;
     private uniqueOrderIds;
     private getIdKey;
+    private isOrderLookupMatch;
     /**
      * 解析订单 SQLite 主键，规则与宿主 OrderDataSource.getOrderStorageKey 一致。
      *
@@ -275,4 +210,3 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     clear(): Promise<void>;
 }
-export {};