@pisell/pisellos 2.2.244 → 2.2.246

package/dist/modules/Order/utils.js

@@ -1,14 +1,14 @@
 var _excluded = ["unique_identification_number"],
-  _excluded2 = ["num", "product_option_item", "surcharge_fee"],
-  _excluded3 = ["_extend", "relation_id", "table_form_id", "resource_id", "summary", "lastOrderInfo", "paid_amount", "shop_id", "shop_note", "shop_service_type", "start_time", "customer", "shop_full_order_number", "tax_fee", "total_amount", "total_refund_amount", "create_date", "holder_id"],
+  _excluded2 = ["num", "surcharge_fee", "discount_amount", "discount_type", "discountway", "product_discount_reason", "discount_per"],
+  _excluded3 = ["_extend", "relation_id", "table_form_id", "resource_id", "summary", "lastOrderInfo", "paid_amount", "shop_id", "shop_note", "shop_service_type", "start_time", "customer", "discount_list", "tax_fee", "total_amount", "total_refund_amount", "create_date", "holder_id"],
   _excluded4 = ["collect_pax", "table_occupancy_duration"];
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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; }
@@ -19,7 +19,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import dayjs from "dayjs";
 import Decimal from 'decimal.js';
-import { buildProductLineFingerprint } from "../../solution/ScanOrder/utils";
+import { buildProductLineFingerprint, createEmptySummary } from "../../solution/ScanOrder/utils";
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
  *
@@ -43,13 +43,15 @@ export function composeLinePrice(params) {
       _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var _ref, _item$original_price, _item$bundle_selling_, _ref2, _item$num;
+        var _ref, _item$num;
         var item = _step.value;
-        var rawPrice = useOriginalBundle ? (_ref = (_item$original_price = item === null || item === void 0 ? void 0 : item.original_price) !== null && _item$original_price !== void 0 ? _item$original_price : item === null || item === void 0 ? void 0 : item.product_price) !== null && _ref !== void 0 ? _ref : item === null || item === void 0 ? void 0 : item.price : (_item$bundle_selling_ = item === null || item === void 0 ? void 0 : item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item === null || item === void 0 ? void 0 : item.price;
-        var price = new Decimal(Number(rawPrice) || 0);
-        var rawNum = (_ref2 = (_item$num = item === null || item === void 0 ? void 0 : item.num) !== null && _item$num !== void 0 ? _item$num : item === null || item === void 0 ? void 0 : item.quantity) !== null && _ref2 !== void 0 ? _ref2 : 1;
+        // markdown（减价）按带符号净额取减；markup/原价维持相加。
+        var signedUnit = getBundleSignedUnit(item, {
+          useOriginal: useOriginalBundle
+        });
+        var rawNum = (_ref = (_item$num = item === null || item === void 0 ? void 0 : item.num) !== null && _item$num !== void 0 ? _item$num : item === null || item === void 0 ? void 0 : item.quantity) !== null && _ref !== void 0 ? _ref : 1;
         var num = new Decimal(Number(rawNum) || 0);
-        total = total.plus(price.times(num));
+        total = total.plus(signedUnit.times(num));
       }
     } catch (err) {
       _iterator.e(err);
@@ -59,9 +61,30 @@ export function composeLinePrice(params) {
   }
   return total.toDecimalPlaces(2).toFixed(2);
 }
+export function normalizeProductSkuOptions(options) {
+  if (!Array.isArray(options)) return [];
+  return options.map(function (option) {
+    var _normalized$add_price;
+    var normalized = _objectSpread({}, option && _typeof(option) === 'object' ? option : {});
+    var addPrice = (_normalized$add_price = normalized.add_price) !== null && _normalized$add_price !== void 0 ? _normalized$add_price : normalized.price;
+    if (addPrice !== undefined) normalized.add_price = addPrice;
+    delete normalized.price;
+    return normalized;
+  });
+}
+export function ensureProductSku(product) {
+  var rawSku = product !== null && product !== void 0 && product.product_sku && _typeof(product.product_sku) === 'object' ? product.product_sku : {};
+  return _objectSpread(_objectSpread({}, rawSku), {}, {
+    option: normalizeProductSkuOptions(rawSku.option)
+  });
+}
+export function getProductSkuOptions(product) {
+  return ensureProductSku(product).option;
+}
 
 /**
- * 计算 option 单价合计：Σ(option.price × option.num)。
+ * 计算 option 单价合计：Σ(option.add_price × option.num)。
+ * 兼容入参仍带旧 `price` 的调用方，但运行时归一化后只维护 `add_price`。
  * 在新语义 v2 下，main_product_original_price = source_product_price + 本函数结果。
  */
 export function sumOptionUnitPrice(options) {
@@ -71,8 +94,9 @@ export function sumOptionUnitPrice(options) {
     _step2;
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var _opt$add_price;
       var opt = _step2.value;
-      var price = new Decimal(Number(opt === null || opt === void 0 ? void 0 : opt.price) || 0);
+      var price = new Decimal(Number((_opt$add_price = opt === null || opt === void 0 ? void 0 : opt.add_price) !== null && _opt$add_price !== void 0 ? _opt$add_price : opt === null || opt === void 0 ? void 0 : opt.price) || 0);
       var num = new Decimal(Number(opt === null || opt === void 0 ? void 0 : opt.num) || 0);
       total = total.plus(price.times(num));
     }
@@ -83,6 +107,263 @@ export function sumOptionUnitPrice(options) {
   }
   return total;
 }
