@pisell/pisellos 0.0.568 → 0.0.570

package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -0,0 +1,286 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildCacheItemFromOrderLine = buildCacheItemFromOrderLine;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _utils = require("../../Order/utils");
+var _manualProductDiscount = require("../../Order/utils/manualProductDiscount");
+var _orderLineDisplay = require("./orderLineDisplay");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function safeFormat(value, fmt) {
+  if (value === undefined || value === null) return undefined;
+  const d = (0, _dayjs.default)(value);
+  if (!d.isValid()) return undefined;
+  return d.format(fmt);
+}
+function normalizeTimeString(value) {
+  if (value === undefined || value === null) return undefined;
+  if (typeof value === 'string') {
+    const t = value.trim();
+    const hhmmFromHhmmss = t.match(/^(\d{1,2}:\d{2}):\d{2}$/);
+    if (hhmmFromHhmmss) return hhmmFromHhmmss[1];
+    if (/^\d{1,2}:\d{2}$/.test(t)) return t;
+  }
+  const d = (0, _dayjs.default)(value);
+  if (d.isValid()) return d.format('HH:mm');
+  return undefined;
+}
+
+/**
+ * bookings[].resources[] → cacheItem._extend.resource（与 cacheItemToBookingInput.flattenResources 互逆）。
+ */
+function unflattenResourceMap(resources) {
+  const map = {};
+  if (!Array.isArray(resources)) return map;
+  resources.forEach(r => {
+    const formId = r?.form_id;
+    if (formId === undefined || formId === null) return;
+    const key = String(formId);
+    if (!map[key]) map[key] = [];
+    map[key].push({
+      form_id: formId,
+      relation_id: r.relation_id,
+      relation_type: r.relation_type || 'form',
+      like_status: r.like_status || 'common',
+      metadata: r.metadata ? {
+        ...r.metadata
+      } : undefined,
+      children: r.children
+    });
+  });
+  return map;
+}
+
+/**
+ * 从 booking.metadata.capacity 还原 `_extend.capacity`（与 info2 ticketBooking getCapacity 对齐）。
+ * 勿用 resources[].relation_id 反推人数维度 id。
+ */
+function resolveCapacityFromBooking(booking) {
+  const metaCap = booking.metadata?.capacity;
+  if (Array.isArray(metaCap) && metaCap.length > 0) {
+    return metaCap.map(item => {
+      if (!item || typeof item !== 'object') return null;
+      if (item.id === undefined || item.id === null) return null;
+      const row = {
+        id: item.id,
+        value: Number(item.value ?? 0)
+      };
+      if (item.name !== undefined) row.name = item.name;
+      return row;
+    }).filter(item => item != null);
+  }
+  if (typeof metaCap === 'number' && Number.isFinite(metaCap)) {
+    return [{
+      id: 0,
+      value: metaCap,
+      name: ''
+    }];
+  }
+  return [];
+}
+function resolveDurationForExtend(booking) {
+  const duration = booking.duration;
+  if (booking.sub_type === 'days' || booking.is_all === 1) {
+    return duration;
+  }
+  if (typeof duration === 'number' && Number.isFinite(duration)) {
+    return duration;
+  }
+  return duration;
+}
+
+/** booking.duration → catalog 顶层 duration 结构（供 isNormalProductByDurationSchedule 识别）。 */
+function resolveTopLevelDuration(booking, sourceProduct) {
+  if (sourceProduct?.duration !== undefined) {
+    return sourceProduct.duration;
+  }
+  const raw = booking.duration;
+  if (raw == null || raw === '') return undefined;
+  if (typeof raw === 'object' && raw.type) {
+    return raw;
+  }
+  const subType = booking.sub_type === 'days' ? 'days' : 'minutes';
+  const value = Number(raw);
+  if (!Number.isFinite(value) || value <= 0) return undefined;
+  return {
+    type: subType,
+    value
+  };
+}
+function resolveProductTitle(product, booking, sourceProduct) {
+  const metadata = product.metadata || {};
+  return sourceProduct?.title ?? sourceProduct?.name ?? metadata.product_title ?? metadata.product_name ?? booking?.product?.title ?? booking?.detail?.product_title ?? '';
+}
+function resolveProductCover(product, booking, sourceProduct) {
+  return sourceProduct?.cover ?? product.product_cover ?? '';
+}
+function resolveMainProductPrice(product, fallback) {
+  const metadata = product.metadata || {};
+  const value = metadata.main_product_original_price ?? metadata.source_product_price;
+  const parsed = Number(value);
+  return Number.isFinite(parsed) ? parsed : fallback;
+}
+function mapOrderBundleToOtherBundle(bundle) {
+  return bundle.map(item => {
+    return {
+      ...item,
+      original_price: item.original_price ?? item.bundle_selling_price ?? item.price
+    };
+  });
+}
+
+/**
+ * catalog 缺 product_resource 时，从 booking.resources 反推最小 product_resource 结构，
+ * 供 getResourceByIds / formatResources 渲染资源编辑 UI。
+ *
+ * @example
+ * synthesizeProductResourceFromBooking({ resources: [{ form_id: 35, relation_id: 41077 }] });
+ */
+function synthesizeProductResourceFromBooking(booking) {
+  const rows = booking?.resources;
+  if (!Array.isArray(rows) || rows.length === 0) return undefined;
+  const relationIdsByForm = new Map();
+  rows.forEach(row => {
+    const formId = row?.form_id;
+    const relationId = Number(row?.relation_id);
+    if (formId == null || formId === '' || !Number.isFinite(relationId) || relationId <= 0) {
+      return;
+    }
+    const list = relationIdsByForm.get(formId) ?? [];
+    if (!list.includes(relationId)) {
+      list.push(relationId);
+    }
+    relationIdsByForm.set(formId, list);
+  });
+  if (relationIdsByForm.size === 0) return undefined;
+  return {
+    resources: Array.from(relationIdsByForm.entries()).map(([formId, relationIds]) => ({
+      id: formId,
+      status: 1,
+      type: 'form',
+      code: '',
+      optional_resource: relationIds,
+      default_resource: []
+    }))
+  };
+}
+
+/**
+ * 从已加车的 order line + booking 反查 editService 所需的 cacheItem。
+ *
+ * 与 `buildCacheItemFromCartDetail` / `buildCacheItemFromDetail` 正向拼装互逆（在 getProductExtend 之前调用）。
+ * 调用方须传入与该行关联的 booking（通常 bookings[].product_uid === product.metadata.unique_identification_number）。
+ */
+function buildCacheItemFromOrderLine(input) {
+  const {
+    product,
+    booking,
+    sourceProduct
+  } = input;
+  const resolvedId = product.product_id ?? sourceProduct?.id;
+  const selling = Number(product.selling_price ?? 0);
+  const original = Number(product.original_price ?? selling);
+  const mainProductPrice = resolveMainProductPrice(product, selling);
+  const startDate = safeFormat(booking.start_date, 'YYYY-MM-DD');
+  const endDate = safeFormat(booking.end_date, 'YYYY-MM-DD');
+  const startTime = normalizeTimeString(booking.start_time);
+  const endTime = normalizeTimeString(booking.end_time);
+  const resource = unflattenResourceMap(booking.resources);
+  const capacity = resolveCapacityFromBooking(booking);
+  const holderId = booking.metadata?.holder_id ?? booking.holder_id;
+  const productTitle = resolveProductTitle(product, booking, sourceProduct);
+  const productCover = resolveProductCover(product, booking, sourceProduct);
+  const productOptionString = (0, _orderLineDisplay.buildProductOptionStringFromOrderLine)(product);
+  const other = {
+    product_variant_id: product.product_variant_id ?? 0,
+    option: (0, _utils.getProductSkuOptions)(product),
+    bundle: mapOrderBundleToOtherBundle(Array.isArray(product.product_bundle) ? product.product_bundle : [])
+  };
+  const extend = {
+    start_date: startDate ? (0, _dayjs.default)(startDate) : undefined,
+    end_date: endDate ? (0, _dayjs.default)(endDate) : undefined,
+    startDate: startDate ? (0, _dayjs.default)(startDate) : undefined,
+    endDate: endDate ? (0, _dayjs.default)(endDate) : undefined,
+    start_time: startTime,
+    end_time: endTime,
+    duration: resolveDurationForExtend(booking),
+    sub_type: booking.sub_type,
+    quantity: product.num ?? 1,
+    product_name: productTitle,
+    product_cover: productCover,
+    note: product.note ?? booking?.detail?.note ?? '',
+    price: mainProductPrice,
+    total: selling,
+    origin_total: original,
+    resource,
+    capacity,
+    holder_id: holderId,
+    other,
+    like_status: booking.like_status || 'common',
+    discount_reason: (0, _manualProductDiscount.resolveManualDiscountMessage)(product.discount_list, product.metadata?.product_discount_reason) || undefined,
+    ...(productOptionString ? {
+      product_option_string: productOptionString
+    } : {})
+  };
+  const manualDiscount = (product.discount_list || []).find(d => d?.type === 'product');
+  if (manualDiscount && extend.origin_total === selling) {
+    const manualAmount = Number(manualDiscount.amount ?? 0);
+    if (Number.isFinite(manualAmount) && manualAmount > 0) {
+      extend.origin_total = selling + manualAmount;
+    }
+  }
+  if (product.metadata?.price_override != null || manualDiscount) {
+    extend.priceOverride = selling;
+  }
+  if (booking.holder !== undefined) {
+    extend.holder = booking.holder;
+  }
+  if (Array.isArray(booking.relation_forms)) {
+    extend.relation_forms = booking.relation_forms;
+  }
+  const base = {
+    ...(sourceProduct || {}),
+    id: resolvedId,
+    product_id: resolvedId,
+    extension_type: sourceProduct?.extension_type ?? booking?.product?.extension_type ?? sourceProduct?.extension_type,
+    title: productTitle || sourceProduct?.title || booking?.product?.title,
+    price: sourceProduct?.price ?? selling,
+    selling_price: product.selling_price,
+    original_price: product.original_price,
+    ...(productOptionString ? {
+      product_option_string: productOptionString
+    } : {}),
+    _extend: extend,
+    new: 0,
+    autoClose: false,
+    order_detail_id: product.order_detail_id ?? null,
+    booking_id: booking.id ?? booking.booking_id ?? 0
+  };
+  if (sourceProduct?.capacity !== undefined) {
+    base.capacity = sourceProduct.capacity;
+  }
+  const topLevelDuration = resolveTopLevelDuration(booking, sourceProduct);
+  if (topLevelDuration !== undefined) {
+    base.duration = topLevelDuration;
+  }
+  if (sourceProduct?.product_resource !== undefined) {
+    base.product_resource = sourceProduct.product_resource;
+  } else {
+    const synthesized = synthesizeProductResourceFromBooking(booking);
+    if (synthesized) {
+      base.product_resource = synthesized;
+    }
+  }
+  if (Array.isArray(sourceProduct?.schedules) && sourceProduct.schedules.length) {
+    base.schedules = sourceProduct.schedules;
+  }
+  if (Array.isArray(sourceProduct?.['schedule.ids']) && sourceProduct['schedule.ids'].length) {
+    base['schedule.ids'] = sourceProduct['schedule.ids'];
+  }
+  if (booking.schedule_event_id !== undefined) {
+    base.schedule_event_id = booking.schedule_event_id;
+  }
+  return base;
+}

