@pisell/pisellos 2.2.244 → 2.2.245

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

@@ -0,0 +1,7 @@
+import type { QuotationModule } from '../../../modules/Quotation';
+import type { BaseSalesCalculateProductBookingPriceParams, BaseSalesProductBookingPriceResult } from '../types';
+interface BuildBaseSalesQuotationPriceParams extends BaseSalesCalculateProductBookingPriceParams {
+    quotation?: Pick<QuotationModule, 'getPriceForProduct' | 'getQuotationShelfId'> | null;
+}
+export declare function calculateBaseSalesProductBookingPrice(params: BuildBaseSalesQuotationPriceParams): BaseSalesProductBookingPriceResult;
+export {};

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

@@ -0,0 +1,277 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/solution/BaseSales/utils/quotationPrice.ts
+var quotationPrice_exports = {};
+__export(quotationPrice_exports, {
+  calculateBaseSalesProductBookingPrice: () => calculateBaseSalesProductBookingPrice
+});
+module.exports = __toCommonJS(quotationPrice_exports);
+var import_dayjs = __toESM(require("dayjs"));
+var import_decimal = __toESM(require("decimal.js"));
+function toFiniteNumber(value, fallback = 0) {
+  const parsedValue = Number(value);
+  if (!Number.isFinite(parsedValue))
+    return fallback;
+  return parsedValue;
+}
+function toPositiveInt(value, fallback = 1) {
+  const parsedValue = Math.floor(Number(value));
+  if (!Number.isFinite(parsedValue) || parsedValue < 1)
+    return fallback;
+  return parsedValue;
+}
+function toPriceString(value) {
+  return new import_decimal.default(Number(value) || 0).toDecimalPlaces(2).toFixed(2);
+}
+function normalizeDateTime(value) {
+  if (typeof value !== "string" || !value.trim())
+    return null;
+  const normalized = value.includes(":") ? value : `${value} 00:00:00`;
+  const datetime = (0, import_dayjs.default)(normalized);
+  if (!datetime.isValid())
+    return null;
+  return datetime;
+}
+function buildBookingDateTime(date, time) {
+  if (typeof date !== "string" || !date.trim())
+    return null;
+  const timeText = typeof time === "string" && time.trim() ? time.trim() : "00:00";
+  const datetime = (0, import_dayjs.default)(`${date.trim()} ${timeText}`);
+  if (!datetime.isValid())
+    return null;
+  return datetime;
+}
+function getDurationUnit(type) {
+  const normalizedType = String(type || "").toLowerCase();
+  if (normalizedType === "day" || normalizedType === "days")
+    return "day";
+  if (normalizedType === "minute" || normalizedType === "minutes")
+    return "minute";
+  return null;
+}
+function getProductId(product) {
+  const productId = toFiniteNumber(product.product_id ?? product.id, NaN);
+  if (!Number.isFinite(productId))
+    return null;
+  return productId;
+}
+function getProductVariantId(product) {
+  const variantId = toFiniteNumber(
+    product.product_variant_id ?? product.variant_id,
+    0
+  );
+  if (!Number.isFinite(variantId) || variantId <= 0)
+    return void 0;
+  return variantId;
+}
+function getFallbackPrice(params) {
+  const product = params.product || {};
+  return toPriceString(
+    params.fallback_price ?? product.price ?? product.selling_price ?? product.original_price ?? 0
+  );
+}
+function getProductQuantity(product) {
+  return toPositiveInt(product.num ?? product.quantity, 1);
+}
+function getBundleProductId(bundle) {
+  const productId = toFiniteNumber(
+    bundle.bundle_product_id ?? bundle._bundle_product_id,
+    NaN
+  );
+  if (!Number.isFinite(productId))
+    return null;
+  return productId;
+}
+function getBundleVariantId(bundle) {
+  const variantId = toFiniteNumber(
+    bundle.bundle_variant_id ?? bundle.variant_id,
+    0
+  );
+  if (!Number.isFinite(variantId) || variantId <= 0)
+    return void 0;
+  return variantId;
+}
+function getBundleFallbackPrice(bundle) {
+  return toPriceString(
+    bundle.bundle_selling_price ?? bundle.price ?? bundle.original_price ?? bundle.base_price ?? 0
+  );
+}
+function shouldSplitByDuration(duration, start, end) {
+  if (!duration)
+    return false;
+  if (!start || !end || !end.isAfter(start))
+    return false;
+  const unit = getDurationUnit(duration.type);
+  const value = toFiniteNumber(duration.value);
+  return !!unit && value > 0;
+}
+function buildTimeSegments(params) {
+  const booking = params.booking || {};
+  const explicitDatetime = normalizeDateTime(params.datetime);
+  const bookingStart = buildBookingDateTime(booking.start_date, booking.start_time);
+  const start = bookingStart || explicitDatetime || (0, import_dayjs.default)();
+  const bookingEnd = buildBookingDateTime(booking.end_date, booking.end_time);
+  if (!shouldSplitByDuration(params.duration, start, bookingEnd)) {
+    return [{ start }];
+  }
+  const unit = getDurationUnit(params.duration.type);
+  const value = toFiniteNumber(params.duration.value);
+  const segments = [];
+  let cursor = start;
+  let guard = 0;
+  while (cursor.isBefore(bookingEnd) && guard < 1e4) {
+    const next = cursor.add(value, unit);
+    segments.push({
+      start: cursor,
+      end: next.isBefore(bookingEnd) ? next : bookingEnd ?? void 0
+    });
+    cursor = next;
+    guard += 1;
+  }
+  return segments.length ? segments : [{ start }];
+}
+function formatTimePoint(datetime) {
+  return datetime.format("YYYY-MM-DD HH:mm:ss");
+}
+function buildPriceSegment(params) {
+  const timePoint = formatTimePoint(params.segment.start);
+  const quotedPrice = params.quotation && params.productId !== null ? params.quotation.getPriceForProduct({
+    productId: params.productId,
+    variantId: params.variantId,
+    datetime: timePoint,
+    customer_id: params.customerId
+  }) : null;
+  const unitPrice = toPriceString(quotedPrice ?? params.fallbackPrice);
+  const quotationShelfId = quotedPrice !== null && params.quotation && params.productId !== null ? params.quotation.getQuotationShelfId({
+    productId: params.productId,
+    variantId: params.variantId,
+    datetime: timePoint,
+    customer_id: params.customerId
+  }) : 0;
+  return {
+    start_datetime: timePoint,
+    end_datetime: params.segment.end ? formatTimePoint(params.segment.end) : void 0,
+    time_point: timePoint,
+    unit_price: unitPrice,
+    quantity: 1,
+    total_price: unitPrice,
+    quotation_shelf_id: quotationShelfId,
+    source: quotedPrice !== null ? "quotation" : "fallback"
+  };
+}
+function calculatePriceForProduct(params) {
+  var _a;
+  const segments = params.segments.map((segment) => buildPriceSegment({
+    quotation: params.quotation,
+    productId: params.productId,
+    variantId: params.variantId,
+    customerId: params.customerId,
+    fallbackPrice: params.fallbackPrice,
+    segment
+  }));
+  const unitPrice = segments.reduce(
+    (total, segment) => total.plus(segment.total_price),
+    new import_decimal.default(0)
+  );
+  const totalPrice = unitPrice.times(params.quantity);
+  const quotationShelfId = ((_a = segments.find((segment) => segment.quotation_shelf_id)) == null ? void 0 : _a.quotation_shelf_id) || 0;
+  return {
+    unitPrice,
+    totalPrice,
+    quotationShelfId,
+    segments
+  };
+}
+function calculateBundlePrices(params, segments) {
+  var _a;
+  const bundleList = ((_a = params.product) == null ? void 0 : _a.product_bundle) || [];
+  if (!bundleList.length)
+    return void 0;
+  return bundleList.map((bundle) => {
+    const productId = getBundleProductId(bundle);
+    const variantId = getBundleVariantId(bundle);
+    const quantity = getProductQuantity(bundle);
+    const price = calculatePriceForProduct({
+      quotation: params.quotation,
+      productId,
+      variantId,
+      customerId: params.customer_id,
+      quantity,
+      fallbackPrice: getBundleFallbackPrice(bundle),
+      segments
+    });
+    return {
+      bundle_id: bundle.bundle_id ?? bundle.id,
+      group_id: bundle.group_id,
+      bundle_group_id: bundle.bundle_group_id,
+      bundle_product_id: productId,
+      bundle_variant_id: variantId ?? 0,
+      unit_price: price.unitPrice.toDecimalPlaces(2).toFixed(2),
+      total_price: price.totalPrice.toDecimalPlaces(2).toFixed(2),
+      quantity,
+      quotation_shelf_id: price.quotationShelfId,
+      source: price.segments.some((segment) => segment.source === "quotation") ? "quotation" : "fallback",
+      segments: price.segments
+    };
+  });
+}
+function calculateBaseSalesProductBookingPrice(params) {
+  const product = params.product || {};
+  const productId = getProductId(product);
+  const variantId = getProductVariantId(product);
+  const productQuantity = getProductQuantity(product);
+  const fallbackPrice = getFallbackPrice(params);
+  const timeSegments = buildTimeSegments(params);
+  const price = calculatePriceForProduct({
+    quotation: params.quotation,
+    productId,
+    variantId,
+    customerId: params.customer_id,
+    quantity: productQuantity,
+    fallbackPrice,
+    segments: timeSegments
+  });
+  const bundlePrices = calculateBundlePrices(params, timeSegments);
+  return {
+    product_id: productId,
+    product_variant_id: variantId ?? 0,
+    customer_id: params.customer_id,
+    unit_price: price.unitPrice.toDecimalPlaces(2).toFixed(2),
+    total_price: price.totalPrice.toDecimalPlaces(2).toFixed(2),
+    quantity: productQuantity,
+    duration: params.duration,
+    quotation_shelf_id: price.quotationShelfId,
+    segments: price.segments,
+    ...bundlePrices ? { product_bundle: bundlePrices } : {}
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  calculateBaseSalesProductBookingPrice
+});

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

