@pisell/pisellos 2.2.192 → 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

@@ -69,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 订单数据并更新本地
@@ -152,6 +152,7 @@ export declare class OrderModule extends BaseModule implements Module {
     private normalizeOrderSyncPayload;
     private uniqueOrderIds;
     private getIdKey;
+    private isOrderLookupMatch;
     /**
      * 解析订单 SQLite 主键，规则与宿主 OrderDataSource.getOrderStorageKey 一致。
      *

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

@@ -346,26 +346,20 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   getOrderById(id) {
     return this.store.map.get(this.getIdKey(id));
   }
-  /** 按 order_id 查询（推荐） */
+  /** 按 order_id 查询内存订单。 */
   getOrderByOrderId(orderId) {
     return this.store.map.get(this.getIdKey(orderId));
   }
-  async getLocalOrderByOrderId(orderId) {
-    const key = this.getIdKey(orderId);
-    const memoryOrder = this.store.map.get(key);
-    if (memoryOrder) {
+  async getLocalOrderByLookup(lookup) {
+    const key = this.getIdKey(lookup);
+    const memoryOrderById = this.store.map.get(key);
+    if (memoryOrderById)
+      return memoryOrderById;
+    const memoryOrder = this.store.list.find((order) => this.isOrderLookupMatch(order, key));
+    if (memoryOrder)
       return memoryOrder;
-    }
     const orders = await this.loadOrdersFromSQLite();
-    const localOrder = orders.find((order) => {
-      const shopOrderNumber = order == null ? void 0 : order.shop_order_number;
-      if (shopOrderNumber && this.getIdKey(shopOrderNumber) === key)
-        return true;
-      const id = order == null ? void 0 : order.order_id;
-      if (id === void 0 || id === null)
-        return false;
-      return this.getIdKey(id) === key;
-    });
+    const localOrder = orders.find((order) => this.isOrderLookupMatch(order, key));
     if (!localOrder)
       return null;
     this.store.list = orders;
@@ -862,6 +856,22 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   getIdKey(id) {
     return String(id);
   }
+  isOrderLookupMatch(order, lookupKey) {
+    if (!order || !lookupKey)
+      return false;
+    const candidates = [
+      order.order_id,
+      order.external_sale_number,
+      order.order_number,
+      order.shop_order_number,
+      order.shop_full_order_number
+    ];
+    return candidates.some((value) => {
+      if (value === void 0 || value === null || value === "")
+        return false;
+      return this.getIdKey(value) === lookupKey;
+    });
+  }
   /**
    * 解析订单 SQLite 主键，规则与宿主 OrderDataSource.getOrderStorageKey 一致。
    *

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

@@ -89,7 +89,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     destroy(): Promise<void>;
     /**
      * 加载销售订单到统一 tempOrder 工作区。
-     * 有 app.sqlite 时优先读取本地记录；本地未命中或 forceRemote=true 时再拉云端。
+     * 统一通过 OrderModule 的 sales detail lookup 加载订单详情。
      *
      * 子类可在 `super.loadSalesDetail` 之后基于返回的 `sales` 做业务侧装配
      * （比如把 `sales.customer` 写入 CustomerModule、emit 业务 hook 等）。
@@ -140,6 +140,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private getHistoricalProductDiscountList;
     private isPersistedOrderProduct;
     private mergeHistoricalDiscountList;
+    private shouldSkipAutoApplyFetchedDiscountsInEditMode;
     private mergeCurrentDiscountSelectionState;
     loadDiscountConfig(params?: {
         customerId?: number;

package/lib/solution/BaseSales/index.js

@@ -429,7 +429,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   }
   /**
    * 加载销售订单到统一 tempOrder 工作区。
-   * 有 app.sqlite 时优先读取本地记录；本地未命中或 forceRemote=true 时再拉云端。
+   * 统一通过 OrderModule 的 sales detail lookup 加载订单详情。
    *
    * 子类可在 `super.loadSalesDetail` 之后基于返回的 `sales` 做业务侧装配
    * （比如把 `sales.customer` 写入 CustomerModule、emit 业务 hook 等）。
@@ -439,25 +439,19 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw new Error("order 模块未初始化");
     const params = typeof orderIdOrParams === "object" ? orderIdOrParams : { orderId: orderIdOrParams };
     const externalSaleNumber = params.externalSaleNumber || params.external_sale_number;
-    if (!params.forceRemote) {
-      const localRecord = params.orderId !== void 0 ? await this.store.order.getLocalOrderByOrderId(params.orderId) : externalSaleNumber ? await this.store.order.getLocalOrderByExternalSaleNumber(externalSaleNumber) : params.orderNumber ? await this.store.order.getLocalOrderByOrderNumber(params.orderNumber) : null;
-      if (localRecord) {
-        const sales2 = await this.store.order.hydrateTempOrderFromRecord(localRecord, { recalcOnHydrate: false });
-        this.currentSalesDetail = sales2;
-        await this.core.effects.emit(`${this.name}:onSalesOrderLoaded`, { sales: sales2 });
-        return sales2;
-      }
-    }
-    if (params.orderId === void 0 || params.orderId === null) {
-      throw new Error("加载销售详情需要 orderId，或本地库中存在对应 externalSaleNumber/orderNumber");
+    const lookup = params.orderId ?? externalSaleNumber ?? params.orderNumber;
+    if (lookup === void 0 || lookup === null || lookup === "") {
+      throw new Error("加载销售详情需要 orderId、externalSaleNumber 或 orderNumber");
     }
-    const res = await this.store.order.getOrderInfoByRemote(Number(params.orderId));
+    const res = await this.store.order.getSalesOrderByLookup({
+      lookup,
+      forceRemote: params.forceRemote
+    });
     if (!res || res.code !== 200) {
-      const message = res && (res.message || res.msg) || `加载销售详情失败: ${params.orderId}`;
+      const message = res && (res.message || res.msg) || `加载销售详情失败: ${lookup}`;
       throw new Error(message);
     }
     const sales = await this.store.order.hydrateTempOrderFromRecord(res.data, { recalcOnHydrate: false });
-    await this.store.order.saveDraft();
     this.currentSalesDetail = sales;
     await this.core.effects.emit(`${this.name}:onSalesOrderLoaded`, { sales });
     return sales;
@@ -733,6 +727,23 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       ...(discountList || []).filter((discount) => !historyIds.has(discount.id))
     ];
   }
+  shouldSkipAutoApplyFetchedDiscountsInEditMode(params) {
+    if (params.discountAction !== "edit")
+      return false;
+    if (!params.products.length)
+      return false;
+    const hasDraftProduct = params.products.some((product) => !this.isPersistedOrderProduct(product));
+    if (hasDraftProduct)
+      return false;
+    const hasSelectedDiscount = params.currentDiscountList.some(
+      (discount) => discount.isSelected || discount.isEditMode || discount.isManualSelect
+    );
+    if (hasSelectedDiscount)
+      return false;
+    return !params.nextDiscountList.some(
+      (discount) => discount.isSelected || discount.isEditMode || discount.isManualSelect
+    );
+  }
   mergeCurrentDiscountSelectionState(discountList, currentDiscountList) {
     if (!currentDiscountList.length)
       return discountList;
@@ -811,6 +822,26 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       currentDiscountList
     );
     await (discountModule == null ? void 0 : discountModule.setDiscountList(nextDiscountList));
+    const shouldSkipAutoApplyFetchedDiscounts = this.shouldSkipAutoApplyFetchedDiscountsInEditMode({
+      discountAction,
+      products: tempOrder.products || [],
+      currentDiscountList,
+      nextDiscountList
+    });
+    if (shouldSkipAutoApplyFetchedDiscounts) {
+      const summary2 = await this.store.order.recalculateSummary({ createIfMissing: true });
+      this.store.order.persistTempOrder();
+      await this.effectsEmit("onDiscountApplied", {
+        productList: tempOrder.products || [],
+        discountList: nextDiscountList,
+        selectedDiscountList: tempOrder.discount_list || [],
+        tempOrder
+      });
+      return {
+        productList: tempOrder.products || [],
+        discountList: nextDiscountList
+      };
+    }
     if (rulesModule) {
       const holders = ((_l = tempOrder.holder) == null ? void 0 : _l.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
       const result = rulesModule.calcDiscount({
@@ -1173,8 +1204,14 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const paymentRecord = payment;
+    const paymentAmount = new import_decimal.default(paymentRecord.amount || 0);
+    if (paymentAmount.isZero()) {
+      this.logWarning("addOrderPayment: 支付金额为 0，跳过添加支付项", {
+        payment: paymentRecord
+      });
+      return this.store.order.getOrderPayments();
+    }
     const metadata = paymentRecord.metadata && typeof paymentRecord.metadata === "object" ? { ...paymentRecord.metadata } : {};
-    debugger;
     const shopWalletPassId = (_a = this.otherParams) == null ? void 0 : _a.shop_wallet_pass_id;
     if (shopWalletPassId !== void 0 && shopWalletPassId !== null) {
       metadata.shop_wallet_pass_id = shopWalletPassId;

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -180,7 +180,6 @@ function transformBaseProductToOrderProduct(params) {
     duration: payload.duration,
     policy_id: payload.policy_id,
     source_shop_id: payload.source_shop_id,
-    origin,
     source_product_price: sourceProductPrice,
     main_product_selling_price: mainProductSellingPrice,
     main_product_original_price: mainProductOriginalPrice,

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
+        weekNum: 0 | 1 | 2 | 6 | 3 | 5 | 4;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

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

package/lib/solution/ScanOrder/index.js

@@ -1654,7 +1654,9 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         tempOrder.order_id = resourceState.lastOrderId;
       }
       if (tempOrder.order_id) {
-        const res = await ((_i = this.store.order) == null ? void 0 : _i.getOrderInfoByRemote(tempOrder.order_id));
+        const res = await ((_i = this.store.order) == null ? void 0 : _i.getSalesOrderByLookup({
+          lookup: tempOrder.order_id
+        }));
         const entryPaxNumber = (_m = (_l = (_k = (_j = res == null ? void 0 : res.data) == null ? void 0 : _j.bookings) == null ? void 0 : _k.find((p) => {
           var _a2;
           return (_a2 = p.metadata) == null ? void 0 : _a2.collect_pax;

package/package.json

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