package/lib/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.d.ts

@@ -0,0 +1,8 @@
+import type { OrderProduct } from '../../Order/types';
+export interface BuildNormalProductCacheItemFromOrderLineInput {
+    /** tempOrder.products 中的一行（普通商品，无关联 booking） */
+    product: OrderProduct;
+    /** 商品 catalog / 详情，用于 variant / option / bundle 模板字段 */
+    sourceProduct?: Record<string, any> | null;
+}
+export declare function buildNormalProductCacheItemFromOrderLine(input: BuildNormalProductCacheItemFromOrderLineInput): Record<string, any>;

package/lib/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js

@@ -0,0 +1,148 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildNormalProductCacheItemFromOrderLine = buildNormalProductCacheItemFromOrderLine;
+var _utils = require("../../Order/utils");
+var _orderLineDisplay = require("./orderLineDisplay");
+/**
+ * 从已加车的普通商品 order line 反查 SkuDetailModal edit 所需的 cacheItem。
+ *
+ * 与 `buildCacheItemFromOrderLine`（预约行 + booking）并列；不含 resource / duration / holder 等预约字段。
+ */
+/**
+ * 解析 v2 主商品 source 价（不含 option、不含 bundle），供 SkuDetailModal / transform 使用。
+ */
+function resolveSourceProductPrice(product, sourceProduct) {
+  const metadata = product.metadata || {};
+  if (metadata.source_product_price !== undefined && metadata.source_product_price !== null) {
+    const parsed = Number(metadata.source_product_price);
+    if (Number.isFinite(parsed)) return parsed;
+  }
+  const variantId = Number(product.product_variant_id || 0);
+  if (variantId > 0) {
+    const variantList = metadata.origin?.variant ?? sourceProduct?.variant;
+    if (Array.isArray(variantList)) {
+      const matched = variantList.find(v => Number(v?.id) === variantId);
+      const variantPrice = matched?.price ?? matched?.base_price;
+      if (variantPrice !== undefined && variantPrice !== null) {
+        const parsed = Number(variantPrice);
+        if (Number.isFinite(parsed)) return parsed;
+      }
+    }
+  }
+  const catalogPrice = sourceProduct?.price ?? sourceProduct?.base_price;
+  if (catalogPrice !== undefined && catalogPrice !== null) {
+    const parsed = Number(catalogPrice);
+    if (Number.isFinite(parsed)) return parsed;
+  }
+  const originPrice = metadata.origin?.price ?? metadata.origin?.base_price;
+  if (originPrice !== undefined && originPrice !== null) {
+    const parsed = Number(originPrice);
+    if (Number.isFinite(parsed)) return parsed;
+  }
+  return Number(product.selling_price ?? 0);
+}
+
+/** 订单行 bundle → booking other.bundle（保留 original_price 供 setProductPrice 按比例分摊） */
+function mapOrderBundleToOtherBundle(bundle) {
+  return bundle.map(item => {
+    const catalogOriginal = item.original_price ?? item.product_price ?? item.price ?? item.bundle_selling_price;
+    const selling = item.bundle_selling_price ?? item.price ?? catalogOriginal;
+    const {
+      bundle_selling_price: _omitBundleSelling,
+      ...rest
+    } = item;
+    const isMarkupOrMarkdown = (item.price_type === 'markdown' || item.price_type === 'markup') && (item.price_type_ext === '' || item.price_type_ext === undefined || item.price_type_ext === null);
+    if (isMarkupOrMarkdown) delete rest.original_total;
+    return {
+      ...rest,
+      price: selling,
+      original_price: catalogOriginal,
+      ...(isMarkupOrMarkdown ? {} : {
+        original_total: item.original_total ?? catalogOriginal
+      }),
+      num: item.num ?? item.quantity ?? 1,
+      quantity: item.quantity ?? item.num ?? 1
+    };
+  });
+}
+function buildNormalProductCacheItemFromOrderLine(input) {
+  const {
+    product,
+    sourceProduct
+  } = input;
+  const resolvedId = product.product_id ?? sourceProduct?.id;
+  const sourcePrice = resolveSourceProductPrice(product, sourceProduct);
+  const selling = Number(product.selling_price ?? 0);
+  const original = Number(product.original_price ?? selling);
+  const uid = product.metadata?.unique_identification_number;
+  const option = (0, _utils.getProductSkuOptions)(product);
+  const bundle = mapOrderBundleToOtherBundle(Array.isArray(product.product_bundle) ? product.product_bundle : []);
+  const originExtend = product.metadata?.origin?._extend;
+  const productOptionString = (0, _orderLineDisplay.buildProductOptionStringFromOrderLine)(product);
+  const discountList = product.discount_list || [];
+  const other = {
+    product_id: resolvedId,
+    product_variant_id: product.product_variant_id ?? 0,
+    option,
+    bundle: originExtend?.other?.bundle ? JSON.parse(JSON.stringify(originExtend.other.bundle)) : bundle,
+    quantity: product.num ?? 1
+  };
+  const skuValue = {
+    product_id: resolvedId,
+    product_variant_id: product.product_variant_id ?? 0,
+    option: other.option,
+    bundle: other.bundle
+  };
+  const extend = {
+    quantity: product.num ?? 1,
+    product_name: sourceProduct?.title ?? '',
+    note: product.note ?? '',
+    // v2：_extend.price 为主商品 source 价；行 composite 用 total / origin_total 展示
+    price: originExtend?.price ?? sourcePrice,
+    total: originExtend?.total ?? selling,
+    origin_total: originExtend?.origin_total ?? original,
+    other,
+    skuValue: JSON.parse(JSON.stringify(skuValue)),
+    _skuValue: JSON.parse(JSON.stringify(skuValue)),
+    isNormalProduct: true,
+    metadata: {
+      product_add_schedule_time: product.metadata?.product_add_schedule_time
+    },
+    ...(productOptionString ? {
+      product_option_string: productOptionString
+    } : {}),
+    ...(originExtend?.priceOverride !== undefined ? {
+      priceOverride: originExtend.priceOverride
+    } : {}),
+    ...(originExtend?.bundle_edit !== undefined ? {
+      bundle_edit: originExtend.bundle_edit
+    } : {})
+  };
+  if (originExtend?.skuValue || originExtend?._skuValue) {
+    extend.skuValue = JSON.parse(JSON.stringify(originExtend.skuValue || originExtend._skuValue));
+    extend._skuValue = JSON.parse(JSON.stringify(extend.skuValue));
+  }
+  return {
+    ...(sourceProduct || {}),
+    id: resolvedId,
+    product_id: resolvedId,
+    _id: uid,
+    title: sourceProduct?.title ?? product.product_title ?? '',
+    cover: sourceProduct?.cover ?? product.product_cover ?? '',
+    price: sourceProduct?.price ?? sourcePrice,
+    selling_price: product.selling_price,
+    original_price: product.original_price,
+    ...(productOptionString ? {
+      product_option_string: productOptionString
+    } : {}),
+    note: product.note,
+    order_detail_id: product.order_detail_id ?? null,
+    discount_list: discountList,
+    new: 0,
+    autoClose: true,
+    _extend: extend
+  };
+}