@@ -23,6 +23,7 @@ export interface BaseProductDetailPayload {
     option?: BaseProductDetailOptionItem[];
     options?: BaseProductDetailOptionItem[];
     product_option_item?: BaseProductDetailOptionItem[];
+    product_sku?: Record<string, any>;
     bundle?: BaseProductDetailBundleItem[];
     product_bundle?: BaseProductDetailBundleItem[];
     unique?: string;

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

@@ -22,6 +22,8 @@ __export(transformBaseProductToOrderProduct_exports, {
   transformBaseProductToOrderProduct: () => transformBaseProductToOrderProduct
 });
 module.exports = __toCommonJS(transformBaseProductToOrderProduct_exports);
+var import_utils = require("../../../modules/Order/utils");
+var import_manualProductDiscount = require("../../../modules/Order/utils/manualProductDiscount");
 function toNumber(value, fallback = 0) {
   const parsedValue = Number(value);
   if (!Number.isFinite(parsedValue))
@@ -52,23 +54,49 @@ function normalizeOptionItems(optionItems) {
   if (!Array.isArray(optionItems))
     return [];
   return optionItems.map((optionItem) => {
-    const optionGroupItemId = toNumber(optionItem == null ? void 0 : optionItem.option_group_item_id);
+    const optionGroupItemId = toNumber((optionItem == null ? void 0 : optionItem.option_group_item_id) ?? (optionItem == null ? void 0 : optionItem.id));
     const price = (optionItem == null ? void 0 : optionItem.price) ?? (optionItem == null ? void 0 : optionItem.add_price) ?? 0;
     return {
+      ...optionItem,
       option_group_item_id: optionGroupItemId,
       option_group_id: toNumber(optionItem == null ? void 0 : optionItem.option_group_id),
       num: toSafePositiveInt((optionItem == null ? void 0 : optionItem.num) ?? (optionItem == null ? void 0 : optionItem.quantity), 1),
-      price: toNumber(price, 0)
+      add_price: toNumber(price, 0),
+      price: void 0
     };
   });
 }
-function normalizeBundleItems(bundleItems) {
+function normalizeBundleItems(bundleItems, preferPriceField = false) {
   if (!Array.isArray(bundleItems))
     return [];
-  return bundleItems.map((bundleItem) => ({
-    ...bundleItem,
-    option: normalizeOptionItems(bundleItem == null ? void 0 : bundleItem.option)
-  }));
+  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 == null ? void 0 : bundleItem.num) ?? (bundleItem == null ? void 0 : bundleItem.quantity), 1);
+    const magnitudeSource = {
+      ...bundleItem,
+      option: normalizeOptionItems(bundleItem == null ? void 0 : bundleItem.option),
+      bundle_selling_price: unitStr,
+      // 计算 markdown 净额时，只传真实毛价；仅有 bundle_selling_price 时按历史净额兜底。
+      price: bundleItem.price ?? bundleItem.custom_price
+    };
+    const normalizedItem = {
+      ...bundleItem,
+      num,
+      quantity: (bundleItem == null ? void 0 : 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 == null ? void 0 : bundleItem.option)
+    };
+    normalizedItem.bundle_selling_price = (0, import_utils.getBundleSellingMagnitude)(magnitudeSource).toFixed(2);
+    if ((normalizedItem.price_type ?? normalizedItem.custom_price_type) === "markdown" && (normalizedItem.price_type_ext === "" || normalizedItem.price_type_ext === void 0 || 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)
@@ -77,7 +105,7 @@ function findVariantById(origin, variantId) {
   return variants.find((variant) => Number(variant == null ? void 0 : variant.id) === variantId) || null;
 }
 function transformBaseProductToOrderProduct(params) {
-  var _a, _b;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   const { payload, fallbackProductId = null } = params;
   if (!payload || typeof payload !== "object")
     return null;
@@ -101,13 +129,61 @@ function transformBaseProductToOrderProduct(params) {
     payload.price ?? payload.selling_price ?? (matchedVariant == null ? void 0 : matchedVariant.price) ?? (matchedVariant == null ? void 0 : matchedVariant.base_price) ?? (origin == null ? void 0 : origin.price) ?? (origin == null ? void 0 : origin.base_price) ?? (sourceProduct == null ? void 0 : sourceProduct.price) ?? (sourceProduct == null ? void 0 : sourceProduct.selling_price) ?? (sourceProduct == null ? void 0 : sourceProduct.base_price),
     "0.00"
   );
-  const productOptionItem = normalizeOptionItems(
-    payload.option ?? payload.options ?? payload.product_option_item
+  const lineCompositeTotal = toPriceString(
+    payload.line_total ?? payload.total ?? ((_c = payload._extend) == null ? void 0 : _c.total),
+    sourceProductPrice
+  );
+  const hasPriceOverride = payload.price_override !== void 0 && payload.price_override !== null && payload.price_override !== "";
+  const productOptionItem = (0, import_utils.normalizeProductSkuOptions)(
+    normalizeOptionItems(
+      ((_d = payload.product_sku) == null ? void 0 : _d.option) ?? payload.option ?? payload.options ?? payload.product_option_item
+    )
   );
   const productBundle = normalizeBundleItems(
-    payload.bundle ?? payload.product_bundle
+    payload.bundle ?? payload.product_bundle,
+    hasPriceOverride
+  );
+  const uniqueIdentificationNumber = payload.unique_identification_number;
+  const resolvedQuantity = toSafePositiveInt(payload.quantity ?? payload.num, 1);
+  const originTotal = (0, import_manualProductDiscount.resolveManualDiscountOriginTotal)({
+    originTotal: payload.origin_total,
+    extendOriginTotal: (_e = payload._extend) == null ? void 0 : _e.origin_total,
+    originExtendOriginTotal: (_f = origin == null ? void 0 : origin._extend) == null ? void 0 : _f.origin_total,
+    sourceExtendOriginTotal: (_g = sourceProduct == null ? void 0 : sourceProduct._extend) == null ? void 0 : _g.origin_total,
+    catalogUnitPrice: (origin == null ? void 0 : origin.base_price) ?? (origin == null ? void 0 : origin.price) ?? (sourceProduct == null ? void 0 : sourceProduct.base_price) ?? (sourceProduct == null ? void 0 : sourceProduct.price),
+    quantity: resolvedQuantity
+  });
+  const sellingTotal = Number(
+    payload.line_total ?? payload.total ?? ((_h = payload._extend) == null ? void 0 : _h.total) ?? lineCompositeTotal
+  );
+  const discountReason = (0, import_manualProductDiscount.resolveManualDiscountReasonFromSources)({
+    discountReason: payload.discount_reason,
+    extendDiscountReason: (_i = payload._extend) == null ? void 0 : _i.discount_reason,
+    originExtendDiscountReason: (_j = origin == null ? void 0 : origin._extend) == null ? void 0 : _j.discount_reason
+  });
+  const lineOriginalPrice = hasPriceOverride && Number.isFinite(originTotal) ? toPriceString(originTotal) : lineCompositeTotal;
+  const manualDiscountList = (0, import_manualProductDiscount.shouldBuildManualProductDiscount)({
+    hasPriceOverride,
+    originTotal,
+    sellingTotal
+  }) ? (0, import_manualProductDiscount.mergeManualProductDiscountIntoList)(
+    payload.discount_list,
+    (0, import_manualProductDiscount.buildManualProductDiscountItem)({
+      originTotal: Number.isFinite(originTotal) ? originTotal : Number(lineOriginalPrice),
+      sellingTotal: Number.isFinite(sellingTotal) ? sellingTotal : Number(lineCompositeTotal),
+      quantity: resolvedQuantity,
+      message: discountReason,
+      discountway: (_k = payload._extend) == null ? void 0 : _k.discountway,
+      discount_per: (_l = payload._extend) == null ? void 0 : _l.discount_per
+    })
+  ) : payload.discount_list || [];
+  const optionSum = (0, import_utils.sumOptionUnitPrice)(productOptionItem).toNumber();
+  const mainProductOriginalPrice = toPriceString(Number(sourceProductPrice) + optionSum);
+  const bundleOnlyComposite = (0, import_utils.composeLinePrice)({ mainPrice: 0, bundle: productBundle });
+  const derivedMainSelling = Number(lineCompositeTotal) - Number(bundleOnlyComposite);
+  const mainProductSellingPrice = toPriceString(
+    Number.isFinite(derivedMainSelling) && derivedMainSelling >= 0 ? derivedMainSelling : Number(mainProductOriginalPrice)
   );
-  const uniqueIdentificationNumber = payload.unique_identification_number ?? payload.unique;
   const metadata = {
     unique: payload.unique,
     session: payload.session,
@@ -118,8 +194,15 @@ function transformBaseProductToOrderProduct(params) {
     duration: payload.duration,
     policy_id: payload.policy_id,
     source_shop_id: payload.source_shop_id,
-    origin,
-    source_product_price: sourceProductPrice
+    source_product_price: sourceProductPrice,
+    main_product_selling_price: mainProductSellingPrice,
+    main_product_original_price: mainProductOriginalPrice,
+    price_schema_version: 2,
+    ...hasPriceOverride ? {
+      price_override: String(payload.price_override),
+      is_manual_discount: 1
+    } : {},
+    ...payload.bundle_edit !== void 0 ? { bundle_edit: payload.bundle_edit } : {}
   };
   if (uniqueIdentificationNumber) {
     metadata.unique_identification_number = String(uniqueIdentificationNumber);
@@ -128,11 +211,16 @@ function transformBaseProductToOrderProduct(params) {
     product_id: productId,
     product_variant_id: productVariantId,
     unique_identification_number: uniqueIdentificationNumber ? String(uniqueIdentificationNumber) : void 0,
-    num: toSafePositiveInt(payload.quantity ?? payload.num, 1),
-    product_option_item: productOptionItem,
+    num: resolvedQuantity,
+    product_sku: {
+      ...payload.product_sku && typeof payload.product_sku === "object" ? payload.product_sku : {},
+      option: productOptionItem
+    },
     product_bundle: productBundle,
-    selling_price: sourceProductPrice,
-    original_price: sourceProductPrice,
+    discount_list: manualDiscountList,
+    // 折后行价由 normalizeOrderProduct 按 main + bundle 合成；手动改价时 bundle 已为分摊后单价
+    selling_price: lineCompositeTotal,
+    original_price: lineOriginalPrice,
     tax_fee: toPriceString(
       payload.tax_fee ?? (matchedVariant == null ? void 0 : matchedVariant.tax_fee) ?? (origin == null ? void 0 : origin.tax_fee) ?? (sourceProduct == null ? void 0 : sourceProduct.tax_fee),
       "0.00"

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

@@ -12,7 +12,7 @@ export declare function buildProductLineFingerprint(productOptionItem?: unknown,
 export declare function getSafeProductNum(num?: number): number;
 /**
  * removeProductFromOrder 仅传 SKU 时的通配 identity（对象上未声明选项键）。
- * 与显式 `product_option_item: []` 区分：后者只匹配「无选项」行。
+ * 与显式 `product_sku: { option: [] }` 区分：后者只匹配「无选项」行。
  */
 export declare function isSkuOnlyDeleteIdentity(x: BaseSalesOrderProductIdentity): boolean;
 /**

package/lib/solution/BaseSales/utils.js

@@ -38,6 +38,7 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../../modules/Order/utils");
+var import_manualProductDiscount = require("../../modules/Order/utils/manualProductDiscount");
 function createEmptySummary() {
   return {
     product_quantity: 0,
@@ -64,7 +65,7 @@ function buildProductLineFingerprint(productOptionItem, productBundle) {
     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) ?? "")
+    price: String((item == null ? void 0 : item.add_price) ?? (item == null ? void 0 : 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;
@@ -99,26 +100,58 @@ function getSafeProductNum(num) {
 function isSkuOnlyDeleteIdentity(x) {
   if (x.identity_key)
     return false;
-  return !("product_option_item" in x) && !("product_bundle" in x);
+  return !("product_sku" in x) && !("product_bundle" in x);
 }
 function normalizeOrderProduct(product) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e, _f, _g;
   const metadata = { ...product.metadata || {} };
   const resolvedIdentityKey = ((_a = product.metadata) == null ? void 0 : _a.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, import_utils.createUuidV4)();
   metadata.unique_identification_number = resolvedIdentityKey;
-  const normalizedBundle = (product.product_bundle || []).map((item) => ({
+  const priceOverride = metadata.price_override;
+  const originOtherBundle = (_d = (_c = (_b = metadata.origin) == null ? void 0 : _b._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.bundle;
+  let bundleInput = product.product_bundle || [];
+  if (priceOverride !== void 0 && priceOverride !== null && priceOverride !== "" && Array.isArray(originOtherBundle) && originOtherBundle.length > 0) {
+    const priceById = /* @__PURE__ */ new Map();
+    originOtherBundle.forEach((item) => {
+      if ((item == null ? void 0 : item.id) == null)
+        return;
+      const unit = item.price ?? item.bundle_selling_price;
+      if (unit === void 0 || 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 == null ? void 0 : item.id));
+      if (unit === void 0)
+        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 = product.product_option_item || [];
+  const normalizedOptions = (0, import_utils.normalizeProductSkuOptions)((_e = product.product_sku) == null ? void 0 : _e.option);
   const optionSum = (0, import_utils.sumOptionUnitPrice)(normalizedOptions);
+  const productSku = {
+    ...(0, import_utils.ensureProductSku)(product),
+    option: normalizedOptions
+  };
   const isV2 = metadata.price_schema_version === 2 || metadata.price_schema_version === "2";
   const variantId = Number(product.product_variant_id || 0);
-  const variantList = variantId ? (_b = metadata == null ? void 0 : metadata.origin) == null ? void 0 : _b.variant : null;
-  const variantPrice = Array.isArray(variantList) ? (_c = variantList.find((v) => Number(v == null ? void 0 : v.id) === variantId)) == null ? void 0 : _c.price : void 0;
+  const variantList = variantId ? (_f = metadata == null ? void 0 : metadata.origin) == null ? void 0 : _f.variant : null;
+  const variantPrice = Array.isArray(variantList) ? (_g = variantList.find((v) => Number(v == null ? void 0 : v.id) === variantId)) == null ? void 0 : _g.price : void 0;
   const resolvedSource = (() => {
     var _a2, _b2;
     if (metadata.source_product_price !== void 0) {
@@ -174,17 +207,28 @@ function normalizeOrderProduct(product) {
     bundle: normalizedBundle,
     useOriginalBundle: true
   });
+  const finalOriginalPrice = (0, import_utils.resolveManualOverrideLineOriginalPrice)(
+    { num: product.num, metadata, lineOriginalPrice: product.original_price },
+    composedOriginalPrice
+  );
+  const discountList = (0, import_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_option_item: normalizedOptions,
+    product_sku: productSku,
     selling_price: composedSellingPrice,
-    original_price: composedOriginalPrice,
+    original_price: finalOriginalPrice,
     tax_fee: product.tax_fee || "0.00",
     is_charge_tax: product.is_charge_tax ?? 0,
-    discount_list: product.discount_list || [],
+    discount_list: discountList,
     product_bundle: normalizedBundle,
     metadata,
     note: product.note != null ? String(product.note) : ""

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