@pisell/pisellos 0.0.568 → 0.0.569

package/lib/modules/Order/utils.js

@@ -3,7 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "buildManualProductDiscountItem", {
+  enumerable: true,
+  get: function () {
+    return _manualProductDiscount.buildManualProductDiscountItem;
+  }
+});
 exports.buildSubmitPayload = buildSubmitPayload;
+exports.calculateOrderProductsDeposit = calculateOrderProductsDeposit;
+exports.clearTempOrderHolderAssignments = clearTempOrderHolderAssignments;
 exports.composeLinePrice = composeLinePrice;
 exports.createDefaultOrderRulesHooks = createDefaultOrderRulesHooks;
 exports.createDefaultTempOrder = createDefaultTempOrder;
@@ -13,22 +21,111 @@ Object.defineProperty(exports, "createEmptySummary", {
     return _utils2.createEmptySummary;
   }
 });
-exports.createUuidV4 = createUuidV4;
+Object.defineProperty(exports, "createUuidV4", {
+  enumerable: true,
+  get: function () {
+    return _orderCollectionIdentity.createUuidV4;
+  }
+});
 exports.ensureCartItemOriginHolder = ensureCartItemOriginHolder;
-exports.filterProductsForScanOrderMore = filterProductsForScanOrderMore;
+Object.defineProperty(exports, "ensureManualProductDiscountList", {
+  enumerable: true,
+  get: function () {
+    return _manualProductDiscount.ensureManualProductDiscountList;
+  }
+});
+exports.ensureProductSku = ensureProductSku;
+Object.defineProperty(exports, "findManualProductDiscountItem", {
+  enumerable: true,
+  get: function () {
+    return _manualProductDiscount.findManualProductDiscountItem;
+  }
+});
 exports.formatDateTime = formatDateTime;
 exports.formatV1Product = formatV1Product;
 exports.getAllDiscountList = exports.generateDuration = void 0;
+exports.getBundleSellingMagnitude = getBundleSellingMagnitude;
+exports.getBundleSignedUnit = getBundleSignedUnit;
+exports.getOrderProductLineUid = getOrderProductLineUid;
+exports.getProductSkuOptions = getProductSkuOptions;
+exports.getRuntimeProductOrigin = getRuntimeProductOrigin;
+exports.hasAssignedHolderId = hasAssignedHolderId;
+exports.indexOrderProductsByUid = indexOrderProductsByUid;
+exports.isEmptyOrderProductDisplayValue = isEmptyOrderProductDisplayValue;
+exports.isHolderConfigRequired = isHolderConfigRequired;
+exports.isMarkdownBundle = isMarkdownBundle;
 exports.isTempOrder = isTempOrder;
+exports.mapPaymentItemToOrderPayment = mapPaymentItemToOrderPayment;
+exports.mapPaymentItemsToOrderPayments = mapPaymentItemsToOrderPayments;
+Object.defineProperty(exports, "mergeManualProductDiscountIntoList", {
+  enumerable: true,
+  get: function () {
+    return _manualProductDiscount.mergeManualProductDiscountIntoList;
+  }
+});
+exports.mergeOrderProductDisplayFields = mergeOrderProductDisplayFields;
 exports.mergeRelationForms = void 0;
+exports.normalizeBookingIsAll = normalizeBookingIsAll;
+exports.normalizeBookingSubType = normalizeBookingSubType;
+exports.normalizeOrderProductDiscountList = normalizeOrderProductDiscountList;
+exports.normalizeProductSkuOptions = normalizeProductSkuOptions;
 exports.normalizeSubmitBooking = normalizeSubmitBooking;
 exports.normalizeSubmitCollectPaxValue = normalizeSubmitCollectPaxValue;
+exports.productRequiresFormSubject = productRequiresFormSubject;
+exports.resolveEffectivePerUnitDiscount = resolveEffectivePerUnitDiscount;
+exports.resolveIsFormSubject = resolveIsFormSubject;
+Object.defineProperty(exports, "resolveManualDiscountMessage", {
+  enumerable: true,
+  get: function () {
+    return _manualProductDiscount.resolveManualDiscountMessage;
+  }
+});
+Object.defineProperty(exports, "resolveManualDiscountOriginTotal", {
+  enumerable: true,
+  get: function () {
+    return _manualProductDiscount.resolveManualDiscountOriginTotal;
+  }
+});
+Object.defineProperty(exports, "resolveManualDiscountReasonFromSources", {
+  enumerable: true,
+  get: function () {
+    return _manualProductDiscount.resolveManualDiscountReasonFromSources;
+  }
+});
+exports.resolveManualOverrideLineOriginalPrice = resolveManualOverrideLineOriginalPrice;
+exports.resolveRulesManualDiscountFlag = resolveRulesManualDiscountFlag;
+Object.defineProperty(exports, "resolveSafeProductNum", {
+  enumerable: true,
+  get: function () {
+    return _manualProductDiscount.resolveSafeProductNum;
+  }
+});
 exports.resolveSubmitCollectPax = resolveSubmitCollectPax;
+Object.defineProperty(exports, "shouldBuildManualProductDiscount", {
+  enumerable: true,
+  get: function () {
+    return _manualProductDiscount.shouldBuildManualProductDiscount;
+  }
+});
+Object.defineProperty(exports, "stripManualProductDiscountItems", {
+  enumerable: true,
+  get: function () {
+    return _manualProductDiscount.stripManualProductDiscountItems;
+  }
+});
 exports.sumOptionUnitPrice = sumOptionUnitPrice;
+Object.defineProperty(exports, "syncManualProductDiscountProductNum", {
+  enumerable: true,
+  get: function () {
+    return _manualProductDiscount.syncManualProductDiscountProductNum;
+  }
+});
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _utils = require("../Holder/utils");
 var _utils2 = require("../../solution/ScanOrder/utils");
+var _orderCollectionIdentity = require("./utils/orderCollectionIdentity");
+var _manualProductDiscount = require("./utils/manualProductDiscount");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
@@ -52,30 +149,274 @@ function composeLinePrice(params) {
   let total = new _decimal.default(Number(mainPrice) || 0);
   if (Array.isArray(bundle)) {
     for (const item of bundle) {
-      const rawPrice = useOriginalBundle ? item?.original_price ?? item?.product_price ?? item?.price : item?.bundle_selling_price ?? item?.price;
-      const price = new _decimal.default(Number(rawPrice) || 0);
+      // markdown（减价）按带符号净额取减；markup/原价维持相加。
+      const signedUnit = getBundleSignedUnit(item, {
+        useOriginal: useOriginalBundle
+      });
       const rawNum = item?.num ?? item?.quantity ?? 1;
       const num = new _decimal.default(Number(rawNum) || 0);
-      total = total.plus(price.times(num));
+      total = total.plus(signedUnit.times(num));
     }
   }
   return total.toDecimalPlaces(2).toFixed(2);
 }