package/lib/modules/BookingContext/utils/cacheItemToBookingInput.d.ts

@@ -0,0 +1,76 @@
+/**
+ * 把 info2 `cacheItem` 转换为 OS `addProductToOrder(product, booking)` 所需的 booking 入参。
+ *
+ * 协议严格对齐 `pisell_os/src/modules/Order/TEMP_ORDER_FIELDS_SUMMARY.md` 的 Bookings 章节：
+ *   - 顶层只允许出现：schedule_event_id / appointment_status / start_date / start_time / end_date /
+ *     end_time / select_date / duration / sub_type / like_status / number / resources / relation_forms /
+ *     holder / metadata / is_all / schedule_id / relation_id / form_id / relation_type / product_uid
+ *   - bookings[] 不允许出现 `_extend`
+ *   - bookings[].metadata 走白名单：unique_identification_number / collect_pax / capacity / holder_id / resource_select_type
+ *   - bookings[].resources[] 只接受协议白名单：form_id / relation_type / relation_id / capacity / like_status / metadata / children
+ *
+ * `product_uid` / `metadata.unique_identification_number` 不在这里生成：
+ *   OS `addProductToOrder` 内的 `createLinkedProductAndBooking` 会在最终一步统一改写，
+ *   保证商品行 uid 与 booking root 唯一值始终对齐。
+ *
+ * 复杂 multi-day 展开（createBookingItemsByGroup / concatBookings）首版**不支持**，
+ * 由 UI 在 `cart.confirmDetail` 之外通过辅助 API 处理。
+ */
+export interface CacheItemToBookingInputOptions {
+    /** booking config，用于推导 metadata.resource_select_type（默认从 cacheItem.\_data.resources[0].select_type.type 推断）。 */
+    bookingConfig?: any;
+}
+export interface BookingInput {
+    schedule_event_id?: number | string;
+    start_date?: string;
+    start_time?: string;
+    end_date?: string;
+    end_time?: string;
+    select_date?: string;
+    duration?: number;
+    sub_type?: 'days' | 'minutes' | string;
+    is_all?: 0 | 1;
+    number?: number;
+    holder?: any;
+    like_status?: string;
+    relation_forms?: any[];
+    resources?: BookingResourceInput[];
+    metadata?: BookingMetadataInput;
+    schedule_id?: number | string;
+    relation_id?: number | string;
+    form_id?: number | string;
+    relation_type?: string;
+}
+export interface BookingResourceInput {
+    form_id?: number | string;
+    relation_type?: string;
+    relation_id?: number | string;
+    capacity?: number;
+    like_status?: string;
+    metadata?: Record<string, any>;
+    children?: BookingResourceInput[];
+}
+/** custom / package 人数维度快照，与 info2 `_extend.capacity` / `metadata.capacity` 对齐。 */
+export interface BookingCapacityMetadataItem {
+    id: string | number;
+    value: number;
+    name?: Record<string, any> | string;
+}
+export interface BookingMetadataInput {
+    /** 由 OS createLinkedProductAndBooking 统一改写，这里不生成。 */
+    unique_identification_number?: string;
+    collect_pax?: number;
+    /**
+     * 资源容量快照：custom 多维度时为 `{ id, value, name? }[]`；
+     * 仅总和场景可为 number（capacity_snapshot 兼容）。
+     */
+    capacity?: number | BookingCapacityMetadataItem[];
+    /** 协议要求始终提交（即使为 null）。 */
+    holder_id: any;
+    holder?: any;
+    resource_select_type?: 'single' | 'multiple' | string;
+}
+/**
+ * 主入口。
+ */
+export declare function cacheItemToBookingInput(cacheItem: any, options?: CacheItemToBookingInputOptions): BookingInput;