@pisell/pisellos 2.2.171 → 2.2.172

package/dist/solution/BaseSales/types.d.ts

@@ -1,4 +1,4 @@
-import { OrderModule, ProductList, SalesSummaryModule, ScanOrderLoggerModule as BaseSalesLoggerModule, ScheduleModule } from '../../modules';
+import { OrderModule, ProductList, QuotationModule, SalesSummaryModule, ScanOrderLoggerModule as BaseSalesLoggerModule, ScheduleModule } from '../../modules';
 import type { ScanOrderLogInput as BaseSalesLogInput, ScanOrderLoggerProviderConfig as BaseSalesLoggerProviderConfig, ScanOrderLoggerProviderType as BaseSalesLoggerProviderType } from '../../modules/ScanOrderLogger/types';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 /**
@@ -11,6 +11,8 @@ export declare const BaseSalesHookNames: {
     readonly onRetryInit: "onRetryInit";
     readonly onRefresh: "onRefresh";
     readonly onCartValidationChanged: "onCartValidationChanged";
+    readonly onPaymentSyncStart: "onPaymentSyncStart";
+    readonly onPaymentSyncEnd: "onPaymentSyncEnd";
 };
 export type BaseSalesHookName = typeof BaseSalesHookNames[keyof typeof BaseSalesHookNames];
 export declare function createBaseSalesHook(moduleName: string, hookName: BaseSalesHookName): string;
@@ -42,6 +44,9 @@ export interface BaseSalesOrderProductIdentity {
     product_option_item?: any[];
     product_bundle?: any[];
 }
+export interface BaseSalesUpdateOrderProductQuantityParams extends BaseSalesOrderProductIdentity {
+    num: number;
+}
 export interface BaseSalesOrderProduct extends BaseSalesOrderProductIdentity {
     order_detail_id: number | null;
     num: number;
@@ -203,6 +208,52 @@ export interface BaseSalesSubmitPayload extends Omit<BaseSalesTempOrder, 'platfo
     }>;
     products: BaseSalesSubmitProduct[];
 }
+export interface BaseSalesQuotationDurationConfig {
+    type: string;
+    value: number;
+    flexible_config?: {
+        is_enable_minimum_duration?: 0 | 1;
+        warning_threshold?: number;
+        block_threshold?: number;
+    };
+}
+export interface BaseSalesCalculateProductBookingPriceParams {
+    product: Record<string, any>;
+    booking?: {
+        start_date?: string;
+        start_time?: string;
+        end_date?: string;
+        end_time?: string;
+        [key: string]: any;
+    };
+    duration?: BaseSalesQuotationDurationConfig;
+    customer_id?: number | string;
+    fallback_price?: number | string;
+    datetime?: string;
+    channel?: string;
+}
+export type BaseSalesProductBookingPriceSegmentSource = 'quotation' | 'fallback';
+export interface BaseSalesProductBookingPriceSegment {
+    start_datetime: string;
+    end_datetime?: string;
+    time_point: string;
+    unit_price: string;
+    quantity: number;
+    total_price: string;
+    quotation_shelf_id: number;
+    source: BaseSalesProductBookingPriceSegmentSource;
+}
+export interface BaseSalesProductBookingPriceResult {
+    product_id: number | null;
+    product_variant_id: number;
+    customer_id?: number | string;
+    unit_price: string;
+    total_price: string;
+    quantity: number;
+    duration?: BaseSalesQuotationDurationConfig;
+    quotation_shelf_id: number;
+    segments: BaseSalesProductBookingPriceSegment[];
+}
 export type BaseSalesAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'additional_order_with_code' | 'additional_order';
 export interface BaseSalesTableFormRecord {
     policy?: string | null;
@@ -281,6 +332,7 @@ export interface BaseSalesState {
     error: string | null;
     products?: ProductList;
     order?: OrderModule;
+    quotation?: QuotationModule;
     salesSummary?: SalesSummaryModule;
     baseSalesLogger?: BaseSalesLoggerModule;
     schedule?: ScheduleModule;

package/dist/solution/BaseSales/types.js

@@ -7,7 +7,9 @@ export var BaseSalesHookNames = {
   onDestroy: 'onDestroy',
   onRetryInit: 'onRetryInit',
   onRefresh: 'onRefresh',
-  onCartValidationChanged: 'onCartValidationChanged'
+  onCartValidationChanged: 'onCartValidationChanged',
+  onPaymentSyncStart: 'onPaymentSyncStart',
+  onPaymentSyncEnd: 'onPaymentSyncEnd'
 };
 export function createBaseSalesHook(moduleName, hookName) {
   return "".concat(moduleName, ":").concat(hookName);

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,159 @@
+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 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'
+  };
+}
+export function calculateBaseSalesProductBookingPrice(params) {
+  var _segments$find;
+  var product = params.product || {};
+  var productId = getProductId(product);
+  var variantId = getProductVariantId(product);
+  var productQuantity = getProductQuantity(product);
+  var fallbackPrice = getFallbackPrice(params);
+  var segments = buildTimeSegments(params).map(function (segment) {
+    return buildPriceSegment({
+      quotation: params.quotation,
+      productId: productId,
+      variantId: variantId,
+      customerId: params.customer_id,
+      fallbackPrice: fallbackPrice,
+      segment: segment
+    });
+  });
+  var unitPrice = segments.reduce(function (total, segment) {
+    return total.plus(segment.total_price);
+  }, new Decimal(0));
+  var totalPrice = unitPrice.times(productQuantity);
+  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 {
+    product_id: productId,
+    product_variant_id: variantId !== null && variantId !== void 0 ? variantId : 0,
+    customer_id: params.customer_id,
+    unit_price: unitPrice.toDecimalPlaces(2).toFixed(2),
+    total_price: totalPrice.toDecimalPlaces(2).toFixed(2),
+    quantity: productQuantity,
+    duration: params.duration,
+    quotation_shelf_id: quotationShelfId,
+    segments: segments
+  };
+}

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

@@ -4,6 +4,7 @@ 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 { 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);
@@ -43,9 +44,19 @@ function normalizeOptionItems(optionItems) {
   });
 }
 function normalizeBundleItems(bundleItems) {
+  var preferPriceField = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   if (!Array.isArray(bundleItems)) return [];
   return bundleItems.map(function (bundleItem) {
+    var _ref2, _ref3, _ref4, _bundleItem$price, _ref5, _ref6, _ref7, _bundleItem$bundle_se, _bundleItem$num, _bundleItem$quantity, _bundleItem$price2, _ref8, _ref9, _bundleItem$original_;
+    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);
     return _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: (_bundleItem$price2 = bundleItem.price) !== null && _bundleItem$price2 !== void 0 ? _bundleItem$price2 : 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)
     });
   });
@@ -64,23 +75,53 @@ 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, _payload$option, _payload$bundle, _payload$unique_ident, _payload$quantity, _payload$_extend2, _extend, _extend2, _ref25, _ref26, _origin$base_price, _ref27, _ref28, _payload$line_total2, _payload$_extend3, _payload$_extend4, _extend3, _payload$_extend5, _payload$_extend6, _ref29, _ref30, _payload$tax_fee, _ref31, _ref32, _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 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 = normalizeOptionItems((_ref24 = (_payload$option = payload.option) !== null && _payload$option !== void 0 ? _payload$option : 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);
   var uniqueIdentificationNumber = (_payload$unique_ident = payload.unique_identification_number) !== null && _payload$unique_ident !== void 0 ? _payload$unique_ident : payload.unique;
-  var metadata = {
+  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: (_ref25 = (_ref26 = (_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 && _ref26 !== void 0 ? _ref26 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price) !== null && _ref25 !== void 0 ? _ref25 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price,
+    quantity: resolvedQuantity
+  });
+  var sellingTotal = Number((_ref27 = (_ref28 = (_payload$line_total2 = payload.line_total) !== null && _payload$line_total2 !== void 0 ? _payload$line_total2 : payload.total) !== null && _ref28 !== void 0 ? _ref28 : (_payload$_extend3 = payload._extend) === null || _payload$_extend3 === void 0 ? void 0 : _payload$_extend3.total) !== null && _ref27 !== void 0 ? _ref27 : 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 || [];
+  var metadata = _objectSpread(_objectSpread({
     unique: payload.unique,
     session: payload.session,
     form: payload.form,
@@ -91,8 +132,15 @@ export function transformBaseProductToOrderProduct(params) {
     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: sourceProductPrice,
+    main_product_original_price: sourceProductPrice
+  }, 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 +148,15 @@ 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),
+    num: resolvedQuantity,
     product_option_item: 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((_ref29 = (_ref30 = (_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 && _ref30 !== void 0 ? _ref30 : origin === null || origin === void 0 ? void 0 : origin.tax_fee) !== null && _ref29 !== void 0 ? _ref29 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.tax_fee, '0.00'),
+    is_charge_tax: toNumber((_ref31 = (_ref32 = (_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 && _ref32 !== void 0 ? _ref32 : origin === null || origin === void 0 ? void 0 : origin.is_charge_tax) !== null && _ref31 !== void 0 ? _ref31 : 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.js

@@ -5,7 +5,8 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 Decimal from 'decimal.js';
-import { composeLinePrice, createUuidV4, sumOptionUnitPrice } from "../../modules/Order/utils";
+import { composeLinePrice, createUuidV4, resolveManualOverrideLineOriginalPrice, sumOptionUnitPrice } from "../../modules/Order/utils";
+import { ensureManualProductDiscountList } from "../../modules/Order/utils/manualProductDiscount";
 
 /**
  * 构建金额全为 0 的空 summary。
@@ -106,17 +107,42 @@ export function isSkuOnlyDeleteIdentity(x) {
  * - 因此多次 normalize 不会重复叠加 option/bundle。
  */
 export function normalizeOrderProduct(product) {
-  var _product$metadata, _metadata$origin, _variantList$find, _product$is_charge_ta;
+  var _product$metadata, _metadata$origin, _metadata$origin2, _variantList$find, _product$is_charge_ta;
   var metadata = _objectSpread({}, product.metadata || {});
   // 不透明 identity 契约：每条订单行必须带 identity_key。
   // 调用方未传时由 SDK 自动生成 UUID，后续 update/remove 只做严格比对，避免猜测合成 key。
   var resolvedIdentityKey = (_product$metadata = product.metadata) !== null && _product$metadata !== void 0 && _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) : createUuidV4();
   metadata.unique_identification_number = resolvedIdentityKey;
