@pisell/pisellos 2.1.129 → 2.1.131

package/dist/modules/Order/utils.js

@@ -1,38 +1,114 @@
 var _excluded = ["_origin", "identity_key"],
-  _excluded2 = ["created_at", "summary", "surcharges"];
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+  _excluded2 = ["created_at", "summary", "surcharges"],
+  _excluded3 = ["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 _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 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 _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; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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 { createEmptySummary } from "../../solution/ScanOrder/utils";
+import { buildProductLineFingerprint, createEmptySummary } from "../../solution/ScanOrder/utils";
+/**
+ * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
+ *
+ * 新语义 v2 约定：
+ * - `mainPrice` 必须是**已经包含 option 的主商品单价**（即 `metadata.main_product_selling_price`
+ *   或 `metadata.main_product_original_price`），option 价格不由本函数叠加。
+ * - 套餐价：Σ((bundle.bundle_selling_price ?? bundle.price) × (bundle.num ?? bundle.quantity ?? 1))
+ *   当 `useOriginalBundle=true` 时，改用 `bundle.original_price ?? bundle.product_price ?? bundle.price`。
+ * - 返回值：保留 2 位小数的字符串，方便直接写回 `selling_price` / `original_price` 字段。
+ *
+ * 被 `normalizeOrderProduct`、Rules setProduct 钩子、各 Solution 的 setDiscountSelected 共用，
+ * 保证合成逻辑单点来源。
+ */
+export function composeLinePrice(params) {
+  var mainPrice = params.mainPrice,
+    bundle = params.bundle,
+    useOriginalBundle = params.useOriginalBundle;
+  var total = new Decimal(Number(mainPrice) || 0);
+  if (Array.isArray(bundle)) {
+    var _iterator = _createForOfIteratorHelper(bundle),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var _ref, _item$original_price, _item$bundle_selling_, _ref2, _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;
+        var num = new Decimal(Number(rawNum) || 0);
+        total = total.plus(price.times(num));
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+  }
+  return total.toDecimalPlaces(2).toFixed(2);
+}
+
+/**
+ * 计算 option 单价合计：Σ(option.price × option.num)。
+ * 在新语义 v2 下，main_product_original_price = source_product_price + 本函数结果。
+ */
+export function sumOptionUnitPrice(options) {
+  var total = new Decimal(0);
+  if (!Array.isArray(options)) return total;
+  var _iterator2 = _createForOfIteratorHelper(options),
+    _step2;
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var opt = _step2.value;
+      var price = new Decimal(Number(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));
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+  return total;
+}
+
 /**
  * OrderModule 默认 Rules 钩子工厂。
  *
- * 价格语义约定（订单域）：
- * - `selling_price`：券后单品单价（实际成交单价）。初次加购 = `original_price`；券应用后由 Rules 引擎更新。
- * - `original_price`：券前单品单价（店铺售价）。不承载后台划线价语义。
- * - `payment_price`：已从内部字段移除；只在出站 payload 中由 `selling_price` 派生以兼容后端。
+ * 价格语义约定（订单域，v2 composite 口径）：
+ * - `selling_price`：券后 **行 composite 单价**
+ *   = `metadata.main_product_selling_price` + Σ(bundle_selling_price × num)。
+ * - `original_price`：券前 **行 composite 单价**
+ *   = `metadata.main_product_original_price` + Σ(bundle 原价 × num)。
+ * - `metadata.source_product_price`：主商品/variant 基础价（已应用报价单），不含 option、
+ *   不含折扣。**权威源**。
+ * - `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）。
  *
- * Rules 钩子契约：
- * - `getProduct.total` = `selling_price × num`（当前成交总价）
- * - `getProduct.origin_total` = `original_price × num`（券前总价）
- * - `setProduct` 写回 `selling_price` 的优先级：
- *   1. `values.main_product_selling_price`（券应用分支，per-unit 券后主价）
- *   2. `values.price`（还原分支 `restoredPrice`、good_pass 归零）
- *   3. `values.total / num`（仅当 Rules 只给出总价时的兜底）
+ * Rules 钩子契约（hook_adapt 方案，Rules 内部保持不变）：
+ * - `getProduct.price` / `getProduct.original_price` 回传 **source-level 主价**
+ *   （`metadata.source_product_price`）。Rules 内部 `getProductTotalPrice` /
+ *   `getProductOriginTotalPrice` 会自行叠加 option + bundle，喂 source 可避免 option 双加。
+ * - `getProduct.total` = `selling_price × num`（行 composite × num），与 Rules 内部产出的
+ *   total（source + option + bundle）对齐。
+ * - `setProduct` 反向流程：把 Rules 返回的 source-level `main_product_selling_price` / `price`
+ *   加回 Σoptions，重新合成含 option 的 main_product_* 并派生 composite。
+ *   优先级：
+ *     1. `values.main_product_selling_price`（券应用分支，per-unit 券后 source-level 主价）
+ *     2. `values.price`（还原分支 `restoredPrice`、good_pass 归零）
+ *     3. `values.total / num`（仅当 Rules 只给出总价时的兜底）
  *
  * 导出为纯函数方便单测直接驱动钩子，不依赖 OrderModule 实例。
  */
@@ -44,13 +120,40 @@ export function createDefaultOrderRulesHooks() {
   return {
     getProduct: function getProduct(product) {
       var _product$_origin, _product$_origin2, _product$_origin3, _product$_origin4;
+      // source_product_price 是权威源；兜底链：source → mainSelling − options（反推）→ 行 selling_price
+      var metadataAny = product.metadata || {};
+      var optionSum = sumOptionUnitPrice(product.product_option_item);
+      var sourcePrice;
+      if (metadataAny.source_product_price !== undefined) {
+        sourcePrice = String(metadataAny.source_product_price);
+      } else if (metadataAny.main_product_selling_price !== undefined) {
+        sourcePrice = new Decimal(Number(metadataAny.main_product_selling_price) || 0).minus(optionSum).toDecimalPlaces(2).toString();
+      } else {
+        var _product$selling_pric;
+        sourcePrice = String((_product$selling_pric = product.selling_price) !== null && _product$selling_pric !== void 0 ? _product$selling_pric : 0);
+      }
+      var sourceOriginalPrice;
+      if (metadataAny.source_product_price !== undefined) {
+        sourceOriginalPrice = String(metadataAny.source_product_price);
+      } else if (metadataAny.main_product_original_price !== undefined) {
+        sourceOriginalPrice = new Decimal(Number(metadataAny.main_product_original_price) || 0).minus(optionSum).toDecimalPlaces(2).toString();
+      } else {
+        sourceOriginalPrice = sourcePrice;
+      }
       return {
         id: product.product_id,
-        _id: product.identity_key ? "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(product.identity_key) : "".concat(product.product_id, "_").concat(product.product_variant_id),
-        price: product.selling_price,
+        // Rules 引擎用 _id 作为 processedProductsMap 键；必须与购物车行级 identity 一致，
+        // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
+        // 不透明 identity 契约下，normalizeOrderProduct / restoreTempOrderFromStorage 已保证 identity_key 必存在；
+        // 留 fingerprint 分支仅作 Rules 单测里直接传裸 product 时的兜底。
+        _id: product.identity_key ? "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(product.identity_key) : "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(buildProductLineFingerprint(product.product_option_item, product.product_bundle)),
+        // Rules 内部 getProductTotalPrice / getProductOriginTotalPrice 会各自再叠加 bundle + option，
+        // 所以这里必须喂 source-level（不含 option、不含 bundle、不含折扣）单价，避免双加 option。
+        price: sourcePrice,
+        // total / origin_total 使用 composite × num，跟 Rules 内部产出的 total 对齐（含 option + bundle）。
         total: new Decimal(product.selling_price || 0).times(product.num || 1).toNumber(),
         origin_total: new Decimal(product.original_price || product.selling_price || 0).times(product.num || 1).toNumber(),
-        original_price: product.original_price,
+        original_price: sourceOriginalPrice,
         quantity: product.num || 1,
         num: product.num || 1,
         discount_list: product.discount_list || [],
@@ -63,18 +166,47 @@ export function createDefaultOrderRulesHooks() {
       };
     },
     setProduct: function setProduct(product, values) {
-      var _ref, _values$quantity, _values$discount_list, _values$quantity2, _values$bundle;
-      var nextNum = Number((_ref = (_values$quantity = values.quantity) !== null && _values$quantity !== void 0 ? _values$quantity : product.num) !== null && _ref !== void 0 ? _ref : 1) || 1;
-      var nextSellingPrice = values.main_product_selling_price !== undefined ? String(values.main_product_selling_price) : values.price !== undefined ? String(values.price) : values.total !== undefined ? toUnitPriceString(values.total, nextNum) : product.selling_price;
+      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 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 optionSum = sumOptionUnitPrice(nextOptions);
+
+      // Rules 返回的 main_product_selling_price / price / total 均为 source-level。
+      // 优先级：main_product_selling_price（per-unit 券后 source）> price（还原/good_pass 分支）>
+      // total/num（仅当 Rules 只给 total 时的兜底）> 保留当前 source。
+      var nextSourceSellingPrice = values.main_product_selling_price !== undefined ? String(values.main_product_selling_price) : values.price !== undefined ? String(values.price) : values.total !== undefined ? toUnitPriceString(values.total, nextNum) : String(existedSource);
+
+      // 券前 source：values.original_price 是 source-level（Rules 层本就不含 option），
+      // 缺省时保留现有 source（券前 = 当前 source）。
+      var nextSourceOriginalPrice = values.original_price !== undefined ? String(values.original_price) : String(existedSource);
+
+      // 含 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 composedSellingPrice = composeLinePrice({
+        mainPrice: nextMainSellingPrice,
+        bundle: nextBundle
+      });
+      var composedOriginalPrice = composeLinePrice({
+        mainPrice: nextMainOriginalPrice,
+        bundle: nextBundle,
+        useOriginalBundle: true
+      });
       return _objectSpread(_objectSpread({}, product), {}, {
-        selling_price: nextSellingPrice,
-        original_price: values.original_price !== undefined ? String(values.original_price) : product.original_price,
+        selling_price: composedSellingPrice,
+        original_price: composedOriginalPrice,
         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: (_values$bundle = values.bundle) !== null && _values$bundle !== void 0 ? _values$bundle : product.product_bundle,
-        metadata: _objectSpread(_objectSpread({}, product.metadata || {}), values.main_product_selling_price !== undefined ? {
-          main_product_selling_price: String(values.main_product_selling_price)
-        } : {})
+        product_bundle: nextBundle,
+        metadata: _objectSpread(_objectSpread({}, metadataAny), {}, {
+          source_product_price: nextSourceSellingPrice,
+          main_product_selling_price: nextMainSellingPrice,
+          main_product_original_price: nextMainOriginalPrice,
+          price_schema_version: 2
+        })
       });
     }
   };
@@ -167,6 +299,92 @@ export function formatDateTime(date) {
 function normalizeSubmitPlatform(platform) {
   return (platform === null || platform === void 0 ? void 0 : platform.toLowerCase()) === 'pc' ? 'PC' : 'H5';
 }
+
+// 出站重命名：后端 checkout 协议字段 option_group_item_id；
+// tempOrder / UI 运行时一律使用 product_option_item_id。仅保留后端契约字段，
+// 与 src/modules/Cart/utils/cartProduct.ts#formatOptionsToOrigin 形状一致。
+function formatSubmitOptionItems(options) {
+  if (!Array.isArray(options)) return [];
+  return options.map(function (d) {
+    var _d$option_group_item_;
+    return {
+      num: d === null || d === void 0 ? void 0 : d.num,
+      option_group_item_id: (_d$option_group_item_ = d === null || d === void 0 ? void 0 : d.option_group_item_id) !== null && _d$option_group_item_ !== void 0 ? _d$option_group_item_ : d === null || d === void 0 ? void 0 : d.product_option_item_id,
+      option_group_id: d === null || d === void 0 ? void 0 : d.option_group_id
+    };
+  });
+}
+function toBundleNumber(value) {
+  var fallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  var parsed = Number(value);
+  return Number.isFinite(parsed) ? parsed : fallback;
+}
+function toBundleCustomPriceString(value) {
+  var 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 的消费。
+function formatSubmitBundleItems(bundle) {
+  if (!Array.isArray(bundle)) return [];
+  return bundle.map(function (b) {
+    var _rawBundle$bundle_sel, _rawBundle$price_type, _ref5, _rawBundle$custom_pri, _rawBundle$surcharge_, _rawBundle$is_charge_, _rawBundle$bundle_var, _rawBundle$extension_, _rawBundle$extension_2, _rawBundle$price_type2, _ref6, _rawBundle$custom_pri2;
+    var rawBundle = b && _typeof(b) === 'object' ? b : {};
+    var existedMetadata = rawBundle.metadata && _typeof(rawBundle.metadata) === 'object' ? rawBundle.metadata : {};
+    var sellingPriceNum = toBundleNumber((_rawBundle$bundle_sel = rawBundle.bundle_selling_price) !== null && _rawBundle$bundle_sel !== void 0 ? _rawBundle$bundle_sel : rawBundle.price, 0);
+    var priceNum = toBundleNumber(rawBundle.price, sellingPriceNum);
+    var priceType = (_rawBundle$price_type = rawBundle.price_type) !== null && _rawBundle$price_type !== void 0 ? _rawBundle$price_type : '';
+    var customPriceStr = toBundleCustomPriceString((_ref5 = (_rawBundle$custom_pri = rawBundle.custom_price) !== null && _rawBundle$custom_pri !== void 0 ? _rawBundle$custom_pri : rawBundle.bundle_selling_price) !== null && _ref5 !== void 0 ? _ref5 : rawBundle.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 = toBundleNumber((_rawBundle$surcharge_ = rawBundle.surcharge_fee) !== null && _rawBundle$surcharge_ !== void 0 ? _rawBundle$surcharge_ : existedMetadata.surcharge_fee, 0);
+    var productDiscountDifference = toBundleNumber(existedMetadata.product_discount_difference, 0);
+    return _objectSpread(_objectSpread({}, rawBundle), {}, {
+      is_charge_tax: (_rawBundle$is_charge_ = rawBundle.is_charge_tax) !== null && _rawBundle$is_charge_ !== void 0 ? _rawBundle$is_charge_ : 0,
+      tax_fee: toBundleNumber(rawBundle.tax_fee, 0),
+      bundle_variant_id: (_rawBundle$bundle_var = rawBundle.bundle_variant_id) !== null && _rawBundle$bundle_var !== void 0 ? _rawBundle$bundle_var : 0,
+      num: toBundleNumber(rawBundle.num, 1),
+      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: priceNum,
+      price_type: priceType,
+      price_type_ext: (_rawBundle$price_type2 = rawBundle.price_type_ext) !== null && _rawBundle$price_type2 !== void 0 ? _rawBundle$price_type2 : '',
+      custom_price: customPriceStr,
+      custom_price_type: (_ref6 = (_rawBundle$custom_pri2 = rawBundle.custom_price_type) !== null && _rawBundle$custom_pri2 !== void 0 ? _rawBundle$custom_pri2 : priceType) !== null && _ref6 !== void 0 ? _ref6 : '',
+      bundle_selling_price: sellingPriceNum,
+      option: formatSubmitOptionItems(rawBundle.option),
+      bundle_group_id: rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.group_id,
+      bundle_id: rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.id,
+      metadata: _objectSpread(_objectSpread({}, existedMetadata), {}, {
+        surcharge_fee: surchargeFee,
+        relation_surcharge_ids: relationSurchargeIds,
+        product_discount_difference: productDiscountDifference
+      })
+    });
+  });
+}
+
+/**
+ * 把 tempOrder product 打包成出站 submit payload。
+ *
+ * 价格字段语义（出站口径，v2 composite）：
+ * - `selling_price`：**行 composite 券后单价**
+ *   = `metadata.main_product_selling_price` + Σ(bundle_selling_price × num)。
+ * - `original_price`：**行 composite 券前单价**
+ *   = `metadata.main_product_original_price` + Σ(bundle 原价 × num)。
+ * - `payment_price`：兼容后端的出站字段，直接从 `selling_price` 派生（composite）。
+ * - `metadata.source_product_price`：主商品/variant 基础价（不含 option、不含折扣），权威源。
+ * - `metadata.main_product_original_price`：含 option、不含折扣。
+ * - `metadata.main_product_selling_price`：含 option、含主商品折扣。
+ * - `metadata.price_schema_version`：schema 版本号（当前 = 2），用于跨端协商价格口径。
+ *
+ * 本函数不再改造价格字段形状，仅做字段/metadata 裁剪。
+ */
 function normalizeSubmitProduct(product) {
   var _origin = product._origin,
     identity_key = product.identity_key,
@@ -177,7 +395,7 @@ function normalizeSubmitProduct(product) {
   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'];
+  var priceMetaKeys = ['main_product_original_price', 'main_product_selling_price', 'source_product_price', 'price_schema_version'];
   for (var _i = 0, _priceMetaKeys = priceMetaKeys; _i < _priceMetaKeys.length; _i++) {
     var key = _priceMetaKeys[_i];
     if (rawMetadata[key] !== undefined) {
@@ -187,14 +405,18 @@ function normalizeSubmitProduct(product) {
   if (rawMetadata.price_breakdown) {
     cleanMetadata.price_breakdown = rawMetadata.price_breakdown;
   }
+  if (rawMetadata.is_rule !== undefined) {
+    cleanMetadata.is_rule = rawMetadata.is_rule;
+  }
   return _objectSpread(_objectSpread(_objectSpread({}, submitProduct), bookingUid ? {
     booking_uid: bookingUid
   } : {}), {}, {
-    product_option_item: submitProduct.product_option_item || [],
+    product_option_item: formatSubmitOptionItems(submitProduct.product_option_item),
     discount_list: submitProduct.discount_list || [],
-    product_bundle: submitProduct.product_bundle || [],
+    product_bundle: formatSubmitBundleItems(submitProduct.product_bundle),
     metadata: cleanMetadata,
-    // 出站兼容：后端仍消费 payment_price 字段，从 selling_price（券后单价）派生。
+    // 出站兼容：后端消费 payment_price 字段，这里从 selling_price 直接派生。
+    // 新语义下 selling_price 是 composite（含 option/bundle），payment_price 同语义。
     payment_price: submitProduct.selling_price
   });
 }
@@ -202,19 +424,19 @@ var SUBMIT_BOOKING_METADATA_WHITELIST = ['unique_identification_number', 'collec
 export function normalizeSubmitBooking(booking) {
   var rawMetadata = booking.metadata || {};
   var cleanMetadata = {};
-  var _iterator = _createForOfIteratorHelper(SUBMIT_BOOKING_METADATA_WHITELIST),
-    _step;
+  var _iterator3 = _createForOfIteratorHelper(SUBMIT_BOOKING_METADATA_WHITELIST),
+    _step3;
   try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var key = _step.value;
+    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+      var key = _step3.value;
       if (rawMetadata[key] !== undefined) {
         cleanMetadata[key] = rawMetadata[key];
       }
     }
   } catch (err) {
-    _iterator.e(err);
+    _iterator3.e(err);
   } finally {
-    _iterator.f();
+    _iterator3.f();
   }
   return _objectSpread(_objectSpread({}, booking), {}, {
     metadata: cleanMetadata
@@ -295,7 +517,7 @@ export function createDefaultTempOrder(params) {
   };
 }
 export function buildSubmitPayload(params) {
-  var _ref2, _ref3, _ref4, _tempOrder$is_price_i, _tempOrder$is_deposit;
+  var _ref7, _ref8, _ref9, _tempOrder$is_price_i, _tempOrder$is_deposit;
   var tempOrder = params.tempOrder,
     cacheId = params.cacheId,
     _params$now = params.now,
@@ -303,7 +525,8 @@ export function buildSubmitPayload(params) {
     platform = params.platform,
     businessCode = params.businessCode,
     channel = params.channel,
-    type = params.type;
+    type = params.type,
+    enhance = params.enhance;
   var scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
   var summary = tempOrder.summary || createEmptySummary();
   var relationId = tempOrder.relation_id;
@@ -313,8 +536,8 @@ export function buildSubmitPayload(params) {
   var bookingDuration = resolveTableOccupancyDuration(tempOrder);
   var bookingEnd = bookingStart.add(bookingDuration, 'minute');
   var bookings = relationId && tableFormId ? [{
-    relation_id: relationId,
-    form_id: 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'),
@@ -326,26 +549,26 @@ export function buildSubmitPayload(params) {
     },
     select_date: bookingStart.format('YYYY-MM-DD'),
     is_all: false,
-    "like_status": "common",
-    "schedule_id": 0,
-    "relation_type": "form",
-    "number": 1
+    like_status: 'common',
+    schedule_id: 0,
+    relation_type: '',
+    number: 1
   }] : tempOrder.bookings || [];
   var formRecordIds = relationId && tableFormId ? [{
     form_id: tableFormId,
-    form_record_ids: [relationId]
+    form_record_id: relationId
   }] : undefined;
   var _createdAt = tempOrder.created_at,
     _summary = tempOrder.summary,
     _surcharges = tempOrder.surcharges,
     tempOrderRest = _objectWithoutProperties(tempOrder, _excluded2);
-  return _objectSpread(_objectSpread({}, tempOrderRest), {}, {
+  var payload = _objectSpread(_objectSpread({}, tempOrderRest), {}, {
     platform: normalizeSubmitPlatform(platform !== null && platform !== void 0 ? platform : tempOrder.platform),
     request_unique_idempotency_token: cacheId,
-    type: (_ref2 = type !== null && type !== void 0 ? type : tempOrder.type) !== null && _ref2 !== void 0 ? _ref2 : 'table-order',
-    business_code: (_ref3 = businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code) !== null && _ref3 !== void 0 ? _ref3 : 'table-order',
+    type: (_ref7 = type !== null && type !== void 0 ? type : tempOrder.type) !== null && _ref7 !== void 0 ? _ref7 : 'table-order',
+    business_code: (_ref8 = businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code) !== null && _ref8 !== void 0 ? _ref8 : 'table-order',
     sales_channel: tempOrder.sales_channel || 'my_pisel',
-    order_sales_channel: (_ref4 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref4 !== void 0 ? _ref4 : 'online_store',
+    order_sales_channel: (_ref9 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref9 !== void 0 ? _ref9 : 'online_store',
     status: tempOrder.status || 'normal',
     payment_status: tempOrder.payment_status || 'payment_processing',
     // shipping_status: tempOrder.shipping_status || 'unfulfilled',
@@ -368,14 +591,42 @@ export function buildSubmitPayload(params) {
     contacts_info: tempOrder.contacts_info || [],
     // holder: tempOrder.holder || null,
     // summary,
-    metadata: _objectSpread({}, tempOrder.metadata),
+    metadata: function () {
+      var _ref10 = tempOrder.metadata || {},
+        _collectPax = _ref10.collect_pax,
+        _tableOccupancyDuration = _ref10.table_occupancy_duration,
+        rest = _objectWithoutProperties(_ref10, _excluded3);
+      return _objectSpread({}, rest);
+    }(),
     products: (tempOrder.products || []).map(function (product) {
       return normalizeSubmitProduct(product);
     })
   });
+  return enhance ? enhance(payload, {
+    tempOrder: tempOrder,
+    bookingUuid: bookingUuid,
+    now: now
+  }) : payload;
 }
+
+/** 加单（scanOrderMore）不应提交 booking 关联的虚拟规则商品行 */
+export function filterProductsForScanOrderMore(products) {
+  return (products || []).filter(function (p) {
+    var _p$metadata;
+    return ((_p$metadata = p.metadata) === null || _p$metadata === void 0 ? void 0 : _p$metadata.is_rule) !== true;
+  });
+}
+
+/**
+ * 历史 V1 加餐结构映射器。
+ *
+ * @deprecated 加餐（`PUT /order/order/product/:id`）已改为与正常 checkout 共用
+ * `ScanOrderSubmitProduct` 新结构（见 `OrderModule.submitTempOrder` 的加餐分支）。
+ * 本函数仅保留以兼容历史接入方，未来会移除。新代码请勿再调用。
+ */
 export function formatV1Product(products) {
   return products.map(function (product) {
+    var _product$note;
     return {
       bundle: product.product_bundle,
       key: product.product_id,
@@ -383,6 +634,7 @@ export function formatV1Product(products) {
       product_id: product.product_id,
       product_variant_id: product.product_variant_id,
       num: product.num,
+      note: String((_product$note = product.note) !== null && _product$note !== void 0 ? _product$note : ''),
       rowKey: product.product_id,
       session: null,
       unique: createUuidV4()