@pisell/pisellos 2.2.153 → 2.2.154

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

@@ -8,12 +8,15 @@ import type { Discount } from '../../modules/Discount/types';
 import { RequestPlugin, WindowPlugin } from '../../plugins';
 export * from './types';
 import { ProductList } from '../../modules/ProductList';
+import { PaymentModule } from '../../modules/Payment';
 import type { SalesSummaryModule } from '../../modules/SalesSummary';
 import type { ScheduleModule } from '../../modules/Schedule';
 import type { ISalesDetail, ISalesDetailHeader, ISalesBooking, ISalesPayment, ISalesSurcharge } from './utils/parseSalesResponse';
+import { type TransformBaseProductToOrderProductParams } from './utils/transformBaseProductToOrderProduct';
 export interface BaseSalesState {
     order?: OrderModule;
     products?: ProductList;
+    payment?: PaymentModule;
     salesSummary?: SalesSummaryModule;
     schedule?: ScheduleModule;
 }
@@ -22,6 +25,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     protected defaultVersion: string;
     isSolution: boolean;
     protected initializeOptions: ModuleOptions;
+    private logger;
     protected store: BaseSalesState;
     protected otherParams: Record<string, any>;
     protected cacheId: string | undefined;
@@ -35,15 +39,29 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     constructor(name?: string, version?: string);
     /**
      * 子类可覆盖此方法以追加/收敛要注册的子模块。
-     * 默认包含通用销售模块：products / order / salesSummary / schedule。
+     * 默认包含通用销售模块：products / order / salesSummary / schedule / payment。
      */
     protected getRegisteredModuleNames(): readonly string[];
+    /**
+     * 记录信息日志
+     */
+    private logInfo;
+    /**
+     * 记录警告日志
+     */
+    private logWarning;
+    /**
+     * 记录错误日志
+     */
+    private logError;
+    get payment(): PaymentModule | undefined;
     /**
      * 工厂入口：根据子模块名实例化对应模块。
      * 默认使用 BookingByStep 公共 `createModule`。子类若需引入额外类型（如 customer），
      * 可覆盖此方法并把未识别的 name 委托给 `super.createSubModule(name)`。
      */
     protected createSubModule(moduleName: string): Module | null;
+    protected getSubModuleHooks(moduleName: string): any;
     /**
      * 读取 sessionStorage[this.name][cacheId]，作为子模块 initialState 的来源。
      * sessionStorage 损坏时静默忽略，按空状态注册。
@@ -80,7 +98,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     getOrderAmountSnapshot(): import("../../modules/Order/types").OrderAmountSnapshot | null;
     getTempOrderNote(): string;
     updateTempOrderNote(note: string): string;
-    updateOrderShopDiscount(amount: string | number): string;
+    updateTempOrderShopDiscount(amount: string | number): string;
+    updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
     private ensureTempOrder;
     addNewOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
     saveDraft(): Promise<void>;
@@ -124,6 +143,10 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     deleteOrderPayment(paymentIdentity: string | number): OrderPaymentData[];
     /** 覆盖 wallet pass 支付项，同时保留普通支付项。 */
     updateVoucherOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
