@pisell/pisellos 2.2.153 → 2.2.154

package/lib/solution/BookingTicket/index.js

@@ -37,6 +37,7 @@ module.exports = __toCommonJS(BookingTicket_exports);
 var import_types = require("./types");
 var import_BaseSales = require("../BaseSales");
 var import_scan = __toESM(require("./utils/scan"));
+var import_orderCustomer = require("./utils/orderCustomer");
 var import_handleScan = require("./utils/scan/handleScan");
 var import_scanCache = __toESM(require("./utils/scan/scanCache"));
 var import_cartView = require("./utils/cartView");
@@ -76,10 +77,6 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
   async initialize(core, options = {}) {
     var _a;
     this.scan = new import_scan.default(this, "BOOKING_TICKET_SCAN");
-    this.shopStore = core.getPlugin("shopStore");
-    if (!this.shopStore) {
-      throw new Error("bookingTicket解决方案需要 shopStore 插件支持");
-    }
     await super.initialize(core, options);
     if (!this.request) {
       throw new Error("bookingTicket解决方案需要 request 插件支持");
@@ -111,7 +108,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
         country_calling_code: detailCustomer == null ? void 0 : detailCustomer.country_calling_code
       };
       customerModule.setSelectedCustomer(customer);
-      this.setOrderCustomer(customer, detailCustomer);
+      this.setOrderCustomer(customer);
     }
     return sales;
   }
@@ -259,33 +256,20 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
   /**
    * 获取购物车 UI 视图。
    *
-   * tempOrder 仍是 checkout 协议对象；本方法只输出 UI 直接消费的数据，
-   * 商品行展示字段在 Solution 层合并，避免 UI 直接读取 tempOrder 原始结构。
+   * tempOrder 仍是 checkout 协议对象；商品行直接透传 products，bookings 附带关联商品。
    */
   getCart() {
     var _a;
     const tempOrder = ((_a = this.store.order) == null ? void 0 : _a.getTempOrder()) ?? null;
     const salesDetail = this.getSalesOrder();
     const bookings = (salesDetail == null ? void 0 : salesDetail.bookings) ?? ((tempOrder == null ? void 0 : tempOrder.bookings) || []);
-    const salesDetailBookingMap = salesDetail == null ? void 0 : salesDetail.bookingsByProductUid;
-    const bookingsByProductUid = salesDetailBookingMap && Object.keys(salesDetailBookingMap).length > 0 ? salesDetailBookingMap : (0, import_cartView.indexBookingsByProductUid)(bookings);
-    return {
-      items: (0, import_cartView.buildCartItemViews)((tempOrder == null ? void 0 : tempOrder.products) || [], {
-        bookingDetailMap: bookingsByProductUid,
-        productsCatalog: this.productCatalog
-      })
-    };
+    return (0, import_cartView.buildCartView)((tempOrder == null ? void 0 : tempOrder.products) || [], bookings);
   }
   /**
-   * 获取客户 UI 视图。
-   *
-   * 优先使用 CustomerModule 的 selected customer；缺失时回退到 tempOrder 顶层客户字段。
+   * 获取当前下单客户（与 OrderModule.tempOrder snapshot 一致）。
    */
   getCustomer() {
-    var _a, _b, _c, _d;
-    const selected = ((_b = (_a = this.store.customer) == null ? void 0 : _a.getSelectedCustomer) == null ? void 0 : _b.call(_a)) ?? null;
-    const tempOrder = ((_d = (_c = this.store.order) == null ? void 0 : _c.getTempOrder) == null ? void 0 : _d.call(_c)) ?? null;
-    return (0, import_cartView.buildCustomerView)(selected, tempOrder);
+    return this.getOrderCustomerSnapshot();
   }
   /**
    * 通过 ids 获取商品列表（不加载到模块中）
@@ -387,16 +371,22 @@ var BookingTicketImpl = class extends import_BaseSales.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 订阅。
    */