+function normalizeProductSkuOptions(options) {
+  if (!Array.isArray(options)) return [];
+  return options.map(option => {
+    const normalized = {
+      ...(option && typeof option === 'object' ? option : {})
+    };
+    const addPrice = normalized.add_price ?? normalized.price;
+    if (addPrice !== undefined) normalized.add_price = addPrice;
+    delete normalized.price;
+    return normalized;
+  });
+}
+function ensureProductSku(product) {
+  const rawSku = product?.product_sku && typeof product.product_sku === 'object' ? product.product_sku : {};
+  return {
+    ...rawSku,
+    option: normalizeProductSkuOptions(rawSku.option)
+  };
+}
+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 + 本函数结果。
  */
 function sumOptionUnitPrice(options) {
   let total = new _decimal.default(0);
   if (!Array.isArray(options)) return total;
   for (const opt of options) {
-    const price = new _decimal.default(Number(opt?.price) || 0);
+    const price = new _decimal.default(Number(opt?.add_price ?? opt?.price) || 0);
     const num = new _decimal.default(Number(opt?.num) || 0);
     total = total.plus(price.times(num));
   }
   return total;
 }
+function getSafeOrderProductNum(num) {
+  const parsedNum = Number(num ?? 1);
+  if (!Number.isFinite(parsedNum) || parsedNum < 1) return 1;
+  return Math.floor(parsedNum);
+}
+function getOrderProductDepositUnitTotal(product) {
+  const metadata = product.metadata || {};
+  const paymentPrice = metadata.main_product_attached_bundle_payment_price;
+  const mainSellingPrice = metadata.main_product_selling_price;
+  const fallbackPrice = product.selling_price;
+  return new _decimal.default(Number(paymentPrice ?? mainSellingPrice ?? fallbackPrice) || 0);
+}
+function normalizeDepositProtocols(protocols) {
+  if (!Array.isArray(protocols)) return [];
+  return protocols.reduce((result, protocol) => {
+    const id = Number(protocol?.id);
+    if (!Number.isFinite(id)) return result;
+    result.push({
+      id: Math.floor(id),
+      title: String(protocol?.title || '')
+    });
+    return result;
+  }, []);
+}
+function getDepositPolicyIds(depositData) {
+  const ids = [...(Array.isArray(depositData?.self_deposit_policy_ids) ? depositData.self_deposit_policy_ids : []), ...(Array.isArray(depositData?.deposit_policy_ids) ? depositData.deposit_policy_ids : [])];
+  return ids.reduce((result, id) => {
+    const normalizedId = Number(id);
+    if (!Number.isFinite(normalizedId)) return result;
+    result.push(Math.floor(normalizedId));
+    return result;
+  }, []);
+}
+function handleOrderProductDeposit(params) {
+  const {
+    depositData,
+    total,
+    num
+  } = params;
+  if (!depositData) return {
+    result: false,
+    depositTotal: new _decimal.default(0)
+  };
+  const {
+    deposit_fixed,
+    deposit_percentage
+  } = depositData;
+  if (typeof deposit_fixed !== 'string' || typeof deposit_percentage !== 'string') {
+    return {
+      result: false,
+      depositTotal: new _decimal.default(0)
+    };
+  }
+  const depositFixed = new _decimal.default(deposit_fixed || 0);
+  const depositPercent = new _decimal.default(deposit_percentage || 0);
+  const productTotalPrice = new _decimal.default(total || 0);
+  const deposit = depositFixed.plus(depositPercent.times(productTotalPrice));
+  return {
+    depositTotal: deposit.times(num),
+    result: true
+  };
+}
+function resolveOrderProductDepositSource(product, runtimeOrigin) {
+  const record = product;
+  const origin = record._origin || runtimeOrigin || {};
+  const originProduct = origin.product || {};
+  return {
+    ...originProduct,
+    ...origin,
+    ...record,
+    custom_deposit_data: record.custom_deposit_data ?? origin.custom_deposit_data ?? originProduct.custom_deposit_data,
+    variant: record.variant ?? origin.variant ?? originProduct.variant
+  };
+}
+function getOrderProductDeposit(product, runtimeOrigin) {
+  const depositProduct = resolveOrderProductDepositSource(product, runtimeOrigin);
+  const depositData = depositProduct.custom_deposit_data;
+  if (depositData?.has_deposit != 1) return null;
+  const num = getSafeOrderProductNum(product.num);
+  const total = getOrderProductDepositUnitTotal(product).times(num);
+  const allProtocols = normalizeDepositProtocols(depositData.deposit_policy_data);
+  const protocolIds = [];
+  let depositTotal = new _decimal.default(0);
+  let hasDeposit = false;
+  if (typeof depositData.deposit_fixed === 'string' && typeof depositData.deposit_percentage === 'string') {
+    const result = handleOrderProductDeposit({
+      depositData,
+      total,
+      num
+    });
+    if (result.result) {
+      depositTotal = result.depositTotal;
+      protocolIds.push(...getDepositPolicyIds({
+        self_deposit_policy_ids: depositData.self_deposit_policy_ids
+      }));
+      hasDeposit = true;
+    }
+  } else {
+    const productVariantId = depositProduct.product_variant_id ?? product.product_variant_id;
+    if (productVariantId) {
+      const variantProduct = (depositProduct.variant || []).find(item => item?.id === productVariantId);
+      const variantDepositData = variantProduct?.custom_deposit_data;
+      const result = handleOrderProductDeposit({
+        depositData: variantDepositData,
+        total,
+        num
+      });
+      if (result.result) {
+        depositTotal = result.depositTotal;
+        protocolIds.push(...getDepositPolicyIds({
+          self_deposit_policy_ids: variantDepositData?.self_deposit_policy_ids
+        }));
+        hasDeposit = true;
+      }
+    }
+    if (Array.isArray(product.product_bundle) && product.product_bundle.length) {
+      depositTotal = product.product_bundle.reduce((accumulator, bundleProduct) => {
+        const bundleDepositData = bundleProduct?.custom_deposit_data;
+        const result = handleOrderProductDeposit({
+          depositData: bundleDepositData,
+          total: bundleProduct?.price,
+          num: getSafeOrderProductNum(bundleProduct?.num || 1)
+        });
+        if (!result.result) return accumulator;
+        protocolIds.push(...getDepositPolicyIds({
+          self_deposit_policy_ids: bundleDepositData?.self_deposit_policy_ids
+        }));
+        hasDeposit = true;
+        return accumulator.plus(result.depositTotal);
+      }, new _decimal.default(0));
+    }
+  }
+  if (!hasDeposit) return null;
+  const protocolIdSet = new Set(protocolIds);
+  const protocols = allProtocols.filter(protocol => protocolIdSet.has(protocol.id));
+  return {
+    total: depositTotal.toNumber(),
+    protocols
+  };
+}
+
+/**
+ * 仅基于 tempOrder.products 重算整单定金。
+ *
+ * 商品折扣在进入定金计算前已体现在商品行价格字段中，
+ * 因此这里只按商品定金规则汇总，不再扣减 discount_list；tempOrder.bookings 不参与这里的计算。
+ */
+function calculateOrderProductsDeposit(products = [], options) {
+  const protocolMap = new Map();
+  let total = new _decimal.default(0);
+  let hasDeposit = false;
+  for (const product of products || []) {
+    const productUid = product.metadata?.unique_identification_number;
+    const runtimeOrigin = productUid ? options?.productsByUid?.[productUid]?.origin : undefined;
+    const deposit = getOrderProductDeposit(product, runtimeOrigin);
+    product.deposit = deposit;
+    if (!deposit?.total || Number(deposit.total) <= 0) continue;
+    total = total.plus(deposit.total);
+    for (const protocol of deposit.protocols || []) {
+      if (!protocolMap.has(protocol.id)) protocolMap.set(protocol.id, protocol);
+    }
+    hasDeposit = true;
+  }
+  const roundedTotal = total.toDecimalPlaces(2, _decimal.default.ROUND_HALF_UP);
+  const protocols = [...protocolMap.values()];
+  return {
+    total: roundedTotal.toNumber(),
+    totalText: roundedTotal.toFixed(2),
+    protocols,
+    deposit_policy_ids: protocols.map(protocol => protocol.id),
+    hasDeposit
+  };
+}
+
+/**
+ * 判定套餐子商品是否为 markdown（减价）类型。
+ * 与后端口径一致：price_type='markdown' 且 price_type_ext 非 'product_price'（原价子商品）。
+ */
+function isMarkdownBundle(bundle) {
+  if (!bundle || typeof bundle !== 'object') return false;
+  const ext = bundle.price_type_ext ?? bundle.custom_price_type_ext;
+  const type = 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)`，行为不变。
+ */
+function getBundleSignedUnit(bundle, options) {
+  if (!bundle || typeof bundle !== 'object') return new _decimal.default(0);
+  const useOriginal = options?.useOriginal ?? false;
+  if (isMarkdownBundle(bundle)) {
+    const catalog = useOriginal ? bundle.original_price ?? bundle.product_price ?? bundle.custom_price ?? bundle.base_price ?? bundle.price : bundle.custom_price ?? bundle.product_price ?? bundle.original_price ?? bundle.base_price ?? bundle.price;
+    if (catalog !== undefined && catalog !== null && catalog !== '') {
+      const raw = new _decimal.default(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.default(Number(bundle.bundle_selling_price) || 0).abs().negated();
+  }
+  const rawPrice = useOriginal ? bundle.original_price ?? bundle.product_price ?? bundle.price : bundle.bundle_selling_price ?? bundle.price;
+  return new _decimal.default(Number(rawPrice) || 0);
+}
+
+/**
+ * 套餐子商品 `bundle_selling_price` 的存储净额（正值幅度）。
+ * markdown 取净额绝对值（3.70）；markup/原价维持原值。
+ */
+function getBundleSellingMagnitude(bundle) {
+  return getBundleSignedUnit(bundle).abs();
+}
 
 /**
  * OrderModule 默认 Rules 钩子工厂。
@@ -89,7 +430,7 @@ 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 主价**
@@ -106,16 +447,206 @@ function sumOptionUnitPrice(options) {
  *
  * 导出为纯函数方便单测直接驱动钩子，不依赖 OrderModule 实例。
  */
+
+/** Rules calcDiscount 用手动价标记；undefined 表示交给 Rules 用 total/origin_total 推断 */
+function resolveRulesManualDiscountFlag(metadata) {
+  if (!metadata) return undefined;
+  if (metadata.is_manual_discount === true || metadata.is_manual_discount === 1) {
+    return true;
+  }
+  const 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。
+ */
+function normalizeOrderProductDiscountList(discountList) {
+  if (!Array.isArray(discountList)) return [];
+  return discountList.filter(item => !!item && typeof item === 'object').map(item => {
+    const 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) {
+      const orderDiscountId = Number(item.order_discount_id);
+      if (Number.isFinite(orderDiscountId)) {
+        normalized.order_discount_id = orderDiscountId;
+      }
+    }
+    if (item.type !== undefined) normalized.type = item.type;
+    const amount = normalizeOrderProductDiscountAmount(item.amount);
+    if (amount !== undefined) normalized.amount = amount;
+    if (item.discount && typeof item.discount === 'object') {
+      normalized.discount = {
+        ...item.discount
+      };
+    }
+    if (item.metadata === null) {
+      normalized.metadata = null;
+    } else if (item.metadata && typeof item.metadata === 'object') {
+      normalized.metadata = {
+        ...item.metadata
+      };
+    }
+    return normalized;
+  });
+}
+function resolveSubmitBundleMapId(bundle) {
+  const metadataMapId = bundle.metadata?.custom_product_bundle_map_id;
+  if (metadataMapId !== undefined && metadataMapId !== null && metadataMapId !== '') {
+    return metadataMapId;
+  }
+  if (bundle._id !== undefined && bundle._id !== null && bundle._id !== '') {
+    return bundle._id;
+  }
+  return undefined;
+}
+function collectSubmitProductDiscountList(product) {
+  const submitDiscountList = Array.isArray(product?.discount_list) ? [...product.discount_list] : [];
+  for (const bundle of product?.product_bundle || []) {
+    if (!bundle || typeof bundle !== 'object') continue;
+    const bundleMapId = resolveSubmitBundleMapId(bundle);
+    const bundleDiscountList = Array.isArray(bundle.discount_list) ? bundle.discount_list : [];
+    for (const discount of bundleDiscountList) {
+      if (!discount || typeof discount !== 'object') continue;
+      const discountMetadata = discount.metadata && typeof discount.metadata === 'object' ? discount.metadata : {};
+      const discountMapId = discountMetadata.custom_product_bundle_map_id !== undefined && discountMetadata.custom_product_bundle_map_id !== null && discountMetadata.custom_product_bundle_map_id !== '' ? discountMetadata.custom_product_bundle_map_id : bundleMapId;
+      submitDiscountList.push({
+        ...discount,
+        ...(discountMapId !== undefined ? {
+          metadata: {
+            ...discountMetadata,
+            custom_product_bundle_map_id: discountMapId
+          }
+        } : {})
+      });
+    }
+  }
+  return normalizeOrderProductDiscountList(submitDiscountList);
+}
+
+/**
+ * 手动改价（price_override）时行级 original_price（composite 单价）：
+ * 购物车划线价应对齐 metadata.origin._extend.origin_total（改价前单价 composite，如 40），
+ * 而非 bundle 子项 catalog 原价合成的 composedOriginalPrice（如 30）。
+ *
+ * origin_total 与 SkuDetailModal / cacheItem._extend 一致，为单价语义，不再除以 num。
+ */
+function resolveManualOverrideLineOriginalPrice(params, fallbackCompositeOriginal) {
+  const metadata = params.metadata || {};
+  const priceOverride = metadata.price_override;
+  if (priceOverride === undefined || priceOverride === null || priceOverride === '') {
+    return fallbackCompositeOriginal;
+  }
+  const refTotal = metadata.origin?._extend?.origin_total;
+  if (refTotal !== undefined && refTotal !== null && refTotal !== '') {
+    const parsed = Number(refTotal);
+    if (Number.isFinite(parsed)) {
+      return new _decimal.default(parsed).toDecimalPlaces(2).toFixed(2);
+    }
+  }
+  const lineOriginal = params.lineOriginalPrice;
+  if (lineOriginal !== undefined && lineOriginal !== null && lineOriginal !== '') {
+    const parsedLine = Number(lineOriginal);
+    const parsedFallback = Number(fallbackCompositeOriginal);
+    if (Number.isFinite(parsedLine) && Number.isFinite(parsedFallback) && parsedLine > parsedFallback) {
+      return new _decimal.default(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
+ */
+function resolveEffectivePerUnitDiscount(product) {
+  const discountList = Array.isArray(product?.discount_list) ? product.discount_list : [];
+  const fromList = discountList.reduce((sum, discount) => sum + Number(discount?.amount || 0), 0);
+  const hasPromoDiscountItem = discountList.some(item => item?.type === 'promotion');
+  if (hasPromoDiscountItem) return fromList;
+  const metadata = product?.metadata || {};
+  const promo = metadata._promotion;
+  if (promo?.inPromotion !== true) return fromList;
+  const optionSum = sumOptionUnitPrice(getProductSkuOptions(product)).toNumber();
+
+  // applyPromotion 写价后、Rules 剥离 promotion discount 的兜底
+  if (!discountList.length && metadata.source_product_price != null && metadata.main_product_selling_price != null) {
+    const source = Number(metadata.source_product_price);
+    const selling = Number(metadata.main_product_selling_price) - optionSum;
+    if (Number.isFinite(source) && Number.isFinite(selling) && source !== selling) {
+      return fromList + (source - selling);
+    }
+  }
+  const originalPrice = Number(promo.originalPrice);
+  const finalPrice = Number(promo.finalPrice);
+  if (!Number.isFinite(originalPrice) || !Number.isFinite(finalPrice)) return fromList;
+  return fromList + (originalPrice - finalPrice);
+}
 function createDefaultOrderRulesHooks() {
   const toUnitPriceString = (totalLike, num) => {
     const effectiveNum = Number(num) > 0 ? Number(num) : 1;
     return new _decimal.default(Number(totalLike) || 0).dividedBy(effectiveNum).toDecimalPlaces(2).toString();
   };
+  const getBundleIdentity = bundle => {
+    return [bundle.bundle_id ?? bundle.id ?? '', bundle.bundle_product_id ?? bundle._bundle_product_id ?? bundle.product_id ?? '', bundle.bundle_variant_id ?? bundle.variant_id ?? bundle.product_variant_id ?? 0, bundle.bundle_group_id ?? bundle.group_id ?? ''].join('|');
+  };
+  const mergeRulesBundlePrices = (currentBundle, rulesBundle) => {
+    if (!Array.isArray(rulesBundle)) return rulesBundle;
+    const currentByIdentity = new Map();
+    (currentBundle || []).forEach(bundle => {
+      if (!bundle || typeof bundle !== 'object') return;
+      currentByIdentity.set(getBundleIdentity(bundle), bundle);
+    });
+    return rulesBundle.map(bundle => {
+      if (!bundle || typeof bundle !== 'object') return bundle;
+      const current = currentByIdentity.get(getBundleIdentity(bundle));
+      if (!current) return bundle;
+      const bundleWithDisplayFields = {
+        ...bundle,
+        ...(isEmptyOrderProductDisplayValue(bundle.cover) && !isEmptyOrderProductDisplayValue(current.cover) ? {
+          cover: current.cover
+        } : {})
+      };
+      const isProductPriceBundle = (bundle.price_type_ext ?? current.price_type_ext) === 'product_price';
+      if (!isProductPriceBundle) return bundleWithDisplayFields;
+      const sourcePrice = current.price ?? current.custom_price ?? current.original_price ?? current.bundle_selling_price;
+      const originalPrice = current.original_price ?? current.product_price ?? current.price ?? current.custom_price ?? sourcePrice;
+      return {
+        ...bundleWithDisplayFields,
+        ...(sourcePrice !== undefined ? {
+          price: sourcePrice
+        } : {}),
+        ...(originalPrice !== undefined ? {
+          original_price: originalPrice
+        } : {}),
+        ...(current.original_total !== undefined ? {
+          original_total: current.original_total
+        } : {})
+      };
+    });
+  };
   return {
     getProduct: product => {
       // source_product_price 是权威源；兜底链：source → mainSelling − options（反推）→ 行 selling_price
       const metadataAny = product.metadata || {};
-      const optionSum = sumOptionUnitPrice(product.product_option_item);
+      const optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
       let sourcePrice;
       if (metadataAny.source_product_price !== undefined) {
         sourcePrice = String(metadataAny.source_product_price);
@@ -136,9 +667,9 @@ function createDefaultOrderRulesHooks() {
         id: product.product_id,
         // Rules 引擎用 _id 作为 processedProductsMap 键；必须与购物车行级 identity 一致，
         // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
-        // 不透明 identity 契约下，normalizeOrderProduct / restoreTempOrderFromStorage 已保证 identity_key 必存在；
+        // 不透明 identity 契约下，normalizeOrderProduct / hydrate 已保证唯一值存在；
         // 留 fingerprint 分支仅作 Rules 单测里直接传裸 product 时的兜底。
-        _id: product.identity_key ? `${product.product_id}_${product.product_variant_id}_${product.identity_key}` : `${product.product_id}_${product.product_variant_id}_${(0, _utils2.buildProductLineFingerprint)(product.product_option_item, product.product_bundle)}`,
+        _id: product.metadata?.unique_identification_number ? `${product.product_id}_${product.product_variant_id}_${product.metadata.unique_identification_number}` : `${product.product_id}_${product.product_variant_id}_${(0, _utils2.buildProductLineFingerprint)(getProductSkuOptions(product), product.product_bundle)}`,
         // Rules 内部 getProductTotalPrice / getProductOriginTotalPrice 会各自再叠加 bundle + option，
         // 所以这里必须喂 source-level（不含 option、不含 bundle、不含折扣）单价，避免双加 option。
         price: sourcePrice,
@@ -150,18 +681,23 @@ function createDefaultOrderRulesHooks() {
         num: product.num || 1,
         discount_list: product.discount_list || [],
         bundle: product.product_bundle || [],
-        booking_id: product._origin?.booking_id || null,
+        booking_id: product.metadata?.booking_id || null,
         isClient: false,
-        isManualDiscount: product._origin?.isManualDiscount || false,
-        holder_id: product._origin?.holder_id,
-        startDate: product._origin?.startDate
+        // 勿写死 false：否则 Rules 不会走 total≠origin_total 的手动价推断，
+        // 无券时会把 bundle 价还原成 original_price（手动改价套餐会从 20 回到 30）。
+        isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
+        holder_id: product.metadata?.holder_id,
+        startDate: product.metadata?.start_date || product.metadata?.startDate,
+        main_product_selling_price: metadataAny.main_product_selling_price !== undefined ? new _decimal.default(Number(metadataAny.main_product_selling_price) || 0).minus(optionSum).toDecimalPlaces(2).toString() : undefined,
+        inPromotion: metadataAny._promotion?.inPromotion === true,
+        _promotion: metadataAny._promotion
       };
     },
     setProduct: (product, values) => {
       const nextNum = Number(values.quantity ?? product.num ?? 1) || 1;
       const metadataAny = product.metadata || {};
       const existedSource = metadataAny.source_product_price ?? product.selling_price ?? '0';
-      const nextOptions = product.product_option_item;
+      const nextOptions = getProductSkuOptions(product);
       const optionSum = sumOptionUnitPrice(nextOptions);
 
       // Rules 返回的 main_product_selling_price / price / total 均为 source-level。
@@ -176,7 +712,7 @@ function createDefaultOrderRulesHooks() {
       // 含 option 的 main_product_*
       const nextMainSellingPrice = new _decimal.default(Number(nextSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
       const nextMainOriginalPrice = new _decimal.default(Number(nextSourceOriginalPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
-      const nextBundle = values.bundle ?? product.product_bundle;
+      const nextBundle = values.bundle !== undefined ? mergeRulesBundlePrices(product.product_bundle, values.bundle) : product.product_bundle;
       const composedSellingPrice = composeLinePrice({
         mainPrice: nextMainSellingPrice,
         bundle: nextBundle
@@ -186,10 +722,15 @@ function createDefaultOrderRulesHooks() {
         bundle: nextBundle,
         useOriginalBundle: true
       });
+      const finalOriginalPrice = resolveManualOverrideLineOriginalPrice({
+        num: nextNum,
+        metadata: metadataAny,
+        lineOriginalPrice: product.original_price
+      }, composedOriginalPrice);
       return {
         ...product,
         selling_price: composedSellingPrice,
-        original_price: composedOriginalPrice,
+        original_price: finalOriginalPrice,
         discount_list: values.discount_list ?? product.discount_list,
         num: values.quantity ?? product.num,
         product_bundle: nextBundle,
@@ -291,14 +832,6 @@ const getAllDiscountList = cartItem => {
 
 // ─── 以下为从 ScanOrder/utils.ts 迁入的 Order 专属工具函数 ───
 exports.getAllDiscountList = getAllDiscountList;
-function createUuidV4() {
-  const template = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx';
-  return template.replace(/[xy]/g, char => {
-    const randomValue = Math.floor(Math.random() * 16);
-    const value = char === 'x' ? randomValue : randomValue & 0x3 | 0x8;
-    return value.toString(16);
-  });
-}
 function isTempOrder(data) {
   if (!data || typeof data !== 'object') return false;
   if (!Array.isArray(data.products)) return false;
@@ -315,70 +848,86 @@ function formatDateTime(date) {
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 }
 function normalizeSubmitPlatform(platform) {
-  return platform?.toLowerCase() === 'pc' ? 'PC' : 'H5';
+  const value = String(platform || '').trim();
+  if (!value) return 'H5';
+  const lower = value.toLowerCase();
+  if (lower === 'pc') return 'PC';
+  if (lower === 'h5') return 'H5';
+  return value;
 }
 
-// 出站重命名：后端 checkout 协议字段 option_group_item_id；
-// tempOrder / UI 运行时一律使用 product_option_item_id。仅保留后端契约字段，
-// 与 src/modules/Cart/utils/cartProduct.ts#formatOptionsToOrigin 形状一致。
+// 后端 checkout 协议字段 option_group_item_id；tempOrder 内部也保持同一字段名。
 function formatSubmitOptionItems(options) {
   if (!Array.isArray(options)) return [];
-  return options.map(d => ({
-    num: d?.num,
-    option_group_item_id: d?.option_group_item_id ?? d?.product_option_item_id,
-    option_group_id: d?.option_group_id
-  }));
+  return options.map(d => {
+    const option = {
+      ...(d && typeof d === 'object' ? d : {}),
+      num: d?.num,
+      option_group_item_id: d?.option_group_item_id,
+      option_group_id: d?.option_group_id
+    };
+    const addPrice = d?.add_price ?? d?.price;
+    if (addPrice !== undefined) option.add_price = String(addPrice);
+    delete option.price;
+    return option;
+  });
 }
 function toBundleNumber(value, fallback = 0) {
   const parsed = Number(value);
   return Number.isFinite(parsed) ? parsed : fallback;
 }
-function toBundleCustomPriceString(value) {
+function toMoneyString(value) {
   const parsed = Number(value);
   if (Number.isFinite(parsed)) return parsed.toFixed(2);
   if (value === null || value === undefined || value === '') return '0.00';
   return String(value);
 }
 
-// 出站补齐：以 additive 方式把 bundle 项补足为后端 checkout 协议所需的形状，
-// 同时把 Summary / Rules 运行时写到 bundle 顶层的 surcharge_fee / relation_surcharge_ids
-// 和来自 _origin 的 product_discount_difference 汇总到 metadata。
-// 保留原对象上已有字段（如 discount_list、metadata.custom_product_bundle_map_id）
-// 以兼容运行时 bundle 归一化、Rules、Summary 的消费。
+// 出站补齐：只输出后端 checkout 协议字段，运行时/详情展示字段不进入 bundle payload。
 function formatSubmitBundleItems(bundle) {
   if (!Array.isArray(bundle)) return [];
   return bundle.map(b => {
     const rawBundle = b && typeof b === 'object' ? b : {};
     const existedMetadata = rawBundle.metadata && typeof rawBundle.metadata === 'object' ? rawBundle.metadata : {};
-    const sellingPriceNum = toBundleNumber(rawBundle.bundle_selling_price ?? rawBundle.price, 0);
-    const priceNum = toBundleNumber(rawBundle.price, sellingPriceNum);
-    const priceType = rawBundle.price_type ?? '';
-    // const customPriceStr = toBundleCustomPriceString(
-    //   rawBundle.custom_price ?? rawBundle.bundle_selling_price ?? rawBundle.price,
-    // );
+    const {
+      custom_product_bundle_map_id: _customProductBundleMapId,
+      ...submitMetadata
+    } = existedMetadata;
 
+    // bundle_selling_price 出站存「正净额」：markdown 为 |price| − Σoptions（如 3.70），
+    // markup/原价维持原值；与后端口径一致（price 仍为毛价）。
+    const sellingPrice = getBundleSellingMagnitude(rawBundle).toFixed(2);
+    // payment 价由整单折扣均摊层产出；缺省（无折扣）时与 selling 净额同义。
+    const paymentPrice = rawBundle.bundle_payment_price !== undefined && rawBundle.bundle_payment_price !== null && rawBundle.bundle_payment_price !== '' ? toMoneyString(rawBundle.bundle_payment_price) : sellingPrice;
+    const priceValue = rawBundle.price ?? rawBundle.custom_price ?? rawBundle.bundle_selling_price;
     const relationSurchargeIds = Array.isArray(rawBundle.relation_surcharge_ids) ? rawBundle.relation_surcharge_ids : Array.isArray(existedMetadata.relation_surcharge_ids) ? existedMetadata.relation_surcharge_ids : [];
-    const surchargeFee = toBundleNumber(rawBundle.surcharge_fee ?? existedMetadata.surcharge_fee, 0);
+    const surchargeFee = toMoneyString(rawBundle.surcharge_fee ?? existedMetadata.surcharge_fee);
     const productDiscountDifference = toBundleNumber(existedMetadata.product_discount_difference, 0);
+    const num = toBundleNumber(rawBundle.num ?? rawBundle.quantity, 1);
+    const bundleMapId = resolveSubmitBundleMapId(rawBundle);
+    const hasSubmitBundleDiscounts = Array.isArray(rawBundle.discount_list) && rawBundle.discount_list.length > 0;
     return {
-      ...rawBundle,
       is_charge_tax: rawBundle.is_charge_tax ?? 0,
-      tax_fee: toBundleNumber(rawBundle.tax_fee, 0),
       bundle_variant_id: rawBundle.bundle_variant_id ?? 0,
-      num: toBundleNumber(rawBundle.num, 1),
+      num,
+      quantity: toBundleNumber(rawBundle.quantity ?? rawBundle.num, num),
       extension_id: rawBundle.extension_id ?? 0,
       extension_type: rawBundle.extension_type ?? 'normal',
-      price: priceNum,
-      price_type: priceType,
-      price_type_ext: rawBundle.price_type_ext ?? '',
-      // custom_price: customPriceStr,
-      custom_price_type: rawBundle.custom_price_type ?? priceType ?? '',
-      bundle_selling_price: sellingPriceNum,
+      price: priceValue,
+      price_type: rawBundle.price_type ?? rawBundle.custom_price_type ?? '',
+      price_type_ext: rawBundle.price_type_ext ?? rawBundle.custom_price_type_ext ?? '',
+      bundle_selling_price: sellingPrice,
+      bundle_payment_price: paymentPrice,
       option: formatSubmitOptionItems(rawBundle.option),
-      bundle_group_id: rawBundle?.group_id,
-      bundle_id: rawBundle?.id,
+      bundle_group_id: rawBundle?.bundle_group_id ?? rawBundle?.group_id,
+      bundle_id: rawBundle?.bundle_id ?? rawBundle?.id,
+      bundle_product_id: rawBundle?.bundle_product_id ?? rawBundle?._bundle_product_id,
+      cover: rawBundle.cover,
       metadata: {
-        ...existedMetadata,
+        ...submitMetadata,
+        ...(hasSubmitBundleDiscounts && bundleMapId !== undefined ? {
+          custom_product_bundle_map_id: bundleMapId
+        } : {}),
         surcharge_fee: surchargeFee,
         relation_surcharge_ids: relationSurchargeIds,
         product_discount_difference: productDiscountDifference
@@ -395,7 +944,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、含主商品折扣。
@@ -405,43 +954,72 @@ function formatSubmitBundleItems(bundle) {
  */
 function normalizeSubmitProduct(product) {
   const {
-    _origin,
-    identity_key,
+    unique_identification_number: _runtimeUid,
     ...submitProduct
   } = product;
+  const {
+    num,
+    surcharge_fee: _productSurchargeFee,
+    discount_amount: _deprecatedDiscountAmount,
+    discount_type: _deprecatedDiscountType,
+    discountway: _deprecatedDiscountway,
+    product_discount_reason: _deprecatedProductDiscountReason,
+    discount_per: _deprecatedDiscountPer,
+    ...productRest
+  } = submitProduct;
+  delete productRest[`product_${'option'}_item`];
   const rawMetadata = submitProduct.metadata || {};
   const bookingUid = rawMetadata.booking_uid;
   const cleanMetadata = {};
   if (rawMetadata.unique_identification_number) {
     cleanMetadata.unique_identification_number = rawMetadata.unique_identification_number;
   }
-  const priceMetaKeys = ['main_product_original_price', 'main_product_selling_price', 'source_product_price', 'price_schema_version'];
+  const 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 (const key of priceMetaKeys) {
     if (rawMetadata[key] !== undefined) {
       cleanMetadata[key] = rawMetadata[key];
     }
   }
+  cleanMetadata.product_discount_difference = rawMetadata.product_discount_difference ?? '';
   if (rawMetadata.price_breakdown) {
     cleanMetadata.price_breakdown = rawMetadata.price_breakdown;
   }
   if (rawMetadata.is_rule !== undefined) {
     cleanMetadata.is_rule = rawMetadata.is_rule;
   }
+  if (rawMetadata.holder_config !== undefined) {
+    cleanMetadata.holder_config = rawMetadata.holder_config;
+  }
+  const productSku = {
+    ...(submitProduct.product_sku && typeof submitProduct.product_sku === 'object' ? submitProduct.product_sku : {}),
+    option: formatSubmitOptionItems(submitProduct.product_sku?.option)
+  };
   return {
-    ...submitProduct,
+    ...productRest,
     ...(bookingUid ? {
       booking_uid: bookingUid
     } : {}),
-    product_option_item: formatSubmitOptionItems(submitProduct.product_option_item),
-    discount_list: submitProduct.discount_list || [],
+    product_quantity: toBundleNumber(num ?? submitProduct.product_quantity, 1),
+    product_sku: productSku,
+    discount_list: collectSubmitProductDiscountList(submitProduct),
     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.payment_price ?? submitProduct.selling_price
   };
 }
-const SUBMIT_BOOKING_METADATA_WHITELIST = ['unique_identification_number', 'collect_pax'];
+const SUBMIT_BOOKING_METADATA_WHITELIST = ['unique_identification_number', 'collect_pax', 'capacity', 'holder_id', 'resource_select_type', 'holder'];
+function normalizeBookingIsAll(booking) {
+  return booking.is_all === true || booking.is_all === 1 || booking.is_all === '1' || booking.is_all === 'true' ? 1 : 0;
+}
+function normalizeBookingSubType(booking) {
+  if (normalizeBookingIsAll(booking) === 1) return 'days';
+  if (booking.sub_type !== undefined && booking.sub_type !== null && booking.sub_type !== '') {
+    return String(booking.sub_type);
+  }
+  return 'minutes';
+}
 function normalizeSubmitBooking(booking) {
   const rawMetadata = booking.metadata || {};
   const cleanMetadata = {};
@@ -450,8 +1028,18 @@ function normalizeSubmitBooking(booking) {
       cleanMetadata[key] = rawMetadata[key];
     }
   }
+  if (cleanMetadata.holder_id === undefined) cleanMetadata.holder_id = null;
+  const bookingRecord = booking;
+  const startDate = bookingRecord.start_date;
+  const shouldRestoreSelectDate = bookingRecord.select_date === undefined || bookingRecord.select_date === null || bookingRecord.select_date === '';
+  const selectDateFromStartDate = typeof startDate === 'string' ? startDate.split(/\s+/)[0] : startDate;
   return {
     ...booking,
+    ...(shouldRestoreSelectDate && selectDateFromStartDate ? {
+      select_date: selectDateFromStartDate
+    } : {}),
+    is_all: normalizeBookingIsAll(bookingRecord),
+    sub_type: normalizeBookingSubType(bookingRecord),
     metadata: cleanMetadata
   };
 }
@@ -479,27 +1067,26 @@ function resolveSubmitCollectPax(tempOrder) {
   return normalizeSubmitCollectPaxValue(tempOrder.metadata?.collect_pax);
 }
 function createDefaultTempOrder(params) {
-  const summary = params.summary || (0, _utils2.createEmptySummary)();
   return {
     order_id: null,
-    relation_id: undefined,
-    table_form_id: undefined,
-    resource_id: undefined,
-    order_number: '',
-    shop_order_number: '',
-    type: 'appointment_booking',
-    business_code: 'appointment_booking',
+    external_sale_number: '',
+    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: '',
@@ -512,18 +1099,21 @@ 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: [],
+    contacts_info: null,
     holder: null,
-    summary,
-    metadata: {}
+    metadata: {},
+    _extend: {
+      productsByUid: {}
+    }
   };
 }
 function buildSubmitPayload(params) {
@@ -535,51 +1125,52 @@ function buildSubmitPayload(params) {
     businessCode,
     channel,
     type,
+    summary,
     enhance
   } = params;
   const scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
-  const summary = tempOrder.summary || (0, _utils2.createEmptySummary)();
-  const relationId = tempOrder.relation_id;
-  const tableFormId = tempOrder.table_form_id;
-  const bookingUuid = createUuidV4();
-  const bookingStart = (0, _dayjs.default)(now);
-  const bookingDuration = resolveTableOccupancyDuration(tempOrder);
-  const bookingEnd = bookingStart.add(bookingDuration, 'minute');
-  const bookings = relationId && tableFormId ? [{
-    relation_id: 0,
-    form_id: 0,
-    start_time: bookingStart.format('HH:mm'),
-    start_date: bookingStart.format('YYYY-MM-DD'),
-    end_time: bookingEnd.format('HH:mm'),
-    end_date: bookingEnd.format('YYYY-MM-DD'),
-    duration: bookingDuration,
-    metadata: {
-      unique_identification_number: bookingUuid,
-      collect_pax: resolveSubmitCollectPax(tempOrder)
-    },
-    select_date: bookingStart.format('YYYY-MM-DD'),
-    is_all: false,
-    like_status: 'common',
-    schedule_id: 0,
-    relation_type: '',
-    number: 1
-  }] : tempOrder.bookings || [];
-  const formRecordIds = relationId && tableFormId ? [{
-    form_id: tableFormId,
-    form_record_id: relationId
-  }] : undefined;
+  const bookingUuid = (0, _orderCollectionIdentity.createUuidV4)();
   const {
-    created_at: _createdAt,
+    _extend: _extend,
+    relation_id: _relationId,
+    table_form_id: _tableFormId,
+    resource_id: _resourceId,
     summary: _summary,
-    surcharges: _surcharges,
+    lastOrderInfo: _lastOrderInfo,
+    paid_amount: _paidAmount,
+    shop_id: _shopId,
+    shop_note: _shopNote,
+    shop_service_type: _shopServiceType,
+    start_time: _startTime,
+    customer: _customer,
+    discount_list: _discountList,
+    tax_fee: _rootTaxFee,
+    total_amount: _totalAmount,
+    total_refund_amount: _totalRefundAmount,
+    create_date: _createDate,
+    holder_id: _holderId,
     ...tempOrderRest
   } = tempOrder;
+  let submitType = type ?? tempOrder.type;
+  if (!submitType) {
+    // 如果外部没有传递 types，根据订单里当前是否有 bookings 来决定是 appointment_booking 还是 virtual
+    if (tempOrder?.bookings?.length) {
+      submitType = 'appointment_booking';
+    } else {
+      submitType = 'virtual';
+    }
+  }
   const payload = {
     ...tempOrderRest,
-    platform: normalizeSubmitPlatform(platform ?? tempOrder.platform),
-    request_unique_idempotency_token: cacheId,
-    type: type ?? tempOrder.type ?? 'table-order',
-    business_code: businessCode ?? tempOrder.business_code ?? 'table-order',
+    customer_id: tempOrder.customer_id ?? 1,
+    customer_name: tempOrder.customer_name || 'Walk-In',
+    order_number: tempOrder.order_number ?? null,
+    shop_order_number: tempOrder.shop_order_number ?? null,
+    shop_full_order_number: tempOrder.shop_full_order_number ?? null,
+    platform: normalizeSubmitPlatform(platform),
+    request_unique_idempotency_token: params?.request_unique_idempotency_token || tempOrder.request_unique_idempotency_token || `${tempOrder.external_sale_number}_${now.getTime()}`,
+    type: submitType,
+    business_code: businessCode ?? tempOrder.business_code,
     sales_channel: tempOrder.sales_channel || 'my_pisel',
     order_sales_channel: channel ?? tempOrder.order_sales_channel ?? 'online_store',
     status: tempOrder.status || 'normal',
@@ -590,18 +1181,18 @@ function buildSubmitPayload(params) {
     is_deposit: tempOrder.is_deposit ?? 0,
     deposit_amount: tempOrder.deposit_amount || '0.00',
     shop_discount: tempOrder.shop_discount || '0.00',
-    surcharge_fee: summary.surcharge_fee || tempOrder.surcharge_fee || '0.00',
+    surcharge_fee: tempOrder.surcharge_fee || '0.00',
     note: tempOrder.note || '',
+    delivery_type: tempOrder.delivery_type || 'nil',
     schedule_date: scheduleDate,
-    bookings: bookings.map(booking => normalizeSubmitBooking(booking)),
+    // created_at: tempOrder.created_at || formatDateTime(now), 和后端协定这个字段先不提交到接口
+    bookings: (tempOrder.bookings || []).filter(booking => Number(booking.parent_id) !== 0).map(booking => normalizeSubmitBooking(booking)),
     payments: tempOrder.payments || [],
-    // discount_list: tempOrder.discount_list || [],
     relation_forms: tempOrder.relation_forms || [],
-    form_record_ids: formRecordIds,
     // contacts: tempOrder.contacts || [],
-    contacts_info: tempOrder.contacts_info || [],
+    contacts_info: tempOrder.contacts_info && !Array.isArray(tempOrder.contacts_info) ? tempOrder.contacts_info : null,
     // holder: tempOrder.holder || null,
-    // summary,
+    summary: summary || tempOrder.summary || (0, _utils2.createEmptySummary)(),
     metadata: (() => {
       const {
         collect_pax: _collectPax,
@@ -614,23 +1205,96 @@ function buildSubmitPayload(params) {
     })(),
     products: (tempOrder.products || []).map(product => normalizeSubmitProduct(product))
   };
-  return enhance ? enhance(payload, {
+  if (!enhance) return payload;
+  const enhancedPayload = enhance(payload, {
     tempOrder,
     bookingUuid,
     now
-  }) : payload;
+  });
+  return {
+    ...enhancedPayload,
+    summary: enhancedPayload.summary ?? payload.summary
+  };
 }
-
-/** 加单（scanOrderMore）不应提交 booking 关联的虚拟规则商品行 */
-function filterProductsForScanOrderMore(products) {
-  return (products || []).filter(p => p.metadata?.is_rule !== true);
+function mapPaymentItemToOrderPayment(paymentItem) {
+  const item = paymentItem;
+  const customPaymentId = item.custom_payment_id ?? item.id;
+  const metadata = item.metadata && typeof item.metadata === 'object' ? {
+    ...item.metadata
+  } : {};
+  if (item.uuid && !metadata.unique_payment_number) {
+    metadata.unique_payment_number = String(item.uuid);
+  }
+  const paymentMetadataKeys = ['rounding_rule', 'shop_wallet_pass_id', 'actual_paid_amount', 'change_given_amount'];
+  for (const key of paymentMetadataKeys) {
+    if (item[key] !== undefined && metadata[key] === undefined) {
+      metadata[key] = item[key];
+    }
+  }
+  const timestamp = (0, _dayjs.default)().format('YYYY-MM-DD HH:mm:ss');
+  const paymentTime = item.payment_time ?? timestamp;
+  const createdAt = item.created_at ?? timestamp;
+  return {
+    ...(item.order_payment_id !== undefined ? {
+      order_payment_id: item.order_payment_id
+    } : {}),
+    amount: String(item.amount ?? '0.00'),
+    code: String(item.code || ''),
+    custom_payment_id: Number(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 ? {
+      voucher_id: item.voucher_id
+    } : {}),
+    ...(item.origin_amount !== undefined ? {
+      origin_amount: String(item.origin_amount)
+    } : {}),
+    ...(item.service_fee !== undefined ? {
+      service_fee: String(item.service_fee)
+    } : {}),
+    ...(item.status !== undefined ? {
+      status: item.status
+    } : {}),
+    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: {
+        ...item.fund_record
+      }
+    } : {}),
+    metadata,
+    ...(item.rounding_amount !== undefined ? {
+      rounding_amount: String(item.rounding_amount)
+    } : {}),
+    ...(item.service_charge !== undefined ? {
+      service_charge: item.service_charge
+    } : {}),
+    ...(item.order_payment_type !== undefined ? {
+      order_payment_type: item.order_payment_type
+    } : {}),
+    ...(item.updated_at !== undefined ? {
+      updated_at: item.updated_at
+    } : {})
+  };
+}
+function mapPaymentItemsToOrderPayments(paymentItems, options = {}) {
+  if (!Array.isArray(paymentItems)) return [];
+  return paymentItems.filter(item => options.includeVoided || item.status !== 'voided').map(item => mapPaymentItemToOrderPayment(item));
 }
 
 /**
  * 历史 V1 加餐结构映射器。
  *
- * @deprecated 加餐（`PUT /order/order/product/:id`）已改为与正常 checkout 共用
- * `ScanOrderSubmitProduct` 新结构（见 `OrderModule.submitTempOrder` 的加餐分支）。
+ * @deprecated 标准 Sales checkout 已统一提交结构。
  * 本函数仅保留以兼容历史接入方，未来会移除。新代码请勿再调用。
  */
 function formatV1Product(products) {
@@ -638,14 +1302,186 @@ function formatV1Product(products) {
     return {
       bundle: product.product_bundle,
       key: product.product_id,
-      option: product.product_option_item,
+      option: product.product_sku?.option || [],
       product_id: product.product_id,
       product_variant_id: product.product_variant_id,
-      num: product.num,
+      num: product.product_quantity,
       note: String(product.note ?? ''),
       rowKey: product.product_id,
       session: null,
-      unique: createUuidV4()
+      unique: (0, _orderCollectionIdentity.createUuidV4)()
     };
   });
+}
+
+/**
+ * 判断 holder_id 是否已分配（非空）。
+ *
+ * @example
+ * hasAssignedHolderId(12); // true
+ * hasAssignedHolderId([]); // false
+ */
+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);
+ */
+function clearTempOrderHolderAssignments(tempOrder) {
+  let changed = false;
+  const resetHolderField = (target, key = 'holder_id') => {
+    if (!hasAssignedHolderId(target[key])) return;
+    target[key] = null;
+    changed = true;
+  };
+  for (const product of tempOrder.products || []) {
+    if (product.metadata && typeof product.metadata === 'object') {
+      resetHolderField(product.metadata);
+    }
+  }
+  for (const booking of tempOrder.bookings || []) {
+    const bookingRecord = booking;
+    if (booking.metadata && typeof booking.metadata === 'object') {
+      resetHolderField(booking.metadata);
+    }
+    if (bookingRecord.holder !== undefined && bookingRecord.holder !== null) {
+      delete bookingRecord.holder;
+      changed = true;
+    }
+  }
+  const productsByUid = tempOrder._extend?.productsByUid;
+  if (productsByUid && typeof productsByUid === 'object') {
+    for (const entry of Object.values(productsByUid)) {
+      const origin = 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'
+ */
+function getOrderProductLineUid(product) {
+  if (!product || typeof product !== 'object') return null;
+  const uid = product.metadata?.unique_identification_number ?? product.unique_identification_number;
+  if (uid === undefined || uid === null || uid === '') return null;
+  return String(uid);
+}
+function getRuntimeProductOrigin(tempOrder, product) {
+  const uid = getOrderProductLineUid(product);
+  if (uid && tempOrder?._extend?.productsByUid?.[uid]?.origin) {
+    return tempOrder._extend.productsByUid[uid].origin;
+  }
+  const matchedProduct = (tempOrder?.products || []).find(item => item === product || getOrderProductLineUid(item) === uid || String(item?.product_id ?? item?.id ?? '') === String(product?.product_id ?? product?.id ?? ''));
+  const matchedUid = matchedProduct ? getOrderProductLineUid(matchedProduct) : '';
+  return matchedUid ? tempOrder?._extend?.productsByUid?.[matchedUid]?.origin || null : null;
+}
+function isHolderConfigRequired(holderConfig) {
+  if (!holderConfig || typeof holderConfig !== 'object') return false;
+  if (holderConfig.status === 'disable') return false;
+  return Number(holderConfig.required) === 1;
+}
+function productRequiresFormSubject(tempOrder, product) {
+  const _orderProduct = tempOrder?.products?.find(item => {
+    return item.metadata.unique_identification_number === product._id || item.product_id === product.id;
+  });
+  const runtimeOrigin = getRuntimeProductOrigin(tempOrder, product);
+  return isHolderConfigRequired(_orderProduct?.metadata?.holder_config) || isHolderConfigRequired(runtimeOrigin?.holder_config) || isHolderConfigRequired(product?.holder_config);
+}
+function resolveIsFormSubject(tempOrder, product) {
+  debugger;
+  // 旧版预约维度的 holder 类型仍然生效；新版则从当前商品 holder_config 判断。
+  if (tempOrder?.holder?.type === 'form') return true;
+  if (product) return productRequiresFormSubject(tempOrder, product);
+  return (tempOrder?.products || []).some(item => productRequiresFormSubject(tempOrder, item));
+}
+
+/**
+ * 判断展示字段是否为空（含 i18n 对象全空）。
+ *
+ * @example
+ * isEmptyOrderProductDisplayValue(''); // true
+ * isEmptyOrderProductDisplayValue({ auto: '桌台费' }); // false
+ */
+function isEmptyOrderProductDisplayValue(value) {
+  if (value === undefined || value === null) return true;
+  if (typeof value === 'string') return value.trim() === '';
+  if (typeof value === 'object') {
+    const record = value;
+    return !Object.values(record).some(item => 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' } },
+ * );
+ */
+function mergeOrderProductDisplayFields(previous, next) {
+  const merged = {
+    ...next
+  };
+  const displayFields = ['product_title', 'product_name', 'product_cover', 'cover', 'product_cover', 'variant_title', 'product_sku', 'payment_price'];
+  displayFields.forEach(field => {
+    if (isEmptyOrderProductDisplayValue(merged[field]) && !isEmptyOrderProductDisplayValue(previous[field])) {
+      merged[field] = previous[field];
+    }
+  });
+  if (previous.metadata || next.metadata) {
+    merged.metadata = {
+      ...(previous.metadata || {}),
+      ...(next.metadata || {})
+    };
+    ['product_title', 'product_name'].forEach(field => {
+      if (isEmptyOrderProductDisplayValue(merged.metadata[field]) && !isEmptyOrderProductDisplayValue(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' } }]);
+ */
+function indexOrderProductsByUid(products) {
+  const map = new Map();
+  (products || []).forEach((product, index) => {
+    const uid = getOrderProductLineUid(product);
+    if (uid) {
+      map.set(uid, product);
+      return;
+    }
+    map.set(`__index__:${index}`, product);
+  });
+  return map;
 }