@pisell/pisellos 0.0.568 → 0.0.570

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

@@ -0,0 +1,215 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.transformBaseProductToOrderProduct = transformBaseProductToOrderProduct;
+var _utils = require("../../../modules/Order/utils");
+var _manualProductDiscount = require("../../../modules/Order/utils/manualProductDiscount");
+function toNumber(value, fallback = 0) {
+  const parsedValue = Number(value);
+  if (!Number.isFinite(parsedValue)) return fallback;
+  return parsedValue;
+}
+function toProductId(value) {
+  if (value === null || value === undefined || value === '') return null;
+  const parsedValue = Number(value);
+  if (!Number.isFinite(parsedValue)) return null;
+  return parsedValue;
+}
+function toSafePositiveInt(value, fallback = 1) {
+  const parsedValue = Math.floor(Number(value));
+  if (!Number.isFinite(parsedValue) || parsedValue < 1) return fallback;
+  return parsedValue;
+}
+function toPriceString(value, fallback = '0.00') {
+  const parsedValue = Number(value);
+  if (!Number.isFinite(parsedValue)) return fallback;
+  return parsedValue.toFixed(2);
+}
+function isBlankValue(value) {
+  return value === undefined || value === null || typeof value === 'string' && value.trim() === '';
+}
+function firstNonBlank(...values) {
+  return values.find(value => !isBlankValue(value));
+}
+function normalizeOptionItems(optionItems) {
+  if (!Array.isArray(optionItems)) return [];
+  return optionItems.map(optionItem => {
+    const optionGroupItemId = toNumber(optionItem?.option_group_item_id ?? optionItem?.id);
+    const price = optionItem?.price ?? optionItem?.add_price ?? 0;
+    return {
+      ...optionItem,
+      option_group_item_id: optionGroupItemId,
+      option_group_id: toNumber(optionItem?.option_group_id),
+      num: toSafePositiveInt(optionItem?.num ?? optionItem?.quantity, 1),
+      add_price: toNumber(price, 0),
+      price: undefined
+    };
+  });
+}
+function normalizeBundleItems(bundleItems, preferPriceField = false) {
+  if (!Array.isArray(bundleItems)) return [];
+  return bundleItems.map(bundleItem => {
+    const unitSelling = preferPriceField ? bundleItem.price ?? bundleItem.bundle_selling_price ?? bundleItem.custom_price ?? bundleItem.product_price ?? '0' : bundleItem.bundle_selling_price ?? bundleItem.price ?? bundleItem.custom_price ?? bundleItem.product_price ?? '0';
+    const unitStr = toPriceString(unitSelling, '0.00');
+    const num = toSafePositiveInt(bundleItem?.num ?? bundleItem?.quantity, 1);
+    const magnitudeSource = {
+      ...bundleItem,
+      option: normalizeOptionItems(bundleItem?.option),
+      bundle_selling_price: unitStr,
+      // 计算 markdown 净额时，只传真实毛价；仅有 bundle_selling_price 时按历史净额兜底。
+      price: bundleItem.price ?? bundleItem.custom_price
+    };
+    const normalizedItem = {
+      ...bundleItem,
+      num,
+      quantity: bundleItem?.quantity ?? num,
+      // price 保留毛价（markdown 仍为正），由 price_type 决定符号。
+      price: bundleItem.price ?? unitStr,
+      bundle_selling_price: unitStr,
+      original_price: bundleItem.original_price ?? bundleItem.product_price ?? bundleItem.price ?? unitStr,
+      option: normalizeOptionItems(bundleItem?.option),
+      discount_list: preferPriceField ? [] : bundleItem.discount_list
+    };
+    // bundle_selling_price 落「正净额」：markdown = |price| − Σoptions；markup/原价维持原值。
+    normalizedItem.bundle_selling_price = (0, _utils.getBundleSellingMagnitude)(magnitudeSource).toFixed(2);
+    if ((normalizedItem.price_type ?? normalizedItem.custom_price_type) === 'markdown' && (normalizedItem.price_type_ext === '' || normalizedItem.price_type_ext === undefined || normalizedItem.price_type_ext === null)) {
+      normalizedItem.custom_price = normalizedItem.custom_price ?? normalizedItem.price;
+      normalizedItem.price = normalizedItem.bundle_selling_price;
+    }
+    return normalizedItem;
+  });
+}
+function findVariantById(origin, variantId) {
+  if (!origin || !variantId || variantId <= 0) return null;
+  const variants = Array.isArray(origin?.variant) ? origin.variant : [];
+  return variants.find(variant => Number(variant?.id) === variantId) || null;
+}
+
+/**
+ * 将商品列表原始数据 + 商品详情选择回调转换成 OrderModule.addProductToOrder 入参。
+ *
+ * 注意：这里不生成 identity，缺省时由 OrderModule 自动补齐。
+ */
+function transformBaseProductToOrderProduct(params) {
+  const {
+    payload,
+    fallbackProductId = null
+  } = params;
+  if (!payload || typeof payload !== 'object') return null;
+  const sourceProduct = params.sourceProduct || params.sourceItem || {};
+  const productId = toProductId(payload.product_id ?? payload.id ?? sourceProduct?.product_id ?? sourceProduct?.id ?? fallbackProductId);
+  if (productId === null) return null;
+  const productVariantId = toNumber(payload.product_variant_id ?? payload.variant_id ?? sourceProduct?.product_variant_id ?? sourceProduct?.variant_id, 0);
+  const callbackOrigin = payload.origin || payload._origin?.sourceProduct || payload._origin?.sourceItem || payload._origin || {};
+  const origin = {
+    ...(sourceProduct || {}),
+    ...(callbackOrigin || {})
+  };
+  const matchedVariant = findVariantById(callbackOrigin, productVariantId) ?? findVariantById(sourceProduct, productVariantId) ?? findVariantById(origin, productVariantId);
+  const sourceProductPrice = toPriceString(payload.price ?? payload.selling_price ?? matchedVariant?.price ?? matchedVariant?.base_price ?? origin?.price ?? origin?.base_price ?? sourceProduct?.price ?? sourceProduct?.selling_price ?? sourceProduct?.base_price, '0.00');
+  const explicitLineTotal = payload.line_total ?? payload.total ?? payload._extend?.total;
+  const hasExplicitLineTotal = Number.isFinite(Number(explicitLineTotal));
+  const lineCompositeTotal = toPriceString(explicitLineTotal, sourceProductPrice);
+  const hasPriceOverride = payload.price_override !== undefined && payload.price_override !== null && payload.price_override !== '';
+  const productOptionItem = (0, _utils.normalizeProductSkuOptions)(normalizeOptionItems(payload.product_sku?.option ?? payload.option ?? payload.options ?? payload.product_option_item));
+  const productBundle = normalizeBundleItems(payload.bundle ?? payload.product_bundle, hasPriceOverride);
+  // `payload.unique` 是业务侧商品/票务标识，可能在连续加同一商品时重复；
+  // 行级唯一值只接受显式协议字段，缺省交给 OrderModule 生成。
+  const uniqueIdentificationNumber = payload.unique_identification_number;
+  const resolvedQuantity = toSafePositiveInt(payload.quantity ?? payload.num, 1);
+  const originTotal = (0, _manualProductDiscount.resolveManualDiscountOriginTotal)({
+    originTotal: payload.origin_total,
+    extendOriginTotal: payload._extend?.origin_total,
+    originExtendOriginTotal: origin?._extend?.origin_total,
+    sourceExtendOriginTotal: sourceProduct?._extend?.origin_total,
+    catalogUnitPrice: origin?.base_price ?? origin?.price ?? sourceProduct?.base_price ?? sourceProduct?.price,
+    quantity: resolvedQuantity
+  });
+  const sellingTotal = Number(payload.line_total ?? payload.total ?? payload._extend?.total ?? lineCompositeTotal);
+  const discountReason = (0, _manualProductDiscount.resolveManualDiscountReasonFromSources)({
+    discountReason: payload.discount_reason,
+    extendDiscountReason: payload._extend?.discount_reason,
+    originExtendDiscountReason: origin?._extend?.discount_reason
+  });
+  const lineOriginalPrice = hasPriceOverride && Number.isFinite(originTotal) ? toPriceString(originTotal) : lineCompositeTotal;
+  const manualDiscountList = (0, _manualProductDiscount.shouldBuildManualProductDiscount)({
+    hasPriceOverride,
+    originTotal,
+    sellingTotal
+  }) ? (0, _manualProductDiscount.mergeManualProductDiscountIntoList)(payload.discount_list, (0, _manualProductDiscount.buildManualProductDiscountItem)({
+    originTotal: Number.isFinite(originTotal) ? originTotal : Number(lineOriginalPrice),
+    sellingTotal: Number.isFinite(sellingTotal) ? sellingTotal : Number(lineCompositeTotal),
+    quantity: resolvedQuantity,
+    message: discountReason,
+    discountway: payload._extend?.discountway,
+    discount_per: payload._extend?.discount_per
+  })) : payload.discount_list || [];
+
+  // v2：source 不含 option；main_product_* 含 option（与 normalizeOrderProduct 一致）
+  const optionSum = (0, _utils.sumOptionUnitPrice)(productOptionItem).toNumber();
+  const mainProductOriginalPrice = toPriceString(Number(sourceProductPrice) + optionSum);
+  const bundleOnlyComposite = (0, _utils.composeLinePrice)({
+    mainPrice: 0,
+    bundle: productBundle
+  });
+  const derivedMainSelling = hasExplicitLineTotal ? Number(lineCompositeTotal) - Number(bundleOnlyComposite) : Number(mainProductOriginalPrice);
+  const mainProductSellingPrice = toPriceString(Number.isFinite(derivedMainSelling) && derivedMainSelling >= 0 ? derivedMainSelling : Number(mainProductOriginalPrice));
+  const metadata = {
+    unique: payload.unique,
+    session: payload.session,
+    form: payload.form,
+    service_times: payload.service_times,
+    machine_code: payload.machine_code,
+    schedule_id: payload.schedule_id,
+    duration: payload.duration,
+    policy_id: payload.policy_id,
+    source_shop_id: payload.source_shop_id,
+    source_product_price: sourceProductPrice,
+    main_product_selling_price: mainProductSellingPrice,
+    main_product_original_price: mainProductOriginalPrice,
+    price_schema_version: 2,
+    holder_config: sourceProduct?.holder_config,
+    ...(hasPriceOverride ? {
+      price_override: String(payload.price_override),
+      is_manual_discount: 1
+    } : {}),
+    ...(payload.bundle_edit !== undefined ? {
+      bundle_edit: payload.bundle_edit
+    } : {})
+  };
+  if (uniqueIdentificationNumber) {
+    metadata.unique_identification_number = String(uniqueIdentificationNumber);
+  }
+  // 从源头补充商品多语言标题
+  const productTitle = {
+    ...(sourceProduct?.title_i18n || {}),
+    original: sourceProduct?.title || ''
+  };
+  return {
+    product_id: productId,
+    product_variant_id: productVariantId,
+    unique_identification_number: uniqueIdentificationNumber ? String(uniqueIdentificationNumber) : undefined,
+    num: resolvedQuantity,
+    product_sku: {
+      ...(payload.product_sku && typeof payload.product_sku === 'object' ? payload.product_sku : {}),
+      option: productOptionItem
+    },
+    product_bundle: productBundle,
+    discount_list: manualDiscountList,
+    // 折后行价由 normalizeOrderProduct 按 main + bundle 合成；手动改价时 bundle 已为分摊后单价
+    selling_price: lineCompositeTotal,
+    original_price: lineOriginalPrice,
+    tax_fee: toPriceString(payload.tax_fee ?? matchedVariant?.tax_fee ?? origin?.tax_fee ?? sourceProduct?.tax_fee, '0.00'),
+    is_charge_tax: toNumber(payload.is_charge_tax ?? matchedVariant?.is_charge_tax ?? origin?.is_charge_tax ?? sourceProduct?.is_charge_tax, 0),
+    metadata,
+    note: payload.note != null ? String(payload.note) : '',
+    product_title: productTitle,
+    product_cover: firstNonBlank(matchedVariant?.cover, sourceProduct?.cover),
+    _origin: {
+      ...(sourceProduct || {}),
+      callbackData: payload
+    }
+  };
+}

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

