@pisell/pisellos 2.1.130 → 2.1.131

package/dist/solution/VenueBooking/index.js

@@ -45,7 +45,7 @@ import { extractResourceIds, buildResourceProductMap } from "./utils/resource";
 import { buildTimeSlotGrid, isBusinessHoursCrossDay, generateTimeLabels } from "./utils/timeSlot";
 import { buildDateRangeSummary } from "./utils/dateSummary";
 import { mergeConsecutiveSlots, expandMergedSlotToIndividual, buildVenueIdentityKey, buildVenueBookingEntry, buildPriceBreakdown } from "./utils/slotMerge";
-import { createUuidV4 } from "../../modules/Order/utils";
+import { composeLinePrice, createUuidV4, sumOptionUnitPrice } from "../../modules/Order/utils";
 import { OrderModule } from "../../modules/Order";
 import { RegisterAndLoginHooks } from "../RegisterAndLogin/types";
 import Decimal from 'decimal.js';
@@ -2027,7 +2027,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setDiscountSelected",
     value: (function () {
       var _setDiscountSelected = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(params) {
-        var _tempOrder$holder, _this$store$order$get, _this$store$order$get2, list, beforeTarget, updated, updatedTarget, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _tempOrder$holder2, result, beforeSelectedIds, _iterator13, _step13, d, selectedResourceIds, _iterator14, _step14, _product$_origin, product, totalPerUnitDiscount, newSellingPrice, afterApplyTarget, finalSummary, finalProduct, finalTarget;
+        var _tempOrder$holder, _this$store$order$get, _this$store$order$get2, list, beforeTarget, updated, updatedTarget, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _tempOrder$holder2, result, beforeSelectedIds, _iterator13, _step13, d, selectedResourceIds, _iterator14, _step14, _product$_origin, _product$metadata$sou, _product$metadata3, _product$metadata4, _product$original_pri, product, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice, afterApplyTarget, finalSummary, finalProduct, finalTarget;
         return _regeneratorRuntime().wrap(function _callee21$(_context21) {
           while (1) switch (_context21.prev = _context21.next) {
             case 0:
@@ -2116,7 +2116,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               _iterator14.s();
             case 21:
               if ((_step14 = _iterator14.n()).done) {
-                _context21.next = 32;
+                _context21.next = 35;
                 break;
               }
               product = _step14.value;
@@ -2124,7 +2124,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 _context21.next = 25;
                 break;
               }
-              return _context21.abrupt("continue", 30);
+              return _context21.abrupt("continue", 33);
             case 25:
               // 1. 把 product.discount_list 和当前选中的 discount 对齐（剔除已取消的券）
               product.discount_list = (product.discount_list || []).filter(function (pd) {
@@ -2133,45 +2133,53 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 return rid != null && selectedResourceIds.has(rid);
               });
 
-              // 2. 以 original_price 为基准重算 selling_price
+              // 2. 以 source_product_price 为券作用基准：券作用于 source（不含 option），
+              //    再把 option 加回得到含 option 的 main_product_selling_price，最后合成 composite。
               totalPerUnitDiscount = (product.discount_list || []).reduce(function (sum, pd) {
                 return sum + (pd.amount || 0);
               }, 0);
-              newSellingPrice = new Decimal(product.original_price || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
-              product.selling_price = newSellingPrice;
+              optionSum = sumOptionUnitPrice(product.product_option_item);
+              sourcePrice = (_product$metadata$sou = (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.source_product_price) !== null && _product$metadata$sou !== void 0 ? _product$metadata$sou : ((_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.main_product_original_price) != null ? new Decimal(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : '0';
+              newSourceSellingPrice = new Decimal(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
+              newMainSellingPrice = new Decimal(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
               if (product.metadata) {
-                product.metadata.main_product_selling_price = newSellingPrice;
+                product.metadata.main_product_selling_price = newMainSellingPrice;
+                product.metadata.price_schema_version = 2;
               }
-            case 30:
+              product.selling_price = composeLinePrice({
+                mainPrice: newMainSellingPrice,
+                bundle: product.product_bundle
+              });
+            case 33:
               _context21.next = 21;
               break;
-            case 32:
-              _context21.next = 37;
+            case 35:
+              _context21.next = 40;
               break;
-            case 34:
-              _context21.prev = 34;
-              _context21.t0 = _context21["catch"](19);
-              _iterator14.e(_context21.t0);
             case 37:
               _context21.prev = 37;
-              _iterator14.f();
-              return _context21.finish(37);
+              _context21.t0 = _context21["catch"](19);
+              _iterator14.e(_context21.t0);
             case 40:
+              _context21.prev = 40;
+              _iterator14.f();
+              return _context21.finish(40);
+            case 43:
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context21.next = 43;
+              _context21.next = 46;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 43:
+            case 46:
               tempOrder.discount_list = (nextDiscountList || []).filter(function (d) {
                 return d.isSelected;
               });
               afterApplyTarget = this.store.order.getDiscountList().find(function (d) {
                 return d.id === params.discountId;
               }) || null;
-              _context21.next = 47;
+              _context21.next = 50;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 47:
+            case 50:
               this.store.order.persistTempOrder();
               finalSummary = ((_this$store$order$get = this.store.order.getTempOrder()) === null || _this$store$order$get === void 0 ? void 0 : _this$store$order$get.summary) || null;
               finalProduct = ((_this$store$order$get2 = this.store.order.getTempOrder()) === null || _this$store$order$get2 === void 0 || (_this$store$order$get2 = _this$store$order$get2.products) === null || _this$store$order$get2 === void 0 ? void 0 : _this$store$order$get2[0]) || null;
@@ -2180,16 +2188,16 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 return d.id === params.discountId;
               }) || null;
               return _context21.abrupt("return", this.store.order.getDiscountList());
-            case 55:
-              _context21.prev = 55;
+            case 58:
+              _context21.prev = 58;
               _context21.t1 = _context21["catch"](1);
               this.logMethodError('setDiscountSelected', _context21.t1);
               throw _context21.t1;
-            case 59:
+            case 62:
             case "end":
               return _context21.stop();
           }
-        }, _callee21, this, [[1, 55], [19, 34, 37, 40]]);
+        }, _callee21, this, [[1, 58], [19, 37, 40, 43]]);
       }));
       function setDiscountSelected(_x15) {
         return _setDiscountSelected.apply(this, arguments);
@@ -2336,7 +2344,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "addProductToOrder",
     value: function () {
       var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(product) {
-        var _product$metadata3, _product$product_vari2, quotationPrice, products;
+        var _product$metadata5, _product$product_vari2, quotationPrice, products;
         return _regeneratorRuntime().wrap(function _callee25$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
@@ -2351,7 +2359,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('order 模块未初始化');
             case 4:
-              if (!((_product$metadata3 = product.metadata) !== null && _product$metadata3 !== void 0 && _product$metadata3.venue_booking) && this.store.quotation && product.product_id != null) {
+              if (!((_product$metadata5 = product.metadata) !== null && _product$metadata5 !== void 0 && _product$metadata5.venue_booking) && this.store.quotation && product.product_id != null) {
                 quotationPrice = this.store.quotation.getPriceForProduct({
                   productId: product.product_id,
                   variantId: (_product$product_vari2 = product.product_variant_id) !== null && _product$product_vari2 !== void 0 ? _product$product_vari2 : undefined,

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

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { OrderModuleAPI, CommitOrderParams, SubmitScanOrderParams, ScanOrderMoreParams, CheckoutOrderParams } from './types';
+import { OrderModuleAPI, CommitOrderParams, SubmitScanOrderParams, ScanOrderMoreParams, CheckoutOrderParams, UpdateProductInOrderParams } from './types';
 import { CartItem } from '../Cart/types';
 import { type SubmitPayloadEnhancer } from './utils';
 import type { ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderSummary, ScanOrderTempOrder } from '../../solution/ScanOrder/types';
@@ -71,11 +71,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     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[]>;
     submitTempOrder<T = any>(params?: {
         cacheId?: string;
@@ -119,3 +115,4 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     getOrderInfoByRemote(order_id: number): Promise<any>;
     getLastOrderInfo(): Record<string, any> | undefined;
 }
+export type { UpdateProductInOrderParams } from './types';

package/lib/modules/Order/index.js

@@ -285,6 +285,31 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         this.window.localStorage.removeItem(key);
         return;
       }
+      if (Array.isArray(parsedData.products)) {
+        for (let i = 0; i < parsedData.products.length; i++) {
+          const p = parsedData.products[i];
+          if (!p || typeof p !== "object")
+            continue;
+          if (!Array.isArray(p.product_option_item)) {
+            p.product_option_item = [];
+          }
+          if (!Array.isArray(p.product_bundle)) {
+            p.product_bundle = [];
+          }
+          const row = p;
+          if (typeof row.identity_key !== "string" || row.identity_key.length === 0) {
+            const newKey = (0, import_utils.createUuidV4)();
+            row.identity_key = newKey;
+            if (!row.metadata || typeof row.metadata !== "object") {
+              row.metadata = {};
+            }
+            if (!row.metadata.unique_identification_number) {
+              row.metadata.unique_identification_number = newKey;
+            }
+          }
+          parsedData.products[i] = (0, import_utils3.normalizeOrderProduct)(row);
+        }
+      }
       this.store.tempOrder = parsedData;
     } catch {
       (_b = (_a = this.window) == null ? void 0 : _a.localStorage) == null ? void 0 : _b.removeItem(key);
@@ -394,21 +419,57 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   // ─── TempOrder: 商品 CRUD ───
   async addProductToOrder(product) {
     const tempOrder = this.ensureTempOrder();
-    const normalizedProduct = (0, import_utils3.normalizeOrderProduct)(product);
-    const productIndex = (0, import_utils3.getProductIdentityIndex)(
-      tempOrder.products,
-      normalizedProduct
-    );
-    if (productIndex === -1) {
-      tempOrder.products.push(normalizedProduct);
+    const hasExplicitIdentityKey = typeof product.identity_key === "string" && product.identity_key.length > 0;
+    if (hasExplicitIdentityKey) {
+      const normalizedProduct = (0, import_utils3.normalizeOrderProduct)(product);
+      const productIndex = (0, import_utils3.getProductIdentityIndex)(
+        tempOrder.products,
+        normalizedProduct
+      );
+      if (productIndex === -1) {
+        tempOrder.products.push(normalizedProduct);
+      } else {
+        const targetProduct = tempOrder.products[productIndex];
+        tempOrder.products[productIndex] = {
+          ...targetProduct,
+          ...normalizedProduct,
+          num: (0, import_utils3.getSafeProductNum)(targetProduct.num + normalizedProduct.num),
+          _origin: normalizedProduct._origin || targetProduct._origin
+        };
+      }
     } else {
-      const targetProduct = tempOrder.products[productIndex];
-      tempOrder.products[productIndex] = {
-        ...targetProduct,
-        ...normalizedProduct,
-        num: (0, import_utils3.getSafeProductNum)(targetProduct.num + normalizedProduct.num),
-        _origin: normalizedProduct._origin || targetProduct._origin
-      };
+      const incomingFingerprint = (0, import_utils3.buildProductLineFingerprint)(
+        product.product_option_item,
+        product.product_bundle
+      );
+      const matchedIndex = tempOrder.products.findIndex((item) => {
+        if (item.product_id !== product.product_id)
+          return false;
+        if (item.product_variant_id !== product.product_variant_id)
+          return false;
+        const existedFingerprint = (0, import_utils3.buildProductLineFingerprint)(
+          item.product_option_item,
+          item.product_bundle
+        );
+        return existedFingerprint === incomingFingerprint;
+      });
+      if (matchedIndex === -1) {
+        const normalizedProduct = (0, import_utils3.normalizeOrderProduct)(product);
+        tempOrder.products.push(normalizedProduct);
+      } else {
+        const targetProduct = tempOrder.products[matchedIndex];
+        const normalizedProduct = (0, import_utils3.normalizeOrderProduct)({
+          ...product,
+          identity_key: targetProduct.identity_key
+        });
+        tempOrder.products[matchedIndex] = {
+          ...targetProduct,
+          ...normalizedProduct,
+          identity_key: targetProduct.identity_key,
+          num: (0, import_utils3.getSafeProductNum)(targetProduct.num + normalizedProduct.num),
+          _origin: normalizedProduct._origin || targetProduct._origin
+        };
+      }
     }
     this.applyDiscount();
     await this.recalculateSummary({ createIfMissing: true });
@@ -416,12 +477,27 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return tempOrder.products;
   }
   async updateProductInOrder(params) {
-    const { product_id, product_variant_id, updates } = params;
+    var _a, _b, _c;
+    const {
+      product_id,
+      product_variant_id,
+      updates,
+      identity_key,
+      product_option_item,
+      product_bundle
+    } = params;
     const tempOrder = this.ensureTempOrder();
-    const productIndex = (0, import_utils3.getProductIdentityIndex)(tempOrder.products, {
+    const identityLookup = {
       product_id,
       product_variant_id
-    });
+    };
+    if (identity_key !== void 0)
+      identityLookup.identity_key = identity_key;
+    if (product_option_item !== void 0)
+      identityLookup.product_option_item = product_option_item;
+    if (product_bundle !== void 0)
+      identityLookup.product_bundle = product_bundle;
+    const productIndex = (0, import_utils3.getProductIdentityIndex)(tempOrder.products, identityLookup);
     if (productIndex === -1) {
       throw new Error("[Order] 目标商品不存在，无法更新");
     }
@@ -433,7 +509,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       product_variant_id
     };
     nextProduct.num = (0, import_utils3.getSafeProductNum)(nextProduct.num);
-    tempOrder.products[productIndex] = nextProduct;
+    const callerUpdatesTopPrice = Object.prototype.hasOwnProperty.call(updates || {}, "selling_price") || Object.prototype.hasOwnProperty.call(updates || {}, "original_price");
+    const callerUpdatesMainMeta = ((_a = updates == null ? void 0 : updates.metadata) == null ? void 0 : _a.main_product_selling_price) !== void 0 || ((_b = updates == null ? void 0 : updates.metadata) == null ? void 0 : _b.main_product_original_price) !== void 0 || ((_c = updates == null ? void 0 : updates.metadata) == null ? void 0 : _c.source_product_price) !== void 0;
+    if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+      const existedMeta = nextProduct.metadata || {};
+      nextProduct.metadata = { ...existedMeta };
+      delete nextProduct.metadata.source_product_price;
+      delete nextProduct.metadata.main_product_selling_price;
+      delete nextProduct.metadata.main_product_original_price;
+      delete nextProduct.metadata.price_schema_version;
+    }
+    tempOrder.products[productIndex] = (0, import_utils3.normalizeOrderProduct)(nextProduct);
     this.applyDiscount();
     await this.recalculateSummary({ createIfMissing: true });
     this.persistTempOrder();
@@ -441,18 +527,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   async removeProductFromOrder(identity) {
     const tempOrder = this.ensureTempOrder();
-    const beforeProducts = tempOrder.products;
     tempOrder.products = tempOrder.products.filter(
       (item) => !(0, import_utils3.isIdentityMatch)(item, identity)
     );
-    const removedByStrictIdentity = beforeProducts.length - tempOrder.products.length;
-    if (removedByStrictIdentity === 0 && identity.identity_key) {
-      tempOrder.products = tempOrder.products.filter((item) => {
-        const isSameProduct = String(item.product_id) === String(identity.product_id) && String(item.product_variant_id) === String(identity.product_variant_id);
-        const hasNoIdentityKey = !item.identity_key;
-        return !(isSameProduct && hasNoIdentityKey);
-      });
-    }
     this.applyDiscount();
     await this.recalculateSummary({ createIfMissing: true });
     this.persistTempOrder();
@@ -474,7 +551,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
     let result;
     if (tempOrder.order_id) {
-      const products = (0, import_utils.formatV1Product)(payload.products);
+      const products = (0, import_utils.filterProductsForScanOrderMore)(payload.products);
       const moreResult = await this.scanOrderMore({
         query: {
           order_id: tempOrder.order_id,
@@ -700,7 +777,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async submitScanOrder(params) {
     const { url, query } = params;
     const fetchUrl = url || "/order/sales/checkout";
-    return this.request.post(fetchUrl, query);
+    return this.request.post(fetchUrl, query, { customToast: () => {
+    } });
   }
   async scanOrderMore(params) {
     const { url, query } = params;
@@ -709,7 +787,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       products: query.products,
       request_unique_idempotency_token: query.request_unique_idempotency_token
     };
-    return this.request.put(fetchUrl, requestBody);
+    return this.request.put(fetchUrl, requestBody, { customToast: () => {
+    } });
   }
   // TODO 获取详情的接口
   async getOrderInfoByRemote(order_id) {

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

@@ -16,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[];
+}
 /**
  * 订单信息
  */
@@ -35,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;
@@ -210,11 +232,7 @@ export interface OrderModuleAPI {
     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?: {

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 实例。
  */
@@ -72,6 +117,15 @@ export declare function buildSubmitPayload(params: {
     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;
@@ -79,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;