-  setOrderCustomer(patch, snapshot) {
-    this.store.order.setOrderCustomer(patch, snapshot);
+  setOrderCustomer(customer) {
+    if (!customer) {
+      this.clearOrderCustomer();
+      return;
+    }
+    const patch = (0, import_orderCustomer.formatOrderCustomerPatch)(customer);
+    this.store.order.setOrderCustomer(patch, customer);
     const next = this.buildOrderCustomerPayload();
-    console.log("setOrderCustomer1234", patch, snapshot, next);
     this.core.effects.emit(`${this.name}:onOrderCustomerChange`, next);
   }
   /**

package/lib/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/lib/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/lib/solution/BookingTicket/utils/cartView.js

@@ -19,8 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/solution/BookingTicket/utils/cartView.ts
 var cartView_exports = {};
 __export(cartView_exports, {
-  buildCartItemView: () => buildCartItemView,
-  buildCartItemViews: () => buildCartItemViews,
+  buildCartView: () => buildCartView,
   buildCustomerView: () => buildCustomerView,
   indexBookingsByProductUid: () => indexBookingsByProductUid,
   isWalkInCustomer: () => isWalkInCustomer
@@ -40,21 +39,49 @@ function indexBookingsByProductUid(bookings) {
     return acc;
   }, {});
 }
-function buildCartItemView(line, ctx) {
-  var _a, _b, _c;
-  const productUid = (_a = line.metadata) == null ? void 0 : _a.unique_identification_number;
-  const matched = productUid ? (_c = (_b = ctx.bookingDetailMap) == null ? void 0 : _b[String(productUid)]) == null ? void 0 : _c[0] : void 0;
-  return {
-    ...line,
-    _extend: {
-      booking: matched ?? null
-    }
-  };
+function indexProductsByUid(lines) {
+  return lines.reduce((acc, line) => {
+    var _a;
+    const uid = (_a = line.metadata) == null ? void 0 : _a.unique_identification_number;
+    if (uid === void 0 || uid === null || uid === "")
+      return acc;
+    const key = String(uid);
+    if (!acc[key])
+      acc[key] = line;
+    return acc;
+  }, {});
 }
-function buildCartItemViews(lines, ctx) {
-  if (!Array.isArray(lines) || lines.length === 0)
-    return [];
-  return lines.map((line) => buildCartItemView(line, ctx));
+function buildCartView(lines, bookings) {
+  const productLines = Array.isArray(lines) ? lines : [];
+  const bookingList = Array.isArray(bookings) ? bookings : [];
+  const linesByUid = indexProductsByUid(productLines);
+  const claimedUids = /* @__PURE__ */ new Set();
+  const cartBookings = bookingList.filter((booking) => booking.parent_id !== 0).map((booking) => {
+    const uid = booking == null ? void 0 : booking.product_uid;
+    let product = null;
+    if (uid !== void 0 && uid !== null && uid !== "") {
+      const key = String(uid);
+      if (!claimedUids.has(key)) {
+        const line = linesByUid[key];
+        if (line) {
+          claimedUids.add(key);
+          product = line;
+        }
+      }
+    }
+    return {
+      ...booking,
+      _extend: { product }
+    };
+  });
+  const items = productLines.filter((line) => {
+    var _a;
+    const uid = (_a = line.metadata) == null ? void 0 : _a.unique_identification_number;
+    if (uid === void 0 || uid === null || uid === "")
+      return true;
+    return !claimedUids.has(String(uid));
+  });
+  return { bookings: cartBookings, items };
 }
 function isWalkInCustomer(customer) {
   if (!customer)
@@ -95,8 +122,7 @@ function buildCustomerView(selected, tempOrder) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  buildCartItemView,
-  buildCartItemViews,
+  buildCartView,
   buildCustomerView,
   indexBookingsByProductUid,
   isWalkInCustomer

package/lib/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;

package/lib/solution/BookingTicket/utils/orderCustomer.js

@@ -0,0 +1,58 @@
+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/BookingTicket/utils/orderCustomer.ts
+var orderCustomer_exports = {};
+__export(orderCustomer_exports, {
+  formatOrderCustomerPatch: () => formatOrderCustomerPatch
+});
+module.exports = __toCommonJS(orderCustomer_exports);
+function resolveCustomerDisplayName(customer) {
+  const c = customer;
+  const displayName = c.display_name;
+  if (typeof displayName === "string" && displayName)
+    return displayName;
+  const nickname = c.nickname;
+  if (typeof nickname === "string" && nickname)
+    return nickname;
+  const firstName = c.first_name;
+  const lastName = c.last_name;
+  if (typeof firstName === "string" && firstName || typeof lastName === "string" && lastName) {
+    return `${typeof firstName === "string" ? firstName : ""} ${typeof lastName === "string" ? lastName : ""}`.trim();
+  }
+  const customerName = c.customer_name;
+  if (typeof customerName === "string" && customerName)
+    return customerName;
+  return customer.name ?? "";
+}
+function formatOrderCustomerPatch(customer) {
+  var _a;
+  const rawId = customer.id;
+  const numericId = typeof rawId === "number" ? rawId : rawId !== void 0 && rawId !== null && rawId !== "" ? Number(rawId) : null;
+  return {
+    customer_id: Number.isFinite(numericId) ? numericId : null,
+    customer_name: resolveCustomerDisplayName(customer),
+    phone: customer.phone ?? "",
+    email: customer.email ?? "",
+    country_calling_code: ((_a = customer.country_calling_code) == null ? void 0 : _a.toString()) ?? ""
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  formatOrderCustomerPatch
+});

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

@@ -82,6 +82,9 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private getResourceId;
     private getBookingAppointmentStatus;
     private getBookingOrderPaymentStatus;
+    private countBookingOrders;
+    private countCompletedBookings;
+    private groupBookingsByResource;
     private isBookingMatchedResource;
     private sortMatchedBookings;
     /**

package/lib/solution/Sales/index.js

@@ -254,6 +254,37 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     var _a;
     return String(((_a = booking.order) == null ? void 0 : _a.payment_status) ?? "");
   }
+  countBookingOrders(bookings) {
+    const orderIds = /* @__PURE__ */ new Set();
+    bookings.forEach((booking) => {
+      var _a;
+      const orderId = booking.order_id ?? ((_a = booking.order) == null ? void 0 : _a.order_id);
+      if (orderId === void 0 || orderId === null)
+        return;
+      orderIds.add(String(orderId));
+    });
+    return orderIds.size;
+  }
+  countCompletedBookings(bookings) {
+    return bookings.filter((booking) => this.getBookingAppointmentStatus(booking) === "completed").length;
+  }
+  groupBookingsByResource(bookingList) {
+    const bookingMap = /* @__PURE__ */ new Map();
+    bookingList.forEach((booking) => {
+      if (!Array.isArray(booking.resources))
+        return;
+      booking.resources.forEach((resource) => {
+        const relationId = resource == null ? void 0 : resource.relation_id;
+        if (relationId === void 0 || relationId === null)
+          return;
+        const key = String(relationId);
+        const list = bookingMap.get(key) || [];
+        list.push(booking);
+        bookingMap.set(key, list);
+      });
+    });
+    return bookingMap;
+  }
   isBookingMatchedResource(booking, resourceId) {
     if (!Array.isArray(booking.resources))
       return false;
@@ -534,27 +565,22 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     if (!Array.isArray(resourceList) || resourceList.length === 0)
       return [];
     const normalizedBookings = this.normalizeResourceBookings(current, deviceCurrent, bookingList);
-    const bookingMap = /* @__PURE__ */ new Map();
-    normalizedBookings.forEach((booking) => {
-      if (!Array.isArray(booking.resources))
-        return;
-      booking.resources.forEach((resource) => {
-        const relationId = resource == null ? void 0 : resource.relation_id;
-        if (relationId === void 0 || relationId === null)
-          return;
-        const key = String(relationId);
-        const list2 = bookingMap.get(key) || [];
-        list2.push(booking);
-        bookingMap.set(key, list2);
-      });
-    });
+    const rawBookingMap = this.groupBookingsByResource(bookingList);
+    const bookingMap = this.groupBookingsByResource(normalizedBookings);
     const list = resourceList.map((resource) => {
       const resourceId = this.getResourceId(resource);
+      const rawMatchedBookings = rawBookingMap.get(String(resourceId)) || [];
       const matchedBookings = bookingMap.get(String(resourceId)) || [];
+      const orderCount = this.countBookingOrders(rawMatchedBookings);
+      const bookingCount = rawMatchedBookings.length;
+      const compeleteBookingCount = this.countCompletedBookings(rawMatchedBookings);
       const bookings = this.pickBookingsForCurrentPoint(current, matchedBookings);
       return {
         ...resource,
         resource_id: resourceId,
+        orderCount,
+        bookingCount,
+        compeleteBookingCount,
         bookings
       };
     });
@@ -616,6 +642,9 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
       current,
       this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList)
     );