@@ -0,0 +1,40 @@
+import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesSummary } from './types';
+/**
+ * 构建金额全为 0 的空 summary。
+ * 作为尚未计算金额时的兜底默认值，避免下游因 undefined 报错。
+ */
+export declare function createEmptySummary(): BaseSalesSummary;
+/**
+ * 将选项行 / 套餐行归一成稳定 JSON，用于「同 SKU 是否合并」判断。
+ * 数组元素先按主键排序再序列化，避免顺序差异导致误判为不同行。
+ */
+export declare function buildProductLineFingerprint(productOptionItem?: unknown, productBundle?: unknown): string;
+export declare function getSafeProductNum(num?: number): number;
+/**
+ * removeProductFromOrder 仅传 SKU 时的通配 identity（对象上未声明选项键）。
+ * 与显式 `product_sku: { option: [] }` 区分：后者只匹配「无选项」行。
+ */
+export declare function isSkuOnlyDeleteIdentity(x: BaseSalesOrderProductIdentity): boolean;
+/**
+ * 对外部传入的商品对象做归一化（v2 composite 语义）：
+ * - 补全可选字段默认值（未传则使用兜底值，避免后续计算时因 undefined 导致异常）
+ * - 对 num 调用 getSafeProductNum 做安全处理
+ * - 保留 _origin 供后续业务流程（如促销规则）使用
+ *
+ * 价格字段语义（metadata 权威源 + composite 派生）：
+ * - `metadata.source_product_price`：主商品/variant 基础价（已应用报价单），**不含 option**、
+ *   **不含折扣**。是推导 main_product_* 的起点。variant 分支优先读 `metadata.origin.variant[vid].price`。
+ * - `metadata.main_product_original_price`：`source + Σ(option.price × option.num)`，**含 option**、
+ *   **不含折扣**。
+ * - `metadata.main_product_selling_price`：`main_product_original_price - 主商品券 per-unit amount`，
+ *   **含 option**、**含折扣**。
+ * - 行级 `selling_price` = `main_product_selling_price + Σ(bundle_selling_price × num)`。
+ * - 行级 `original_price` = `main_product_original_price + Σ(bundle 原价 × num)`。
+ *
+ * 迁移与幂等：
+ * - `metadata.price_schema_version === 2` → 已新语义归一化，保留 main_product_* 原值（保留折扣）。
+ * - 其它情况（v1 / 缺字段 / 无 metadata）→ 按"main_product_selling_price 曾是 main-only"的旧约定
+ *   反推 legacyDiscount，再以新 source + options 基准重算。最终统一打上 `price_schema_version: 2`。
+ * - 因此多次 normalize 不会重复叠加 option/bundle。
+ */
+export declare function normalizeOrderProduct(product: Partial<BaseSalesOrderProduct> & BaseSalesOrderProductIdentity): BaseSalesOrderProduct;