+    private getWalletProductList;
+    initWalletData(params?: {
+        order_wait_pay_amount?: number;
+    }): Promise<import("../../modules/Payment").WalletInitializationResult>;
     /**
      * 更新当前订单客户字段。
      *
@@ -159,6 +182,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         order_ids?: Array<number | string>;
         submitBeforeSend?: boolean;
     }): Promise<T>;
+    transformBaseProductToOrderProduct(params: TransformBaseProductToOrderProductParams): import("./utils/transformBaseProductToOrderProduct").BaseProductOrderProductInput | null;
     addProductToOrder(product: Partial<BaseSalesOrderProduct> & BaseSalesOrderProductIdentity, booking?: AddProductBookingInput): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateProductInOrder(params: UpdateProductInOrderParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
     /**

package/lib/solution/BaseSales/index.js

@@ -40,6 +40,7 @@ var import_types = require("../BookingByStep/types");
 var import_utils = require("../../modules/Order/utils");
 var import_dayjs = __toESM(require("dayjs"));
 __reExport(BaseSales_exports, require("./types"), module.exports);
+var import_transformBaseProductToOrderProduct = require("./utils/transformBaseProductToOrderProduct");
 var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -47,6 +48,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     this.defaultVersion = "1.0.0";
     this.isSolution = true;
     this.initializeOptions = {};
+    // LoggerManager 实例
     this.store = {
       order: void 0
     };
@@ -56,10 +58,52 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   }
   /**
    * 子类可覆盖此方法以追加/收敛要注册的子模块。
-   * 默认包含通用销售模块：products / order / salesSummary / schedule。
+   * 默认包含通用销售模块：products / order / salesSummary / schedule / payment。
    */
   getRegisteredModuleNames() {
-    return ["products", "order", "salesSummary", "schedule"];
+    return ["products", "order", "salesSummary", "schedule", "payment"];
+  }
+  /**
+   * 记录信息日志
+   */
+  logInfo(title, metadata) {
+    if (this.logger) {
+      const tempOrder = this.getTempOrder();
+      this.logger.addLog({
+        type: "info",
+        title: `[BaseSales]  ${tempOrder == null ? void 0 : tempOrder.order_id} ${tempOrder == null ? void 0 : tempOrder.external_sale_number} ${title}`,
+        metadata: metadata || {}
+      });
+    }
+  }
+  /**
+   * 记录警告日志
+   */
+  logWarning(title, metadata) {
+    if (this.logger) {
+      const tempOrder = this.getTempOrder();
+      this.logger.addLog({
+        type: "warning",
+        title: `[BaseSales] ${tempOrder == null ? void 0 : tempOrder.order_id} ${tempOrder == null ? void 0 : tempOrder.external_sale_number} ${title}`,
+        metadata: metadata || {}
+      });
+    }
+  }
+  /**
+   * 记录错误日志
+   */
+  logError(title, metadata) {
+    if (this.logger) {
+      const tempOrder = this.getTempOrder();
+      this.logger.addLog({
+        type: "error",
+        title: `[BaseSales] ${tempOrder == null ? void 0 : tempOrder.order_id} ${tempOrder == null ? void 0 : tempOrder.external_sale_number} ${title}`,
+        metadata: metadata || {}
+      });
+    }
+  }
+  get payment() {
+    return this.store.payment;
   }
   /**
    * 工厂入口：根据子模块名实例化对应模块。
@@ -69,6 +113,16 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   createSubModule(moduleName) {
     return (0, import_types.createModule)(moduleName, this.name);
   }
+  getSubModuleHooks(moduleName) {
+    var _a, _b;
+    const optionHooks = this.initializeOptions.hooks || {};
+    const otherHooks = this.otherParams.hooks || {};
+    if (moduleName === "order") {
+      const directOrderHooks = optionHooks;
+      return optionHooks.order || ((_a = this.otherParams.order) == null ? void 0 : _a.hooks) || otherHooks.order || (directOrderHooks.onBeforeMergeProductToOrder ? directOrderHooks : void 0);
+    }
+    return optionHooks[moduleName] || ((_b = this.otherParams[moduleName]) == null ? void 0 : _b.hooks) || otherHooks[moduleName];
+  }
   /**
    * 读取 sessionStorage[this.name][cacheId]，作为子模块 initialState 的来源。
    * sessionStorage 损坏时静默忽略，按空状态注册。
@@ -94,6 +148,12 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     this.cacheId = (_a = this.otherParams) == null ? void 0 : _a.cacheId;
     this.window = core.getPlugin("window");
     this.request = core.getPlugin("request");
+    const appPlugin = core.getPlugin("app");
+    if (!appPlugin) {
+      throw new Error("Checkout 解决方案需要 app 插件支持");
+    }
+    const app = appPlugin.getApp();
+    this.logger = app.logger;
     const targetCacheData = this.readSessionCacheData();
     const moduleNames = this.getRegisteredModuleNames();
     moduleNames.forEach((step) => {
@@ -101,9 +161,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       if (!targetModule) {
         throw new Error(`模块 ${step} 不存在`);
       }
+      const hooks = this.getSubModuleHooks(step);
       this.store[step] = targetModule;
       this.core.registerModule(targetModule, {
         initialState: (targetCacheData == null ? void 0 : targetCacheData[targetModule.name]) || {},
+        ...hooks ? { hooks } : {},
         otherParams: {
           ...this.otherParams,
           salesSummaryModuleName: `${this.name}_salesSummary`,
@@ -259,11 +321,16 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
-  updateOrderShopDiscount(amount) {
+  updateTempOrderShopDiscount(amount) {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     return this.store.order.updateTempOrderShopDiscount(amount);
   }
+  updateTempOrderContactsInfo(contactsInfo) {
+    if (!this.store.order)
+      throw new Error("order 模块未初始化");
+    return this.store.order.updateTempOrderContactsInfo(contactsInfo);
+  }
   ensureTempOrder() {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
@@ -496,6 +563,99 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw new Error("order 模块未初始化");
     return this.store.order.updateVoucherOrderPayments(payments);
   }
+  getWalletProductList() {
+    var _a, _b;
+    const tempOrder = (_a = this.store.order) == null ? void 0 : _a.getTempOrder();
+    if (!((_b = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _b.length))
+      return [];
+    return tempOrder.products.map((product) => {
+      const metadata = product.metadata || {};
+      return {
+        product_id: product.product_id,
+        product_variant_id: String(product.product_variant_id ?? ""),
+        quantity: product.num || 1,
+        is_price_include_tax: tempOrder.is_price_include_tax,
+        is_charge_tax: product.is_charge_tax ?? 0,
+        tax_fee: product.tax_fee,
+        selling_price: Number(product.selling_price || 0),
+        holder_id: product.holder_id ?? metadata.holder_id,
+        original_price: product.original_price,
+        main_product_original_price: metadata.main_product_original_price ?? product.original_price,
+        main_product_selling_price: metadata.main_product_selling_price ?? product.selling_price,
+        metadata: {
+          main_product_attached_bundle_tax_fee: metadata.main_product_attached_bundle_tax_fee,
+          main_product_attached_bundle_surcharge_fee: metadata.main_product_attached_bundle_surcharge_fee,
+          surcharge_rounding_remainder: metadata.surcharge_rounding_remainder
+        },
+        product_bundle: (product.product_bundle || []).map((bundle) => {
+          const bundleMetadata = bundle.metadata || {};
+          return {
+            is_price_include_tax: tempOrder.is_price_include_tax,
+            bundle_id: bundle.bundle_id,
+            bundle_product_id: bundle.bundle_product_id,
+            bundle_variant_id: bundle.bundle_variant_id,
+            price_type: bundle.price_type,
+            price_type_ext: bundle.price_type_ext,
+            bundle_sum_price: bundle.bundle_sum_price,
+            bundle_selling_price: bundle.bundle_selling_price,
+            num: bundle.num,
+            is_charge_tax: bundle.is_charge_tax,
+            tax_fee: bundle.tax_fee,
+            metadata: {
+              surcharge_fee: bundleMetadata.surcharge_fee,
+              surcharge_rounding_remainder: bundleMetadata.surcharge_rounding_remainder
+            }
+          };
+        })
+      };
+    });
+  }
+  async initWalletData(params) {
+    if (!this.store.order)
+      throw new Error("order 模块未初始化");
+    if (!this.store.payment)
+      throw new Error("payment 模块未初始化");
+    const snapshot = this.store.order.getOrderSnapshot();
+    const tempOrder = snapshot == null ? void 0 : snapshot.tempOrder;
+    const amount = snapshot == null ? void 0 : snapshot.amount;
+    if (!tempOrder || !amount) {
+      return {
+        walletRecommendList: [],
+        userIdentificationCodes: [],
+        transformList: [],
+        noApplicableVoucher: [],
+        products: []
+      };
+    }
+    const walletBusinessData = {
+      customer_id: tempOrder.customer_id ? Number(tempOrder.customer_id) : void 0,
+      holder: tempOrder.holder,
+      amountInfo: {
+        totalAmount: amount.totalAmount,
+        subTotal: amount.summary.product_amount || amount.summary.product_expect_amount || amount.totalAmount,
+        depositAmount: amount.depositAmount,
+        isDeposit: tempOrder.is_deposit
+      },
+      products: this.getWalletProductList(),
+      order_wait_pay_amount: (params == null ? void 0 : params.order_wait_pay_amount) ?? Number(amount.amountGap || 0),
+      is_price_include_tax: tempOrder.is_price_include_tax ?? this.otherParams.is_price_include_tax ?? 1,
+      ...snapshot.identity.orderId ? { payment_order_id: String(snapshot.identity.orderId) } : {}
+    };
+    const result = await this.store.payment.wallet.initializeWalletDataFromBusinessAsync(
+      walletBusinessData
+    );
+    await this.core.effects.emit(`${this.name}:onWalletDataInitialized`, {
+      orderId: snapshot.identity.orderId,
+      customerId: walletBusinessData.customer_id,
+      walletBusinessData: {
+        customer_id: walletBusinessData.customer_id,
+        amountInfo: walletBusinessData.amountInfo,
+        order_wait_pay_amount: walletBusinessData.order_wait_pay_amount
+      },
+      timestamp: Date.now()
+    });
+    return result;
+  }
   /**
    * 更新当前订单客户字段。
    *
@@ -512,6 +672,9 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   }
   /** 获取可用支付方式列表，供 PaymentModal 渲染支付选项。 */
   async getPaymentMethodsAsync() {
+    if (this.store.payment) {
+      return this.store.payment.getPayMethodListAsync();
+    }
     const response = await this.request.get("/pay/custom-payment/all");
     return (response == null ? void 0 : response.data) || [];
   }
