@pisell/pisellos 2.1.129 → 2.1.131

package/lib/modules/Order/types.d.ts

@@ -3,6 +3,7 @@ import type { ScanOrderTempOrder, ScanOrderOrderProduct, ScanOrderOrderProductId
 import type { DiscountModule } from '../Discount';
 import type { RulesModule } from '../Rules';
 import type { Discount } from '../Discount/types';
+import type { SubmitPayloadEnhancer } from './utils';
 export declare enum OrderHooks {
     OnOrderCreate = "order:onOrderCreate",
     OnOrderUpdate = "order:onOrderUpdate",
@@ -15,6 +16,15 @@ export interface OrderState {
     discount: DiscountModule | null;
     rules: RulesModule | null;
 }
+/** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 identity_key / 选项指纹等 */
+export interface UpdateProductInOrderParams {
+    product_id: number | null;
+    product_variant_id: number;
+    updates: Partial<ScanOrderOrderProduct>;
+    identity_key?: string;
+    product_option_item?: any[];
+    product_bundle?: any[];
+}
 /**
  * 订单信息
  */
@@ -34,14 +44,27 @@ export interface SubmitScanOrderProduct {
     num: number;
     product_variant_id: number;
     product_option_item: any[];
+    /**
+     * 行 composite 券后单价。
+     * 公式：`metadata.main_product_selling_price` + Σ(bundle_selling_price × num)。
+     * 主商品（含 option、含主商品折扣）的单价存在 `metadata.main_product_selling_price`。
+     */
     selling_price: string;
+    /**
+     * 行 composite 券前单价。
+     * 公式：`metadata.main_product_original_price` + Σ(bundle 原价 × num)。
+     * 主商品（含 option、不含折扣）的单价存在 `metadata.main_product_original_price`。
+     */
     original_price: string;
+    /** 出站兼容字段，直接由 `selling_price` 派生，语义同 composite。 */
     payment_price: string;
     tax_fee: string;
     is_charge_tax: number;
     discount_list: any[];
     product_bundle: any[];
     metadata: Record<string, any>;
+    /** 商品行备注 */
+    note?: string;
 }
 export interface SubmitScanOrderSummary {
     product_quantity: number;
@@ -68,10 +91,12 @@ export interface SubmitScanOrderBooking {
     start_time?: string;
     end_time?: string;
     metadata?: Record<string, any>;
+    resources?: Array<Record<string, any>>;
+    product_uid?: string;
 }
 export interface SubmitScanOrderFormRecord {
     form_id: number | string;
-    form_record_ids: Array<number | string>;
+    form_record_id: number | string;
 }
 export interface SubmitScanOrderParams {
     url?: string;
@@ -107,6 +132,8 @@ export interface SubmitScanOrderParams {
         shop_discount: string;
         surcharge_fee: string;
         note: string;
+        delivery_type?: string;
+        table_number?: Record<string, any>;
         schedule_date: string;
         created_at?: string;
         products: SubmitScanOrderProduct[];
@@ -195,19 +222,17 @@ export interface OrderModuleAPI {
     getTempOrder: () => ScanOrderTempOrder | null;
     ensureTempOrder: () => ScanOrderTempOrder;
     addNewOrder: () => Promise<ScanOrderTempOrder>;
+    restoreOrder: () => ScanOrderTempOrder;
     getOrderProducts: () => ScanOrderOrderProduct[];
     getScanOrderSummary: () => Promise<ScanOrderSummary>;
     recalculateSummary: (options?: {
         createIfMissing?: boolean;
     }) => Promise<ScanOrderSummary | null>;
     updateTempOrderNote: (note: string) => string;
+    updateTempOrderBuzzer: (buzzer: string) => string;
     updateTempOrderContactsInfo: (contactsInfo: any[]) => any[];
     addProductToOrder: (product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity) => Promise<ScanOrderOrderProduct[]>;
-    updateProductInOrder: (params: {
-        product_id: number | null;
-        product_variant_id: number;
-        updates: Partial<ScanOrderOrderProduct>;
-    }) => Promise<ScanOrderOrderProduct[]>;
+    updateProductInOrder: (params: UpdateProductInOrderParams) => Promise<ScanOrderOrderProduct[]>;
     removeProductFromOrder: (identity: ScanOrderOrderProductIdentity) => Promise<ScanOrderOrderProduct[]>;
     persistTempOrder: () => void;
     submitTempOrder: <T = any>(params?: {
@@ -216,6 +241,7 @@ export interface OrderModuleAPI {
         businessCode?: string;
         channel?: string;
         type?: string;
+        enhancePayload?: SubmitPayloadEnhancer;
     }) => Promise<T>;
     loadDiscountConfig: (params: {
         customerId: number;

package/lib/modules/Order/utils.d.ts

@@ -1,21 +1,66 @@
+import Decimal from 'decimal.js';
 import { CartItem } from "../Cart";
 import type { ScanOrderSubmitPayload, ScanOrderSubmitProduct, ScanOrderSummary, ScanOrderTempOrder } from '../../solution/ScanOrder/types';
 import type { RulesParamsHooks } from '../Rules/types';
+/**
+ * 把"含 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 declare function composeLinePrice(params: {
+    mainPrice: string | number | null | undefined;
+    bundle?: Array<{
+        bundle_selling_price?: any;
+        price?: any;
+        num?: any;
+        quantity?: any;
+        original_price?: any;
+        product_price?: any;
+    }> | null;
+    useOriginalBundle?: boolean;
+}): string;
+/**
+ * 计算 option 单价合计：Σ(option.price × option.num)。
+ * 在新语义 v2 下，main_product_original_price = source_product_price + 本函数结果。
+ */
+export declare function sumOptionUnitPrice(options?: Array<{
+    price?: any;
+    num?: any;
+}> | null): Decimal;
 /**
  * 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 实例。
  */
@@ -56,6 +101,12 @@ export declare function createDefaultTempOrder(params: {
     now: string;
     summary?: ScanOrderSummary;
 }): ScanOrderTempOrder;
+export interface SubmitPayloadEnhancerContext {
+    tempOrder: ScanOrderTempOrder;
+    bookingUuid: string;
+    now: Date;
+}
+export type SubmitPayloadEnhancer = (payload: ScanOrderSubmitPayload, ctx: SubmitPayloadEnhancerContext) => ScanOrderSubmitPayload;
 export declare function buildSubmitPayload(params: {
     tempOrder: ScanOrderTempOrder;
     cacheId?: string;
@@ -64,7 +115,17 @@ export declare function buildSubmitPayload(params: {
     businessCode?: string;
     channel?: string;
     type?: string;
+    enhance?: SubmitPayloadEnhancer;
 }): ScanOrderSubmitPayload;
+/** 加单（scanOrderMore）不应提交 booking 关联的虚拟规则商品行 */
+export declare function filterProductsForScanOrderMore(products: ScanOrderSubmitProduct[]): ScanOrderSubmitProduct[];
+/**
+ * 历史 V1 加餐结构映射器。
+ *
+ * @deprecated 加餐（`PUT /order/order/product/:id`）已改为与正常 checkout 共用
+ * `ScanOrderSubmitProduct` 新结构（见 `OrderModule.submitTempOrder` 的加餐分支）。
+ * 本函数仅保留以兼容历史接入方，未来会移除。新代码请勿再调用。
+ */
 export declare function formatV1Product(products: ScanOrderSubmitProduct[]): {
     bundle: any[];
     key: number | null;
@@ -72,6 +133,7 @@ export declare function formatV1Product(products: ScanOrderSubmitProduct[]): {
     product_id: number | null;
     product_variant_id: number;
     num: number;
+    note: string;
     rowKey: number | null;
     session: null;
     unique: string;

package/lib/modules/Order/utils.js

@@ -30,10 +30,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   buildSubmitPayload: () => buildSubmitPayload,
+  composeLinePrice: () => composeLinePrice,
   createDefaultOrderRulesHooks: () => createDefaultOrderRulesHooks,
   createDefaultTempOrder: () => createDefaultTempOrder,
   createEmptySummary: () => import_utils2.createEmptySummary,
   createUuidV4: () => createUuidV4,
+  filterProductsForScanOrderMore: () => filterProductsForScanOrderMore,
   formatDateTime: () => formatDateTime,
   formatV1Product: () => formatV1Product,
   generateDuration: () => generateDuration,
@@ -42,13 +44,39 @@ __export(utils_exports, {
   mergeRelationForms: () => mergeRelationForms,
   normalizeSubmitBooking: () => normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue: () => normalizeSubmitCollectPaxValue,
-  resolveSubmitCollectPax: () => resolveSubmitCollectPax
+  resolveSubmitCollectPax: () => resolveSubmitCollectPax,
+  sumOptionUnitPrice: () => sumOptionUnitPrice
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../../solution/ScanOrder/utils");
 var import_utils2 = require("../../solution/ScanOrder/utils");
+function composeLinePrice(params) {
+  const { mainPrice, bundle, useOriginalBundle } = params;
+  let total = new import_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);
+      total = total.plus(price.times(num));
+    }
+  }
+  return total.toDecimalPlaces(2).toFixed(2);
+}
+function sumOptionUnitPrice(options) {
+  let total = new import_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);
+    total = total.plus(price.times(num));
+  }
+  return total;
+}
 function createDefaultOrderRulesHooks() {
   const toUnitPriceString = (totalLike, num) => {
     const effectiveNum = Number(num) > 0 ? Number(num) : 1;
@@ -57,13 +85,47 @@ function createDefaultOrderRulesHooks() {
   return {
     getProduct: (product) => {
       var _a, _b, _c, _d;
+      const metadataAny = product.metadata || {};
+      const optionSum = sumOptionUnitPrice(product.product_option_item);
+      let sourcePrice;
+      if (metadataAny.source_product_price !== void 0) {
+        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 {
+        sourcePrice = String(product.selling_price ?? 0);
+      }
+      let sourceOriginalPrice;
+      if (metadataAny.source_product_price !== void 0) {
+        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 {
+        sourceOriginalPrice = sourcePrice;
+      }
       return {
         id: product.product_id,
-        _id: product.identity_key ? `${product.product_id}_${product.product_variant_id}_${product.identity_key}` : `${product.product_id}_${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 ? `${product.product_id}_${product.product_variant_id}_${product.identity_key}` : `${product.product_id}_${product.product_variant_id}_${(0, import_utils.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(),
-        original_price: product.original_price,
+        origin_total: new import_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 || [],
@@ -77,17 +139,37 @@ function createDefaultOrderRulesHooks() {
     },
     setProduct: (product, values) => {
       const nextNum = Number(values.quantity ?? product.num ?? 1) || 1;
-      const nextSellingPrice = 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) : product.selling_price;
+      const metadataAny = product.metadata || {};
+      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);
+      const nextBundle = values.bundle ?? product.product_bundle;
+      const composedSellingPrice = composeLinePrice({
+        mainPrice: nextMainSellingPrice,
+        bundle: nextBundle
+      });
+      const composedOriginalPrice = composeLinePrice({
+        mainPrice: nextMainOriginalPrice,
+        bundle: nextBundle,
+        useOriginalBundle: true
+      });
       return {
         ...product,
-        selling_price: nextSellingPrice,
-        original_price: values.original_price !== void 0 ? String(values.original_price) : product.original_price,
+        selling_price: composedSellingPrice,
+        original_price: composedOriginalPrice,
         discount_list: values.discount_list ?? product.discount_list,
         num: values.quantity ?? product.num,
-        product_bundle: values.bundle ?? product.product_bundle,
+        product_bundle: nextBundle,
         metadata: {
-          ...product.metadata || {},
-          ...values.main_product_selling_price !== void 0 ? { main_product_selling_price: String(values.main_product_selling_price) } : {}
+          ...metadataAny,
+          source_product_price: nextSourceSellingPrice,
+          main_product_selling_price: nextMainSellingPrice,
+          main_product_original_price: nextMainOriginalPrice,
+          price_schema_version: 2
         }
       };
     }
@@ -151,6 +233,77 @@ function formatDateTime(date) {
 function normalizeSubmitPlatform(platform) {
   return (platform == null ? void 0 : platform.toLowerCase()) === "pc" ? "PC" : "H5";
 }
+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
+  }));
+}
+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 === void 0 || value === "")
+    return "0.00";
+  return String(value);
+}
+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 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
+    );
+    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),
+      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,
+      option: formatSubmitOptionItems(rawBundle.option),
+      bundle_group_id: rawBundle == null ? void 0 : rawBundle.group_id,
+      bundle_id: rawBundle == null ? void 0 : rawBundle.id,
+      metadata: {
+        ...existedMetadata,
+        surcharge_fee: surchargeFee,
+        relation_surcharge_ids: relationSurchargeIds,
+        product_discount_difference: productDiscountDifference
+      }
+    };
+  });
+}
 function normalizeSubmitProduct(product) {
   const { _origin, identity_key, ...submitProduct } = product;
   const rawMetadata = submitProduct.metadata || {};
@@ -162,7 +315,8 @@ function normalizeSubmitProduct(product) {
   const priceMetaKeys = [
     "main_product_original_price",
     "main_product_selling_price",
-    "source_product_price"
+    "source_product_price",
+    "price_schema_version"
   ];
   for (const key of priceMetaKeys) {
     if (rawMetadata[key] !== void 0) {
@@ -172,14 +326,18 @@ function normalizeSubmitProduct(product) {
   if (rawMetadata.price_breakdown) {
     cleanMetadata.price_breakdown = rawMetadata.price_breakdown;
   }
+  if (rawMetadata.is_rule !== void 0) {
+    cleanMetadata.is_rule = rawMetadata.is_rule;
+  }
   return {
     ...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
   };
 }
@@ -286,7 +444,8 @@ function buildSubmitPayload(params) {
     platform,
     businessCode,
     channel,
-    type
+    type,
+    enhance
   } = params;
   const scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
   const summary = tempOrder.summary || (0, import_utils.createEmptySummary)();
@@ -297,8 +456,8 @@ function buildSubmitPayload(params) {
   const bookingDuration = resolveTableOccupancyDuration(tempOrder);
   const bookingEnd = bookingStart.add(bookingDuration, "minute");
   const 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"),
@@ -310,17 +469,17 @@ 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 || [];
   const formRecordIds = relationId && tableFormId ? [{
     form_id: tableFormId,
-    form_record_ids: [relationId]
+    form_record_id: relationId
   }] : void 0;
   const { created_at: _createdAt, summary: _summary, surcharges: _surcharges, ...tempOrderRest } = tempOrder;
-  return {
+  const payload = {
     ...tempOrderRest,
     platform: normalizeSubmitPlatform(platform ?? tempOrder.platform),
     request_unique_idempotency_token: cacheId,
@@ -348,13 +507,25 @@ function buildSubmitPayload(params) {
     contacts_info: tempOrder.contacts_info || [],
     // holder: tempOrder.holder || null,
     // summary,
-    metadata: {
-      ...tempOrder.metadata
-    },
+    metadata: (() => {
+      const {
+        collect_pax: _collectPax,
+        table_occupancy_duration: _tableOccupancyDuration,
+        ...rest
+      } = tempOrder.metadata || {};
+      return { ...rest };
+    })(),
     products: (tempOrder.products || []).map(
       (product) => normalizeSubmitProduct(product)
     )
   };
+  return enhance ? enhance(payload, { tempOrder, bookingUuid, now }) : payload;
+}
+function filterProductsForScanOrderMore(products) {
+  return (products || []).filter((p) => {
+    var _a;
+    return ((_a = p.metadata) == null ? void 0 : _a.is_rule) !== true;
+  });
 }
 function formatV1Product(products) {
   return products.map((product) => {
@@ -365,6 +536,7 @@ function formatV1Product(products) {
       product_id: product.product_id,
       product_variant_id: product.product_variant_id,
       num: product.num,
+      note: String(product.note ?? ""),
       rowKey: product.product_id,
       session: null,
       unique: createUuidV4()
@@ -374,10 +546,12 @@ function formatV1Product(products) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   buildSubmitPayload,
+  composeLinePrice,
   createDefaultOrderRulesHooks,
   createDefaultTempOrder,
   createEmptySummary,
   createUuidV4,
+  filterProductsForScanOrderMore,
   formatDateTime,
   formatV1Product,
   generateDuration,
@@ -386,5 +560,6 @@ function formatV1Product(products) {
   mergeRelationForms,
   normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue,
-  resolveSubmitCollectPax
+  resolveSubmitCollectPax,
+  sumOptionUnitPrice
 });

package/lib/modules/SalesSummary/utils.js

@@ -48,30 +48,6 @@ function getSafeNum(num) {
     return 1;
   return Math.floor(num);
 }
-function getVariantPrice(product) {
-  var _a, _b;
-  const variantId = Number(product.product_variant_id || 0);
-  if (!variantId)
-    return null;
-  const metadataVariantList = (_b = (_a = product.metadata) == null ? void 0 : _a.origin) == null ? void 0 : _b.variant;
-  if (Array.isArray(metadataVariantList)) {
-    const variant = metadataVariantList.find(
-      (item) => Number(item.id) === variantId
-    );
-    if ((variant == null ? void 0 : variant.price) !== void 0 && (variant == null ? void 0 : variant.price) !== null) {
-      return toDecimal(variant.price);
-    }
-  }
-  return null;
-}
-function getOptionUnitPrice(product) {
-  const optionItems = product.product_option_item || [];
-  return optionItems.reduce((sum, item) => {
-    const quantity = getSafeNum(item == null ? void 0 : item.num);
-    const itemPrice = toDecimal(item == null ? void 0 : item.price);
-    return sum.plus(itemPrice.times(quantity));
-  }, new import_decimal.default(0));
-}
 function getBundleUnitPrice(product, useOriginal = false) {
   const bundleItems = product.product_bundle || [];
   return bundleItems.reduce((sum, item) => {
@@ -81,13 +57,18 @@ function getBundleUnitPrice(product, useOriginal = false) {
   }, new import_decimal.default(0));
 }
 function getUnitPaymentTotal(product) {
-  const variantPrice = getVariantPrice(product);
-  const basePrice = variantPrice || toDecimal(product.selling_price);
-  return basePrice.plus(getOptionUnitPrice(product)).plus(getBundleUnitPrice(product));
+  var _a, _b;
+  const mainSelling = (_a = product.metadata) == null ? void 0 : _a.main_product_selling_price;
+  const mainOriginal = (_b = product.metadata) == null ? void 0 : _b.main_product_original_price;
+  const basePrice = mainSelling !== void 0 ? toDecimal(mainSelling) : mainOriginal !== void 0 ? toDecimal(mainOriginal) : toDecimal(product.selling_price);
+  return basePrice.plus(getBundleUnitPrice(product));
 }
 function getUnitOriginalTotal(product) {
-  const basePrice = toDecimal(product.original_price || product.selling_price);
-  return basePrice.plus(getOptionUnitPrice(product)).plus(getBundleUnitPrice(product, true));
+  var _a, _b;
+  const mainOriginal = (_a = product.metadata) == null ? void 0 : _a.main_product_original_price;
+  const mainSelling = (_b = product.metadata) == null ? void 0 : _b.main_product_selling_price;
+  const basePrice = mainOriginal !== void 0 ? toDecimal(mainOriginal) : mainSelling !== void 0 ? toDecimal(mainSelling) : toDecimal(product.original_price || product.selling_price);
+  return basePrice.plus(getBundleUnitPrice(product, true));
 }
 function buildSurchargeServiceItems(products) {
   return products.map((product) => {
@@ -207,12 +188,6 @@ function isBundleMarkupOrDiscount(item) {
   const isDiscount = (item == null ? void 0 : item.price_type) === "markdown" && ((item == null ? void 0 : item.price_type_ext) === "" || !(item == null ? void 0 : item.price_type_ext));
   return isMarkup || isDiscount;
 }
-function getDiscountListAmount(discountList) {
-  return (discountList || []).reduce(
-    (total, d) => total.plus(toDecimal(d.amount)),
-    new import_decimal.default(0)
-  );
-}
 function calculateSingleItemTax(params) {
   const { price, taxRate, isPriceIncludeTax, isChargeTax } = params;
   if (price.lte(0))
@@ -229,18 +204,9 @@ function calculateSingleItemTax(params) {
   return price.dividedBy(divisor).times(rate);
 }
 function getMainProductPaymentTotal(product) {
-  var _a, _b, _c, _d;
-  const variantPrice = getVariantPrice(product);
-  let total = variantPrice || toDecimal(((_a = product.metadata) == null ? void 0 : _a.main_product_selling_price) ?? product.selling_price);
-  const mainDiscountList = ((_c = (_b = product._origin) == null ? void 0 : _b.product) == null ? void 0 : _c.discount_list) || ((_d = product._origin) == null ? void 0 : _d.discount_list) || [];
-  const mainDiscountAmount = getDiscountListAmount(
-    mainDiscountList.filter((d) => {
-      var _a2;
-      return !((_a2 = d == null ? void 0 : d.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
-    })
-  );
-  total = total.minus(mainDiscountAmount);
-  total = total.plus(getOptionUnitPrice(product));
+  var _a, _b;
+  const mainSelling = ((_a = product.metadata) == null ? void 0 : _a.main_product_selling_price) ?? ((_b = product.metadata) == null ? void 0 : _b.main_product_original_price) ?? 0;
+  let total = toDecimal(mainSelling);
   const bundleItems = product.product_bundle || [];
   for (const bundleItem of bundleItems) {
     if (isBundleMarkupOrDiscount(bundleItem)) {