-  var normalizedBundle = (product.product_bundle || []).map(function (item) {
-    var _ref2, _item$bundle_selling_, _ref3, _ref4, _item$price2, _ref5, _item$price_type, _ref6, _item$price_type_ext;
+  var priceOverride = metadata.price_override;
+  var originOtherBundle = (_metadata$origin = metadata.origin) === null || _metadata$origin === void 0 || (_metadata$origin = _metadata$origin._extend) === null || _metadata$origin === void 0 || (_metadata$origin = _metadata$origin.other) === null || _metadata$origin === void 0 ? void 0 : _metadata$origin.bundle;
+  var bundleInput = product.product_bundle || [];
+  if (priceOverride !== undefined && priceOverride !== null && priceOverride !== '' && Array.isArray(originOtherBundle) && originOtherBundle.length > 0) {
+    var priceById = new Map();
+    originOtherBundle.forEach(function (item) {
+      var _item$price2;
+      if ((item === null || item === void 0 ? void 0 : item.id) == null) return;
+      var unit = (_item$price2 = item.price) !== null && _item$price2 !== void 0 ? _item$price2 : item.bundle_selling_price;
+      if (unit === undefined || unit === null) return;
+      priceById.set(String(item.id), String(unit));
+    });
+    var base = Array.isArray(bundleInput) && bundleInput.length > 0 ? bundleInput : originOtherBundle;
+    bundleInput = base.map(function (item) {
+      var unit = priceById.get(String(item === null || item === void 0 ? void 0 : item.id));
+      if (unit === undefined) return item;
+      return _objectSpread(_objectSpread({}, item), {}, {
+        price: unit,
+        bundle_selling_price: unit
+      });
+    });
+  }
+  var normalizedBundle = bundleInput.map(function (item) {
+    var _item$bundle_id2, _item$bundle_product_, _item$bundle_group_id, _ref2, _item$bundle_selling_, _ref3, _ref4, _item$price3, _ref5, _item$price_type, _ref6, _item$price_type_ext;
     return _objectSpread(_objectSpread({}, item), {}, {
+      bundle_id: (_item$bundle_id2 = item.bundle_id) !== null && _item$bundle_id2 !== void 0 ? _item$bundle_id2 : item.id,
+      bundle_product_id: (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id,
+      bundle_group_id: (_item$bundle_group_id = item.bundle_group_id) !== null && _item$bundle_group_id !== void 0 ? _item$bundle_group_id : item.group_id,
       bundle_selling_price: (_ref2 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref2 !== void 0 ? _ref2 : '0.00',
-      price: (_ref3 = (_ref4 = (_item$price2 = item.price) !== null && _item$price2 !== void 0 ? _item$price2 : item.custom_price) !== null && _ref4 !== void 0 ? _ref4 : item.bundle_selling_price) !== null && _ref3 !== void 0 ? _ref3 : '0.00',
+      price: (_ref3 = (_ref4 = (_item$price3 = item.price) !== null && _item$price3 !== void 0 ? _item$price3 : item.custom_price) !== null && _ref4 !== void 0 ? _ref4 : item.bundle_selling_price) !== null && _ref3 !== void 0 ? _ref3 : '0.00',
       price_type: (_ref5 = (_item$price_type = item.price_type) !== null && _item$price_type !== void 0 ? _item$price_type : item.custom_price_type) !== null && _ref5 !== void 0 ? _ref5 : '',
       price_type_ext: (_ref6 = (_item$price_type_ext = item.price_type_ext) !== null && _item$price_type_ext !== void 0 ? _item$price_type_ext : item.custom_price_type_ext) !== null && _ref6 !== void 0 ? _ref6 : ''
     });
@@ -134,7 +160,7 @@ export function normalizeOrderProduct(product) {
   //   6) 入参 selling_price（最末兜底，新添加路径 caller 只给 selling_price）
   var isV2 = metadata.price_schema_version === 2 || metadata.price_schema_version === '2';
   var variantId = Number(product.product_variant_id || 0);
-  var variantList = variantId ? metadata === null || metadata === void 0 || (_metadata$origin = metadata.origin) === null || _metadata$origin === void 0 ? void 0 : _metadata$origin.variant : null;
+  var variantList = variantId ? metadata === null || metadata === void 0 || (_metadata$origin2 = metadata.origin) === null || _metadata$origin2 === void 0 ? void 0 : _metadata$origin2.variant : null;
   var variantPrice = Array.isArray(variantList) ? (_variantList$find = variantList.find(function (v) {
     return Number(v === null || v === void 0 ? void 0 : v.id) === variantId;
   })) === null || _variantList$find === void 0 ? void 0 : _variantList$find.price : undefined;
@@ -204,6 +230,18 @@ export function normalizeOrderProduct(product) {
     bundle: normalizedBundle,
     useOriginalBundle: true
   });
+  var finalOriginalPrice = resolveManualOverrideLineOriginalPrice({
+    num: product.num,
+    metadata: metadata,
+    lineOriginalPrice: product.original_price
+  }, composedOriginalPrice);
+  var discountList = ensureManualProductDiscountList({
+    discountList: product.discount_list,
+    metadata: metadata,
+    originalPrice: finalOriginalPrice,
+    sellingPrice: composedSellingPrice,
+    quantity: getSafeProductNum(product.num)
+  });
   return {
     order_detail_id: product.order_detail_id || null,
     product_id: product.product_id,
@@ -211,10 +249,10 @@ export function normalizeOrderProduct(product) {
     product_variant_id: product.product_variant_id,
     product_option_item: normalizedOptions,
     selling_price: composedSellingPrice,
-    original_price: composedOriginalPrice,
+    original_price: finalOriginalPrice,
     tax_fee: product.tax_fee || '0.00',
     is_charge_tax: (_product$is_charge_ta = product.is_charge_tax) !== null && _product$is_charge_ta !== void 0 ? _product$is_charge_ta : 0,
-    discount_list: product.discount_list || [],
+    discount_list: discountList,
     product_bundle: normalizedBundle,
     metadata: metadata,
     note: product.note != null ? String(product.note) : ''