package/lib/solution/BaseSales/utils.js

@@ -0,0 +1,259 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildProductLineFingerprint = buildProductLineFingerprint;
+exports.createEmptySummary = createEmptySummary;
+exports.getSafeProductNum = getSafeProductNum;
+exports.isSkuOnlyDeleteIdentity = isSkuOnlyDeleteIdentity;
+exports.normalizeOrderProduct = normalizeOrderProduct;
+var _decimal = _interopRequireDefault(require("decimal.js"));
+var _utils = require("../../modules/Order/utils");
+var _manualProductDiscount = require("../../modules/Order/utils/manualProductDiscount");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * 构建金额全为 0 的空 summary。
+ * 作为尚未计算金额时的兜底默认值，避免下游因 undefined 报错。
+ */
+function createEmptySummary() {
+  return {
+    product_quantity: 0,
+    product_original_amount: '0.00',
+    product_amount: '0.00',
+    product_expect_amount: '0.00',
+    product_tax_fee: '0.00',
+    shipping_fee: '0.00',
+    shipping_tax_fee: '0.00',
+    tax_fee: '0.00',
+    surcharge_fee: '0.00',
+    discount_amount: '0.00',
+    deposit_amount: '0.00',
+    expect_amount: '0.00',
+    total_amount: '0.00',
+    amount_gap: '0.00',
+    rounding_amount: '0.00',
+    pay_service_charge_amount: '0.00'
+  };
+}
+/**
+ * 将选项行 / 套餐行归一成稳定 JSON，用于「同 SKU 是否合并」判断。
+ * 数组元素先按主键排序再序列化，避免顺序差异导致误判为不同行。
+ */
+function buildProductLineFingerprint(productOptionItem, productBundle) {
+  const optArr = Array.isArray(productOptionItem) ? productOptionItem : [];
+  const normalizedOpts = optArr.map(item => ({
+    option_group_item_id: Number(item?.option_group_item_id) || 0,
+    option_group_id: Number(item?.option_group_id) || 0,
+    num: typeof item?.num === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+    price: String(item?.add_price ?? item?.price ?? '')
+  })).sort((p, q) => {
+    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;
+    return p.price.localeCompare(q.price);
+  });
+  const bundleArr = Array.isArray(productBundle) ? productBundle : [];
+  const normalizedBundles = bundleArr.map(item => ({
+    bundle_id: Number(item?.bundle_id ?? item?.id ?? 0) || 0,
+    product_id: Number(item?.product_id) || 0,
+    num: typeof item?.num === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1
+  })).sort((p, q) => {
+    if (p.bundle_id !== q.bundle_id) return p.bundle_id - q.bundle_id;
+    if (p.product_id !== q.product_id) return p.product_id - q.product_id;
+    return p.num - q.num;
+  });
+  return JSON.stringify([normalizedOpts, normalizedBundles]);
+}
+function getSafeProductNum(num) {
+  if (!num || Number.isNaN(num)) return 1;
+  if (num < 1) return 1;
+  return Math.floor(num);
+}
+
+/**
+ * removeProductFromOrder 仅传 SKU 时的通配 identity（对象上未声明选项键）。
+ * 与显式 `product_sku: { option: [] }` 区分：后者只匹配「无选项」行。
+ */
+function isSkuOnlyDeleteIdentity(x) {
+  if (x.identity_key) return false;
+  return !('product_sku' in x) && !('product_bundle' in x);
+}
+
+/**
+ * 对外部传入的商品对象做归一化（v2 composite 语义）：
+ * - 补全可选字段默认值（未传则使用兜底值，避免后续计算时因 undefined 导致异常）
+ * - 对 num 调用 getSafeProductNum 做安全处理
+ * - 保留 _origin 供后续业务流程（如促销规则）使用
+ *
+ * 价格字段语义（metadata 权威源 + composite 派生）：
+ * - `metadata.source_product_price`：主商品/variant 基础价（已应用报价单），**不含 option**、
+ *   **不含折扣**。是推导 main_product_* 的起点。variant 分支优先读 `metadata.origin.variant[vid].price`。
+ * - `metadata.main_product_original_price`：`source + Σ(option.price × option.num)`，**含 option**、
+ *   **不含折扣**。
+ * - `metadata.main_product_selling_price`：`main_product_original_price - 主商品券 per-unit amount`，
+ *   **含 option**、**含折扣**。
+ * - 行级 `selling_price` = `main_product_selling_price + Σ(bundle_selling_price × num)`。
+ * - 行级 `original_price` = `main_product_original_price + Σ(bundle 原价 × num)`。
+ *
+ * 迁移与幂等：
+ * - `metadata.price_schema_version === 2` → 已新语义归一化，保留 main_product_* 原值（保留折扣）。
+ * - 其它情况（v1 / 缺字段 / 无 metadata）→ 按"main_product_selling_price 曾是 main-only"的旧约定
+ *   反推 legacyDiscount，再以新 source + options 基准重算。最终统一打上 `price_schema_version: 2`。
+ * - 因此多次 normalize 不会重复叠加 option/bundle。
+ */
+function normalizeOrderProduct(product) {
+  const metadata = {
+    ...(product.metadata || {})
+  };
+  // 不透明 identity 契约：每条订单行必须带 identity_key。
+  // 调用方未传时由 SDK 自动生成 UUID，后续 update/remove 只做严格比对，避免猜测合成 key。
+  const resolvedIdentityKey = product.metadata?.unique_identification_number ? String(product.metadata.unique_identification_number) : product.unique_identification_number && String(product.unique_identification_number).length > 0 ? String(product.unique_identification_number) : product.identity_key && String(product.identity_key).length > 0 ? String(product.identity_key) : (0, _utils.createUuidV4)();
+  metadata.unique_identification_number = resolvedIdentityKey;
+  const priceOverride = metadata.price_override;
+  const originOtherBundle = metadata.origin?._extend?.other?.bundle;
+  let bundleInput = product.product_bundle || [];
+  if (priceOverride !== undefined && priceOverride !== null && priceOverride !== '' && Array.isArray(originOtherBundle) && originOtherBundle.length > 0) {
+    const priceById = new Map();
+    originOtherBundle.forEach(item => {
+      if (item?.id == null) return;
+      const unit = item.price ?? item.bundle_selling_price;
+      if (unit === undefined || unit === null) return;
+      priceById.set(String(item.id), String(unit));
+    });
+    const base = Array.isArray(bundleInput) && bundleInput.length > 0 ? bundleInput : originOtherBundle;
+    bundleInput = base.map(item => {
+      const unit = priceById.get(String(item?.id));
+      if (unit === undefined) return item;
+      return {
+        ...item,
+        price: unit,
+        bundle_selling_price: unit
+      };
+    });
+  }
+  const normalizedBundle = bundleInput.map(item => ({
+    ...item,
+    bundle_id: item.bundle_id ?? item.id,
+    bundle_product_id: item.bundle_product_id ?? item._bundle_product_id,
+    bundle_group_id: item.bundle_group_id ?? item.group_id,
+    bundle_selling_price: item.bundle_selling_price ?? item.price ?? '0.00',
+    price: item.price ?? item.custom_price ?? item.bundle_selling_price ?? '0.00',
+    price_type: item.price_type ?? item.custom_price_type ?? '',
+    price_type_ext: item.price_type_ext ?? item.custom_price_type_ext ?? ''
+  }));
+  const normalizedOptions = (0, _utils.normalizeProductSkuOptions)(product.product_sku?.option);
+  const optionSum = (0, _utils.sumOptionUnitPrice)(normalizedOptions);
+  const productSku = {
+    ...(0, _utils.ensureProductSku)(product),
+    option: normalizedOptions
+  };
+
+  // 1) 解析 source_product_price。
+  // 优先级：
+  //   1) metadata.source_product_price（v2 权威）
+  //   2) variantPrice（命中 variant_id，从 metadata.origin.variant[vid].price 读）
+  //   3) _origin.price / _origin.base_price（后端语义的基础价）
+  //   4) v1 兼容：无 v2 标记但存在 metadata.main_product_original_price（v1 main-only，即旧 source）
+  //   5) 入参 original_price（v1 addProduct 约定：original_price 为 pre-discount 基础价）
+  //   6) 入参 selling_price（最末兜底，新添加路径 caller 只给 selling_price）
+  const isV2 = metadata.price_schema_version === 2 || metadata.price_schema_version === '2';
+  const variantId = Number(product.product_variant_id || 0);
+  const variantList = variantId ? metadata?.origin?.variant : null;
+  const variantPrice = Array.isArray(variantList) ? variantList.find(v => Number(v?.id) === variantId)?.price : undefined;
+  const resolvedSource = (() => {
+    if (metadata.source_product_price !== undefined) {
+      return String(metadata.source_product_price);
+    }
+    if (variantPrice !== undefined && variantPrice !== null) {
+      return String(variantPrice);
+    }
+    const originPrice = product._origin?.price;
+    if (originPrice !== undefined && originPrice !== null) {
+      return String(originPrice);
+    }
+    const originBasePrice = product._origin?.base_price;
+    if (originBasePrice !== undefined && originBasePrice !== null) {
+      return String(originBasePrice);
+    }
+    if (!isV2 && metadata.main_product_original_price !== undefined) {
+      return String(metadata.main_product_original_price);
+    }
+    return product.original_price ?? product.selling_price ?? '0.00';
+  })();
+
+  // 2) 派生 main_product_original_price（含 option、不含折扣）
+  const mainOriginalDec = new _decimal.default(Number(resolvedSource) || 0).plus(optionSum);
+  const mainOriginalStr = mainOriginalDec.toDecimalPlaces(2).toFixed(2);
+
+  // 3) 派生 main_product_selling_price（含 option、含主商品折扣）
+  //    - v2 数据：直接沿用 metadata.main_product_selling_price（保留折扣）
+  //    - v1 metadata：main_product_selling_price 旧语义是 main-only（≈ source-level 折后价），
+  //      反推 legacyDiscount = main_original(旧) - main_selling(旧)，再用新 main_original - legacyDiscount
+  //    - v1 addProduct 入参：top-level selling_price < original_price 表示主商品折扣；
+  //      用差额作为 legacyDiscount 映射到新 main_selling
+  //    - 其它：视为无折扣，main_selling = main_original
+  let mainSellingDec;
+  if (isV2 && metadata.main_product_selling_price != null) {
+    mainSellingDec = new _decimal.default(Number(metadata.main_product_selling_price) || 0);
+  } else if (metadata.main_product_selling_price != null && metadata.main_product_original_price != null) {
+    const legacyOriginal = new _decimal.default(Number(metadata.main_product_original_price) || 0);
+    const legacySelling = new _decimal.default(Number(metadata.main_product_selling_price) || 0);
+    const legacyDiscount = legacyOriginal.minus(legacySelling);
+    mainSellingDec = mainOriginalDec.minus(legacyDiscount);
+  } else if (product.original_price != null && product.selling_price != null && new _decimal.default(Number(product.original_price) || 0).greaterThan(new _decimal.default(Number(product.selling_price) || 0))) {
+    const topOriginal = new _decimal.default(Number(product.original_price) || 0);
+    const topSelling = new _decimal.default(Number(product.selling_price) || 0);
+    const legacyDiscount = topOriginal.minus(topSelling);
+    mainSellingDec = mainOriginalDec.minus(legacyDiscount);
+  } else {
+    mainSellingDec = mainOriginalDec;
+  }
+  const mainSellingStr = mainSellingDec.toDecimalPlaces(2).toFixed(2);
+
+  // 4) 落盘 metadata：三字段 + schema 版本 sentinel
+  metadata.source_product_price = resolvedSource;
+  metadata.main_product_original_price = mainOriginalStr;
+  metadata.main_product_selling_price = mainSellingStr;
+  metadata.price_schema_version = 2;
+
+  // 5) 合成行级 composite（main 已含 option，本步只叠 bundle）
+  const composedSellingPrice = (0, _utils.composeLinePrice)({
+    mainPrice: mainSellingStr,
+    bundle: normalizedBundle
+  });
+  const composedOriginalPrice = (0, _utils.composeLinePrice)({
+    mainPrice: mainOriginalStr,
+    bundle: normalizedBundle,
+    useOriginalBundle: true
+  });
+  const finalOriginalPrice = (0, _utils.resolveManualOverrideLineOriginalPrice)({
+    num: product.num,
+    metadata,
+    lineOriginalPrice: product.original_price
+  }, composedOriginalPrice);
+  const discountList = (0, _manualProductDiscount.ensureManualProductDiscountList)({
+    discountList: product.discount_list,
+    metadata,
+    originalPrice: finalOriginalPrice,
+    sellingPrice: composedSellingPrice,
+    quantity: getSafeProductNum(product.num)
+  });
+  return {
+    order_detail_id: product.order_detail_id || null,
+    product_id: product.product_id,
+    num: getSafeProductNum(product.num),
+    product_variant_id: product.product_variant_id,
+    product_sku: productSku,
+    selling_price: composedSellingPrice,
+    original_price: finalOriginalPrice,
+    tax_fee: product.tax_fee || '0.00',
+    is_charge_tax: product.is_charge_tax ?? 0,
+    discount_list: discountList,
+    product_bundle: normalizedBundle,
+    metadata,
+    note: product.note != null ? String(product.note) : ''
+  };
+}

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -373,7 +373,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/lib/solution/BookingByStep/utils/resources.d.ts

@@ -6,7 +6,7 @@ import { CartItem, ProductData } from '../../../modules';
  * 3. 格式化资源相关 格式化资源列表 --> 格式化资源 --> 获取时间切片列表 --> 判断单个时间切片是否可用 formatResources
  *
  */
-type DateType = Dayjs;
+declare type DateType = Dayjs;
 export interface TimeSliceItem {
     start_time: string;
     end_time: string;