@pisell/pisellos 2.2.282 → 2.2.284

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

@@ -1,105 +1,123 @@
-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);
+"use strict";
 
-// src/solution/BookingTicket/utils/cartView.ts
-var cartView_exports = {};
-__export(cartView_exports, {
-  buildCartView: () => buildCartView,
-  buildCustomerView: () => buildCustomerView,
-  indexBookingsByProductUid: () => indexBookingsByProductUid,
-  isWalkInCustomer: () => isWalkInCustomer
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(cartView_exports);
-var import_addTimeAvailability = require("./addTimeAvailability");
+exports.buildCartView = buildCartView;
+exports.buildCustomerView = buildCustomerView;
+exports.indexBookingsByProductUid = indexBookingsByProductUid;
+exports.isWalkInCustomer = isWalkInCustomer;
+var _addTimeAvailability = require("./addTimeAvailability");
+/**
+ * 仅按 booking.product_uid 建索引，避免发明 booking 与商品行之间的其它等价关系。
+ */
 function indexBookingsByProductUid(bookings) {
-  if (!Array.isArray(bookings) || bookings.length === 0)
-    return {};
+  if (!Array.isArray(bookings) || bookings.length === 0) return {};
   return bookings.reduce((acc, booking) => {
-    const uid = booking == null ? void 0 : booking.product_uid;
-    if (uid === void 0 || uid === null || uid === "")
-      return acc;
+    const uid = booking?.product_uid;
+    if (uid === undefined || uid === null || uid === '') return acc;
     const key = String(uid);
-    if (!acc[key])
-      acc[key] = [];
+    if (!acc[key]) acc[key] = [];
     acc[key].push(booking);
     return acc;
   }, {});
 }
+
+/**
+ * 商品行按 unique_identification_number 建 1:1 索引（同 uid 多行时保留首行）。
+ */
 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 uid = line.metadata?.unique_identification_number;
+    if (uid === undefined || uid === null || uid === '') return acc;
     const key = String(uid);
-    if (!acc[key])
-      acc[key] = line;
+    if (!acc[key]) acc[key] = line;
     return acc;
   }, {});
 }
+
+/**
+ * 读取 booking 的协议唯一值。
+ *
+ * @example
+ * const uid = getBookingUid(booking);
+ */
 function getBookingUid(booking) {
-  var _a;
-  const uid = (_a = booking == null ? void 0 : booking.metadata) == null ? void 0 : _a.unique_identification_number;
-  return uid === void 0 || uid === null ? "" : String(uid);
+  const uid = booking?.metadata?.unique_identification_number;
+  return uid === undefined || uid === null ? '' : String(uid);
 }
+
+/**
+ * 读取商品行绑定的 booking 唯一值。
+ *
+ * @example
+ * const bookingUid = getProductBookingUid(product);
+ */
 function getProductBookingUid(line) {
-  var _a;
-  const uid = (line == null ? void 0 : line.booking_uid) ?? ((_a = line == null ? void 0 : line.metadata) == null ? void 0 : _a.booking_uid);
-  return uid === void 0 || uid === null ? "" : String(uid);
+  const uid = line?.booking_uid ?? line?.metadata?.booking_uid;
+  return uid === undefined || uid === null ? '' : String(uid);
 }
+
+/**
+ * 判断商品行是否为加时商品行。
+ *
+ * @example
+ * isAddTimeProductLine({ metadata: { product_add_schedule_time: 30 } } as any);
+ */
 function isAddTimeProductLine(line) {
-  var _a, _b;
-  return ((_a = line == null ? void 0 : line.metadata) == null ? void 0 : _a.product_add_schedule_time) !== void 0 && ((_b = line == null ? void 0 : line.metadata) == null ? void 0 : _b.product_add_schedule_time) !== null;
+  return line?.metadata?.product_add_schedule_time !== undefined && line?.metadata?.product_add_schedule_time !== null;
 }
+
+/**
+ * 将加时商品按 booking_uid 建索引。
+ *
+ * @example
+ * const map = indexAddTimeProductsByBookingUid(products);
+ */
 function indexAddTimeProductsByBookingUid(lines) {
   return lines.reduce((acc, line) => {
-    if (!isAddTimeProductLine(line))
-      return acc;
+    if (!isAddTimeProductLine(line)) return acc;
     const bookingUid = getProductBookingUid(line);
-    if (!bookingUid)
-      return acc;
-    if (!acc[bookingUid])
-      acc[bookingUid] = [];
+    if (!bookingUid) return acc;
+    if (!acc[bookingUid]) acc[bookingUid] = [];
     acc[bookingUid].push(line);
     return acc;
   }, {});
 }