+    const orderCount = this.countBookingOrders(matchedBookingList);
+    const bookingCount = matchedBookingList.length;
+    const compeleteBookingCount = completedBookingList.length;
     this.logger.addLog({
       type: "info",
       title: "getResourceBookingItem",
@@ -626,12 +655,18 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
         bookingList: (_b = params.bookingList) == null ? void 0 : _b.length,
         bookings: bookings.length,
         completedBookings: completedBookings.length,
-        unpaidBookings: unpaidBookings.length
+        unpaidBookings: unpaidBookings.length,
+        orderCount,
+        bookingCount,
+        compeleteBookingCount
       }
     });
     return {
       ...targetResource,
       resource_id: resourceId,
+      orderCount,
+      bookingCount,
+      compeleteBookingCount,
       bookings,
       completedBookings,
       unpaidBookings

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

@@ -30,6 +30,9 @@ export interface SalesResourceMatchedBooking extends Omit<BookingData, 'status'>
 }
 export interface SalesResourceBookingItem extends Omit<ResourceData, 'bookings'> {
     resource_id: ResourceId;
+    orderCount: number;
+    bookingCount: number;
+    compeleteBookingCount: number;
     bookings: SalesResourceMatchedBooking[];
 }
 export interface SalesResourceBookingItemWithGroups extends SalesResourceBookingItem {

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

@@ -85,13 +85,13 @@ export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
  * 出站 payload 版本的商品行。
  *
  * 与 tempOrder 内部 `ScanOrderOrderProduct` 的字段差异：
- * - `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 ScanOrderSubmitProduct extends Omit<ScanOrderOrderProduct, '_origin' | 'identity_key'> {
     /**

package/lib/solution/ScanOrder/utils.js

@@ -349,13 +349,13 @@ function attachItemRuleLimitsToTopLevelProducts(productList, limits) {
 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/package.json

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