@pisell/pisellos 2.2.152 → 2.2.154

package/dist/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/dist/solution/BaseSales/types.js

@@ -17,13 +17,13 @@ export function createBaseSalesHook(moduleName, hookName) {
  * 出站 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 与后端协议一致。
  */
 
 /**

package/dist/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/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -0,0 +1,116 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function toNumber(value) {
+  var fallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  var parsedValue = Number(value);
+  if (!Number.isFinite(parsedValue)) return fallback;
+  return parsedValue;
+}
+function toProductId(value) {
+  if (value === null || value === undefined || value === '') return null;
+  var parsedValue = Number(value);
+  if (!Number.isFinite(parsedValue)) return null;
+  return parsedValue;
+}
+function toSafePositiveInt(value) {
+  var fallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+  var parsedValue = Math.floor(Number(value));
+  if (!Number.isFinite(parsedValue) || parsedValue < 1) return fallback;
+  return parsedValue;
+}
+function toPriceString(value) {
+  var fallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '0.00';
+  var parsedValue = Number(value);
+  if (!Number.isFinite(parsedValue)) return fallback;
+  return parsedValue.toFixed(2);
+}
+function normalizeOptionItems(optionItems) {
+  if (!Array.isArray(optionItems)) return [];
+  return optionItems.map(function (optionItem) {
+    var _ref, _optionItem$price, _optionItem$num;
+    var optionGroupItemId = toNumber(optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id);
+    var price = (_ref = (_optionItem$price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _optionItem$price !== void 0 ? _optionItem$price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _ref !== void 0 ? _ref : 0;
+    return {
+      option_group_item_id: optionGroupItemId,
+      option_group_id: toNumber(optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_id),
+      num: toSafePositiveInt((_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity, 1),
+      price: toNumber(price, 0)
+    };
+  });
+}
+function normalizeBundleItems(bundleItems) {
+  if (!Array.isArray(bundleItems)) return [];
+  return bundleItems.map(function (bundleItem) {
+    return _objectSpread(_objectSpread({}, bundleItem), {}, {
+      option: normalizeOptionItems(bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.option)
+    });
+  });
+}
+function findVariantById(origin, variantId) {
+  if (!origin || !variantId || variantId <= 0) return null;
+  var variants = Array.isArray(origin === null || origin === void 0 ? void 0 : origin.variant) ? origin.variant : [];
+  return variants.find(function (variant) {
+    return Number(variant === null || variant === void 0 ? void 0 : variant.id) === variantId;
+  }) || null;
+}
+
+/**
+ * 将商品列表原始数据 + 商品详情选择回调转换成 OrderModule.addProductToOrder 入参。
+ *
+ * 注意：这里不生成 identity，缺省时由 OrderModule 自动补齐。
+ */
+export function transformBaseProductToOrderProduct(params) {
+  var _ref2, _ref3, _ref4, _payload$product_id, _ref5, _ref6, _payload$product_vari, _payload$_origin, _payload$_origin2, _ref7, _findVariantById, _ref8, _ref9, _ref10, _ref11, _ref12, _ref13, _ref14, _payload$price, _ref15, _payload$option, _payload$bundle, _payload$unique_ident, _payload$quantity, _ref16, _ref17, _payload$tax_fee, _ref18, _ref19, _payload$is_charge_ta;
+  var payload = params.payload,
+    _params$fallbackProdu = params.fallbackProductId,
+    fallbackProductId = _params$fallbackProdu === void 0 ? null : _params$fallbackProdu;
+  if (!payload || _typeof(payload) !== 'object') return null;
+  var sourceProduct = params.sourceProduct || params.sourceItem || {};
+  var productId = toProductId((_ref2 = (_ref3 = (_ref4 = (_payload$product_id = payload.product_id) !== null && _payload$product_id !== void 0 ? _payload$product_id : payload.id) !== null && _ref4 !== void 0 ? _ref4 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.product_id) !== null && _ref3 !== void 0 ? _ref3 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.id) !== null && _ref2 !== void 0 ? _ref2 : fallbackProductId);
+  if (productId === null) return null;
+  var productVariantId = toNumber((_ref5 = (_ref6 = (_payload$product_vari = payload.product_variant_id) !== null && _payload$product_vari !== void 0 ? _payload$product_vari : payload.variant_id) !== null && _ref6 !== void 0 ? _ref6 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.product_variant_id) !== null && _ref5 !== void 0 ? _ref5 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.variant_id, 0);
+  var callbackOrigin = payload.origin || ((_payload$_origin = payload._origin) === null || _payload$_origin === void 0 ? void 0 : _payload$_origin.sourceProduct) || ((_payload$_origin2 = payload._origin) === null || _payload$_origin2 === void 0 ? void 0 : _payload$_origin2.sourceItem) || payload._origin || {};
+  var origin = _objectSpread(_objectSpread({}, sourceProduct || {}), callbackOrigin || {});
+  var matchedVariant = (_ref7 = (_findVariantById = findVariantById(callbackOrigin, productVariantId)) !== null && _findVariantById !== void 0 ? _findVariantById : findVariantById(sourceProduct, productVariantId)) !== null && _ref7 !== void 0 ? _ref7 : findVariantById(origin, productVariantId);
+  var sourceProductPrice = toPriceString((_ref8 = (_ref9 = (_ref10 = (_ref11 = (_ref12 = (_ref13 = (_ref14 = (_payload$price = payload.price) !== null && _payload$price !== void 0 ? _payload$price : payload.selling_price) !== null && _ref14 !== void 0 ? _ref14 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.price) !== null && _ref13 !== void 0 ? _ref13 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.base_price) !== null && _ref12 !== void 0 ? _ref12 : origin === null || origin === void 0 ? void 0 : origin.price) !== null && _ref11 !== void 0 ? _ref11 : origin === null || origin === void 0 ? void 0 : origin.base_price) !== null && _ref10 !== void 0 ? _ref10 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _ref9 !== void 0 ? _ref9 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.selling_price) !== null && _ref8 !== void 0 ? _ref8 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price, '0.00');
+  var productOptionItem = normalizeOptionItems((_ref15 = (_payload$option = payload.option) !== null && _payload$option !== void 0 ? _payload$option : payload.options) !== null && _ref15 !== void 0 ? _ref15 : payload.product_option_item);
+  var productBundle = normalizeBundleItems((_payload$bundle = payload.bundle) !== null && _payload$bundle !== void 0 ? _payload$bundle : payload.product_bundle);
+  var uniqueIdentificationNumber = (_payload$unique_ident = payload.unique_identification_number) !== null && _payload$unique_ident !== void 0 ? _payload$unique_ident : payload.unique;
+  var 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: 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) : undefined,
+    num: toSafePositiveInt((_payload$quantity = payload.quantity) !== null && _payload$quantity !== void 0 ? _payload$quantity : payload.num, 1),
+    product_option_item: productOptionItem,
+    product_bundle: productBundle,
+    selling_price: sourceProductPrice,
+    original_price: sourceProductPrice,
+    tax_fee: toPriceString((_ref16 = (_ref17 = (_payload$tax_fee = payload.tax_fee) !== null && _payload$tax_fee !== void 0 ? _payload$tax_fee : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.tax_fee) !== null && _ref17 !== void 0 ? _ref17 : origin === null || origin === void 0 ? void 0 : origin.tax_fee) !== null && _ref16 !== void 0 ? _ref16 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.tax_fee, '0.00'),
+    is_charge_tax: toNumber((_ref18 = (_ref19 = (_payload$is_charge_ta = payload.is_charge_tax) !== null && _payload$is_charge_ta !== void 0 ? _payload$is_charge_ta : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.is_charge_tax) !== null && _ref19 !== void 0 ? _ref19 : origin === null || origin === void 0 ? void 0 : origin.is_charge_tax) !== null && _ref18 !== void 0 ? _ref18 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.is_charge_tax, 0),
+    metadata: metadata,
+    note: payload.note != null ? String(payload.note) : '',
+    _origin: _objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
+      callbackData: payload
+    })
+  };
+}