+
+/**
+ * 判断商品行是否是促销赠品行。
+ *
+ * @example
+ * isGiftProductLine({ metadata: { _giftInfo: {} } } as any); // true
+ */
 function isGiftProductLine(line) {
-  var _a;
-  return Boolean((_a = line == null ? void 0 : line.metadata) == null ? void 0 : _a._giftInfo);
+  return Boolean(line?.metadata?._giftInfo);
 }
+
+/**
+ * 构建购物车 UI 视图：bookings 平铺附带关联商品；items 仅含未关联 booking 的商品行。
+ *
+ * 商品行直接透传 tempOrder.products，不做 enrichment。
+ * 关联规则（1:1）：booking.product_uid ↔ line.metadata.unique_identification_number；
+ * 同一 uid 已被更早的 booking 占用时，后续 booking 的 product 为 null。
+ */
 function buildCartView(lines, bookings, options = {}) {
   const productLines = Array.isArray(lines) ? lines : [];
   const bookingList = Array.isArray(bookings) ? bookings : [];
-  const childBookings = bookingList.filter((booking) => booking.parent_id !== 0);
+  const childBookings = bookingList.filter(booking => booking.parent_id !== 0);
   const bookingsByProductUid = indexBookingsByProductUid(childBookings);
   const linesByUid = indexProductsByUid(productLines);
   const addTimeLinesByBookingUid = indexAddTimeProductsByBookingUid(productLines);
-  const claimedAddTimeLines = /* @__PURE__ */ new Set();
-  childBookings.forEach((booking) => {
+  const claimedAddTimeLines = new Set();
+  childBookings.forEach(booking => {
     const bookingUid = getBookingUid(booking);
-    if (!bookingUid)
-      return;
-    (addTimeLinesByBookingUid[bookingUid] || []).forEach((line) => {
+    if (!bookingUid) return;
+    (addTimeLinesByBookingUid[bookingUid] || []).forEach(line => {
       claimedAddTimeLines.add(line);
     });
   });
-  const claimedBookings = /* @__PURE__ */ new Set();
+  const claimedBookings = new Set();
   const cartBookings = [];
   const items = [];
   const orderedLines = [];
@@ -111,7 +129,7 @@ function buildCartView(lines, bookings, options = {}) {
       _extend: {
         product,
         addTimeProduct,
-        canAddTime: (0, import_addTimeAvailability.resolveBookingCanAddTime)({
+        canAddTime: (0, _addTimeAvailability.resolveBookingCanAddTime)({
           booking,
           product,
           addTimeProducts: options.addTimeProducts,
@@ -122,14 +140,11 @@ function buildCartView(lines, bookings, options = {}) {
       }
     };
   };
-  productLines.forEach((line) => {
-    var _a;
-    if (isGiftProductLine(line) || claimedAddTimeLines.has(line))
-      return;
-    const uid = (_a = line.metadata) == null ? void 0 : _a.unique_identification_number;
-    const matchedBooking = uid === void 0 || uid === null || uid === "" ? void 0 : (bookingsByProductUid[String(uid)] || []).find(
-      (booking) => !claimedBookings.has(booking)
-    );
+  productLines.forEach(line => {
+    // 赠品由主商品 Gift 行展示；加时商品挂在 booking._extend.addTimeProduct。
+    if (isGiftProductLine(line) || claimedAddTimeLines.has(line)) return;
+    const uid = line.metadata?.unique_identification_number;
+    const matchedBooking = uid === undefined || uid === null || uid === '' ? undefined : (bookingsByProductUid[String(uid)] || []).find(booking => !claimedBookings.has(booking));
     if (matchedBooking) {
       claimedBookings.add(matchedBooking);
       const bookingView = buildBookingView(matchedBooking, line);
@@ -140,33 +155,38 @@ function buildCartView(lines, bookings, options = {}) {
     items.push(line);
     orderedLines.push(line);
   });
-  childBookings.forEach((booking) => {
-    if (claimedBookings.has(booking))
-      return;
-    const uid = booking == null ? void 0 : booking.product_uid;
-    const linkedProduct = uid === void 0 || uid === null || uid === "" ? null : linesByUid[String(uid)] || null;
-    if (isGiftProductLine(linkedProduct))
-      return;
+  childBookings.forEach(booking => {
+    if (claimedBookings.has(booking)) return;
+    const uid = booking?.product_uid;
+    const linkedProduct = uid === undefined || uid === null || uid === '' ? null : linesByUid[String(uid)] || null;
+    // 赠品预约只作为提交数据保留，不在购物车预约卡片区展示。
+    if (isGiftProductLine(linkedProduct)) return;
     cartBookings.push(buildBookingView(booking, null));
   });
-  return { bookings: cartBookings, items, lines: orderedLines };
+  return {
+    bookings: cartBookings,
+    items,
+    lines: orderedLines
+  };
 }
 function isWalkInCustomer(customer) {
-  if (!customer)
-    return true;
+  if (!customer) return true;
   const id = customer.id;
-  if (id === void 0 || id === null)
-    return true;
-  if (typeof id === "string") {
-    return ["", "0", "1"].includes(id);
+  if (id === undefined || id === null) return true;
+  if (typeof id === 'string') {
+    return ['', '0', '1'].includes(id);
   }
   return [0, 1].includes(id);
 }
+
+/**
+ * selected 优先，缺失时回退 tempOrder.customer_*，统一输出 UI 客户视图。
+ */
 function buildCustomerView(selected, tempOrder) {
-  if (selected && selected.id !== void 0 && selected.id !== null && selected.id !== "" && selected.id !== 0) {
+  if (selected && selected.id !== undefined && selected.id !== null && selected.id !== '' && selected.id !== 0) {
     return {
       id: selected.id,
-      name: selected.name ?? "",
+      name: selected.name ?? '',
       phone: selected.phone,
       email: selected.email,
       country_calling_code: selected.country_calling_code,
@@ -175,23 +195,18 @@ function buildCustomerView(selected, tempOrder) {
     };
   }
   if (tempOrder && (tempOrder.customer_id != null || tempOrder.customer_name)) {
-    const id = tempOrder.customer_id ?? "";
+    const id = tempOrder.customer_id ?? '';
     return {
       id,
-      name: tempOrder.customer_name ?? "",
+      name: tempOrder.customer_name ?? '',
       phone: tempOrder.phone,
       email: tempOrder.email,
       country_calling_code: tempOrder.country_calling_code,
-      cover: void 0,
-      isWalkIn: isWalkInCustomer({ id })
+      cover: undefined,
+      isWalkIn: isWalkInCustomer({
+        id
+      })
     };
   }
   return null;
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  buildCartView,
-  buildCustomerView,
-  indexBookingsByProductUid,
-  isWalkInCustomer
-});
+}

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

@@ -0,0 +1,185 @@
+"use strict";
+
+let data = [{
+  "id": 58299,
+  "title": "玄-加时商品-与数量无关-不指定商品",
+  "price": 1,
+  "minMinutes": 30,
+  "maxMinutes": 30,
+  "unitMinutes": 30,
+  "unlimited": false,
+  "_originalProduct": {
+    "id": 58299,
+    "extension_id": 384,
+    "extension_type": "product_add_time",
+    "shop_id": 9,
+    "title": "玄-加时商品-与数量无关-不指定商品",
+    "slug": "玄-加时商品-与数量无关-指定商品",
+    "status": "published",
+    "stock_quantity": -119,
+    "sales_quantity": 113,
+    "sum_stock": -119,
+    "price": "1.00",
+    "original_price": "4.00",
+    "cost_price": "0.00",
+    "cover": "",
+    "channel_application": ["online-store", "pos", "bbc-module:mebook"],
+    "is_track": 0,
+    "over_sold": 0,
+    "is_gst": 1,
+    "code": "",
+    "barcode": "",
+    "is_delivery": 0,
+    "weight_unit": "KILOGRAMS",
+    "weight_value": "0.00",
+    "type": "physical",
+    "unit": "",
+    "sort": 9999999,
+    "subtitle": "",
+    "minimum_markup_price": "0.00",
+    "is_bundle": 0,
+    "description": "",
+    "open_sold_weight": 0,
+    "unit_value": 0,
+    "is_variant": 0,
+    "variant_count": 0,
+    "add_time": {
+      "unit_duration": 30,
+      "min_add_time": 30,
+      "max_add_time": 30,
+      "calculate_type": "not_related_to_quantity",
+      "relation_product": {
+        "type": "product_all",
+        "products": []
+      }
+    },
+    "shelf_product_datas": [],
+    "step_value": 1,
+    "min_num_unit": 1,
+    "is_charge_tax": 1,
+    "base_price": "1.00",
+    "variant": []
+  }
+}, {
+  "id": 58279,
+  "title": "加时商品2",
+  "price": 10,
+  "minMinutes": 30,
+  "maxMinutes": 120,
+  "unitMinutes": 10,
+  "unlimited": false,
+  "_originalProduct": {
+    "id": 58279,
+    "extension_id": 384,
+    "extension_type": "product_add_time",
+    "shop_id": 9,
+    "title": "加时商品2",
+    "slug": "加时商品2",
+    "status": "published",
+    "stock_quantity": -275,
+    "sales_quantity": 261,
+    "sum_stock": -275,
+    "price": "10.00",
+    "original_price": "10.00",
+    "cost_price": "0.00",
+    "cover": "",
+    "channel_application": ["online-store", "pos", "bbc-module:mebook"],
+    "is_track": 0,
+    "over_sold": 0,
+    "is_gst": 1,
+    "code": "",
+    "barcode": "",
+    "is_delivery": 0,
+    "weight_unit": "KILOGRAMS",
+    "weight_value": "0.00",
+    "type": "physical",
+    "unit": "",
+    "sort": 9999999,
+    "subtitle": "",
+    "minimum_markup_price": "0.00",
+    "is_bundle": 0,
+    "description": "",
+    "open_sold_weight": 0,
+    "unit_value": 0,
+    "is_variant": 0,
+    "variant_count": 0,
+    "add_time": {
+      "additional_time_options": "explicit_durations",
+      "unit_duration": 10,
+      "min_add_time": 30,
+      "max_add_time": 120,
+      "calculate_type": "not_related_to_quantity",
+      "relation_product": {
+        "type": "product_all",
+        "products": []
+      }
+    },
+    "shelf_product_datas": [],
+    "step_value": 1,
+    "min_num_unit": 1,
+    "is_charge_tax": 1,
+    "base_price": "10.00",
+    "variant": []
+  }
+}, {
+  "id": 58277,
+  "title": "测试加时商品",
+  "price": 2,
+  "minMinutes": 30,
+  "maxMinutes": 780,
+  "unitMinutes": 30,
+  "unlimited": true,
+  "_originalProduct": {
+    "id": 58277,
+    "extension_id": 384,
+    "extension_type": "product_add_time",
+    "shop_id": 9,
+    "title": "测试加时商品",
+    "slug": "测试加时商品",
+    "status": "published",
+    "stock_quantity": -7,
+    "sales_quantity": 8,
+    "sum_stock": -7,
+    "price": "2.00",
+    "original_price": "0.00",
+    "cost_price": "0.00",
+    "cover": "",
+    "channel_application": ["online-store", "pos", "bbc-module:mebook"],
+    "is_track": 0,
+    "over_sold": 0,
+    "is_gst": 1,
+    "code": "",
+    "barcode": "",
+    "is_delivery": 0,
+    "weight_unit": "KILOGRAMS",
+    "weight_value": "0.00",
+    "type": "physical",
+    "unit": "",
+    "sort": 9999999,
+    "subtitle": "",
+    "minimum_markup_price": "0.00",
+    "is_bundle": 0,
+    "description": "",
+    "open_sold_weight": 0,
+    "unit_value": 0,
+    "is_variant": 0,
+    "variant_count": 0,
+    "add_time": {
+      "additional_time_options": "unlimited",
+      "unit_duration": 30,
+      "min_add_time": 30,
+      "max_add_time": 780,
+      "calculate_type": "select_quantity",
+      "relation_product": {
+        "type": "product_all",
+        "products": []
+      }
+    },
+    "shelf_product_datas": [],
+    "step_value": 1,
+    "min_num_unit": 1,
+    "is_charge_tax": 1,
+    "base_price": "2.00",
+    "variant": []
+  }
+}];

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

@@ -1,58 +1,35 @@
-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);
+"use strict";
 
-// src/solution/BookingTicket/utils/orderCustomer.ts
-var orderCustomer_exports = {};
-__export(orderCustomer_exports, {
-  formatOrderCustomerPatch: () => formatOrderCustomerPatch
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(orderCustomer_exports);
+exports.formatOrderCustomerPatch = formatOrderCustomerPatch;
+/** 从 ICustomer 富字段解析展示名（与 SalesSdk getClientName 语义对齐）。 */
 function resolveCustomerDisplayName(customer) {
   const c = customer;
   const displayName = c.display_name;
-  if (typeof displayName === "string" && displayName)
-    return displayName;
+  if (typeof displayName === 'string' && displayName) return displayName;
   const nickname = c.nickname;
-  if (typeof nickname === "string" && nickname)
-    return 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();
+  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 ?? "";
+  if (typeof customerName === 'string' && customerName) return customerName;
+  return customer.name ?? '';
 }
+
+/** 将 ICustomer 格式化为写入 tempOrder 的协议字段。 */
 function formatOrderCustomerPatch(customer) {
-  var _a;
   const rawId = customer.id;
-  const numericId = typeof rawId === "number" ? rawId : rawId !== void 0 && rawId !== null && rawId !== "" ? Number(rawId) : null;
+  const numericId = typeof rawId === 'number' ? rawId : rawId !== undefined && 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()) ?? ""
+    phone: customer.phone ?? '',
+    email: customer.email ?? '',
+    country_calling_code: customer.country_calling_code?.toString() ?? ''
   };
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  formatOrderCustomerPatch
-});
+}