@pisell/pisellos 2.2.244 → 2.2.246

package/dist/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/dist/solution/BaseSales/utils/quotationPrice.js

@@ -0,0 +1,237 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import dayjs from 'dayjs';
+import Decimal from 'decimal.js';
+function toFiniteNumber(value) {
+  var fallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  var parsedValue = Number(value);
+  if (!Number.isFinite(parsedValue)) return fallback;
+  return parsedValue;
+}
+function toPositiveInt(value) {
+  var fallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+  var parsedValue = Math.floor(Number(value));
+  if (!Number.isFinite(parsedValue) || parsedValue < 1) return fallback;
+  return parsedValue;
+}
+function toPriceString(value) {
+  return new Decimal(Number(value) || 0).toDecimalPlaces(2).toFixed(2);
+}
+function normalizeDateTime(value) {
+  if (typeof value !== 'string' || !value.trim()) return null;
+  var normalized = value.includes(':') ? value : "".concat(value, " 00:00:00");
+  var datetime = dayjs(normalized);
+  if (!datetime.isValid()) return null;
+  return datetime;
+}
+function buildBookingDateTime(date, time) {
+  if (typeof date !== 'string' || !date.trim()) return null;
+  var timeText = typeof time === 'string' && time.trim() ? time.trim() : '00:00';
+  var datetime = dayjs("".concat(date.trim(), " ").concat(timeText));
+  if (!datetime.isValid()) return null;
+  return datetime;
+}
+function getDurationUnit(type) {
+  var normalizedType = String(type || '').toLowerCase();
+  if (normalizedType === 'day' || normalizedType === 'days') return 'day';
+  if (normalizedType === 'minute' || normalizedType === 'minutes') return 'minute';
+  return null;
+}
+function getProductId(product) {
+  var _product$product_id;
+  var productId = toFiniteNumber((_product$product_id = product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : product.id, NaN);
+  if (!Number.isFinite(productId)) return null;
+  return productId;
+}
+function getProductVariantId(product) {
+  var _product$product_vari;
+  var variantId = toFiniteNumber((_product$product_vari = product.product_variant_id) !== null && _product$product_vari !== void 0 ? _product$product_vari : product.variant_id, 0);
+  if (!Number.isFinite(variantId) || variantId <= 0) return undefined;
+  return variantId;
+}
+function getFallbackPrice(params) {
+  var _ref, _ref2, _ref3, _params$fallback_pric;
+  var product = params.product || {};
+  return toPriceString((_ref = (_ref2 = (_ref3 = (_params$fallback_pric = params.fallback_price) !== null && _params$fallback_pric !== void 0 ? _params$fallback_pric : product.price) !== null && _ref3 !== void 0 ? _ref3 : product.selling_price) !== null && _ref2 !== void 0 ? _ref2 : product.original_price) !== null && _ref !== void 0 ? _ref : 0);
+}
+function getProductQuantity(product) {
+  var _product$num;
+  return toPositiveInt((_product$num = product.num) !== null && _product$num !== void 0 ? _product$num : product.quantity, 1);
+}
+function getBundleProductId(bundle) {
+  var _bundle$bundle_produc;
+  var productId = toFiniteNumber((_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id, NaN);
+  if (!Number.isFinite(productId)) return null;
+  return productId;
+}
+function getBundleVariantId(bundle) {
+  var _bundle$bundle_varian;
+  var variantId = toFiniteNumber((_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id, 0);
+  if (!Number.isFinite(variantId) || variantId <= 0) return undefined;
+  return variantId;
+}
+function getBundleFallbackPrice(bundle) {
+  var _ref4, _ref5, _ref6, _bundle$bundle_sellin;
+  return toPriceString((_ref4 = (_ref5 = (_ref6 = (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.price) !== null && _ref6 !== void 0 ? _ref6 : bundle.original_price) !== null && _ref5 !== void 0 ? _ref5 : bundle.base_price) !== null && _ref4 !== void 0 ? _ref4 : 0);
+}
+function shouldSplitByDuration(duration, start, end) {
+  if (!duration) return false;
+  if (!start || !end || !end.isAfter(start)) return false;
+  var unit = getDurationUnit(duration.type);
+  var value = toFiniteNumber(duration.value);
+  return !!unit && value > 0;
+}
+function buildTimeSegments(params) {
+  var booking = params.booking || {};
+  var explicitDatetime = normalizeDateTime(params.datetime);
+  var bookingStart = buildBookingDateTime(booking.start_date, booking.start_time);
+  var start = bookingStart || explicitDatetime || dayjs();
+  var bookingEnd = buildBookingDateTime(booking.end_date, booking.end_time);
+  if (!shouldSplitByDuration(params.duration, start, bookingEnd)) {
+    return [{
+      start: start
+    }];
+  }
+  var unit = getDurationUnit(params.duration.type);
+  var value = toFiniteNumber(params.duration.value);
+  var segments = [];
+  var cursor = start;
+  var guard = 0;
+  while (cursor.isBefore(bookingEnd) && guard < 10000) {
+    var next = cursor.add(value, unit);
+    segments.push({
+      start: cursor,
+      end: next.isBefore(bookingEnd) ? next : bookingEnd !== null && bookingEnd !== void 0 ? bookingEnd : undefined
+    });
+    cursor = next;
+    guard += 1;
+  }
+  return segments.length ? segments : [{
+    start: start
+  }];
+}
+function formatTimePoint(datetime) {
+  return datetime.format('YYYY-MM-DD HH:mm:ss');
+}
+function buildPriceSegment(params) {
+  var timePoint = formatTimePoint(params.segment.start);
+  var quotedPrice = params.quotation && params.productId !== null ? params.quotation.getPriceForProduct({
+    productId: params.productId,
+    variantId: params.variantId,
+    datetime: timePoint,
+    customer_id: params.customerId
+  }) : null;
+  var unitPrice = toPriceString(quotedPrice !== null && quotedPrice !== void 0 ? quotedPrice : params.fallbackPrice);
+  var 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) : undefined,
+    time_point: timePoint,
+    unit_price: unitPrice,
+    quantity: 1,
+    total_price: unitPrice,
+    quotation_shelf_id: quotationShelfId,
+    source: quotedPrice !== null ? 'quotation' : 'fallback'
+  };
+}
+function calculatePriceForProduct(params) {
+  var _segments$find;
+  var segments = params.segments.map(function (segment) {
+    return buildPriceSegment({
+      quotation: params.quotation,
+      productId: params.productId,
+      variantId: params.variantId,
+      customerId: params.customerId,
+      fallbackPrice: params.fallbackPrice,
+      segment: segment
+    });
+  });
+  var unitPrice = segments.reduce(function (total, segment) {
+    return total.plus(segment.total_price);
+  }, new Decimal(0));
+  var totalPrice = unitPrice.times(params.quantity);
+  var quotationShelfId = ((_segments$find = segments.find(function (segment) {
+    return segment.quotation_shelf_id;
+  })) === null || _segments$find === void 0 ? void 0 : _segments$find.quotation_shelf_id) || 0;
+  return {
+    unitPrice: unitPrice,
+    totalPrice: totalPrice,
+    quotationShelfId: quotationShelfId,
+    segments: segments
+  };
+}
+function calculateBundlePrices(params, segments) {
+  var _params$product;
+  var bundleList = ((_params$product = params.product) === null || _params$product === void 0 ? void 0 : _params$product.product_bundle) || [];
+  if (!bundleList.length) return undefined;
+  return bundleList.map(function (bundle) {
+    var _bundle$bundle_id;
+    var productId = getBundleProductId(bundle);
+    var variantId = getBundleVariantId(bundle);
+    var quantity = getProductQuantity(bundle);
+    var price = calculatePriceForProduct({
+      quotation: params.quotation,
+      productId: productId,
+      variantId: variantId,
+      customerId: params.customer_id,
+      quantity: quantity,
+      fallbackPrice: getBundleFallbackPrice(bundle),
+      segments: segments
+    });
+    return {
+      bundle_id: (_bundle$bundle_id = bundle.bundle_id) !== null && _bundle$bundle_id !== void 0 ? _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 !== null && variantId !== void 0 ? variantId : 0,
+      unit_price: price.unitPrice.toDecimalPlaces(2).toFixed(2),
+      total_price: price.totalPrice.toDecimalPlaces(2).toFixed(2),
+      quantity: quantity,
+      quotation_shelf_id: price.quotationShelfId,
+      source: price.segments.some(function (segment) {
+        return segment.source === 'quotation';
+      }) ? 'quotation' : 'fallback',
+      segments: price.segments
+    };
+  });
+}
+export function calculateBaseSalesProductBookingPrice(params) {
+  var product = params.product || {};
+  var productId = getProductId(product);
+  var variantId = getProductVariantId(product);
+  var productQuantity = getProductQuantity(product);
+  var fallbackPrice = getFallbackPrice(params);
+  var timeSegments = buildTimeSegments(params);
+  var price = calculatePriceForProduct({
+    quotation: params.quotation,
+    productId: productId,
+    variantId: variantId,
+    customerId: params.customer_id,
+    quantity: productQuantity,
+    fallbackPrice: fallbackPrice,
+    segments: timeSegments
+  });
+  var bundlePrices = calculateBundlePrices(params, timeSegments);
+  return _objectSpread({
+    product_id: productId,
+    product_variant_id: variantId !== null && variantId !== void 0 ? 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
+  } : {});
+}

package/dist/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/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -4,6 +4,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { composeLinePrice, getBundleSellingMagnitude, normalizeProductSkuOptions, sumOptionUnitPrice } from "../../../modules/Order/utils";
+import { buildManualProductDiscountItem, mergeManualProductDiscountIntoList, resolveManualDiscountOriginTotal, resolveManualDiscountReasonFromSources, shouldBuildManualProductDiscount } from "../../../modules/Order/utils/manualProductDiscount";
 function toNumber(value) {
   var fallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   var parsedValue = Number(value);
@@ -31,23 +33,49 @@ function toPriceString(value) {
 function normalizeOptionItems(optionItems) {
   if (!Array.isArray(optionItems)) return [];
   return optionItems.map(function (optionItem) {
-    var _ref, _optionItem$price, _optionItem$num;
-    var optionGroupItemId = toNumber(optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id);
+    var _optionItem$option_gr, _ref, _optionItem$price, _optionItem$num;
+    var optionGroupItemId = toNumber((_optionItem$option_gr = optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id) !== null && _optionItem$option_gr !== void 0 ? _optionItem$option_gr : optionItem === null || optionItem === void 0 ? void 0 : optionItem.id);
     var price = (_ref = (_optionItem$price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _optionItem$price !== void 0 ? _optionItem$price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _ref !== void 0 ? _ref : 0;
-    return {
+    return _objectSpread(_objectSpread({}, optionItem), {}, {
       option_group_item_id: optionGroupItemId,
       option_group_id: toNumber(optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_id),
       num: toSafePositiveInt((_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity, 1),
-      price: toNumber(price, 0)
-    };
+      add_price: toNumber(price, 0),
+      price: undefined
+    });
   });
 }
 function normalizeBundleItems(bundleItems) {
+  var preferPriceField = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   if (!Array.isArray(bundleItems)) return [];
   return bundleItems.map(function (bundleItem) {
-    return _objectSpread(_objectSpread({}, bundleItem), {}, {
+    var _ref2, _ref3, _ref4, _bundleItem$price, _ref5, _ref6, _ref7, _bundleItem$bundle_se, _bundleItem$num, _bundleItem$price2, _bundleItem$quantity, _bundleItem$price3, _ref8, _ref9, _bundleItem$original_, _normalizedItem$price;
+    var unitSelling = preferPriceField ? (_ref2 = (_ref3 = (_ref4 = (_bundleItem$price = bundleItem.price) !== null && _bundleItem$price !== void 0 ? _bundleItem$price : bundleItem.bundle_selling_price) !== null && _ref4 !== void 0 ? _ref4 : bundleItem.custom_price) !== null && _ref3 !== void 0 ? _ref3 : bundleItem.product_price) !== null && _ref2 !== void 0 ? _ref2 : '0' : (_ref5 = (_ref6 = (_ref7 = (_bundleItem$bundle_se = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se !== void 0 ? _bundleItem$bundle_se : bundleItem.price) !== null && _ref7 !== void 0 ? _ref7 : bundleItem.custom_price) !== null && _ref6 !== void 0 ? _ref6 : bundleItem.product_price) !== null && _ref5 !== void 0 ? _ref5 : '0';
+    var unitStr = toPriceString(unitSelling, '0.00');
+    var num = toSafePositiveInt((_bundleItem$num = bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.num) !== null && _bundleItem$num !== void 0 ? _bundleItem$num : bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.quantity, 1);
+    var magnitudeSource = _objectSpread(_objectSpread({}, bundleItem), {}, {
+      option: normalizeOptionItems(bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.option),
+      bundle_selling_price: unitStr,
+      // 计算 markdown 净额时，只传真实毛价；仅有 bundle_selling_price 时按历史净额兜底。
+      price: (_bundleItem$price2 = bundleItem.price) !== null && _bundleItem$price2 !== void 0 ? _bundleItem$price2 : bundleItem.custom_price
+    });
+    var normalizedItem = _objectSpread(_objectSpread({}, bundleItem), {}, {
+      num: num,
+      quantity: (_bundleItem$quantity = bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.quantity) !== null && _bundleItem$quantity !== void 0 ? _bundleItem$quantity : num,
+      // price 保留毛价（markdown 仍为正），由 price_type 决定符号。
+      price: (_bundleItem$price3 = bundleItem.price) !== null && _bundleItem$price3 !== void 0 ? _bundleItem$price3 : unitStr,
+      bundle_selling_price: unitStr,
+      original_price: (_ref8 = (_ref9 = (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.product_price) !== null && _ref9 !== void 0 ? _ref9 : bundleItem.price) !== null && _ref8 !== void 0 ? _ref8 : unitStr,
       option: normalizeOptionItems(bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.option)
     });
+    // bundle_selling_price 落「正净额」：markdown = |price| − Σoptions；markup/原价维持原值。
+    normalizedItem.bundle_selling_price = getBundleSellingMagnitude(magnitudeSource).toFixed(2);
+    if (((_normalizedItem$price = normalizedItem.price_type) !== null && _normalizedItem$price !== void 0 ? _normalizedItem$price : normalizedItem.custom_price_type) === 'markdown' && (normalizedItem.price_type_ext === '' || normalizedItem.price_type_ext === undefined || normalizedItem.price_type_ext === null)) {
+      var _normalizedItem$custo;
+      normalizedItem.custom_price = (_normalizedItem$custo = normalizedItem.custom_price) !== null && _normalizedItem$custo !== void 0 ? _normalizedItem$custo : normalizedItem.price;
+      normalizedItem.price = normalizedItem.bundle_selling_price;
+    }
+    return normalizedItem;
   });
 }
 function findVariantById(origin, variantId) {
@@ -64,23 +92,65 @@ function findVariantById(origin, variantId) {
  * 注意：这里不生成 identity，缺省时由 OrderModule 自动补齐。
  */
 export function transformBaseProductToOrderProduct(params) {
-  var _ref2, _ref3, _ref4, _payload$product_id, _ref5, _ref6, _payload$product_vari, _payload$_origin, _payload$_origin2, _ref7, _findVariantById, _ref8, _ref9, _ref10, _ref11, _ref12, _ref13, _ref14, _payload$price, _ref15, _payload$option, _payload$bundle, _payload$unique_ident, _payload$quantity, _ref16, _ref17, _payload$tax_fee, _ref18, _ref19, _payload$is_charge_ta;
+  var _ref10, _ref11, _ref12, _payload$product_id, _ref13, _ref14, _payload$product_vari, _payload$_origin, _payload$_origin2, _ref15, _findVariantById, _ref16, _ref17, _ref18, _ref19, _ref20, _ref21, _ref22, _payload$price, _ref23, _payload$line_total, _payload$_extend, _ref24, _ref25, _payload$product_sku$, _payload$product_sku, _payload$bundle, _payload$quantity, _payload$_extend2, _extend, _extend2, _ref26, _ref27, _origin$base_price, _ref28, _ref29, _payload$line_total2, _payload$_extend3, _payload$_extend4, _extend3, _payload$_extend5, _payload$_extend6, _ref30, _ref31, _payload$tax_fee, _ref32, _ref33, _payload$is_charge_ta;
   var payload = params.payload,
     _params$fallbackProdu = params.fallbackProductId,
     fallbackProductId = _params$fallbackProdu === void 0 ? null : _params$fallbackProdu;
   if (!payload || _typeof(payload) !== 'object') return null;
   var sourceProduct = params.sourceProduct || params.sourceItem || {};
-  var productId = toProductId((_ref2 = (_ref3 = (_ref4 = (_payload$product_id = payload.product_id) !== null && _payload$product_id !== void 0 ? _payload$product_id : payload.id) !== null && _ref4 !== void 0 ? _ref4 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.product_id) !== null && _ref3 !== void 0 ? _ref3 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.id) !== null && _ref2 !== void 0 ? _ref2 : fallbackProductId);
+  var productId = toProductId((_ref10 = (_ref11 = (_ref12 = (_payload$product_id = payload.product_id) !== null && _payload$product_id !== void 0 ? _payload$product_id : payload.id) !== null && _ref12 !== void 0 ? _ref12 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.product_id) !== null && _ref11 !== void 0 ? _ref11 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.id) !== null && _ref10 !== void 0 ? _ref10 : fallbackProductId);
   if (productId === null) return null;
-  var productVariantId = toNumber((_ref5 = (_ref6 = (_payload$product_vari = payload.product_variant_id) !== null && _payload$product_vari !== void 0 ? _payload$product_vari : payload.variant_id) !== null && _ref6 !== void 0 ? _ref6 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.product_variant_id) !== null && _ref5 !== void 0 ? _ref5 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.variant_id, 0);
+  var productVariantId = toNumber((_ref13 = (_ref14 = (_payload$product_vari = payload.product_variant_id) !== null && _payload$product_vari !== void 0 ? _payload$product_vari : payload.variant_id) !== null && _ref14 !== void 0 ? _ref14 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.product_variant_id) !== null && _ref13 !== void 0 ? _ref13 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.variant_id, 0);
   var callbackOrigin = payload.origin || ((_payload$_origin = payload._origin) === null || _payload$_origin === void 0 ? void 0 : _payload$_origin.sourceProduct) || ((_payload$_origin2 = payload._origin) === null || _payload$_origin2 === void 0 ? void 0 : _payload$_origin2.sourceItem) || payload._origin || {};
   var origin = _objectSpread(_objectSpread({}, sourceProduct || {}), callbackOrigin || {});
-  var matchedVariant = (_ref7 = (_findVariantById = findVariantById(callbackOrigin, productVariantId)) !== null && _findVariantById !== void 0 ? _findVariantById : findVariantById(sourceProduct, productVariantId)) !== null && _ref7 !== void 0 ? _ref7 : findVariantById(origin, productVariantId);
-  var sourceProductPrice = toPriceString((_ref8 = (_ref9 = (_ref10 = (_ref11 = (_ref12 = (_ref13 = (_ref14 = (_payload$price = payload.price) !== null && _payload$price !== void 0 ? _payload$price : payload.selling_price) !== null && _ref14 !== void 0 ? _ref14 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.price) !== null && _ref13 !== void 0 ? _ref13 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.base_price) !== null && _ref12 !== void 0 ? _ref12 : origin === null || origin === void 0 ? void 0 : origin.price) !== null && _ref11 !== void 0 ? _ref11 : origin === null || origin === void 0 ? void 0 : origin.base_price) !== null && _ref10 !== void 0 ? _ref10 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _ref9 !== void 0 ? _ref9 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.selling_price) !== null && _ref8 !== void 0 ? _ref8 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price, '0.00');
-  var productOptionItem = normalizeOptionItems((_ref15 = (_payload$option = payload.option) !== null && _payload$option !== void 0 ? _payload$option : payload.options) !== null && _ref15 !== void 0 ? _ref15 : payload.product_option_item);
-  var productBundle = normalizeBundleItems((_payload$bundle = payload.bundle) !== null && _payload$bundle !== void 0 ? _payload$bundle : payload.product_bundle);
-  var uniqueIdentificationNumber = (_payload$unique_ident = payload.unique_identification_number) !== null && _payload$unique_ident !== void 0 ? _payload$unique_ident : payload.unique;
-  var metadata = {
+  var matchedVariant = (_ref15 = (_findVariantById = findVariantById(callbackOrigin, productVariantId)) !== null && _findVariantById !== void 0 ? _findVariantById : findVariantById(sourceProduct, productVariantId)) !== null && _ref15 !== void 0 ? _ref15 : findVariantById(origin, productVariantId);
+  var sourceProductPrice = toPriceString((_ref16 = (_ref17 = (_ref18 = (_ref19 = (_ref20 = (_ref21 = (_ref22 = (_payload$price = payload.price) !== null && _payload$price !== void 0 ? _payload$price : payload.selling_price) !== null && _ref22 !== void 0 ? _ref22 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.price) !== null && _ref21 !== void 0 ? _ref21 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.base_price) !== null && _ref20 !== void 0 ? _ref20 : origin === null || origin === void 0 ? void 0 : origin.price) !== null && _ref19 !== void 0 ? _ref19 : origin === null || origin === void 0 ? void 0 : origin.base_price) !== null && _ref18 !== void 0 ? _ref18 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _ref17 !== void 0 ? _ref17 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.selling_price) !== null && _ref16 !== void 0 ? _ref16 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price, '0.00');
+  var lineCompositeTotal = toPriceString((_ref23 = (_payload$line_total = payload.line_total) !== null && _payload$line_total !== void 0 ? _payload$line_total : payload.total) !== null && _ref23 !== void 0 ? _ref23 : (_payload$_extend = payload._extend) === null || _payload$_extend === void 0 ? void 0 : _payload$_extend.total, sourceProductPrice);
+  var hasPriceOverride = payload.price_override !== undefined && payload.price_override !== null && payload.price_override !== '';
+  var productOptionItem = normalizeProductSkuOptions(normalizeOptionItems((_ref24 = (_ref25 = (_payload$product_sku$ = (_payload$product_sku = payload.product_sku) === null || _payload$product_sku === void 0 ? void 0 : _payload$product_sku.option) !== null && _payload$product_sku$ !== void 0 ? _payload$product_sku$ : payload.option) !== null && _ref25 !== void 0 ? _ref25 : payload.options) !== null && _ref24 !== void 0 ? _ref24 : payload.product_option_item));
+  var productBundle = normalizeBundleItems((_payload$bundle = payload.bundle) !== null && _payload$bundle !== void 0 ? _payload$bundle : payload.product_bundle, hasPriceOverride);
+  // `payload.unique` 是业务侧商品/票务标识，可能在连续加同一商品时重复；
+  // 行级唯一值只接受显式协议字段，缺省交给 OrderModule 生成。
+  var uniqueIdentificationNumber = payload.unique_identification_number;
+  var resolvedQuantity = toSafePositiveInt((_payload$quantity = payload.quantity) !== null && _payload$quantity !== void 0 ? _payload$quantity : payload.num, 1);
+  var originTotal = resolveManualDiscountOriginTotal({
+    originTotal: payload.origin_total,
+    extendOriginTotal: (_payload$_extend2 = payload._extend) === null || _payload$_extend2 === void 0 ? void 0 : _payload$_extend2.origin_total,
+    originExtendOriginTotal: origin === null || origin === void 0 || (_extend = origin._extend) === null || _extend === void 0 ? void 0 : _extend.origin_total,
+    sourceExtendOriginTotal: sourceProduct === null || sourceProduct === void 0 || (_extend2 = sourceProduct._extend) === null || _extend2 === void 0 ? void 0 : _extend2.origin_total,
+    catalogUnitPrice: (_ref26 = (_ref27 = (_origin$base_price = origin === null || origin === void 0 ? void 0 : origin.base_price) !== null && _origin$base_price !== void 0 ? _origin$base_price : origin === null || origin === void 0 ? void 0 : origin.price) !== null && _ref27 !== void 0 ? _ref27 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price) !== null && _ref26 !== void 0 ? _ref26 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price,
+    quantity: resolvedQuantity
+  });
+  var sellingTotal = Number((_ref28 = (_ref29 = (_payload$line_total2 = payload.line_total) !== null && _payload$line_total2 !== void 0 ? _payload$line_total2 : payload.total) !== null && _ref29 !== void 0 ? _ref29 : (_payload$_extend3 = payload._extend) === null || _payload$_extend3 === void 0 ? void 0 : _payload$_extend3.total) !== null && _ref28 !== void 0 ? _ref28 : lineCompositeTotal);
+  var discountReason = resolveManualDiscountReasonFromSources({
+    discountReason: payload.discount_reason,
+    extendDiscountReason: (_payload$_extend4 = payload._extend) === null || _payload$_extend4 === void 0 ? void 0 : _payload$_extend4.discount_reason,
+    originExtendDiscountReason: origin === null || origin === void 0 || (_extend3 = origin._extend) === null || _extend3 === void 0 ? void 0 : _extend3.discount_reason
+  });
+  var lineOriginalPrice = hasPriceOverride && Number.isFinite(originTotal) ? toPriceString(originTotal) : lineCompositeTotal;
+  var manualDiscountList = shouldBuildManualProductDiscount({
+    hasPriceOverride: hasPriceOverride,
+    originTotal: originTotal,
+    sellingTotal: sellingTotal
+  }) ? mergeManualProductDiscountIntoList(payload.discount_list, buildManualProductDiscountItem({
+    originTotal: Number.isFinite(originTotal) ? originTotal : Number(lineOriginalPrice),
+    sellingTotal: Number.isFinite(sellingTotal) ? sellingTotal : Number(lineCompositeTotal),
+    quantity: resolvedQuantity,
+    message: discountReason,
+    discountway: (_payload$_extend5 = payload._extend) === null || _payload$_extend5 === void 0 ? void 0 : _payload$_extend5.discountway,
+    discount_per: (_payload$_extend6 = payload._extend) === null || _payload$_extend6 === void 0 ? void 0 : _payload$_extend6.discount_per
+  })) : payload.discount_list || [];
+
+  // v2：source 不含 option；main_product_* 含 option（与 normalizeOrderProduct 一致）
+  var optionSum = sumOptionUnitPrice(productOptionItem).toNumber();
+  var mainProductOriginalPrice = toPriceString(Number(sourceProductPrice) + optionSum);
+  var bundleOnlyComposite = composeLinePrice({
+    mainPrice: 0,
+    bundle: productBundle
+  });
+  var derivedMainSelling = Number(lineCompositeTotal) - Number(bundleOnlyComposite);
+  var mainProductSellingPrice = toPriceString(Number.isFinite(derivedMainSelling) && derivedMainSelling >= 0 ? derivedMainSelling : Number(mainProductOriginalPrice));
+  var metadata = _objectSpread(_objectSpread({
     unique: payload.unique,
     session: payload.session,
     form: payload.form,
@@ -90,9 +160,16 @@ export function transformBaseProductToOrderProduct(params) {
     duration: payload.duration,
     policy_id: payload.policy_id,
     source_shop_id: payload.source_shop_id,
-    origin: 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 !== undefined ? {
+    bundle_edit: payload.bundle_edit
+  } : {});
   if (uniqueIdentificationNumber) {
     metadata.unique_identification_number = String(uniqueIdentificationNumber);
   }
@@ -100,13 +177,17 @@ export function transformBaseProductToOrderProduct(params) {
     product_id: productId,
     product_variant_id: productVariantId,
     unique_identification_number: uniqueIdentificationNumber ? String(uniqueIdentificationNumber) : undefined,
-    num: toSafePositiveInt((_payload$quantity = payload.quantity) !== null && _payload$quantity !== void 0 ? _payload$quantity : payload.num, 1),
-    product_option_item: productOptionItem,
+    num: resolvedQuantity,
+    product_sku: _objectSpread(_objectSpread({}, payload.product_sku && _typeof(payload.product_sku) === 'object' ? payload.product_sku : {}), {}, {
+      option: productOptionItem
+    }),
     product_bundle: productBundle,
-    selling_price: sourceProductPrice,
-    original_price: sourceProductPrice,
-    tax_fee: toPriceString((_ref16 = (_ref17 = (_payload$tax_fee = payload.tax_fee) !== null && _payload$tax_fee !== void 0 ? _payload$tax_fee : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.tax_fee) !== null && _ref17 !== void 0 ? _ref17 : origin === null || origin === void 0 ? void 0 : origin.tax_fee) !== null && _ref16 !== void 0 ? _ref16 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.tax_fee, '0.00'),
-    is_charge_tax: toNumber((_ref18 = (_ref19 = (_payload$is_charge_ta = payload.is_charge_tax) !== null && _payload$is_charge_ta !== void 0 ? _payload$is_charge_ta : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.is_charge_tax) !== null && _ref19 !== void 0 ? _ref19 : origin === null || origin === void 0 ? void 0 : origin.is_charge_tax) !== null && _ref18 !== void 0 ? _ref18 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.is_charge_tax, 0),
+    discount_list: manualDiscountList,
+    // 折后行价由 normalizeOrderProduct 按 main + bundle 合成；手动改价时 bundle 已为分摊后单价
+    selling_price: lineCompositeTotal,
+    original_price: lineOriginalPrice,
+    tax_fee: toPriceString((_ref30 = (_ref31 = (_payload$tax_fee = payload.tax_fee) !== null && _payload$tax_fee !== void 0 ? _payload$tax_fee : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.tax_fee) !== null && _ref31 !== void 0 ? _ref31 : origin === null || origin === void 0 ? void 0 : origin.tax_fee) !== null && _ref30 !== void 0 ? _ref30 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.tax_fee, '0.00'),
+    is_charge_tax: toNumber((_ref32 = (_ref33 = (_payload$is_charge_ta = payload.is_charge_tax) !== null && _payload$is_charge_ta !== void 0 ? _payload$is_charge_ta : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.is_charge_tax) !== null && _ref33 !== void 0 ? _ref33 : origin === null || origin === void 0 ? void 0 : origin.is_charge_tax) !== null && _ref32 !== void 0 ? _ref32 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.is_charge_tax, 0),
     metadata: metadata,
     note: payload.note != null ? String(payload.note) : '',
     _origin: _objectSpread(_objectSpread({}, sourceProduct || {}), {}, {

package/dist/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;
 /**