+function getSafeOrderProductNum(num) {
+  var parsedNum = Number(num !== null && num !== void 0 ? num : 1);
+  if (!Number.isFinite(parsedNum) || parsedNum < 1) return 1;
+  return Math.floor(parsedNum);
+}
+function getOrderProductDepositUnitTotal(product) {
+  var _ref2;
+  var metadata = product.metadata || {};
+  var paymentPrice = metadata.main_product_attached_bundle_payment_price;
+  var mainSellingPrice = metadata.main_product_selling_price;
+  var fallbackPrice = product.selling_price;
+  return new Decimal(Number((_ref2 = paymentPrice !== null && paymentPrice !== void 0 ? paymentPrice : mainSellingPrice) !== null && _ref2 !== void 0 ? _ref2 : fallbackPrice) || 0);
+}
+function normalizeDepositProtocols(protocols) {
+  if (!Array.isArray(protocols)) return [];
+  return protocols.reduce(function (result, protocol) {
+    var id = Number(protocol === null || protocol === void 0 ? void 0 : protocol.id);
+    if (!Number.isFinite(id)) return result;
+    result.push({
+      id: Math.floor(id),
+      title: String((protocol === null || protocol === void 0 ? void 0 : protocol.title) || '')
+    });
+    return result;
+  }, []);
+}
+function getDepositPolicyIds(depositData) {
+  var ids = [].concat(_toConsumableArray(Array.isArray(depositData === null || depositData === void 0 ? void 0 : depositData.self_deposit_policy_ids) ? depositData.self_deposit_policy_ids : []), _toConsumableArray(Array.isArray(depositData === null || depositData === void 0 ? void 0 : depositData.deposit_policy_ids) ? depositData.deposit_policy_ids : []));
+  return ids.reduce(function (result, id) {
+    var normalizedId = Number(id);
+    if (!Number.isFinite(normalizedId)) return result;
+    result.push(Math.floor(normalizedId));
+    return result;
+  }, []);
+}
+function handleOrderProductDeposit(params) {
+  var depositData = params.depositData,
+    total = params.total,
+    num = params.num;
+  if (!depositData) return {
+    result: false,
+    depositTotal: new Decimal(0)
+  };
+  var deposit_fixed = depositData.deposit_fixed,
+    deposit_percentage = depositData.deposit_percentage;
+  if (typeof deposit_fixed !== 'string' || typeof deposit_percentage !== 'string') {
+    return {
+      result: false,
+      depositTotal: new Decimal(0)
+    };
+  }
+  var depositFixed = new Decimal(deposit_fixed || 0);
+  var depositPercent = new Decimal(deposit_percentage || 0);
+  var productTotalPrice = new Decimal(total || 0);
+  var deposit = depositFixed.plus(depositPercent.times(productTotalPrice));
+  return {
+    depositTotal: deposit.times(num),
+    result: true
+  };
+}
+function resolveOrderProductDepositSource(product, runtimeOrigin) {
+  var _ref3, _record$custom_deposi, _ref4, _record$variant;
+  var record = product;
+  var origin = record._origin || runtimeOrigin || {};
+  var originProduct = origin.product || {};
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, originProduct), origin), record), {}, {
+    custom_deposit_data: (_ref3 = (_record$custom_deposi = record.custom_deposit_data) !== null && _record$custom_deposi !== void 0 ? _record$custom_deposi : origin.custom_deposit_data) !== null && _ref3 !== void 0 ? _ref3 : originProduct.custom_deposit_data,
+    variant: (_ref4 = (_record$variant = record.variant) !== null && _record$variant !== void 0 ? _record$variant : origin.variant) !== null && _ref4 !== void 0 ? _ref4 : originProduct.variant
+  });
+}
+function getOrderProductDeposit(product, runtimeOrigin) {
+  var depositProduct = resolveOrderProductDepositSource(product, runtimeOrigin);
+  var depositData = depositProduct.custom_deposit_data;
+  if ((depositData === null || depositData === void 0 ? void 0 : depositData.has_deposit) != 1) return null;
+  var num = getSafeOrderProductNum(product.num);
+  var total = getOrderProductDepositUnitTotal(product).times(num);
+  var allProtocols = normalizeDepositProtocols(depositData.deposit_policy_data);
+  var protocolIds = [];
+  var depositTotal = new Decimal(0);
+  var hasDeposit = false;
+  if (typeof depositData.deposit_fixed === 'string' && typeof depositData.deposit_percentage === 'string') {
+    var result = handleOrderProductDeposit({
+      depositData: depositData,
+      total: total,
+      num: num
+    });
+    if (result.result) {
+      depositTotal = result.depositTotal;
+      protocolIds.push.apply(protocolIds, _toConsumableArray(getDepositPolicyIds({
+        self_deposit_policy_ids: depositData.self_deposit_policy_ids
+      })));
+      hasDeposit = true;
+    }
+  } else {
+    var _depositProduct$produ;
+    var productVariantId = (_depositProduct$produ = depositProduct.product_variant_id) !== null && _depositProduct$produ !== void 0 ? _depositProduct$produ : product.product_variant_id;
+    if (productVariantId) {
+      var variantProduct = (depositProduct.variant || []).find(function (item) {
+        return (item === null || item === void 0 ? void 0 : item.id) === productVariantId;
+      });
+      var variantDepositData = variantProduct === null || variantProduct === void 0 ? void 0 : variantProduct.custom_deposit_data;
+      var _result = handleOrderProductDeposit({
+        depositData: variantDepositData,
+        total: total,
+        num: num
+      });
+      if (_result.result) {
+        depositTotal = _result.depositTotal;
+        protocolIds.push.apply(protocolIds, _toConsumableArray(getDepositPolicyIds({
+          self_deposit_policy_ids: variantDepositData === null || variantDepositData === void 0 ? void 0 : variantDepositData.self_deposit_policy_ids
+        })));
+        hasDeposit = true;
+      }
+    }
+    if (Array.isArray(product.product_bundle) && product.product_bundle.length) {
+      depositTotal = product.product_bundle.reduce(function (accumulator, bundleProduct) {
+        var bundleDepositData = bundleProduct === null || bundleProduct === void 0 ? void 0 : bundleProduct.custom_deposit_data;
+        var result = handleOrderProductDeposit({
+          depositData: bundleDepositData,
+          total: bundleProduct === null || bundleProduct === void 0 ? void 0 : bundleProduct.price,
+          num: getSafeOrderProductNum((bundleProduct === null || bundleProduct === void 0 ? void 0 : bundleProduct.num) || 1)
+        });
+        if (!result.result) return accumulator;
+        protocolIds.push.apply(protocolIds, _toConsumableArray(getDepositPolicyIds({
+          self_deposit_policy_ids: bundleDepositData === null || bundleDepositData === void 0 ? void 0 : bundleDepositData.self_deposit_policy_ids
+        })));
+        hasDeposit = true;
+        return accumulator.plus(result.depositTotal);
+      }, new Decimal(0));
+    }
+  }
+  if (!hasDeposit) return null;
+  var protocolIdSet = new Set(protocolIds);
+  var protocols = allProtocols.filter(function (protocol) {
+    return protocolIdSet.has(protocol.id);
+  });
+  return {
+    total: depositTotal.toNumber(),
+    protocols: protocols
+  };
+}
+
+/**
+ * 仅基于 tempOrder.products 重算整单定金。
+ *
+ * 对齐 Checkout relation_products 分支：商品定金先按商品规则计算，
+ * 再扣减商品券/折扣卡抵扣金额；tempOrder.bookings 不参与这里的计算。
+ */
+export function calculateOrderProductsDeposit() {
+  var products = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var options = arguments.length > 1 ? arguments[1] : undefined;
+  var protocolMap = new Map();
+  var total = new Decimal(0);
+  var hasDeposit = false;
+  var _iterator3 = _createForOfIteratorHelper(products || []),
+    _step3;
+  try {
+    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+      var _product$metadata, _options$productsByUi;
+      var product = _step3.value;
+      var productUid = (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.unique_identification_number;
+      var runtimeOrigin = productUid ? options === null || options === void 0 || (_options$productsByUi = options.productsByUid) === null || _options$productsByUi === void 0 || (_options$productsByUi = _options$productsByUi[productUid]) === null || _options$productsByUi === void 0 ? void 0 : _options$productsByUi.origin : undefined;
+      var deposit = getOrderProductDeposit(product, runtimeOrigin);
+      product.deposit = deposit;
+      if (!(deposit !== null && deposit !== void 0 && deposit.total) || Number(deposit.total) <= 0) continue;
+      total = total.plus(deposit.total);
+      var _iterator4 = _createForOfIteratorHelper(product.discount_list || []),
+        _step4;
+      try {
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var discount = _step4.value;
+          total = total.minus((discount === null || discount === void 0 ? void 0 : discount.amount) || 0);
+        }
+      } catch (err) {
+        _iterator4.e(err);
+      } finally {
+        _iterator4.f();
+      }
+      var _iterator5 = _createForOfIteratorHelper(deposit.protocols || []),
+        _step5;
+      try {
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var protocol = _step5.value;
+          if (!protocolMap.has(protocol.id)) protocolMap.set(protocol.id, protocol);
+        }
+      } catch (err) {
+        _iterator5.e(err);
+      } finally {
+        _iterator5.f();
+      }
+      hasDeposit = true;
+    }
+  } catch (err) {
+    _iterator3.e(err);
+  } finally {
+    _iterator3.f();
+  }
+  var roundedTotal = total.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
+  var protocols = _toConsumableArray(protocolMap.values());
+  return {
+    total: roundedTotal.toNumber(),
+    totalText: roundedTotal.toFixed(2),
+    protocols: protocols,
+    deposit_policy_ids: protocols.map(function (protocol) {
+      return protocol.id;
+    }),
+    hasDeposit: hasDeposit
+  };
+}
+
+/**
+ * 判定套餐子商品是否为 markdown（减价）类型。
+ * 与后端口径一致：price_type='markdown' 且 price_type_ext 非 'product_price'（原价子商品）。
+ */
+export function isMarkdownBundle(bundle) {
+  var _bundle$price_type_ex, _bundle$price_type;
+  if (!bundle || _typeof(bundle) !== 'object') return false;
+  var ext = (_bundle$price_type_ex = bundle.price_type_ext) !== null && _bundle$price_type_ex !== void 0 ? _bundle$price_type_ex : bundle.custom_price_type_ext;
+  var type = (_bundle$price_type = bundle.price_type) !== null && _bundle$price_type !== void 0 ? _bundle$price_type : bundle.custom_price_type;
+  return type === 'markdown' && ext !== 'product_price';
+}
+
+/**
+ * 套餐子商品对「行价」的带符号单位贡献（与后端 markdown 口径对齐）。
+ *
+ * - markdown（减价）：净额 = |catalog 毛价| − Σ(option.add_price×num)，**取负**（行内减）。
+ *   catalog 毛价优先 `price`/`custom_price`（避免读已落净额的 `bundle_selling_price` 造成 option 二次扣减）；
+ *   仅当毛价缺失（历史/hydrate 仅剩净额）时退回 `bundle_selling_price`，且此时不再扣 option。
+ * - markup（加价）/原价子商品：维持 `+(bundle_selling_price ?? price)`，行为不变。
+ */
+export function getBundleSignedUnit(bundle, options) {
+  var _options$useOriginal, _ref11, _bundle$original_pric2, _bundle$bundle_sellin;
+  if (!bundle || _typeof(bundle) !== 'object') return new Decimal(0);
+  var useOriginal = (_options$useOriginal = options === null || options === void 0 ? void 0 : options.useOriginal) !== null && _options$useOriginal !== void 0 ? _options$useOriginal : false;
+  if (isMarkdownBundle(bundle)) {
+    var _ref5, _ref6, _ref7, _bundle$original_pric, _ref8, _ref9, _ref10, _bundle$custom_price;
+    var catalog = useOriginal ? (_ref5 = (_ref6 = (_ref7 = (_bundle$original_pric = bundle.original_price) !== null && _bundle$original_pric !== void 0 ? _bundle$original_pric : bundle.product_price) !== null && _ref7 !== void 0 ? _ref7 : bundle.custom_price) !== null && _ref6 !== void 0 ? _ref6 : bundle.base_price) !== null && _ref5 !== void 0 ? _ref5 : bundle.price : (_ref8 = (_ref9 = (_ref10 = (_bundle$custom_price = bundle.custom_price) !== null && _bundle$custom_price !== void 0 ? _bundle$custom_price : bundle.product_price) !== null && _ref10 !== void 0 ? _ref10 : bundle.original_price) !== null && _ref9 !== void 0 ? _ref9 : bundle.base_price) !== null && _ref8 !== void 0 ? _ref8 : bundle.price;
+    if (catalog !== undefined && catalog !== null && catalog !== '') {
+      var raw = new Decimal(Number(catalog) || 0);
+      // 负值表示价格已是「带符号净额」（如 cart/changePrice 产出的 -3.7），直接取用不再扣 option，
+      // 避免与下游 option 二次扣减；正值为毛价（H5 路径，如 5），净额 = price − Σoptions 后取负。
+      if (raw.lt(0)) return raw;
+      return raw.minus(sumOptionUnitPrice(bundle.option)).negated();
+    }
+    // 仅剩净额（无毛价）兜底：直接取负，不再扣 option
+    return new Decimal(Number(bundle.bundle_selling_price) || 0).abs().negated();
+  }
+  var rawPrice = useOriginal ? (_ref11 = (_bundle$original_pric2 = bundle.original_price) !== null && _bundle$original_pric2 !== void 0 ? _bundle$original_pric2 : bundle.product_price) !== null && _ref11 !== void 0 ? _ref11 : bundle.price : (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.price;
+  return new Decimal(Number(rawPrice) || 0);
+}
+
+/**
+ * 套餐子商品 `bundle_selling_price` 的存储净额（正值幅度）。
+ * markdown 取净额绝对值（3.70）；markup/原价维持原值。
+ */
+export function getBundleSellingMagnitude(bundle) {
+  return getBundleSignedUnit(bundle).abs();
+}
 
 /**
  * OrderModule 默认 Rules 钩子工厂。
@@ -96,7 +377,7 @@ export function sumOptionUnitPrice(options) {
  *   不含折扣。**权威源**。
  * - `metadata.main_product_original_price` = source + Σ(option.price × option.num)（含 option、不含折扣）。
  * - `metadata.main_product_selling_price` = main_original − 主商品券 per-unit amount（含 option、含折扣）。
- * - `payment_price`：出站 payload 中由 `selling_price` 派生以兼容后端（composite）。
+ * - `payment_price`：出站 payload 中为行 composite 已减整单折扣均摊价（无折扣时与 `selling_price` 同义）。
  *
  * Rules 钩子契约（hook_adapt 方案，Rules 内部保持不变）：
  * - `getProduct.price` / `getProduct.original_price` 回传 **source-level 主价**
@@ -113,17 +394,168 @@ export function sumOptionUnitPrice(options) {
  *
  * 导出为纯函数方便单测直接驱动钩子，不依赖 OrderModule 实例。
  */
+
+/** Rules calcDiscount 用手动价标记；undefined 表示交给 Rules 用 total/origin_total 推断 */
+export function resolveRulesManualDiscountFlag(metadata) {
+  if (!metadata) return undefined;
+  if (metadata.is_manual_discount === true || metadata.is_manual_discount === 1) {
+    return true;
+  }
+  var priceOverride = metadata.price_override;
+  if (priceOverride !== undefined && priceOverride !== null && priceOverride !== '') {
+    return true;
+  }
+  return undefined;
+}
+function normalizeOrderProductDiscountAmount(amount) {
+  if (amount === undefined || amount === null) return undefined;
+  return String(amount);
+}
+
+/**
+ * 商品行折扣只保留后端 OrderProductDiscountItem 协议字段。
+ * Rules/券计算过程中的 `_num`、`config` 等运行态字段不应进入 tempOrder 或提交 payload。
+ */
+export function normalizeOrderProductDiscountList(discountList) {
+  if (!Array.isArray(discountList)) return [];
+  return discountList.filter(function (item) {
+    return !!item && _typeof(item) === 'object';
+  }).map(function (item) {
+    var normalized = {
+      discount_id: Number.isFinite(Number(item.discount_id)) ? Number(item.discount_id) : 0
+    };
+    if (item.order_discount_id === null) {
+      normalized.order_discount_id = null;
+    } else if (item.order_discount_id !== undefined) {
+      var orderDiscountId = Number(item.order_discount_id);
+      if (Number.isFinite(orderDiscountId)) {
+        normalized.order_discount_id = orderDiscountId;
+      }
+    }
+    if (item.type !== undefined) normalized.type = item.type;
+    var amount = normalizeOrderProductDiscountAmount(item.amount);
+    if (amount !== undefined) normalized.amount = amount;
+    if (item.discount && _typeof(item.discount) === 'object') {
+      normalized.discount = _objectSpread({}, item.discount);
+    }
+    if (item.metadata === null) {
+      normalized.metadata = null;
+    } else if (item.metadata && _typeof(item.metadata) === 'object') {
+      normalized.metadata = _objectSpread({}, item.metadata);
+    }
+    return normalized;
+  });
+}
+
+/**
+ * 手动改价（price_override）时行级 original_price（composite 单价）：
+ * 购物车划线价应对齐 metadata.origin._extend.origin_total（改价前单价 composite，如 40），
+ * 而非 bundle 子项 catalog 原价合成的 composedOriginalPrice（如 30）。
+ *
+ * origin_total 与 SkuDetailModal / cacheItem._extend 一致，为单价语义，不再除以 num。
+ */
+export function resolveManualOverrideLineOriginalPrice(params, fallbackCompositeOriginal) {
+  var _metadata$origin;
+  var metadata = params.metadata || {};
+  var priceOverride = metadata.price_override;
+  if (priceOverride === undefined || priceOverride === null || priceOverride === '') {
+    return fallbackCompositeOriginal;
+  }
+  var refTotal = (_metadata$origin = metadata.origin) === null || _metadata$origin === void 0 || (_metadata$origin = _metadata$origin._extend) === null || _metadata$origin === void 0 ? void 0 : _metadata$origin.origin_total;
+  if (refTotal !== undefined && refTotal !== null && refTotal !== '') {
+    var parsed = Number(refTotal);
+    if (Number.isFinite(parsed)) {
+      return new Decimal(parsed).toDecimalPlaces(2).toFixed(2);
+    }
+  }
+  var lineOriginal = params.lineOriginalPrice;
+  if (lineOriginal !== undefined && lineOriginal !== null && lineOriginal !== '') {
+    var parsedLine = Number(lineOriginal);
+    var parsedFallback = Number(fallbackCompositeOriginal);
+    if (Number.isFinite(parsedLine) && Number.isFinite(parsedFallback) && parsedLine > parsedFallback) {
+      return new Decimal(parsedLine).toDecimalPlaces(2).toFixed(2);
+    }
+  }
+  return fallbackCompositeOriginal;
+}
+
+/**
+ * 计算商品行「每单位有效折扣」：discount_list 合计 + 被 Rules 剥离但仍 inPromotion 的差额。
+ *
+ * Rules.calcDiscount 会把 type=promotion 从 discount_list 去掉，但 metadata._promotion 仍保留；
+ * applyProductDiscountPrices 必须回读 _promotion，否则抬价/降价都会在第二步被 source 原价覆盖。
+ *
+ * @example
+ * resolveEffectivePerUnitDiscount({ metadata: { _promotion: { inPromotion: true, originalPrice: 1, finalPrice: 5 } }, discount_list: [] });
+ * // => -4
+ */
+export function resolveEffectivePerUnitDiscount(product) {
+  var discountList = Array.isArray(product === null || product === void 0 ? void 0 : product.discount_list) ? product.discount_list : [];
+  var fromList = discountList.reduce(function (sum, discount) {
+    return sum + Number((discount === null || discount === void 0 ? void 0 : discount.amount) || 0);
+  }, 0);
+  var hasPromoDiscountItem = discountList.some(function (item) {
+    return (item === null || item === void 0 ? void 0 : item.type) === 'promotion';
+  });
+  if (hasPromoDiscountItem) return fromList;
+  var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
+  var promo = metadata._promotion;
+  if ((promo === null || promo === void 0 ? void 0 : promo.inPromotion) !== true) return fromList;
+  var optionSum = sumOptionUnitPrice(getProductSkuOptions(product)).toNumber();
+
+  // applyPromotion 写价后、Rules 剥离 promotion discount 的兜底
+  if (!discountList.length && metadata.source_product_price != null && metadata.main_product_selling_price != null) {
+    var source = Number(metadata.source_product_price);
+    var selling = Number(metadata.main_product_selling_price) - optionSum;
+    if (Number.isFinite(source) && Number.isFinite(selling) && source !== selling) {
+      return fromList + (source - selling);
+    }
+  }
+  var originalPrice = Number(promo.originalPrice);
+  var finalPrice = Number(promo.finalPrice);
+  if (!Number.isFinite(originalPrice) || !Number.isFinite(finalPrice)) return fromList;
+  return fromList + (originalPrice - finalPrice);
+}
 export function createDefaultOrderRulesHooks() {
   var toUnitPriceString = function toUnitPriceString(totalLike, num) {
     var effectiveNum = Number(num) > 0 ? Number(num) : 1;
     return new Decimal(Number(totalLike) || 0).dividedBy(effectiveNum).toDecimalPlaces(2).toString();
   };
+  var getBundleIdentity = function getBundleIdentity(bundle) {
+    var _ref12, _bundle$bundle_id, _ref13, _ref14, _bundle$bundle_produc, _ref15, _ref16, _bundle$bundle_varian, _ref17, _bundle$bundle_group_;
+    return [(_ref12 = (_bundle$bundle_id = bundle.bundle_id) !== null && _bundle$bundle_id !== void 0 ? _bundle$bundle_id : bundle.id) !== null && _ref12 !== void 0 ? _ref12 : '', (_ref13 = (_ref14 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref14 !== void 0 ? _ref14 : bundle.product_id) !== null && _ref13 !== void 0 ? _ref13 : '', (_ref15 = (_ref16 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref16 !== void 0 ? _ref16 : bundle.product_variant_id) !== null && _ref15 !== void 0 ? _ref15 : 0, (_ref17 = (_bundle$bundle_group_ = bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle.group_id) !== null && _ref17 !== void 0 ? _ref17 : ''].join('|');
+  };
+  var mergeRulesBundlePrices = function mergeRulesBundlePrices(currentBundle, rulesBundle) {
+    if (!Array.isArray(rulesBundle)) return rulesBundle;
+    var currentByIdentity = new Map();
+    (currentBundle || []).forEach(function (bundle) {
+      if (!bundle || _typeof(bundle) !== 'object') return;
+      currentByIdentity.set(getBundleIdentity(bundle), bundle);
+    });
+    return rulesBundle.map(function (bundle) {
+      var _bundle$price_type_ex2, _ref18, _ref19, _current$price, _ref20, _ref21, _ref22, _current$original_pri;
+      if (!bundle || _typeof(bundle) !== 'object') return bundle;
+      var current = currentByIdentity.get(getBundleIdentity(bundle));
+      if (!current) return bundle;
+      var isProductPriceBundle = ((_bundle$price_type_ex2 = bundle.price_type_ext) !== null && _bundle$price_type_ex2 !== void 0 ? _bundle$price_type_ex2 : current.price_type_ext) === 'product_price';
+      if (!isProductPriceBundle) return bundle;
+      var sourcePrice = (_ref18 = (_ref19 = (_current$price = current.price) !== null && _current$price !== void 0 ? _current$price : current.custom_price) !== null && _ref19 !== void 0 ? _ref19 : current.original_price) !== null && _ref18 !== void 0 ? _ref18 : current.bundle_selling_price;
+      var originalPrice = (_ref20 = (_ref21 = (_ref22 = (_current$original_pri = current.original_price) !== null && _current$original_pri !== void 0 ? _current$original_pri : current.product_price) !== null && _ref22 !== void 0 ? _ref22 : current.price) !== null && _ref21 !== void 0 ? _ref21 : current.custom_price) !== null && _ref20 !== void 0 ? _ref20 : sourcePrice;
+      return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, bundle), sourcePrice !== undefined ? {
+        price: sourcePrice
+      } : {}), originalPrice !== undefined ? {
+        original_price: originalPrice
+      } : {}), current.original_total !== undefined ? {
+        original_total: current.original_total
+      } : {});
+    });
+  };
   return {
     getProduct: function getProduct(product) {
-      var _product$metadata, _product$metadata2, _product$metadata3, _product$metadata4, _product$metadata5, _product$metadata6;
+      var _product$metadata2, _product$metadata3, _product$metadata4, _product$metadata5, _product$metadata6, _metadataAny$_promoti;
       // source_product_price 是权威源；兜底链：source → mainSelling − options（反推）→ 行 selling_price
       var metadataAny = product.metadata || {};
-      var optionSum = sumOptionUnitPrice(product.product_option_item);
+      var optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
       var sourcePrice;
       if (metadataAny.source_product_price !== undefined) {
         sourcePrice = String(metadataAny.source_product_price);
@@ -145,9 +577,9 @@ export function createDefaultOrderRulesHooks() {
         id: product.product_id,
         // Rules 引擎用 _id 作为 processedProductsMap 键；必须与购物车行级 identity 一致，
         // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
-        // 不透明 identity 契约下，normalizeOrderProduct / restoreTempOrderFromStorage 已保证唯一值存在；
+        // 不透明 identity 契约下，normalizeOrderProduct / hydrate 已保证唯一值存在；
         // 留 fingerprint 分支仅作 Rules 单测里直接传裸 product 时的兜底。
-        _id: (_product$metadata = product.metadata) !== null && _product$metadata !== void 0 && _product$metadata.unique_identification_number ? "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(product.metadata.unique_identification_number) : "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(buildProductLineFingerprint(product.product_option_item, product.product_bundle)),
+        _id: (_product$metadata2 = product.metadata) !== null && _product$metadata2 !== void 0 && _product$metadata2.unique_identification_number ? "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(product.metadata.unique_identification_number) : "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(buildProductLineFingerprint(getProductSkuOptions(product), product.product_bundle)),
         // Rules 内部 getProductTotalPrice / getProductOriginTotalPrice 会各自再叠加 bundle + option，
         // 所以这里必须喂 source-level（不含 option、不含 bundle、不含折扣）单价，避免双加 option。
         price: sourcePrice,
@@ -159,19 +591,24 @@ export function createDefaultOrderRulesHooks() {
         num: product.num || 1,
         discount_list: product.discount_list || [],
         bundle: product.product_bundle || [],
-        booking_id: ((_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.booking_id) || null,
+        booking_id: ((_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.booking_id) || null,
         isClient: false,
-        isManualDiscount: ((_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.is_manual_discount) || false,
+        // 勿写死 false：否则 Rules 不会走 total≠origin_total 的手动价推断，
+        // 无券时会把 bundle 价还原成 original_price（手动改价套餐会从 20 回到 30）。
+        isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
         holder_id: (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.holder_id,
-        startDate: ((_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.start_date) || ((_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.startDate)
+        startDate: ((_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.start_date) || ((_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.startDate),
+        main_product_selling_price: metadataAny.main_product_selling_price !== undefined ? new Decimal(Number(metadataAny.main_product_selling_price) || 0).minus(optionSum).toDecimalPlaces(2).toString() : undefined,
+        inPromotion: ((_metadataAny$_promoti = metadataAny._promotion) === null || _metadataAny$_promoti === void 0 ? void 0 : _metadataAny$_promoti.inPromotion) === true,
+        _promotion: metadataAny._promotion
       };
     },
     setProduct: function setProduct(product, values) {
-      var _ref3, _values$quantity, _ref4, _metadataAny$source_p, _values$bundle, _values$discount_list, _values$quantity2;
-      var nextNum = Number((_ref3 = (_values$quantity = values.quantity) !== null && _values$quantity !== void 0 ? _values$quantity : product.num) !== null && _ref3 !== void 0 ? _ref3 : 1) || 1;
+      var _ref23, _values$quantity, _ref24, _metadataAny$source_p, _values$discount_list, _values$quantity2;
+      var nextNum = Number((_ref23 = (_values$quantity = values.quantity) !== null && _values$quantity !== void 0 ? _values$quantity : product.num) !== null && _ref23 !== void 0 ? _ref23 : 1) || 1;
       var metadataAny = product.metadata || {};
-      var existedSource = (_ref4 = (_metadataAny$source_p = metadataAny.source_product_price) !== null && _metadataAny$source_p !== void 0 ? _metadataAny$source_p : product.selling_price) !== null && _ref4 !== void 0 ? _ref4 : '0';
-      var nextOptions = product.product_option_item;
+      var existedSource = (_ref24 = (_metadataAny$source_p = metadataAny.source_product_price) !== null && _metadataAny$source_p !== void 0 ? _metadataAny$source_p : product.selling_price) !== null && _ref24 !== void 0 ? _ref24 : '0';
+      var nextOptions = getProductSkuOptions(product);
       var optionSum = sumOptionUnitPrice(nextOptions);
 
       // Rules 返回的 main_product_selling_price / price / total 均为 source-level。
@@ -186,7 +623,7 @@ export function createDefaultOrderRulesHooks() {
       // 含 option 的 main_product_*
       var nextMainSellingPrice = new Decimal(Number(nextSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
       var nextMainOriginalPrice = new Decimal(Number(nextSourceOriginalPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
-      var nextBundle = (_values$bundle = values.bundle) !== null && _values$bundle !== void 0 ? _values$bundle : product.product_bundle;
+      var nextBundle = values.bundle !== undefined ? mergeRulesBundlePrices(product.product_bundle, values.bundle) : product.product_bundle;
       var composedSellingPrice = composeLinePrice({
         mainPrice: nextMainSellingPrice,
         bundle: nextBundle
@@ -196,9 +633,14 @@ export function createDefaultOrderRulesHooks() {
         bundle: nextBundle,
         useOriginalBundle: true
       });
+      var finalOriginalPrice = resolveManualOverrideLineOriginalPrice({
+        num: nextNum,
+        metadata: metadataAny,
+        lineOriginalPrice: product.original_price
+      }, composedOriginalPrice);
       return _objectSpread(_objectSpread({}, product), {}, {
         selling_price: composedSellingPrice,
-        original_price: composedOriginalPrice,
+        original_price: finalOriginalPrice,
         discount_list: (_values$discount_list = values.discount_list) !== null && _values$discount_list !== void 0 ? _values$discount_list : product.discount_list,
         num: (_values$quantity2 = values.quantity) !== null && _values$quantity2 !== void 0 ? _values$quantity2 : product.num,
         product_bundle: nextBundle,
@@ -311,13 +753,14 @@ function formatSubmitOptionItems(options) {
   if (!Array.isArray(options)) return [];
   return options.map(function (d) {
     var _d$add_price;
-    var option = {
+    var option = _objectSpread(_objectSpread({}, d && _typeof(d) === 'object' ? d : {}), {}, {
       num: d === null || d === void 0 ? void 0 : d.num,
       option_group_item_id: d === null || d === void 0 ? void 0 : d.option_group_item_id,
       option_group_id: d === null || d === void 0 ? void 0 : d.option_group_id
-    };
+    });
     var addPrice = (_d$add_price = d === null || d === void 0 ? void 0 : d.add_price) !== null && _d$add_price !== void 0 ? _d$add_price : d === null || d === void 0 ? void 0 : d.price;
     if (addPrice !== undefined) option.add_price = String(addPrice);
+    delete option.price;
     return option;
   });
 }
@@ -337,11 +780,16 @@ function toMoneyString(value) {
 function formatSubmitBundleItems(bundle) {
   if (!Array.isArray(bundle)) return [];
   return bundle.map(function (b) {
-    var _rawBundle$bundle_sel, _ref5, _rawBundle$price, _rawBundle$surcharge_, _rawBundle$num, _rawBundle$is_charge_, _rawBundle$bundle_var, _rawBundle$quantity, _rawBundle$extension_, _rawBundle$extension_2, _ref6, _rawBundle$price_type, _ref7, _rawBundle$price_type2, _rawBundle$bundle_gro, _rawBundle$bundle_id, _rawBundle$bundle_pro;
+    var _ref25, _rawBundle$price, _rawBundle$surcharge_, _rawBundle$num, _rawBundle$is_charge_, _rawBundle$bundle_var, _rawBundle$quantity, _rawBundle$extension_, _rawBundle$extension_2, _ref26, _rawBundle$price_type, _ref27, _rawBundle$price_type2, _rawBundle$bundle_gro, _rawBundle$bundle_id, _rawBundle$bundle_pro;
     var rawBundle = b && _typeof(b) === 'object' ? b : {};
     var existedMetadata = rawBundle.metadata && _typeof(rawBundle.metadata) === 'object' ? rawBundle.metadata : {};
-    var sellingPrice = toMoneyString((_rawBundle$bundle_sel = rawBundle.bundle_selling_price) !== null && _rawBundle$bundle_sel !== void 0 ? _rawBundle$bundle_sel : rawBundle.price);
-    var priceValue = (_ref5 = (_rawBundle$price = rawBundle.price) !== null && _rawBundle$price !== void 0 ? _rawBundle$price : rawBundle.custom_price) !== null && _ref5 !== void 0 ? _ref5 : rawBundle.bundle_selling_price;
+
+    // bundle_selling_price 出站存「正净额」：markdown 为 |price| − Σoptions（如 3.70），
+    // markup/原价维持原值；与后端口径一致（price 仍为毛价）。
+    var sellingPrice = getBundleSellingMagnitude(rawBundle).toFixed(2);
+    // payment 价由整单折扣均摊层产出；缺省（无折扣）时与 selling 净额同义。
+    var paymentPrice = rawBundle.bundle_payment_price !== undefined && rawBundle.bundle_payment_price !== null && rawBundle.bundle_payment_price !== '' ? toMoneyString(rawBundle.bundle_payment_price) : sellingPrice;
+    var priceValue = (_ref25 = (_rawBundle$price = rawBundle.price) !== null && _rawBundle$price !== void 0 ? _rawBundle$price : rawBundle.custom_price) !== null && _ref25 !== void 0 ? _ref25 : rawBundle.bundle_selling_price;
     var relationSurchargeIds = Array.isArray(rawBundle.relation_surcharge_ids) ? rawBundle.relation_surcharge_ids : Array.isArray(existedMetadata.relation_surcharge_ids) ? existedMetadata.relation_surcharge_ids : [];
     var surchargeFee = toMoneyString((_rawBundle$surcharge_ = rawBundle.surcharge_fee) !== null && _rawBundle$surcharge_ !== void 0 ? _rawBundle$surcharge_ : existedMetadata.surcharge_fee);
     var productDiscountDifference = toBundleNumber(existedMetadata.product_discount_difference, 0);
@@ -354,9 +802,10 @@ function formatSubmitBundleItems(bundle) {
       extension_id: (_rawBundle$extension_ = rawBundle.extension_id) !== null && _rawBundle$extension_ !== void 0 ? _rawBundle$extension_ : 0,
       extension_type: (_rawBundle$extension_2 = rawBundle.extension_type) !== null && _rawBundle$extension_2 !== void 0 ? _rawBundle$extension_2 : 'normal',
       price: priceValue,
-      price_type: (_ref6 = (_rawBundle$price_type = rawBundle.price_type) !== null && _rawBundle$price_type !== void 0 ? _rawBundle$price_type : rawBundle.custom_price_type) !== null && _ref6 !== void 0 ? _ref6 : '',
-      price_type_ext: (_ref7 = (_rawBundle$price_type2 = rawBundle.price_type_ext) !== null && _rawBundle$price_type2 !== void 0 ? _rawBundle$price_type2 : rawBundle.custom_price_type_ext) !== null && _ref7 !== void 0 ? _ref7 : '',
+      price_type: (_ref26 = (_rawBundle$price_type = rawBundle.price_type) !== null && _rawBundle$price_type !== void 0 ? _rawBundle$price_type : rawBundle.custom_price_type) !== null && _ref26 !== void 0 ? _ref26 : '',
+      price_type_ext: (_ref27 = (_rawBundle$price_type2 = rawBundle.price_type_ext) !== null && _rawBundle$price_type2 !== void 0 ? _rawBundle$price_type2 : rawBundle.custom_price_type_ext) !== null && _ref27 !== void 0 ? _ref27 : '',
       bundle_selling_price: sellingPrice,
+      bundle_payment_price: paymentPrice,
       option: formatSubmitOptionItems(rawBundle.option),
       bundle_group_id: (_rawBundle$bundle_gro = rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.bundle_group_id) !== null && _rawBundle$bundle_gro !== void 0 ? _rawBundle$bundle_gro : rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.group_id,
       bundle_id: (_rawBundle$bundle_id = rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.bundle_id) !== null && _rawBundle$bundle_id !== void 0 ? _rawBundle$bundle_id : rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.id,
@@ -378,7 +827,7 @@ function formatSubmitBundleItems(bundle) {
  *   = `metadata.main_product_selling_price` + Σ(bundle_selling_price × num)。
  * - `original_price`：**行 composite 券前单价**
  *   = `metadata.main_product_original_price` + Σ(bundle 原价 × num)。
- * - `payment_price`：兼容后端的出站字段，直接从 `selling_price` 派生（composite）。
+ * - `payment_price`：兼容后端的出站字段，行 composite 已减整单折扣均摊（无折扣时与 `selling_price` 同义）。
  * - `metadata.source_product_price`：主商品/variant 基础价（不含 option、不含折扣），权威源。
  * - `metadata.main_product_original_price`：含 option、不含折扣。
  * - `metadata.main_product_selling_price`：含 option、含主商品折扣。
@@ -387,21 +836,26 @@ function formatSubmitBundleItems(bundle) {
  * 本函数不再改造价格字段形状，仅做字段/metadata 裁剪。
  */
 function normalizeSubmitProduct(product) {
-  var _rawMetadata$product_, _submitProduct$produc;
-  var _ref8 = product,
-    _runtimeUid = _ref8.unique_identification_number,
-    submitProduct = _objectWithoutProperties(_ref8, _excluded);
+  var _rawMetadata$product_, _submitProduct$produc, _submitProduct$paymen;
+  var _ref28 = product,
+    _runtimeUid = _ref28.unique_identification_number,
+    submitProduct = _objectWithoutProperties(_ref28, _excluded);
   var num = submitProduct.num,
-    productOptionItem = submitProduct.product_option_item,
     _productSurchargeFee = submitProduct.surcharge_fee,
+    _deprecatedDiscountAmount = submitProduct.discount_amount,
+    _deprecatedDiscountType = submitProduct.discount_type,
+    _deprecatedDiscountway = submitProduct.discountway,
+    _deprecatedProductDiscountReason = submitProduct.product_discount_reason,
+    _deprecatedDiscountPer = submitProduct.discount_per,
     productRest = _objectWithoutProperties(submitProduct, _excluded2);
+  delete productRest["product_".concat('option', "_item")];
   var rawMetadata = submitProduct.metadata || {};
   var bookingUid = rawMetadata.booking_uid;
   var cleanMetadata = {};
   if (rawMetadata.unique_identification_number) {
     cleanMetadata.unique_identification_number = rawMetadata.unique_identification_number;
   }
-  var priceMetaKeys = ['main_product_original_price', 'main_product_selling_price', 'source_product_price', 'main_product_attached_bundle_surcharge_fee', 'main_product_attached_bundle_tax_fee', 'surcharge_rounding_remainder', 'tax_fee_rounding_remainder', 'relation_surcharge_ids', 'discountable_flag', 'parent_unique_identification_number', 'product_add_schedule_time'];
+  var priceMetaKeys = ['main_product_original_price', 'main_product_selling_price', 'main_product_attached_bundle_selling_price', 'main_product_attached_bundle_payment_price', 'average_discount_amount_rate', 'source_product_price', 'main_product_attached_bundle_surcharge_fee', 'main_product_attached_bundle_tax_fee', 'surcharge_rounding_remainder', 'tax_fee_rounding_remainder', 'relation_surcharge_ids', 'discountable_flag', 'parent_unique_identification_number', 'product_add_schedule_time'];
   for (var _i = 0, _priceMetaKeys = priceMetaKeys; _i < _priceMetaKeys.length; _i++) {
     var key = _priceMetaKeys[_i];
     if (rawMetadata[key] !== undefined) {
@@ -416,22 +870,22 @@ function normalizeSubmitProduct(product) {
     cleanMetadata.is_rule = rawMetadata.is_rule;
   }
   var productSku = _objectSpread(_objectSpread({}, submitProduct.product_sku && _typeof(submitProduct.product_sku) === 'object' ? submitProduct.product_sku : {}), {}, {
-    option: formatSubmitOptionItems(productOptionItem !== null && productOptionItem !== void 0 && productOptionItem.length ? productOptionItem : (_submitProduct$produc = submitProduct.product_sku) === null || _submitProduct$produc === void 0 ? void 0 : _submitProduct$produc.option)
+    option: formatSubmitOptionItems((_submitProduct$produc = submitProduct.product_sku) === null || _submitProduct$produc === void 0 ? void 0 : _submitProduct$produc.option)
   });
   return _objectSpread(_objectSpread(_objectSpread({}, productRest), bookingUid ? {
     booking_uid: bookingUid
   } : {}), {}, {
     product_quantity: toBundleNumber(num !== null && num !== void 0 ? num : submitProduct.product_quantity, 1),
     product_sku: productSku,
-    discount_list: submitProduct.discount_list || [],
+    discount_list: normalizeOrderProductDiscountList(submitProduct.discount_list),
     product_bundle: formatSubmitBundleItems(submitProduct.product_bundle),
     metadata: cleanMetadata,
-    // 出站兼容：后端消费 payment_price 字段，这里从 selling_price 直接派生。
-    // 新语义下 selling_price 是 composite（含 option/bundle），payment_price 同语义。
-    payment_price: submitProduct.selling_price
+    // 出站兼容：后端消费 payment_price 字段（行 composite 已减整单折扣均摊）。
+    // 由整单折扣均摊层产出；缺省（无折扣）时与 selling_price 同义。
+    payment_price: (_submitProduct$paymen = submitProduct.payment_price) !== null && _submitProduct$paymen !== void 0 ? _submitProduct$paymen : submitProduct.selling_price
   });
 }
-var SUBMIT_BOOKING_METADATA_WHITELIST = ['unique_identification_number', 'collect_pax', 'capacity', 'holder_id', 'resource_select_type'];
+var SUBMIT_BOOKING_METADATA_WHITELIST = ['unique_identification_number', 'collect_pax', 'capacity', 'holder_id', 'resource_select_type', 'holder'];
 export function normalizeBookingIsAll(booking) {
   return booking.is_all === true || booking.is_all === 1 || booking.is_all === '1' || booking.is_all === 'true' ? 1 : 0;
 }
@@ -445,19 +899,19 @@ export function normalizeBookingSubType(booking) {
 export function normalizeSubmitBooking(booking) {
   var rawMetadata = booking.metadata || {};
   var cleanMetadata = {};
-  var _iterator3 = _createForOfIteratorHelper(SUBMIT_BOOKING_METADATA_WHITELIST),
-    _step3;
+  var _iterator6 = _createForOfIteratorHelper(SUBMIT_BOOKING_METADATA_WHITELIST),
+    _step6;
   try {
-    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-      var key = _step3.value;
+    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+      var key = _step6.value;
       if (rawMetadata[key] !== undefined) {
         cleanMetadata[key] = rawMetadata[key];
       }
     }
   } catch (err) {
-    _iterator3.e(err);
+    _iterator6.e(err);
   } finally {
-    _iterator3.f();
+    _iterator6.f();
   }
   if (cleanMetadata.holder_id === undefined) cleanMetadata.holder_id = null;
   var bookingRecord = booking;
@@ -502,22 +956,23 @@ export function createDefaultTempOrder(params) {
   return {
     order_id: null,
     external_sale_number: '',
-    order_number: '',
-    shop_order_number: '',
-    shop_full_order_number: '',
-    type: 'appointment_booking',
-    business_code: 'appointment_booking',
+    order_number: null,
+    shop_order_number: null,
+    shop_full_order_number: null,
+    type: '',
+    business_code: undefined,
     platform: 'h5',
     sales_channel: 'my_pisel',
     order_sales_channel: 'online_store',
     status: 'normal',
     payment_status: 'payment_processing',
     shipping_status: 'unfulfilled',
-    customer_id: null,
+    customer_id: 0,
     customer_name: '',
     country_calling_code: '',
     phone: '',
     email: '',
+    customer: null,
     is_price_include_tax: 1,
     tax_title: '',
     tax_country_code: '',
@@ -530,14 +985,13 @@ export function createDefaultTempOrder(params) {
     surcharge_fee: '0.00',
     note: '',
     schedule_date: params.now,
-    created_at: params.now,
+    created_at: undefined,
     request_unique_idempotency_token: '',
     vouchers: [],
     products: [],
     bookings: [],
     payments: [],
     surcharges: [],
-    discount_list: [],
     relation_forms: [],
     contacts: [],
     contacts_info: null,
@@ -549,7 +1003,7 @@ export function createDefaultTempOrder(params) {
   };
 }
 export function buildSubmitPayload(params) {
-  var _ref10, _ref11, _ref12, _tempOrder$is_price_i, _tempOrder$is_deposit;
+  var _tempOrder$customer_i, _tempOrder$order_numb, _tempOrder$shop_order, _tempOrder$shop_full_, _ref30, _tempOrder$is_price_i, _tempOrder$is_deposit, _enhancedPayload$summ;
   var tempOrder = params.tempOrder,
     cacheId = params.cacheId,
     _params$now = params.now,
@@ -558,36 +1012,52 @@ export function buildSubmitPayload(params) {
     businessCode = params.businessCode,
     channel = params.channel,
     type = params.type,
+    summary = params.summary,
     enhance = params.enhance;
   var scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
   var bookingUuid = createUuidV4();
-  var _ref9 = tempOrder,
-    _extend = _ref9._extend,
-    _relationId = _ref9.relation_id,
-    _tableFormId = _ref9.table_form_id,
-    _resourceId = _ref9.resource_id,
-    _summary = _ref9.summary,
-    _lastOrderInfo = _ref9.lastOrderInfo,
-    _paidAmount = _ref9.paid_amount,
-    _shopId = _ref9.shop_id,
-    _shopNote = _ref9.shop_note,
-    _shopServiceType = _ref9.shop_service_type,
-    _startTime = _ref9.start_time,
-    _customer = _ref9.customer,
-    _shopFullOrderNumber = _ref9.shop_full_order_number,
-    _rootTaxFee = _ref9.tax_fee,
-    _totalAmount = _ref9.total_amount,
-    _totalRefundAmount = _ref9.total_refund_amount,
-    _createDate = _ref9.create_date,
-    _holderId = _ref9.holder_id,
-    tempOrderRest = _objectWithoutProperties(_ref9, _excluded3);
+  var _ref29 = tempOrder,
+    _extend = _ref29._extend,
+    _relationId = _ref29.relation_id,
+    _tableFormId = _ref29.table_form_id,
+    _resourceId = _ref29.resource_id,
+    _summary = _ref29.summary,
+    _lastOrderInfo = _ref29.lastOrderInfo,
+    _paidAmount = _ref29.paid_amount,
+    _shopId = _ref29.shop_id,
+    _shopNote = _ref29.shop_note,
+    _shopServiceType = _ref29.shop_service_type,
+    _startTime = _ref29.start_time,
+    _customer = _ref29.customer,
+    _discountList = _ref29.discount_list,
+    _rootTaxFee = _ref29.tax_fee,
+    _totalAmount = _ref29.total_amount,
+    _totalRefundAmount = _ref29.total_refund_amount,
+    _createDate = _ref29.create_date,
+    _holderId = _ref29.holder_id,
+    tempOrderRest = _objectWithoutProperties(_ref29, _excluded3);
+  var submitType = type !== null && type !== void 0 ? type : tempOrder.type;
+  if (!submitType) {
+    var _tempOrder$bookings;
+    // 如果外部没有传递 types，根据订单里当前是否有 bookings 来决定是 appointment_booking 还是 virtual
+    if (tempOrder !== null && tempOrder !== void 0 && (_tempOrder$bookings = tempOrder.bookings) !== null && _tempOrder$bookings !== void 0 && _tempOrder$bookings.length) {
+      submitType = 'appointment_booking';
+    } else {
+      submitType = 'virtual';
+    }
+  }
   var payload = _objectSpread(_objectSpread({}, tempOrderRest), {}, {
+    customer_id: (_tempOrder$customer_i = tempOrder.customer_id) !== null && _tempOrder$customer_i !== void 0 ? _tempOrder$customer_i : 1,
+    customer_name: tempOrder.customer_name || 'Walk-In',
+    order_number: (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : null,
+    shop_order_number: (_tempOrder$shop_order = tempOrder.shop_order_number) !== null && _tempOrder$shop_order !== void 0 ? _tempOrder$shop_order : null,
+    shop_full_order_number: (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : null,
     platform: normalizeSubmitPlatform(platform),
-    request_unique_idempotency_token: tempOrder.request_unique_idempotency_token || "".concat(tempOrder.external_sale_number, "_").concat(now.getTime()),
-    type: (_ref10 = type !== null && type !== void 0 ? type : tempOrder.type) !== null && _ref10 !== void 0 ? _ref10 : 'table-order',
-    business_code: (_ref11 = businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code) !== null && _ref11 !== void 0 ? _ref11 : 'table-order',
+    request_unique_idempotency_token: (params === null || params === void 0 ? void 0 : params.request_unique_idempotency_token) || tempOrder.request_unique_idempotency_token || "".concat(tempOrder.external_sale_number, "_").concat(now.getTime()),
+    type: submitType,
+    business_code: businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code,
     sales_channel: tempOrder.sales_channel || 'my_pisel',
-    order_sales_channel: (_ref12 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref12 !== void 0 ? _ref12 : 'online_store',
+    order_sales_channel: (_ref30 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref30 !== void 0 ? _ref30 : 'online_store',
     status: tempOrder.status || 'normal',
     payment_status: tempOrder.payment_status || 'payment_processing',
     // shipping_status: tempOrder.shipping_status || 'unfulfilled',
@@ -600,39 +1070,41 @@ export function buildSubmitPayload(params) {
     note: tempOrder.note || '',
     delivery_type: tempOrder.delivery_type || 'nil',
     schedule_date: scheduleDate,
-    created_at: tempOrder.created_at || formatDateTime(now),
+    // created_at: tempOrder.created_at || formatDateTime(now), 和后端协定这个字段先不提交到接口
     bookings: (tempOrder.bookings || []).filter(function (booking) {
-      var _parent_id;
-      return Number((_parent_id = booking.parent_id) !== null && _parent_id !== void 0 ? _parent_id : 0) !== 0;
+      return Number(booking.parent_id) !== 0;
     }).map(function (booking) {
       return normalizeSubmitBooking(booking);
     }),
     payments: tempOrder.payments || [],
-    // discount_list: tempOrder.discount_list || [],
     relation_forms: tempOrder.relation_forms || [],
     // contacts: tempOrder.contacts || [],
     contacts_info: tempOrder.contacts_info && !Array.isArray(tempOrder.contacts_info) ? tempOrder.contacts_info : null,
     // holder: tempOrder.holder || null,
-    // summary,
+    summary: summary || tempOrder.summary || createEmptySummary(),
     metadata: function () {
-      var _ref13 = tempOrder.metadata || {},
-        _collectPax = _ref13.collect_pax,
-        _tableOccupancyDuration = _ref13.table_occupancy_duration,
-        rest = _objectWithoutProperties(_ref13, _excluded4);
+      var _ref31 = tempOrder.metadata || {},
+        _collectPax = _ref31.collect_pax,
+        _tableOccupancyDuration = _ref31.table_occupancy_duration,
+        rest = _objectWithoutProperties(_ref31, _excluded4);
       return _objectSpread({}, rest);
     }(),
     products: (tempOrder.products || []).map(function (product) {
       return normalizeSubmitProduct(product);
     })
   });
-  return enhance ? enhance(payload, {
+  if (!enhance) return payload;
+  var enhancedPayload = enhance(payload, {
     tempOrder: tempOrder,
     bookingUuid: bookingUuid,
     now: now
-  }) : payload;
+  });
+  return _objectSpread(_objectSpread({}, enhancedPayload), {}, {
+    summary: (_enhancedPayload$summ = enhancedPayload.summary) !== null && _enhancedPayload$summ !== void 0 ? _enhancedPayload$summ : payload.summary
+  });
 }
 export function mapPaymentItemToOrderPayment(paymentItem) {
-  var _item$custom_payment_, _item$amount;
+  var _item$custom_payment_, _item$payment_time, _item$created_at, _item$amount;
   var item = paymentItem;
   var customPaymentId = (_item$custom_payment_ = item.custom_payment_id) !== null && _item$custom_payment_ !== void 0 ? _item$custom_payment_ : item.id;
   var metadata = item.metadata && _typeof(item.metadata) === 'object' ? _objectSpread({}, item.metadata) : {};
@@ -646,10 +1118,18 @@ export function mapPaymentItemToOrderPayment(paymentItem) {
       metadata[key] = item[key];
     }
   }
-  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+  var timestamp = dayjs().format('YYYY-MM-DD HH:mm:ss');
+  var paymentTime = (_item$payment_time = item.payment_time) !== null && _item$payment_time !== void 0 ? _item$payment_time : timestamp;
+  var createdAt = (_item$created_at = item.created_at) !== null && _item$created_at !== void 0 ? _item$created_at : timestamp;
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, item.order_payment_id !== undefined ? {
+    order_payment_id: item.order_payment_id
+  } : {}), {}, {
     amount: String((_item$amount = item.amount) !== null && _item$amount !== void 0 ? _item$amount : '0.00'),
     code: String(item.code || ''),
-    custom_payment_id: Number(customPaymentId !== null && customPaymentId !== void 0 ? customPaymentId : 0),
+    custom_payment_id: Number(customPaymentId !== null && customPaymentId !== void 0 ? customPaymentId : 0)
+  }, item.custom_payment_type !== undefined ? {
+    custom_payment_type: String(item.custom_payment_type)
+  } : {}), {}, {
     name: String(item.name || ''),
     type: String(item.type || '')
   }, item.voucher_id !== undefined ? {
@@ -660,12 +1140,15 @@ export function mapPaymentItemToOrderPayment(paymentItem) {
     service_fee: String(item.service_fee)
   } : {}), item.status !== undefined ? {
     status: item.status
-  } : {}), item.payment_time !== undefined ? {
-    payment_time: item.payment_time
-  } : {}), item.wallet_pass_usage_unit !== undefined ? {
+  } : {}), {}, {
+    payment_time: paymentTime,
+    created_at: createdAt
+  }, item.wallet_pass_usage_unit !== undefined ? {
     wallet_pass_usage_unit: item.wallet_pass_usage_unit
   } : {}), item.wallet_pass_use_value !== undefined ? {
     wallet_pass_use_value: item.wallet_pass_use_value
+  } : {}), item.fund_record && _typeof(item.fund_record) === 'object' && !Array.isArray(item.fund_record) ? {
+    fund_record: _objectSpread({}, item.fund_record)
   } : {}), {}, {
     metadata: metadata
   }, item.rounding_amount !== undefined ? {
@@ -674,8 +1157,6 @@ export function mapPaymentItemToOrderPayment(paymentItem) {
     service_charge: item.service_charge
   } : {}), item.order_payment_type !== undefined ? {
     order_payment_type: item.order_payment_type
-  } : {}), item.created_at !== undefined ? {
-    created_at: item.created_at
   } : {}), item.updated_at !== undefined ? {
     updated_at: item.updated_at
   } : {});
@@ -713,4 +1194,169 @@ export function formatV1Product(products) {
     };
   });
 }
-export { createEmptySummary } from "../../solution/ScanOrder/utils";
+
+/**
+ * 判断 holder_id 是否已分配（非空）。
+ *
+ * @example
+ * hasAssignedHolderId(12); // true
+ * hasAssignedHolderId([]); // false
+ */
+export function hasAssignedHolderId(value) {
+  if (value === undefined || value === null || value === '') return false;
+  if (Array.isArray(value)) return value.length > 0;
+  return true;
+}
+
+/**
+ * 清空 tempOrder 购物车行上的 holder 分配（products / bookings / runtime origin）。
+ * 移除或更换下单客户时调用，与 booking 页换客户清 holder 行为对齐。
+ *
+ * @example
+ * clearTempOrderHolderAssignments(tempOrder);
+ */
+export function clearTempOrderHolderAssignments(tempOrder) {
+  var _tempOrder$_extend;
+  var changed = false;
+  var resetHolderField = function resetHolderField(target) {
+    var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'holder_id';
+    if (!hasAssignedHolderId(target[key])) return;
+    target[key] = null;
+    changed = true;
+  };
+  var _iterator7 = _createForOfIteratorHelper(tempOrder.products || []),
+    _step7;
+  try {
+    for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+      var product = _step7.value;
+      if (product.metadata && _typeof(product.metadata) === 'object') {
+        resetHolderField(product.metadata);
+      }
+    }
+  } catch (err) {
+    _iterator7.e(err);
+  } finally {
+    _iterator7.f();
+  }
+  var _iterator8 = _createForOfIteratorHelper(tempOrder.bookings || []),
+    _step8;
+  try {
+    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+      var booking = _step8.value;
+      var bookingRecord = booking;
+      if (booking.metadata && _typeof(booking.metadata) === 'object') {
+        resetHolderField(booking.metadata);
+      }
+      if (bookingRecord.holder !== undefined && bookingRecord.holder !== null) {
+        delete bookingRecord.holder;
+        changed = true;
+      }
+    }
+  } catch (err) {
+    _iterator8.e(err);
+  } finally {
+    _iterator8.f();
+  }
+  var productsByUid = (_tempOrder$_extend = tempOrder._extend) === null || _tempOrder$_extend === void 0 ? void 0 : _tempOrder$_extend.productsByUid;
+  if (productsByUid && _typeof(productsByUid) === 'object') {
+    for (var _i4 = 0, _Object$values = Object.values(productsByUid); _i4 < _Object$values.length; _i4++) {
+      var entry = _Object$values[_i4];
+      var origin = entry === null || entry === void 0 ? void 0 : entry.origin;
+      if (!origin || _typeof(origin) !== 'object') continue;
+      if (origin.metadata && _typeof(origin.metadata) === 'object') {
+        resetHolderField(origin.metadata);
+      }
+      if (origin._extend && _typeof(origin._extend) === 'object') {
+        resetHolderField(origin._extend);
+      }
+    }
+  }
+  return changed;
+}
+
+/**
+ * 读取购物车行的 stable uid（优先 metadata.unique_identification_number）。
+ *
+ * @example
+ * getOrderProductLineUid({ metadata: { unique_identification_number: 'line-1' } }); // 'line-1'
+ */
+export function getOrderProductLineUid(product) {
+  var _product$metadata$uni, _product$metadata7;
+  if (!product || _typeof(product) !== 'object') return null;
+  var uid = (_product$metadata$uni = (_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.unique_identification_number) !== null && _product$metadata$uni !== void 0 ? _product$metadata$uni : product.unique_identification_number;
+  if (uid === undefined || uid === null || uid === '') return null;
+  return String(uid);
+}
+
+/**
+ * 判断展示字段是否为空（含 i18n 对象全空）。
+ *
+ * @example
+ * isEmptyOrderProductDisplayValue(''); // true
+ * isEmptyOrderProductDisplayValue({ auto: '桌台费' }); // false
+ */
+export function isEmptyOrderProductDisplayValue(value) {
+  if (value === undefined || value === null) return true;
+  if (typeof value === 'string') return value.trim() === '';
+  if (_typeof(value) === 'object') {
+    var record = value;
+    return !Object.values(record).some(function (item) {
+      return typeof item === 'string' && item.trim() !== '';
+    });
+  }
+  return false;
+}
+
+/**
+ * calcDiscount / applyDiscount 回写时 Rules 往往不带 product_title 等展示字段；
+ * 用旧行补齐，避免编辑态 hydrate 后标题被冲掉。
+ *
+ * @example
+ * mergeOrderProductDisplayFields(
+ *   { product_title: { auto: '桌台费' }, metadata: { unique_identification_number: 'u1' } },
+ *   { selling_price: '10.00', metadata: { unique_identification_number: 'u1' } },
+ * );
+ */
+export function mergeOrderProductDisplayFields(previous, next) {
+  var merged = _objectSpread({}, next);
+  var displayFields = ['product_title', 'product_name', 'product_cover', 'cover', 'variant_title', 'product_sku', 'payment_price'];
+  displayFields.forEach(function (field) {
+    if (isEmptyOrderProductDisplayValue(merged[field]) && !isEmptyOrderProductDisplayValue(previous[field])) {
+      merged[field] = previous[field];
+    }
+  });
+  if (previous.metadata || next.metadata) {
+    merged.metadata = _objectSpread(_objectSpread({}, previous.metadata || {}), next.metadata || {});
+    ['product_title', 'product_name'].forEach(function (field) {
+      var _previous$metadata;
+      if (isEmptyOrderProductDisplayValue(merged.metadata[field]) && !isEmptyOrderProductDisplayValue((_previous$metadata = previous.metadata) === null || _previous$metadata === void 0 ? void 0 : _previous$metadata[field])) {
+        merged.metadata[field] = previous.metadata[field];
+      }
+    });
+  }
+  if (previous._extend && !merged._extend) {
+    merged._extend = previous._extend;
+  }
+  return merged;
+}
+
+/**
+ * 按 uid 索引 tempOrder.products，供 applyDiscount 合并展示字段。
+ *
+ * @example
+ * indexOrderProductsByUid([{ metadata: { unique_identification_number: 'u1' } }]);
+ */
+export function indexOrderProductsByUid(products) {
+  var map = new Map();
+  (products || []).forEach(function (product, index) {
+    var uid = getOrderProductLineUid(product);
+    if (uid) {
+      map.set(uid, product);
+      return;
+    }
+    map.set("__index__:".concat(index), product);
+  });
+  return map;
+}
+export { createEmptySummary } from "../../solution/ScanOrder/utils";
+export { buildManualProductDiscountItem, ensureManualProductDiscountList, findManualProductDiscountItem, mergeManualProductDiscountIntoList, resolveManualDiscountMessage, resolveManualDiscountOriginTotal, resolveManualDiscountReasonFromSources, resolveSafeProductNum, shouldBuildManualProductDiscount, syncManualProductDiscountProductNum, stripManualProductDiscountItems } from "./utils/manualProductDiscount";