@pisell/pisellos 0.0.567 → 0.0.568

package/lib/modules/Order/utils.js

@@ -1,111 +1,134 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/modules/Order/utils.ts
-var utils_exports = {};
-__export(utils_exports, {
-  buildSubmitPayload: () => buildSubmitPayload,
-  composeLinePrice: () => composeLinePrice,
-  createDefaultOrderRulesHooks: () => createDefaultOrderRulesHooks,
-  createDefaultTempOrder: () => createDefaultTempOrder,
-  createEmptySummary: () => import_utils3.createEmptySummary,
-  createUuidV4: () => createUuidV4,
-  ensureCartItemOriginHolder: () => ensureCartItemOriginHolder,
-  filterProductsForScanOrderMore: () => filterProductsForScanOrderMore,
-  formatDateTime: () => formatDateTime,
-  formatV1Product: () => formatV1Product,
-  generateDuration: () => generateDuration,
-  getAllDiscountList: () => getAllDiscountList,
-  isTempOrder: () => isTempOrder,
-  mergeRelationForms: () => mergeRelationForms,
-  normalizeSubmitBooking: () => normalizeSubmitBooking,
-  normalizeSubmitCollectPaxValue: () => normalizeSubmitCollectPaxValue,
-  resolveSubmitCollectPax: () => resolveSubmitCollectPax,
-  sumOptionUnitPrice: () => sumOptionUnitPrice
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(utils_exports);
-var import_dayjs = __toESM(require("dayjs"));
-var import_decimal = __toESM(require("decimal.js"));
-var import_utils = require("../Holder/utils");
-var import_utils2 = require("../../solution/ScanOrder/utils");
-var import_utils3 = require("../../solution/ScanOrder/utils");
+exports.buildSubmitPayload = buildSubmitPayload;
+exports.composeLinePrice = composeLinePrice;
+exports.createDefaultOrderRulesHooks = createDefaultOrderRulesHooks;
+exports.createDefaultTempOrder = createDefaultTempOrder;
+Object.defineProperty(exports, "createEmptySummary", {
+  enumerable: true,
+  get: function () {
+    return _utils2.createEmptySummary;
+  }
+});
+exports.createUuidV4 = createUuidV4;
+exports.ensureCartItemOriginHolder = ensureCartItemOriginHolder;
+exports.filterProductsForScanOrderMore = filterProductsForScanOrderMore;
+exports.formatDateTime = formatDateTime;
+exports.formatV1Product = formatV1Product;
+exports.getAllDiscountList = exports.generateDuration = void 0;
+exports.isTempOrder = isTempOrder;
+exports.mergeRelationForms = void 0;
+exports.normalizeSubmitBooking = normalizeSubmitBooking;
+exports.normalizeSubmitCollectPaxValue = normalizeSubmitCollectPaxValue;
+exports.resolveSubmitCollectPax = resolveSubmitCollectPax;
+exports.sumOptionUnitPrice = sumOptionUnitPrice;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _decimal = _interopRequireDefault(require("decimal.js"));
+var _utils = require("../Holder/utils");
+var _utils2 = require("../../solution/ScanOrder/utils");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * 把"含 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 共用，
+ * 保证合成逻辑单点来源。
+ */
 function composeLinePrice(params) {
-  const { mainPrice, bundle, useOriginalBundle } = params;
-  let total = new import_decimal.default(Number(mainPrice) || 0);
+  const {
+    mainPrice,
+    bundle,
+    useOriginalBundle
+  } = params;
+  let total = new _decimal.default(Number(mainPrice) || 0);
   if (Array.isArray(bundle)) {
     for (const item of bundle) {
-      const rawPrice = useOriginalBundle ? (item == null ? void 0 : item.original_price) ?? (item == null ? void 0 : item.product_price) ?? (item == null ? void 0 : item.price) : (item == null ? void 0 : item.bundle_selling_price) ?? (item == null ? void 0 : item.price);
-      const price = new import_decimal.default(Number(rawPrice) || 0);
-      const rawNum = (item == null ? void 0 : item.num) ?? (item == null ? void 0 : item.quantity) ?? 1;
-      const num = new import_decimal.default(Number(rawNum) || 0);
+      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);
+      const rawNum = item?.num ?? item?.quantity ?? 1;
+      const num = new _decimal.default(Number(rawNum) || 0);
       total = total.plus(price.times(num));
     }
   }
   return total.toDecimalPlaces(2).toFixed(2);
 }
+
+/**
+ * 计算 option 单价合计：Σ(option.price × option.num)。
+ * 在新语义 v2 下，main_product_original_price = source_product_price + 本函数结果。
+ */
 function sumOptionUnitPrice(options) {
-  let total = new import_decimal.default(0);
-  if (!Array.isArray(options))
-    return total;
+  let total = new _decimal.default(0);
+  if (!Array.isArray(options)) return total;
   for (const opt of options) {
-    const price = new import_decimal.default(Number(opt == null ? void 0 : opt.price) || 0);
-    const num = new import_decimal.default(Number(opt == null ? void 0 : opt.num) || 0);
+    const price = new _decimal.default(Number(opt?.price) || 0);
+    const num = new _decimal.default(Number(opt?.num) || 0);
     total = total.plus(price.times(num));
   }
   return total;
 }
+
+/**
+ * OrderModule 默认 Rules 钩子工厂。
+ *
+ * 价格语义约定（订单域，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 钩子契约（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 实例。
+ */
 function createDefaultOrderRulesHooks() {
   const toUnitPriceString = (totalLike, num) => {
     const effectiveNum = Number(num) > 0 ? Number(num) : 1;
-    return new import_decimal.default(Number(totalLike) || 0).dividedBy(effectiveNum).toDecimalPlaces(2).toString();
+    return new _decimal.default(Number(totalLike) || 0).dividedBy(effectiveNum).toDecimalPlaces(2).toString();
   };
   return {
-    getProduct: (product) => {
-      var _a, _b, _c, _d;
+    getProduct: product => {
+      // source_product_price 是权威源；兜底链：source → mainSelling − options（反推）→ 行 selling_price
       const metadataAny = product.metadata || {};
       const optionSum = sumOptionUnitPrice(product.product_option_item);
       let sourcePrice;
-      if (metadataAny.source_product_price !== void 0) {
+      if (metadataAny.source_product_price !== undefined) {
         sourcePrice = String(metadataAny.source_product_price);
-      } else if (metadataAny.main_product_selling_price !== void 0) {
-        sourcePrice = new import_decimal.default(
-          Number(metadataAny.main_product_selling_price) || 0
-        ).minus(optionSum).toDecimalPlaces(2).toString();
+      } else if (metadataAny.main_product_selling_price !== undefined) {
+        sourcePrice = new _decimal.default(Number(metadataAny.main_product_selling_price) || 0).minus(optionSum).toDecimalPlaces(2).toString();
       } else {
         sourcePrice = String(product.selling_price ?? 0);
       }
       let sourceOriginalPrice;
-      if (metadataAny.source_product_price !== void 0) {
+      if (metadataAny.source_product_price !== undefined) {
         sourceOriginalPrice = String(metadataAny.source_product_price);
-      } else if (metadataAny.main_product_original_price !== void 0) {
-        sourceOriginalPrice = new import_decimal.default(
-          Number(metadataAny.main_product_original_price) || 0
-        ).minus(optionSum).toDecimalPlaces(2).toString();
+      } else if (metadataAny.main_product_original_price !== undefined) {
+        sourceOriginalPrice = new _decimal.default(Number(metadataAny.main_product_original_price) || 0).minus(optionSum).toDecimalPlaces(2).toString();
       } else {
         sourceOriginalPrice = sourcePrice;
       }
@@ -115,40 +138,44 @@ function createDefaultOrderRulesHooks() {
         // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
         // 不透明 identity 契约下，normalizeOrderProduct / restoreTempOrderFromStorage 已保证 identity_key 必存在；
         // 留 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, import_utils2.buildProductLineFingerprint)(
-          product.product_option_item,
-          product.product_bundle
-        )}`,
+        _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)}`,
         // Rules 内部 getProductTotalPrice / getProductOriginTotalPrice 会各自再叠加 bundle + option，
         // 所以这里必须喂 source-level（不含 option、不含 bundle、不含折扣）单价，避免双加 option。
         price: sourcePrice,
         // total / origin_total 使用 composite × num，跟 Rules 内部产出的 total 对齐（含 option + bundle）。
-        total: new import_decimal.default(product.selling_price || 0).times(product.num || 1).toNumber(),
-        origin_total: new import_decimal.default(
-          product.original_price || product.selling_price || 0
-        ).times(product.num || 1).toNumber(),
+        total: new _decimal.default(product.selling_price || 0).times(product.num || 1).toNumber(),
+        origin_total: new _decimal.default(product.original_price || product.selling_price || 0).times(product.num || 1).toNumber(),
         original_price: sourceOriginalPrice,
         quantity: product.num || 1,
         num: product.num || 1,
         discount_list: product.discount_list || [],
         bundle: product.product_bundle || [],
-        booking_id: ((_a = product._origin) == null ? void 0 : _a.booking_id) || null,
+        booking_id: product._origin?.booking_id || null,
         isClient: false,
-        isManualDiscount: ((_b = product._origin) == null ? void 0 : _b.isManualDiscount) || false,
-        holder_id: (_c = product._origin) == null ? void 0 : _c.holder_id,
-        startDate: (_d = product._origin) == null ? void 0 : _d.startDate
+        isManualDiscount: product._origin?.isManualDiscount || false,
+        holder_id: product._origin?.holder_id,
+        startDate: product._origin?.startDate
       };
     },
     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 existedSource = metadataAny.source_product_price ?? product.selling_price ?? '0';
       const nextOptions = product.product_option_item;
       const optionSum = sumOptionUnitPrice(nextOptions);
-      const nextSourceSellingPrice = values.main_product_selling_price !== void 0 ? String(values.main_product_selling_price) : values.price !== void 0 ? String(values.price) : values.total !== void 0 ? toUnitPriceString(values.total, nextNum) : String(existedSource);
-      const nextSourceOriginalPrice = values.original_price !== void 0 ? String(values.original_price) : String(existedSource);
-      const nextMainSellingPrice = new import_decimal.default(Number(nextSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
-      const nextMainOriginalPrice = new import_decimal.default(Number(nextSourceOriginalPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
+
+      // Rules 返回的 main_product_selling_price / price / total 均为 source-level。
+      // 优先级：main_product_selling_price（per-unit 券后 source）> price（还原/good_pass 分支）>
+      // total/num（仅当 Rules 只给 total 时的兜底）> 保留当前 source。
+      const 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）。
+      const nextSourceOriginalPrice = values.original_price !== undefined ? String(values.original_price) : String(existedSource);
+
+      // 含 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 composedSellingPrice = composeLinePrice({
         mainPrice: nextMainSellingPrice,
@@ -177,47 +204,73 @@ function createDefaultOrderRulesHooks() {
     }
   };
 }
-var generateDuration = (cartItem) => {
-  const startDate = (0, import_dayjs.default)(`${cartItem.start_date} ${cartItem.start_time}`);
-  const endDate = (0, import_dayjs.default)(`${cartItem.end_date} ${cartItem.end_time}`);
-  const duration = endDate.diff(startDate, "minutes");
-  return { duration, durationType: "minutes" };
+
+/**
+ * 通过 session 类商品的开始时间结束时间生成商品的时长
+ * @param {CartItem} cartItem
+ * @return {*}
+ */
+const generateDuration = cartItem => {
+  const startDate = (0, _dayjs.default)(`${cartItem.start_date} ${cartItem.start_time}`);
+  const endDate = (0, _dayjs.default)(`${cartItem.end_date} ${cartItem.end_time}`);
+  const duration = endDate.diff(startDate, 'minutes');
+  return {
+    duration,
+    durationType: 'minutes'
+  };
 };
-var mergeRelationForms = (relationForms) => {
-  return Object.values(
-    relationForms.reduce((acc, cur) => {
-      const { form_id, form_record_ids } = cur;
-      if (!acc[form_id]) {
-        acc[form_id] = { form_id, form_record_ids: [] };
-      }
-      const ids = Array.isArray(form_record_ids) ? form_record_ids : [form_record_ids];
-      const validIds = ids.filter((id) => id != null);
-      acc[form_id].form_record_ids.push(...validIds);
-      acc[form_id].form_record_ids = [...new Set(acc[form_id].form_record_ids)];
-      return acc;
-    }, {})
-  ).filter((item) => item.form_record_ids.length > 0);
+
+/**
+ * 合并关联表单
+ * @param relationForms 关联表单
+ * @returns 合并后的关联表单
+ */
+exports.generateDuration = generateDuration;
+const mergeRelationForms = relationForms => {
+  return Object.values(relationForms.reduce((acc, cur) => {
+    const {
+      form_id,
+      form_record_ids
+    } = cur;
+    // 如果 acc 中没有 form_id，则初始化一个空数组
+    if (!acc[form_id]) {
+      acc[form_id] = {
+        form_id,
+        form_record_ids: []
+      };
+    }
+
+    // 兼容 form_record_id 可能是数组或单个数字
+    const ids = Array.isArray(form_record_ids) ? form_record_ids : [form_record_ids];
+    // 过滤掉空值（null、undefined等）
+    const validIds = ids.filter(id => id != null);
+    acc[form_id].form_record_ids.push(...validIds);
+    // 去重
+    acc[form_id].form_record_ids = [...new Set(acc[form_id].form_record_ids)];
+    return acc;
+  }, {})).filter(item => item.form_record_ids.length > 0); // 过滤掉没有有效记录的表单
 };
+exports.mergeRelationForms = mergeRelationForms;
 function getCustomerIdFromStorage(window) {
-  var _a;
   try {
-    const customer = JSON.parse(((_a = window == null ? void 0 : window.getLocalStorage) == null ? void 0 : _a.call(window, "customer")) || "{}");
-    const customerId = Number(customer == null ? void 0 : customer.id);
-    return Number.isFinite(customerId) && customerId > 0 ? customerId : void 0;
+    const customer = JSON.parse(window?.getLocalStorage?.('customer') || '{}');
+    const customerId = Number(customer?.id);
+    return Number.isFinite(customerId) && customerId > 0 ? customerId : undefined;
   } catch {
-    return void 0;
+    return undefined;
   }
 }
+
+/**
+ * 为购物车行补齐订单所需的 holder 信息（与 cartAccount 结构保持一致）
+ */
 function ensureCartItemOriginHolder(cartItem, window) {
-  var _a;
-  if ((_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.holder) {
+  if (cartItem?._origin?.holder) {
     return;
   }
-  const holderConfig = (0, import_utils.getProductHolderConfig)(
-    (cartItem == null ? void 0 : cartItem._productInit) ?? (cartItem == null ? void 0 : cartItem._productOrigin)
-  );
-  const formRecordId = cartItem == null ? void 0 : cartItem.holder_id;
-  if (!(holderConfig == null ? void 0 : holderConfig.resource_id) || formRecordId == null) {
+  const holderConfig = (0, _utils.getProductHolderConfig)(cartItem?._productInit ?? cartItem?._productOrigin);
+  const formRecordId = cartItem?.holder_id;
+  if (!holderConfig?.resource_id || formRecordId == null) {
     return;
   }
   cartItem._origin.holder = {
@@ -226,32 +279,33 @@ function ensureCartItemOriginHolder(cartItem, window) {
     form_record: [formRecordId]
   };
 }
-var getAllDiscountList = (cartItem) => {
-  var _a, _b, _c, _d;
-  let discountList = ((_b = (_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.product) == null ? void 0 : _b.discount_list) || [];
-  (((_d = (_c = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _c.product) == null ? void 0 : _d.product_bundle) || []).forEach((item) => {
-    discountList = [...discountList, ...(item == null ? void 0 : item.discount_list) || []];
-    item.discount_list = void 0;
+;
+const getAllDiscountList = cartItem => {
+  let discountList = cartItem?._origin?.product?.discount_list || [];
+  (cartItem?._origin?.product?.product_bundle || []).forEach(item => {
+    discountList = [...discountList, ...(item?.discount_list || [])];
+    item.discount_list = undefined;
   });
   return discountList;
 };
+
+// ─── 以下为从 ScanOrder/utils.ts 迁入的 Order 专属工具函数 ───
+exports.getAllDiscountList = getAllDiscountList;
 function createUuidV4() {
-  const template = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx";
-  return template.replace(/[xy]/g, (char) => {
+  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 & 3 | 8;
+    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;
+  if (!data || typeof data !== 'object') return false;
+  if (!Array.isArray(data.products)) return false;
   return true;
 }
 function formatDateTime(date) {
-  const pad = (value) => value.toString().padStart(2, "0");
+  const pad = value => value.toString().padStart(2, '0');
   const year = date.getFullYear();
   const month = pad(date.getMonth() + 1);
   const day = pad(date.getDate());
@@ -261,42 +315,51 @@ function formatDateTime(date) {
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 }
 function normalizeSubmitPlatform(platform) {
-  return (platform == null ? void 0 : platform.toLowerCase()) === "pc" ? "PC" : "H5";
+  return 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((d) => ({
-    num: d == null ? void 0 : d.num,
-    option_group_item_id: (d == null ? void 0 : d.option_group_item_id) ?? (d == null ? void 0 : d.product_option_item_id),
-    option_group_id: d == null ? void 0 : d.option_group_id
+  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
   }));
 }
 function toBundleNumber(value, fallback = 0) {
   const parsed = Number(value);
   return Number.isFinite(parsed) ? parsed : fallback;
 }
+function toBundleCustomPriceString(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 的消费。
 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
-    );
+  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 priceType = rawBundle.price_type ?? '';
+    // const customPriceStr = toBundleCustomPriceString(
+    //   rawBundle.custom_price ?? rawBundle.bundle_selling_price ?? rawBundle.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 productDiscountDifference = toBundleNumber(
-      existedMetadata.product_discount_difference,
-      0
-    );
+    const surchargeFee = toBundleNumber(rawBundle.surcharge_fee ?? existedMetadata.surcharge_fee, 0);
+    const productDiscountDifference = toBundleNumber(existedMetadata.product_discount_difference, 0);
     return {
       ...rawBundle,
       is_charge_tax: rawBundle.is_charge_tax ?? 0,
@@ -304,16 +367,16 @@ function formatSubmitBundleItems(bundle) {
       bundle_variant_id: rawBundle.bundle_variant_id ?? 0,
       num: toBundleNumber(rawBundle.num, 1),
       extension_id: rawBundle.extension_id ?? 0,
-      extension_type: rawBundle.extension_type ?? "normal",
+      extension_type: rawBundle.extension_type ?? 'normal',
       price: priceNum,
       price_type: priceType,
-      price_type_ext: rawBundle.price_type_ext ?? "",
+      price_type_ext: rawBundle.price_type_ext ?? '',
       // custom_price: customPriceStr,
-      custom_price_type: rawBundle.custom_price_type ?? priceType ?? "",
+      custom_price_type: rawBundle.custom_price_type ?? priceType ?? '',
       bundle_selling_price: sellingPriceNum,
       option: formatSubmitOptionItems(rawBundle.option),
-      bundle_group_id: rawBundle == null ? void 0 : rawBundle.group_id,
-      bundle_id: rawBundle == null ? void 0 : rawBundle.id,
+      bundle_group_id: rawBundle?.group_id,
+      bundle_id: rawBundle?.id,
       metadata: {
         ...existedMetadata,
         surcharge_fee: surchargeFee,
@@ -323,34 +386,52 @@ function formatSubmitBundleItems(bundle) {
     };
   });
 }
+
+/**
+ * 把 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) {
-  const { _origin, identity_key, ...submitProduct } = product;
+  const {
+    _origin,
+    identity_key,
+    ...submitProduct
+  } = product;
   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', 'source_product_price', 'price_schema_version'];
   for (const key of priceMetaKeys) {
-    if (rawMetadata[key] !== void 0) {
+    if (rawMetadata[key] !== undefined) {
       cleanMetadata[key] = rawMetadata[key];
     }
   }
   if (rawMetadata.price_breakdown) {
     cleanMetadata.price_breakdown = rawMetadata.price_breakdown;
   }
-  if (rawMetadata.is_rule !== void 0) {
+  if (rawMetadata.is_rule !== undefined) {
     cleanMetadata.is_rule = rawMetadata.is_rule;
   }
   return {
     ...submitProduct,
-    ...bookingUid ? { booking_uid: bookingUid } : {},
+    ...(bookingUid ? {
+      booking_uid: bookingUid
+    } : {}),
     product_option_item: formatSubmitOptionItems(submitProduct.product_option_item),
     discount_list: submitProduct.discount_list || [],
     product_bundle: formatSubmitBundleItems(submitProduct.product_bundle),
@@ -360,15 +441,12 @@ function normalizeSubmitProduct(product) {
     payment_price: submitProduct.selling_price
   };
 }
-var SUBMIT_BOOKING_METADATA_WHITELIST = [
-  "unique_identification_number",
-  "collect_pax"
-];
+const SUBMIT_BOOKING_METADATA_WHITELIST = ['unique_identification_number', 'collect_pax'];
 function normalizeSubmitBooking(booking) {
   const rawMetadata = booking.metadata || {};
   const cleanMetadata = {};
   for (const key of SUBMIT_BOOKING_METADATA_WHITELIST) {
-    if (rawMetadata[key] !== void 0) {
+    if (rawMetadata[key] !== undefined) {
       cleanMetadata[key] = rawMetadata[key];
     }
   }
@@ -377,20 +455,10 @@ function normalizeSubmitBooking(booking) {
     metadata: cleanMetadata
   };
 }
-var DEFAULT_TABLE_OCCUPANCY_DURATION = 20;
+const DEFAULT_TABLE_OCCUPANCY_DURATION = 20;
 function resolveTableOccupancyDuration(tempOrder) {
-  var _a, _b, _c, _d;
   const metadata = tempOrder.metadata || {};
-  const candidates = [
-    metadata.table_occupancy_duration,
-    metadata.booking_duration,
-    metadata.table_duration,
-    metadata.duration,
-    (_a = metadata.table_config) == null ? void 0 : _a.occupancy_duration,
-    (_b = metadata.tableConfig) == null ? void 0 : _b.occupancy_duration,
-    (_c = metadata.resource_config) == null ? void 0 : _c.occupancy_duration,
-    (_d = metadata.resourceConfig) == null ? void 0 : _d.occupancy_duration
-  ];
+  const candidates = [metadata.table_occupancy_duration, metadata.booking_duration, metadata.table_duration, metadata.duration, metadata.table_config?.occupancy_duration, metadata.tableConfig?.occupancy_duration, metadata.resource_config?.occupancy_duration, metadata.resourceConfig?.occupancy_duration];
   for (const value of candidates) {
     const duration = Number(value);
     if (Number.isFinite(duration) && duration > 0) {
@@ -399,47 +467,50 @@ function resolveTableOccupancyDuration(tempOrder) {
   }
   return DEFAULT_TABLE_OCCUPANCY_DURATION;
 }
+
+/** 提交用人数：有限且为正则向下取整，否则为 1 */
 function normalizeSubmitCollectPaxValue(value) {
   const n = Number(value);
   return Number.isFinite(n) && n > 0 ? Math.floor(n) : 1;
 }
+
+/** 从临时订单 metadata 解析合成 booking 的 collect_pax */
 function resolveSubmitCollectPax(tempOrder) {
-  var _a;
-  return normalizeSubmitCollectPaxValue((_a = tempOrder.metadata) == null ? void 0 : _a.collect_pax);
+  return normalizeSubmitCollectPaxValue(tempOrder.metadata?.collect_pax);
 }
 function createDefaultTempOrder(params) {
-  const summary = params.summary || (0, import_utils2.createEmptySummary)();
+  const summary = params.summary || (0, _utils2.createEmptySummary)();
   return {
     order_id: null,
-    relation_id: void 0,
-    table_form_id: void 0,
-    resource_id: void 0,
-    order_number: "",
-    shop_order_number: "",
-    type: "appointment_booking",
-    business_code: "appointment_booking",
-    platform: "h5",
-    sales_channel: "my_pisel",
-    order_sales_channel: "online_store",
-    status: "normal",
-    payment_status: "payment_processing",
-    shipping_status: "unfulfilled",
+    relation_id: undefined,
+    table_form_id: undefined,
+    resource_id: undefined,
+    order_number: '',
+    shop_order_number: '',
+    type: 'appointment_booking',
+    business_code: 'appointment_booking',
+    platform: 'h5',
+    sales_channel: 'my_pisel',
+    order_sales_channel: 'online_store',
+    status: 'normal',
+    payment_status: 'payment_processing',
+    shipping_status: 'unfulfilled',
     customer_id: null,
-    customer_name: "",
-    country_calling_code: "",
-    phone: "",
-    email: "",
+    customer_name: '',
+    country_calling_code: '',
+    phone: '',
+    email: '',
     is_price_include_tax: 1,
-    tax_title: "",
-    tax_country_code: "",
-    currency_code: "",
-    currency_symbol: "",
-    currency_format: "symbol_first",
+    tax_title: '',
+    tax_country_code: '',
+    currency_code: '',
+    currency_symbol: '',
+    currency_format: 'symbol_first',
     is_deposit: 0,
-    deposit_amount: "0.00",
-    shop_discount: "0.00",
-    surcharge_fee: "0.00",
-    note: "",
+    deposit_amount: '0.00',
+    shop_discount: '0.00',
+    surcharge_fee: '0.00',
+    note: '',
     schedule_date: params.now,
     created_at: params.now,
     products: [],
@@ -459,7 +530,7 @@ function buildSubmitPayload(params) {
   const {
     tempOrder,
     cacheId,
-    now = /* @__PURE__ */ new Date(),
+    now = new Date(),
     platform,
     businessCode,
     channel,
@@ -467,57 +538,62 @@ function buildSubmitPayload(params) {
     enhance
   } = params;
   const scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
-  const summary = tempOrder.summary || (0, import_utils2.createEmptySummary)();
+  const summary = tempOrder.summary || (0, _utils2.createEmptySummary)();
   const relationId = tempOrder.relation_id;
   const tableFormId = tempOrder.table_form_id;
   const bookingUuid = createUuidV4();
-  const bookingStart = (0, import_dayjs.default)(now);
+  const bookingStart = (0, _dayjs.default)(now);
   const bookingDuration = resolveTableOccupancyDuration(tempOrder);
-  const bookingEnd = bookingStart.add(bookingDuration, "minute");
+  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"),
+    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"),
+    select_date: bookingStart.format('YYYY-MM-DD'),
     is_all: false,
-    like_status: "common",
+    like_status: 'common',
     schedule_id: 0,
-    relation_type: "",
+    relation_type: '',
     number: 1
   }] : tempOrder.bookings || [];
   const formRecordIds = relationId && tableFormId ? [{
     form_id: tableFormId,
     form_record_id: relationId
-  }] : void 0;
-  const { created_at: _createdAt, summary: _summary, surcharges: _surcharges, ...tempOrderRest } = tempOrder;
+  }] : undefined;
+  const {
+    created_at: _createdAt,
+    summary: _summary,
+    surcharges: _surcharges,
+    ...tempOrderRest
+  } = tempOrder;
   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",
-    sales_channel: tempOrder.sales_channel || "my_pisel",
-    order_sales_channel: channel ?? tempOrder.order_sales_channel ?? "online_store",
-    status: tempOrder.status || "normal",
-    payment_status: tempOrder.payment_status || "payment_processing",
+    type: type ?? tempOrder.type ?? 'table-order',
+    business_code: businessCode ?? tempOrder.business_code ?? 'table-order',
+    sales_channel: tempOrder.sales_channel || 'my_pisel',
+    order_sales_channel: channel ?? tempOrder.order_sales_channel ?? 'online_store',
+    status: tempOrder.status || 'normal',
+    payment_status: tempOrder.payment_status || 'payment_processing',
     // shipping_status: tempOrder.shipping_status || 'unfulfilled',
     is_price_include_tax: tempOrder.is_price_include_tax ?? 1,
-    currency_format: tempOrder.currency_format || "symbol_first",
+    currency_format: tempOrder.currency_format || 'symbol_first',
     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",
-    note: tempOrder.note || "",
+    deposit_amount: tempOrder.deposit_amount || '0.00',
+    shop_discount: tempOrder.shop_discount || '0.00',
+    surcharge_fee: summary.surcharge_fee || tempOrder.surcharge_fee || '0.00',
+    note: tempOrder.note || '',
     schedule_date: scheduleDate,
-    bookings: bookings.map((booking) => normalizeSubmitBooking(booking)),
+    bookings: bookings.map(booking => normalizeSubmitBooking(booking)),
     payments: tempOrder.payments || [],
     // discount_list: tempOrder.discount_list || [],
     relation_forms: tempOrder.relation_forms || [],
@@ -532,22 +608,33 @@ function buildSubmitPayload(params) {
         table_occupancy_duration: _tableOccupancyDuration,
         ...rest
       } = tempOrder.metadata || {};
-      return { ...rest };
+      return {
+        ...rest
+      };
     })(),
-    products: (tempOrder.products || []).map(
-      (product) => normalizeSubmitProduct(product)
-    )
+    products: (tempOrder.products || []).map(product => normalizeSubmitProduct(product))
   };
-  return enhance ? enhance(payload, { tempOrder, bookingUuid, now }) : payload;
+  return enhance ? enhance(payload, {
+    tempOrder,
+    bookingUuid,
+    now
+  }) : payload;
 }
+
+/** 加单（scanOrderMore）不应提交 booking 关联的虚拟规则商品行 */
 function filterProductsForScanOrderMore(products) {
-  return (products || []).filter((p) => {
-    var _a;
-    return ((_a = p.metadata) == null ? void 0 : _a.is_rule) !== true;
-  });
+  return (products || []).filter(p => p.metadata?.is_rule !== true);
 }
+
+/**
+ * 历史 V1 加餐结构映射器。
+ *
+ * @deprecated 加餐（`PUT /order/order/product/:id`）已改为与正常 checkout 共用
+ * `ScanOrderSubmitProduct` 新结构（见 `OrderModule.submitTempOrder` 的加餐分支）。
+ * 本函数仅保留以兼容历史接入方，未来会移除。新代码请勿再调用。
+ */
 function formatV1Product(products) {
-  return products.map((product) => {
+  return products.map(product => {
     return {
       bundle: product.product_bundle,
       key: product.product_id,
@@ -555,31 +642,10 @@ function formatV1Product(products) {
       product_id: product.product_id,
       product_variant_id: product.product_variant_id,
       num: product.num,
-      note: String(product.note ?? ""),
+      note: String(product.note ?? ''),
       rowKey: product.product_id,
       session: null,
       unique: createUuidV4()
     };
   });
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  buildSubmitPayload,
-  composeLinePrice,
-  createDefaultOrderRulesHooks,
-  createDefaultTempOrder,
-  createEmptySummary,
-  createUuidV4,
-  ensureCartItemOriginHolder,
-  filterProductsForScanOrderMore,
-  formatDateTime,
-  formatV1Product,
-  generateDuration,
-  getAllDiscountList,
-  isTempOrder,
-  mergeRelationForms,
-  normalizeSubmitBooking,
-  normalizeSubmitCollectPaxValue,
-  resolveSubmitCollectPax,
-  sumOptionUnitPrice
-});
+}