@@ -565,6 +728,9 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       order_ids: orderIds
     });
   }
+  transformBaseProductToOrderProduct(params) {
+    return (0, import_transformBaseProductToOrderProduct.transformBaseProductToOrderProduct)(params);
+  }
   async addProductToOrder(product, booking) {
     try {
       if (!this.store.order)

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

@@ -91,13 +91,13 @@ export interface BaseSalesOrderProduct extends BaseSalesOrderProductIdentity {
  * 出站 payload 版本的商品行。
  *
  * 与 tempOrder 内部 `BaseSalesOrderProduct` 的字段差异：
- * - `product_option_item[*]`：内部为 `{ product_option_item_id, option_group_id, num, price, ... }`，
- *   出站由 `normalizeSubmitProduct` 重命名为 `{ option_group_item_id, option_group_id, num }`
+ * - `product_option_item[*]`：内部为 `{ option_group_item_id, option_group_id, num, price, ... }`，
+ *   出站保留 `{ option_group_item_id, option_group_id, num }`
  *   （后端 checkout 协议；丢弃 `price` 等运行时辅助字段）。
  * - `product_bundle[*].option[*]`：同上重命名规则。
  *
- * 运行时（UI 显示、加购合并、指纹、持久化）全部消费内部字段名 `product_option_item_id`，
- * 仅在 SDK 提交边界做一次出站映射，不影响 opaque identity 契约。
+ * 运行时（UI 显示、加购合并、指纹、持久化）与提交边界统一消费字段名
+ * `option_group_item_id`，保持 tempOrder 与后端协议一致。
  */
 export interface BaseSalesSubmitProduct extends Omit<BaseSalesOrderProduct, '_origin' | 'identity_key'> {
     /**

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.d.ts

@@ -0,0 +1,62 @@
+import type { OrderProduct, OrderProductIdentity } from '../../../modules/Order/types';
+import type { ProductData } from '../../../modules/Product/types';
+export interface BaseProductDetailOptionItem {
+    option_group_item_id?: number | string;
+    option_group_id?: number | string;
+    num?: number | string;
+    quantity?: number | string;
+    price?: number | string;
+    add_price?: number | string;
+    [key: string]: any;
+}
+export interface BaseProductDetailBundleItem {
+    option?: BaseProductDetailOptionItem[];
+    [key: string]: any;
+}
+export interface BaseProductDetailPayload {
+    id?: number | string | null;
+    product_id?: number | string | null;
+    variant_id?: number | string | null;
+    product_variant_id?: number | string | null;
+    quantity?: number | string;
+    num?: number | string;
+    option?: BaseProductDetailOptionItem[];
+    options?: BaseProductDetailOptionItem[];
+    product_option_item?: BaseProductDetailOptionItem[];
+    bundle?: BaseProductDetailBundleItem[];
+    product_bundle?: BaseProductDetailBundleItem[];
+    unique?: string;
+    unique_identification_number?: string;
+    session?: any;
+    form?: any;
+    service_times?: any;
+    machine_code?: string;
+    schedule_id?: number[];
+    duration?: number;
+    policy_id?: number;
+    source_shop_id?: number;
+    origin?: Record<string, any>;
+    _origin?: Record<string, any>;
+    price?: number | string;
+    selling_price?: number | string;
+    original_price?: number | string;
+    tax_fee?: number | string;
+    is_charge_tax?: number;
+    note?: string;
+    [key: string]: any;
+}
+export interface TransformBaseProductToOrderProductParams {
+    payload: BaseProductDetailPayload;
+    fallbackProductId?: number | string | null;
+    sourceProduct?: ProductData | Record<string, any> | null;
+    sourceItem?: ProductData | Record<string, any> | null;
+}
+export type BaseProductOrderProductInput = Partial<OrderProduct> & OrderProductIdentity & {
+    _origin?: Record<string, any>;
+};
+/**
+ * 将商品列表原始数据 + 商品详情选择回调转换成 OrderModule.addProductToOrder 入参。
+ *
+ * 注意：这里不生成 identity，缺省时由 OrderModule 自动补齐。
+ */
+export declare function transformBaseProductToOrderProduct(params: TransformBaseProductToOrderProductParams): BaseProductOrderProductInput | null;

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

@@ -0,0 +1,155 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/solution/BaseSales/utils/transformBaseProductToOrderProduct.ts
+var transformBaseProductToOrderProduct_exports = {};
+__export(transformBaseProductToOrderProduct_exports, {
+  transformBaseProductToOrderProduct: () => transformBaseProductToOrderProduct
+});
+module.exports = __toCommonJS(transformBaseProductToOrderProduct_exports);
+function toNumber(value, fallback = 0) {
+  const parsedValue = Number(value);
+  if (!Number.isFinite(parsedValue))
+    return fallback;
+  return parsedValue;
+}
+function toProductId(value) {
+  if (value === null || value === void 0 || value === "")
+    return null;
+  const parsedValue = Number(value);
+  if (!Number.isFinite(parsedValue))
+    return null;
+  return parsedValue;
+}
+function toSafePositiveInt(value, fallback = 1) {
+  const parsedValue = Math.floor(Number(value));
+  if (!Number.isFinite(parsedValue) || parsedValue < 1)
+    return fallback;
+  return parsedValue;
+}
+function toPriceString(value, fallback = "0.00") {
+  const parsedValue = Number(value);
+  if (!Number.isFinite(parsedValue))
+    return fallback;
+  return parsedValue.toFixed(2);
+}
+function normalizeOptionItems(optionItems) {
+  if (!Array.isArray(optionItems))
+    return [];
+  return optionItems.map((optionItem) => {
+    const optionGroupItemId = toNumber(optionItem == null ? void 0 : optionItem.option_group_item_id);
+    const price = (optionItem == null ? void 0 : optionItem.price) ?? (optionItem == null ? void 0 : optionItem.add_price) ?? 0;
+    return {
+      option_group_item_id: optionGroupItemId,
+      option_group_id: toNumber(optionItem == null ? void 0 : optionItem.option_group_id),
+      num: toSafePositiveInt((optionItem == null ? void 0 : optionItem.num) ?? (optionItem == null ? void 0 : optionItem.quantity), 1),
+      price: toNumber(price, 0)
+    };
+  });
+}
+function normalizeBundleItems(bundleItems) {
+  if (!Array.isArray(bundleItems))
+    return [];
+  return bundleItems.map((bundleItem) => ({
+    ...bundleItem,
+    option: normalizeOptionItems(bundleItem == null ? void 0 : bundleItem.option)
+  }));
+}
+function findVariantById(origin, variantId) {
+  if (!origin || !variantId || variantId <= 0)
+    return null;
+  const variants = Array.isArray(origin == null ? void 0 : origin.variant) ? origin.variant : [];
+  return variants.find((variant) => Number(variant == null ? void 0 : variant.id) === variantId) || null;
+}
+function transformBaseProductToOrderProduct(params) {
+  var _a, _b;
+  const { payload, fallbackProductId = null } = params;
+  if (!payload || typeof payload !== "object")
+    return null;
+  const sourceProduct = params.sourceProduct || params.sourceItem || {};
+  const productId = toProductId(
+    payload.product_id ?? payload.id ?? (sourceProduct == null ? void 0 : sourceProduct.product_id) ?? (sourceProduct == null ? void 0 : sourceProduct.id) ?? fallbackProductId
+  );
+  if (productId === null)
+    return null;
+  const productVariantId = toNumber(
+    payload.product_variant_id ?? payload.variant_id ?? (sourceProduct == null ? void 0 : sourceProduct.product_variant_id) ?? (sourceProduct == null ? void 0 : sourceProduct.variant_id),
+    0
+  );
+  const callbackOrigin = payload.origin || ((_a = payload._origin) == null ? void 0 : _a.sourceProduct) || ((_b = payload._origin) == null ? void 0 : _b.sourceItem) || payload._origin || {};
+  const origin = {
+    ...sourceProduct || {},
+    ...callbackOrigin || {}
+  };
+  const matchedVariant = findVariantById(callbackOrigin, productVariantId) ?? findVariantById(sourceProduct, productVariantId) ?? findVariantById(origin, productVariantId);
+  const sourceProductPrice = toPriceString(
+    payload.price ?? payload.selling_price ?? (matchedVariant == null ? void 0 : matchedVariant.price) ?? (matchedVariant == null ? void 0 : matchedVariant.base_price) ?? (origin == null ? void 0 : origin.price) ?? (origin == null ? void 0 : origin.base_price) ?? (sourceProduct == null ? void 0 : sourceProduct.price) ?? (sourceProduct == null ? void 0 : sourceProduct.selling_price) ?? (sourceProduct == null ? void 0 : sourceProduct.base_price),
+    "0.00"
+  );
+  const productOptionItem = normalizeOptionItems(
+    payload.option ?? payload.options ?? payload.product_option_item
+  );
+  const productBundle = normalizeBundleItems(
+    payload.bundle ?? payload.product_bundle
+  );
+  const uniqueIdentificationNumber = payload.unique_identification_number ?? payload.unique;
+  const metadata = {
+    unique: payload.unique,
+    session: payload.session,
+    form: payload.form,
+    service_times: payload.service_times,
+    machine_code: payload.machine_code,
+    schedule_id: payload.schedule_id,
+    duration: payload.duration,
+    policy_id: payload.policy_id,
+    source_shop_id: payload.source_shop_id,
+    origin,
+    source_product_price: sourceProductPrice
+  };
+  if (uniqueIdentificationNumber) {
+    metadata.unique_identification_number = String(uniqueIdentificationNumber);
+  }
+  return {
+    product_id: productId,
+    product_variant_id: productVariantId,
+    unique_identification_number: uniqueIdentificationNumber ? String(uniqueIdentificationNumber) : void 0,
+    num: toSafePositiveInt(payload.quantity ?? payload.num, 1),
+    product_option_item: productOptionItem,
+    product_bundle: productBundle,
+    selling_price: sourceProductPrice,
+    original_price: sourceProductPrice,
+    tax_fee: toPriceString(
+      payload.tax_fee ?? (matchedVariant == null ? void 0 : matchedVariant.tax_fee) ?? (origin == null ? void 0 : origin.tax_fee) ?? (sourceProduct == null ? void 0 : sourceProduct.tax_fee),
+      "0.00"
+    ),
+    is_charge_tax: toNumber(
+      payload.is_charge_tax ?? (matchedVariant == null ? void 0 : matchedVariant.is_charge_tax) ?? (origin == null ? void 0 : origin.is_charge_tax) ?? (sourceProduct == null ? void 0 : sourceProduct.is_charge_tax),
+      0
+    ),
+    metadata,
+    note: payload.note != null ? String(payload.note) : "",
+    _origin: {
+      ...sourceProduct || {},
+      callbackData: payload
+    }
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  transformBaseProductToOrderProduct
+});

package/lib/solution/BaseSales/utils.js

@@ -61,13 +61,13 @@ function createEmptySummary() {
 function buildProductLineFingerprint(productOptionItem, productBundle) {
   const optArr = Array.isArray(productOptionItem) ? productOptionItem : [];
   const normalizedOpts = optArr.map((item) => ({
-    product_option_item_id: Number(item == null ? void 0 : item.product_option_item_id) || 0,
+    option_group_item_id: Number(item == null ? void 0 : item.option_group_item_id) || 0,
     option_group_id: Number(item == null ? void 0 : item.option_group_id) || 0,
     num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
     price: String((item == null ? void 0 : item.price) ?? "")
   })).sort((p, q) => {
-    if (p.product_option_item_id !== q.product_option_item_id) {
-      return p.product_option_item_id - q.product_option_item_id;
+    if (p.option_group_item_id !== q.option_group_item_id) {
+      return p.option_group_item_id - q.option_group_item_id;
     }
     if (p.option_group_id !== q.option_group_id)
       return p.option_group_id - q.option_group_id;

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

@@ -1,7 +1,7 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
-import { BookingTicketCartView, BookingTicketCustomerView, BookingTicketProductCatalogView, BookingTicketState, IGetCustomerListParams, ICustomer, ILoadProductsParams, ILoadProductDetailParams, IScanResult } from './types';
+import { BookingTicketCartView, BookingTicketProductCatalogView, BookingTicketState, IGetCustomerListParams, ICustomer, ILoadProductsParams, ILoadProductDetailParams, IScanResult } from './types';
 import type { ProductData } from '../../modules';
-import type { OrderCustomerView, OrderCustomerPatch } from '../../modules/Order/types';
+import type { OrderCustomerView } from '../../modules/Order/types';
 import { BaseSalesImpl } from '../BaseSales';
 import type { ISalesDetail } from '../BaseSales/utils/parseSalesResponse';
 import type { LoadSalesDetailParams } from '../../modules/Order/types';
@@ -13,7 +13,6 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 父类按 `getRegisteredModuleNames` 注入成员到该 store。
      */
     protected store: BookingTicketState;
-    private shopStore;
     private platform;
     private scan;
     private productCatalog;
@@ -102,16 +101,13 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     /**
      * 获取购物车 UI 视图。
      *
-     * tempOrder 仍是 checkout 协议对象；本方法只输出 UI 直接消费的数据，
-     * 商品行展示字段在 Solution 层合并，避免 UI 直接读取 tempOrder 原始结构。
+     * tempOrder 仍是 checkout 协议对象；商品行直接透传 products，bookings 附带关联商品。
      */
     getCart(): BookingTicketCartView;
     /**
-     * 获取客户 UI 视图。
-     *
-     * 优先使用 CustomerModule 的 selected customer；缺失时回退到 tempOrder 顶层客户字段。
+     * 获取当前下单客户（与 OrderModule.tempOrder snapshot 一致）。
      */
-    getCustomer(): BookingTicketCustomerView | null;
+    getCustomer(): ICustomer | null;
     /**
      * 通过 ids 获取商品列表（不加载到模块中）
      * @returns 商品列表
@@ -169,13 +165,15 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     /**
      * 设置当前下单客户。
      *
-     * @param patch    tempOrder 协议字段（customer_id 必填，其余缺省视为清空）
-     * @param snapshot UI 富字段快照；undefined 不动；null 清空；ICustomer 写入
+     * @param customer 完整客户对象；null 表示清空
+     *
+     * 内部将 customer 格式化为 tempOrder 协议字段后写入 OrderModule，
+     * 并以 customer 作为 snapshot 保存富字段。
      *
      * 同时透传 OrderModule 内部 emit 的 `order:onOrderCustomerChange` 之外，
      * 在 BookingTicket 命名空间也 emit 一次，方便上层统一从 Solution 订阅。
      */
-    setOrderCustomer(patch: OrderCustomerPatch | null, snapshot?: ICustomer | null): void;
+    setOrderCustomer(customer: ICustomer | null): void;
     /**
      * 读取 tempOrder 上的下单客户协议字段；customer_id 缺失时返回 null。
      */
@@ -233,7 +231,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态