package/dist/solution/BaseSales/utils.js

@@ -40,14 +40,14 @@ export function buildProductLineFingerprint(productOptionItem, productBundle) {
   var normalizedOpts = optArr.map(function (item) {
     var _item$price;
     return {
-      product_option_item_id: Number(item === null || item === void 0 ? void 0 : item.product_option_item_id) || 0,
+      option_group_item_id: Number(item === null || item === void 0 ? void 0 : item.option_group_item_id) || 0,
       option_group_id: Number(item === null || item === void 0 ? void 0 : item.option_group_id) || 0,
       num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
       price: String((_item$price = item === null || item === void 0 ? void 0 : item.price) !== null && _item$price !== void 0 ? _item$price : '')
     };
   }).sort(function (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;
     if (p.num !== q.num) return p.num - q.num;

package/dist/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 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/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 客户状态

package/dist/solution/BookingTicket/index.js

@@ -32,9 +32,10 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { createBookingTicketModule } from "./types";
 import { BaseSalesImpl } from "../BaseSales";
 import Scan from "./utils/scan";
+import { formatOrderCustomerPatch } from "./utils/orderCustomer";
 import { handleGlobalScan, handleCustomerScan, handleUniversalScan } from "./utils/scan/handleScan";
 import scanCache from "./utils/scan/scanCache";
-import { buildCartItemViews, buildCustomerView, indexBookingsByProductUid } from "./utils/cartView";
+import { buildCartView } from "./utils/cartView";
 import { applyBookingsStatus, resolveScheduleId, restoreBookingsStatus } from "./utils/bookingStatus";
 export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   _inherits(BookingTicketImpl, _BaseSalesImpl);
@@ -53,7 +54,6 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
      * 父类按 `getRegisteredModuleNames` 注入成员到该 store。
      */
     _defineProperty(_assertThisInitialized(_this), "store", {});
-    _defineProperty(_assertThisInitialized(_this), "shopStore", void 0);
     _defineProperty(_assertThisInitialized(_this), "platform", void 0);
     _defineProperty(_assertThisInitialized(_this), "scan", void 0);
     _defineProperty(_assertThisInitialized(_this), "productCatalog", []);
@@ -92,25 +92,18 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
             case 0:
               options = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
               this.scan = new Scan(this, 'BOOKING_TICKET_SCAN');
-              this.shopStore = core.getPlugin('shopStore');
-              if (this.shopStore) {
-                _context.next = 5;
-                break;
-              }
-              throw new Error('bookingTicket解决方案需要 shopStore 插件支持');
-            case 5:
-              _context.next = 7;
+              _context.next = 4;
               return _get(_getPrototypeOf(BookingTicketImpl.prototype), "initialize", this).call(this, core, options);
-            case 7:
+            case 4:
               if (this.request) {
-                _context.next = 9;
+                _context.next = 6;
                 break;
               }
               throw new Error('bookingTicket解决方案需要 request 插件支持');
-            case 9:
+            case 6:
               this.platform = (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.platform;
               console.log('[BookingTicket] 初始化完成');
-            case 11:
+            case 8:
             case "end":
               return _context.stop();
           }
@@ -154,7 +147,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                   country_calling_code: detailCustomer === null || detailCustomer === void 0 ? void 0 : detailCustomer.country_calling_code
                 });
                 customerModule.setSelectedCustomer(customer);
-                this.setOrderCustomer(customer, detailCustomer);
+                this.setOrderCustomer(customer);
               }
               return _context2.abrupt("return", sales);
             case 8:
@@ -444,8 +437,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     /**
      * 获取购物车 UI 视图。
      *
-     * tempOrder 仍是 checkout 协议对象；本方法只输出 UI 直接消费的数据，
-     * 商品行展示字段在 Solution 层合并，避免 UI 直接读取 tempOrder 原始结构。
+     * tempOrder 仍是 checkout 协议对象；商品行直接透传 products，bookings 附带关联商品。
      */
   }, {
     key: "getCart",
@@ -454,28 +446,16 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       var tempOrder = (_this$store$order$get2 = (_this$store$order3 = this.store.order) === null || _this$store$order3 === void 0 ? void 0 : _this$store$order3.getTempOrder()) !== null && _this$store$order$get2 !== void 0 ? _this$store$order$get2 : null;
       var salesDetail = this.getSalesOrder();
       var bookings = (_salesDetail$bookings = salesDetail === null || salesDetail === void 0 ? void 0 : salesDetail.bookings) !== null && _salesDetail$bookings !== void 0 ? _salesDetail$bookings : (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.bookings) || [];
-      var salesDetailBookingMap = salesDetail === null || salesDetail === void 0 ? void 0 : salesDetail.bookingsByProductUid;
-      var bookingsByProductUid = salesDetailBookingMap && Object.keys(salesDetailBookingMap).length > 0 ? salesDetailBookingMap : indexBookingsByProductUid(bookings);
-      return {
-        items: buildCartItemViews((tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.products) || [], {
-          bookingDetailMap: bookingsByProductUid,
-          productsCatalog: this.productCatalog
-        })
-      };
+      return buildCartView((tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.products) || [], bookings);
     }
 
     /**
-     * 获取客户 UI 视图。
-     *
-     * 优先使用 CustomerModule 的 selected customer；缺失时回退到 tempOrder 顶层客户字段。
+     * 获取当前下单客户（与 OrderModule.tempOrder snapshot 一致）。
      */
   }, {
     key: "getCustomer",
     value: function getCustomer() {
-      var _this$store$customer$, _this$store$customer, _this$store$customer$2, _this$store$order$get3, _this$store$order4, _this$store$order4$ge;
-      var selected = (_this$store$customer$ = (_this$store$customer = this.store.customer) === null || _this$store$customer === void 0 || (_this$store$customer$2 = _this$store$customer.getSelectedCustomer) === null || _this$store$customer$2 === void 0 ? void 0 : _this$store$customer$2.call(_this$store$customer)) !== null && _this$store$customer$ !== void 0 ? _this$store$customer$ : null;
-      var tempOrder = (_this$store$order$get3 = (_this$store$order4 = this.store.order) === null || _this$store$order4 === void 0 || (_this$store$order4$ge = _this$store$order4.getTempOrder) === null || _this$store$order4$ge === void 0 ? void 0 : _this$store$order4$ge.call(_this$store$order4)) !== null && _this$store$order$get3 !== void 0 ? _this$store$order$get3 : null;
-      return buildCustomerView(selected, tempOrder);
+      return this.getOrderCustomerSnapshot();
     }
 
     /**
@@ -663,18 +643,24 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     /**
      * 设置当前下单客户。
      *
-     * @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 订阅。
      */
   }, {
     key: "setOrderCustomer",
-    value: function setOrderCustomer(patch, snapshot) {
-      this.store.order.setOrderCustomer(patch, snapshot);
+    value: function setOrderCustomer(customer) {
+      if (!customer) {
+        this.clearOrderCustomer();
+        return;
+      }
+      var patch = formatOrderCustomerPatch(customer);
+      this.store.order.setOrderCustomer(patch, customer);
       var next = this.buildOrderCustomerPayload();
-      console.log('setOrderCustomer1234', patch, snapshot, next);
       this.core.effects.emit("".concat(this.name, ":onOrderCustomerChange"), next);
     }
 

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

@@ -94,21 +94,24 @@ export interface IScanResult {
     result: any;
 }
 /**
- * BookingTicket 面向 UI 的购物车行视图。
+ * BookingTicket 面向 UI 的购物车商品行视图。
  *
- * tempOrder.products 仍保持 Sales checkout 协议结构；展示字段在 Solution 层合并后输出，
- * 避免 UI 直接读取 booking/detail/catalog 等原始来源。
+ * 直接透传 tempOrder.products 协议行，不做 Solution 层 enrichment。
  */
-export interface BookingTicketCartItemView extends BaseSalesOrderProduct {
-    /** UI 运行态扩展，不进入 tempOrder 提交协议。 */
+export type BookingTicketCartItemView = BaseSalesOrderProduct;
+/**
+ * BookingTicket 面向 UI 的 booking 行视图（平铺，附带关联商品）。
+ */
+export interface BookingTicketCartBookingView extends ISalesBooking {
     _extend: {
-        booking: ISalesBooking | null;
+        product: BookingTicketCartItemView | null;
     };
 }
 /**
  * BookingTicket 面向 UI 的购物车视图。
  */
 export interface BookingTicketCartView {
+    bookings: BookingTicketCartBookingView[];
     items: BookingTicketCartItemView[];
 }
 /**

package/dist/solution/BookingTicket/types.js

@@ -55,10 +55,13 @@ export var BookingTicketHooks = /*#__PURE__*/function (BookingTicketHooks) {
  */
 
 /**
- * BookingTicket 面向 UI 的购物车行视图。
+ * BookingTicket 面向 UI 的购物车商品行视图。
  *
- * tempOrder.products 仍保持 Sales checkout 协议结构；展示字段在 Solution 层合并后输出，
- * 避免 UI 直接读取 booking/detail/catalog 等原始来源。
+ * 直接透传 tempOrder.products 协议行，不做 Solution 层 enrichment。
+ */
+
+/**
+ * BookingTicket 面向 UI 的 booking 行视图（平铺，附带关联商品）。
  */
 
 /**

package/dist/solution/BookingTicket/utils/cartView.d.ts

@@ -1,24 +1,19 @@
 import type { BaseSalesOrderProduct } from '../../BaseSales';
 import type { ISalesBooking } from '../../BaseSales/utils/parseSalesResponse';
-import type { ProductData } from '../../../modules/Product/types';
-import type { BookingTicketCartItemView, BookingTicketCustomerView, ICustomer } from '../types';
+import type { BookingTicketCartView, BookingTicketCustomerView, ICustomer } from '../types';
 import type { ScanOrderTempOrder } from '../../ScanOrder/types';
 /**
  * 仅按 booking.product_uid 建索引，避免发明 booking 与商品行之间的其它等价关系。
  */
 export declare function indexBookingsByProductUid(bookings: ISalesBooking[] | undefined | null): Record<string, ISalesBooking[]>;
 /**
- * 合并购物车行展示字段。协议字段仍来自 tempOrder.products，
- * 展示字段按 booking detail/product 优先，商品池 catalog 兜底。
+ * 构建购物车 UI 视图：bookings 平铺附带关联商品；items 仅含未关联 booking 的商品行。
+ *
+ * 商品行直接透传 tempOrder.products，不做 enrichment。
+ * 关联规则（1:1）：booking.product_uid ↔ line.metadata.unique_identification_number；
+ * 同一 uid 已被更早的 booking 占用时，后续 booking 的 product 为 null。
  */
-export declare function buildCartItemView(line: BaseSalesOrderProduct, ctx: {
-    bookingDetailMap?: Record<string, ISalesBooking[]>;
-    productsCatalog: ProductData[];
-}): BookingTicketCartItemView;
-export declare function buildCartItemViews(lines: BaseSalesOrderProduct[] | undefined | null, ctx: {
-    bookingDetailMap?: Record<string, ISalesBooking[]>;
-    productsCatalog: ProductData[];
-}): BookingTicketCartItemView[];
+export declare function buildCartView(lines: BaseSalesOrderProduct[] | undefined | null, bookings: ISalesBooking[] | undefined | null): BookingTicketCartView;
 export declare function isWalkInCustomer(customer: Pick<ICustomer, 'id'> | null | undefined): boolean;
 /**
  * selected 优先，缺失时回退 tempOrder.customer_*，统一输出 UI 客户视图。

package/dist/solution/BookingTicket/utils/cartView.js

@@ -20,24 +20,62 @@ export function indexBookingsByProductUid(bookings) {
 }
 
 /**
- * 合并购物车行展示字段。协议字段仍来自 tempOrder.products，
- * 展示字段按 booking detail/product 优先，商品池 catalog 兜底。
+ * 商品行按 unique_identification_number 建 1:1 索引（同 uid 多行时保留首行）。
  */
-export function buildCartItemView(line, ctx) {
-  var _line$metadata, _ctx$bookingDetailMap;
-  var productUid = (_line$metadata = line.metadata) === null || _line$metadata === void 0 ? void 0 : _line$metadata.unique_identification_number;
-  var matched = productUid ? (_ctx$bookingDetailMap = ctx.bookingDetailMap) === null || _ctx$bookingDetailMap === void 0 || (_ctx$bookingDetailMap = _ctx$bookingDetailMap[String(productUid)]) === null || _ctx$bookingDetailMap === void 0 ? void 0 : _ctx$bookingDetailMap[0] : undefined;
-  return _objectSpread(_objectSpread({}, line), {}, {
-    _extend: {
-      booking: matched !== null && matched !== void 0 ? matched : null
+function indexProductsByUid(lines) {
+  return lines.reduce(function (acc, line) {
+    var _line$metadata;
+    var uid = (_line$metadata = line.metadata) === null || _line$metadata === void 0 ? void 0 : _line$metadata.unique_identification_number;
+    if (uid === undefined || uid === null || uid === '') return acc;
+    var key = String(uid);
+    if (!acc[key]) acc[key] = line;
+    return acc;
+  }, {});
+}
+
+/**
+ * 构建购物车 UI 视图：bookings 平铺附带关联商品；items 仅含未关联 booking 的商品行。
+ *
+ * 商品行直接透传 tempOrder.products，不做 enrichment。
+ * 关联规则（1:1）：booking.product_uid ↔ line.metadata.unique_identification_number；
+ * 同一 uid 已被更早的 booking 占用时，后续 booking 的 product 为 null。
+ */
+export function buildCartView(lines, bookings) {
+  var productLines = Array.isArray(lines) ? lines : [];
+  var bookingList = Array.isArray(bookings) ? bookings : [];
+  var linesByUid = indexProductsByUid(productLines);
+  var claimedUids = new Set();
+  var cartBookings = bookingList.filter(function (booking) {
+    return booking.parent_id !== 0;
+  }).map(function (booking) {
+    var uid = booking === null || booking === void 0 ? void 0 : booking.product_uid;
+    var product = null;
+    if (uid !== undefined && uid !== null && uid !== '') {
+      var key = String(uid);
+      if (!claimedUids.has(key)) {
+        var line = linesByUid[key];
+        if (line) {
+          claimedUids.add(key);
+          product = line;
+        }
+      }
     }
+    return _objectSpread(_objectSpread({}, booking), {}, {
+      _extend: {
+        product: product
+      }
+    });
   });
-}
-export function buildCartItemViews(lines, ctx) {
-  if (!Array.isArray(lines) || lines.length === 0) return [];
-  return lines.map(function (line) {
-    return buildCartItemView(line, ctx);
+  var items = productLines.filter(function (line) {
+    var _line$metadata2;
+    var uid = (_line$metadata2 = line.metadata) === null || _line$metadata2 === void 0 ? void 0 : _line$metadata2.unique_identification_number;
+    if (uid === undefined || uid === null || uid === '') return true;
+    return !claimedUids.has(String(uid));
   });
+  return {
+    bookings: cartBookings,
+    items: items
+  };
 }
 export function isWalkInCustomer(customer) {
   if (!customer) return true;

package/dist/solution/BookingTicket/utils/orderCustomer.d.ts

@@ -0,0 +1,4 @@
+import type { ICustomer } from '../types';
+import type { OrderCustomerPatch } from '../../../modules/Order/types';
+/** 将 ICustomer 格式化为写入 tempOrder 的协议字段。 */
+export declare function formatOrderCustomerPatch(customer: ICustomer): OrderCustomerPatch;