@pisell/pisellos 0.0.510 → 0.0.512

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)) {

package/lib/modules/Summary/utils.js

@@ -437,25 +437,11 @@ var getBundleItemIsDiscountPrice = (item) => {
 var getBundleItemIsMarkupOrDiscountPrice = (item) => {
   return getBundleItemIsMarkupPrice(item) || getBundleItemIsDiscountPrice(item);
 };
-var getDiscountAmount = (discounts) => {
-  return (discounts || []).reduce((total, discount) => {
-    return total.add(new import_decimal.default(discount.amount || 0));
-  }, new import_decimal.default(0)).toNumber();
-};
 var getMainProductTotal = (item) => {
-  var _a, _b, _c, _d, _e, _f;
-  let total = new import_decimal.default((item == null ? void 0 : item.main_product_selling_price) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.main_product_selling_price) ?? item.price ?? 0);
-  const discount = ((_c = (_b = item == null ? void 0 : item._origin) == null ? void 0 : _b.product) == null ? void 0 : _c.discount_list) || ((_f = (_e = (_d = item == null ? void 0 : item._originData) == null ? void 0 : _d.product) == null ? void 0 : _e.discount_list) == null ? void 0 : _f.filter((item2) => {
-    var _a2;
-    return !((_a2 = item2 == null ? void 0 : item2.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
-  })) || [];
-  const mainProductDiscountAmount = getDiscountAmount(discount);
-  total = total.minus(mainProductDiscountAmount);
-  if ((item == null ? void 0 : item.option) && Array.isArray(item == null ? void 0 : item.option)) {
-    total = total.add(item == null ? void 0 : item.option.reduce((t, option) => {
-      return t.add(new import_decimal.default(option.price || 0).mul(option.num || 1));
-    }, new import_decimal.default(0)));
-  }
+  var _a, _b;
+  let total = new import_decimal.default(
+    (item == null ? void 0 : item.main_product_selling_price) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.main_product_selling_price) ?? ((_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.main_product_original_price) ?? 0
+  );
   for (let bundleItem of (item == null ? void 0 : item.bundle) || []) {
     if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
       const bundleItemTotal = new import_decimal.default(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);

package/lib/solution/ScanOrder/index.d.ts

@@ -1,6 +1,7 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderScanCodeResult } from './types';
+import type { UpdateProductInOrderParams } from '../../modules/Order/types';
 import type { Discount } from '../../modules/Discount/types';
 import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { StrategyConfig } from '../../model/strategy/type';
@@ -48,6 +49,9 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private registerCustomerLoginListeners;
     private refreshOrderMarketingAfterLogin;
     constructor(name?: string, version?: string);
+    /** 与 `otherParams.cacheId` 一致，供宿主在 URL 变化时判断是否需要重新注册模块 */
+    getCacheId(): string | undefined;
+    private destroyRegisteredChildModules;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     destroy(): Promise<void>;
     retryInit(): Promise<void>;
@@ -85,11 +89,12 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private buildSubmitPayloadEnhancer;
     submitScanOrder<T = any>(): Promise<T>;
     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[]>;
+    /**
+     * 设置单行商品备注（与整单 `updateTempOrderNote` 区分）。
+     * 多行同 SKU 时必须传入与删除/更新一致的 identity（如 `identity_key`）。
+     */
+    setOrderProductLineNote(identity: ScanOrderOrderProductIdentity, note: string): Promise<ScanOrderOrderProduct[]>;
     removeProductFromOrder(identity: ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
     private loadRuntimeConfigs;
     private syncItemRuleConfigsFromDineInConfig;

package/lib/solution/ScanOrder/index.js

@@ -260,6 +260,23 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       }
     }
   }
+  /** 与 `otherParams.cacheId` 一致，供宿主在 URL 变化时判断是否需要重新注册模块 */
+  getCacheId() {
+    return this.cacheId;
+  }
+  async destroyRegisteredChildModules() {
+    const modules = [
+      this.store.schedule,
+      this.store.salesSummary,
+      this.store.order,
+      this.store.products,
+      this.store.scanOrderLogger
+    ];
+    for (const mod of modules) {
+      if (mod && typeof mod.destroy === "function")
+        await Promise.resolve(mod.destroy());
+    }
+  }
   async initialize(core, options = {}) {
     var _a, _b, _c, _d, _e, _f;
     this.logMethodStart("initialize");
@@ -375,6 +392,8 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     this.logMethodStart("destroy");
     this.clearLoginEffectListeners();
     await this.core.effects.emit(import_types.ScanOrderHooks.onDestroy, {});
+    await this.destroyRegisteredChildModules();
+    super.destroy();
     console.log("[ScanOrder] 已销毁");
     this.logMethodSuccess("destroy");
   }
@@ -626,7 +645,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     }
   }
   async setDiscountSelected(params) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     this.logMethodStart("setDiscountSelected", params);
     try {
       if (!this.store.order)
@@ -691,11 +710,18 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
           (sum, pd) => sum + (pd.amount || 0),
           0
         );
-        const newSellingPrice = new import_decimal.default(product.original_price || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
-        product.selling_price = newSellingPrice;
+        const optionSum = (0, import_utils2.sumOptionUnitPrice)(product.product_option_item);
+        const sourcePrice = ((_d = product.metadata) == null ? void 0 : _d.source_product_price) ?? (((_e = product.metadata) == null ? void 0 : _e.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
+        const newSourceSellingPrice = new import_decimal.default(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
+        const newMainSellingPrice = new import_decimal.default(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;
         }
+        product.selling_price = (0, import_utils2.composeLinePrice)({
+          mainPrice: newMainSellingPrice,
+          bundle: product.product_bundle
+        });
       }
       import_Order.OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
       await (discountModule == null ? void 0 : discountModule.setDiscountList(nextDiscountList));
@@ -892,6 +918,36 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  /**
+   * 设置单行商品备注（与整单 `updateTempOrderNote` 区分）。
+   * 多行同 SKU 时必须传入与删除/更新一致的 identity（如 `identity_key`）。
+   */
+  async setOrderProductLineNote(identity, note) {
+    this.logMethodStart("setOrderProductLineNote", {
+      product_id: identity.product_id,
+      product_variant_id: identity.product_variant_id
+    });
+    try {
+      const params = {
+        product_id: identity.product_id,
+        product_variant_id: identity.product_variant_id,
+        updates: { note: String(note || "") }
+      };
+      if (identity.identity_key !== void 0)
+        params.identity_key = identity.identity_key;
+      if (identity.product_option_item !== void 0) {
+        params.product_option_item = identity.product_option_item;
+      }
+      if (identity.product_bundle !== void 0)
+        params.product_bundle = identity.product_bundle;
+      const products = await this.updateProductInOrder(params);
+      this.logMethodSuccess("setOrderProductLineNote", { productCount: products.length });
+      return products;
+    } catch (error) {
+      this.logMethodError("setOrderProductLineNote", error);
+      throw error;
+    }
+  }
   async removeProductFromOrder(identity) {
     this.logMethodStart("removeProductFromOrder", {
       product_id: identity.product_id,

package/lib/solution/ScanOrder/types.d.ts

@@ -39,21 +39,62 @@ export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     order_detail_id: number | null;
     num: number;
     product_option_item: any[];
-    /** 券后单品单价（= 订单域实际成交单价）。未应用券时等同 original_price。 */
+    /**
+     * 券后 **行 composite 单价** = `metadata.main_product_selling_price`
+     *   + Σ((bundle.bundle_selling_price ?? bundle.price) × (bundle.num ?? 1))
+     *
+     * 新语义 v2 下 `metadata.main_product_selling_price` 已经**含 option**、含主商品折扣，
+     * 因此本字段不再叠加 option。未应用券时等同 `original_price`。
+     * Rules 钩子、主商品计税、Summary 统一读 metadata，不以此字段反推。
+     */
     selling_price: string;
-    /** 券前单品单价（= 店铺售价），不承载后台划线价语义。 */
+    /**
+     * 券前 **行 composite 单价** = `metadata.main_product_original_price`
+     *   + Σ(bundle 原价 × num)
+     *
+     * 新语义 v2 下 `metadata.main_product_original_price` 已经**含 option**、不含折扣。
+     * 不承载后台划线价语义。
+     */
     original_price: string;
     tax_fee: string;
     is_charge_tax: number;
     discount_list: any[];
     product_bundle: any[];
+    /**
+     * 行级扩展 metadata。价格相关的权威字段：
+     *
+     * - `source_product_price`：主商品/variant 基础价（已应用报价单），**不含 option、不含折扣**。
+     *   是派生 `main_product_*` 的唯一源。variant 分支优先读 `metadata.origin.variant[vid].price`。
+     * - `main_product_original_price` = `source_product_price + Σ(option.price × option.num)`，
+     *   **含 option、不含折扣**。
+     * - `main_product_selling_price` = `main_product_original_price − 主商品券 per-unit amount`，
+     *   **含 option、含主商品折扣**。Rules 钩子 / Summary / 计税均以此为主商品权威源。
+     * - `price_schema_version`（当前 = 2）：schema 版本 sentinel，用于跨端协商价格口径、
+     *   区分 v1 旧缓存以便 `normalizeOrderProduct` 触发迁移。
+     */
     metadata: Record<string, any>;
+    /** 商品行备注（如顾客对单品的特殊要求） */
+    note?: string;
     _origin?: Record<string, any>;
 }
+/**
+ * 出站 payload 版本的商品行。
+ *
+ * 与 tempOrder 内部 `ScanOrderOrderProduct` 的字段差异：
+ * - `product_option_item[*]`：内部为 `{ product_option_item_id, option_group_id, num, price, ... }`，
+ *   出站由 `normalizeSubmitProduct` 重命名为 `{ option_group_item_id, option_group_id, num }`
+ *   （后端 checkout 协议；丢弃 `price` 等运行时辅助字段）。
+ * - `product_bundle[*].option[*]`：同上重命名规则。
+ *
+ * 运行时（UI 显示、加购合并、指纹、持久化）全部消费内部字段名 `product_option_item_id`，
+ * 仅在 SDK 提交边界做一次出站映射，不影响 opaque identity 契约。
+ */
 export interface ScanOrderSubmitProduct extends Omit<ScanOrderOrderProduct, '_origin' | 'identity_key'> {
     /**
      * 出站兼容字段：SDK 内部不再消费 payment_price，
      * 仅在提交后端时由 selling_price 派生，保持原有后端契约。
+     * 新语义 v2 下 selling_price 是 composite（含 option、含 bundle、含主商品折扣），
+     * 因此 payment_price 同样是 composite。
      */
     payment_price: string;
 }

package/lib/solution/ScanOrder/utils.d.ts

@@ -92,16 +92,14 @@ export declare function buildProductLineFingerprint(productOptionItem?: unknown,
  */
 export declare function isSkuOnlyDeleteIdentity(x: ScanOrderOrderProductIdentity): boolean;
 /**
- * 与常见 UI 约定一致：仅当存在**一条** `product_option_item` 时，
- * `${product_id}_${option_group_id}_${product_option_item_id}_${num}` 可作为删除用 `identity_key`。
- * 多小料行请使用加购时的 `identity_key` / `metadata.unique_identification_number` 或按 `product_option_item` 指纹删除。
- */
-export declare function buildSyntheticSingleOptionIdentityKey(productId: number | null, productOptionItem: unknown): string | undefined;
-/**
- * 判断两个商品 identity 是否匹配。
- * - 任一方带 `identity_key`：两侧都有则比字符串相等；仅一侧有则比「另一侧有效 key 集合」是否含该 key（见 collectLineIdentityKeyCandidates）。
- * - 否则若任一方为「仅 SKU」删除通配（未声明 product_option_item / product_bundle 键），只比 SKU。
- * - 否则比较选项 + 套餐指纹（同 SKU 且指纹相同才合并数量）。
+ * 判断两个商品 identity 是否匹配（不透明 identity 契约）。
+ *
+ * 调用约定：始终 `isIdentityMatch(line, callerIdentity)`。
+ * - 若 SKU（product_id + product_variant_id）不一致 → 不匹配。
+ * - **双方都带** `identity_key` → 严格字符串相等比较（不再猜测合成 key / metadata 桥接）。
+ *   这是 opaque identity 契约的标准路径：UI 删改时透传 SDK 回灌的 identity_key。
+ * - 否则（即至少一侧未声明 identity_key）→ 进入「SKU 通配 / 显式空选项 / 指纹」回退路径，
+ *   忽略线侧 identity_key，按内容语义匹配。这给「行已 opaque、调用方却想按 SKU 通配 / 选项指纹删除」留兼容入口。
  */
 export declare function isIdentityMatch(a: ScanOrderOrderProductIdentity, b: ScanOrderOrderProductIdentity): boolean;
 /**
@@ -110,10 +108,26 @@ export declare function isIdentityMatch(a: ScanOrderOrderProductIdentity, b: Sca
  */
 export declare function getProductIdentityIndex(products: ScanOrderOrderProduct[], identity: ScanOrderOrderProductIdentity): number;
 /**
- * 对外部传入的商品对象做归一化：
+ * 对外部传入的商品对象做归一化（v2 composite 语义）：
  * - 补全可选字段默认值（未传则使用兜底值，避免后续计算时因 undefined 导致异常）
  * - 对 num 调用 getSafeProductNum 做安全处理
  * - 保留 _origin 供后续业务流程（如促销规则）使用
+ *
+ * 价格字段语义（metadata 权威源 + composite 派生）：
+ * - `metadata.source_product_price`：主商品/variant 基础价（已应用报价单），**不含 option**、
+ *   **不含折扣**。是推导 main_product_* 的起点。variant 分支优先读 `metadata.origin.variant[vid].price`。
+ * - `metadata.main_product_original_price`：`source + Σ(option.price × option.num)`，**含 option**、
+ *   **不含折扣**。
+ * - `metadata.main_product_selling_price`：`main_product_original_price - 主商品券 per-unit amount`，
+ *   **含 option**、**含折扣**。
+ * - 行级 `selling_price` = `main_product_selling_price + Σ(bundle_selling_price × num)`。
+ * - 行级 `original_price` = `main_product_original_price + Σ(bundle 原价 × num)`。
+ *
+ * 迁移与幂等：
+ * - `metadata.price_schema_version === 2` → 已新语义归一化，保留 main_product_* 原值（保留折扣）。
+ * - 其它情况（v1 / 缺字段 / 无 metadata）→ 按"main_product_selling_price 曾是 main-only"的旧约定
+ *   反推 legacyDiscount，再以新 source + options 基准重算。最终统一打上 `price_schema_version: 2`。
+ * - 因此多次 normalize 不会重复叠加 option/bundle。
  */
 export declare function normalizeOrderProduct(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): ScanOrderOrderProduct;
 /**
@@ -129,7 +143,7 @@ export declare function hasCustomCapacityProduct(products: ProductData[]): boole
 /**
  * 根据预约规则商品的 resource.type 计算桌台是否已被"占满"。
  * - single：只要有 `lastOrderId` 即视为占用
- * - multiple：当前时间落在 `capacity_list[i]` 的 `[start_at, end_at]`（inclusive）内的 pax 之和 > 总容量
+ * - multiple：当前时间落在 `capacity_list[i]` 的 `[start_at, end_at]`（inclusive）内的 pax 之和 >= 总容量
  * - 其他（'capacity' / undefined）：返回 false，不施加限制
  */
 export declare function computeResourceIsFull(params: {

package/lib/solution/ScanOrder/utils.js

@@ -35,7 +35,6 @@ __export(utils_exports, {
   buildProductKey: () => buildProductKey,
   buildProductLineFingerprint: () => buildProductLineFingerprint,
   buildQuantityLimitIndex: () => buildQuantityLimitIndex,
-  buildSyntheticSingleOptionIdentityKey: () => buildSyntheticSingleOptionIdentityKey,
   collectLinkProductIdsFromReservationRules: () => collectLinkProductIdsFromReservationRules,
   computeResourceIsFull: () => computeResourceIsFull,
   createEmptySummary: () => createEmptySummary,
@@ -62,6 +61,8 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
+var import_decimal = __toESM(require("decimal.js"));
+var import_utils = require("../../modules/Order/utils");
 function createEmptySummary() {
   return {
     product_quantity: 0,
@@ -378,43 +379,6 @@ function isSkuOnlyDeleteIdentity(x) {
     return false;
   return !("product_option_item" in x) && !("product_bundle" in x);
 }
-function buildSyntheticSingleOptionIdentityKey(productId, productOptionItem) {
-  if (productId == null || !Number.isFinite(Number(productId)))
-    return void 0;
-  const opts = Array.isArray(productOptionItem) ? productOptionItem : [];
-  if (opts.length !== 1)
-    return void 0;
-  const o = opts[0];
-  const gid = Number(o == null ? void 0 : o.option_group_id) || 0;
-  const oid = Number(o == null ? void 0 : o.product_option_item_id) || 0;
-  const rawNum = o == null ? void 0 : o.num;
-  const n = typeof rawNum === "number" && !Number.isNaN(rawNum) ? Math.max(1, Math.floor(rawNum)) : 1;
-  return `${productId}_${gid}_${oid}_${n}`;
-}
-function collectLineIdentityKeyCandidates(x) {
-  var _a;
-  const out = /* @__PURE__ */ new Set();
-  const row = x;
-  if (typeof row.identity_key === "string" && row.identity_key.length > 0) {
-    out.add(row.identity_key);
-  }
-  const uid = (_a = row.metadata) == null ? void 0 : _a.unique_identification_number;
-  if (typeof uid === "string" && uid.length > 0)
-    out.add(uid);
-  const synthetic = buildSyntheticSingleOptionIdentityKey(
-    row.product_id,
-    row.product_option_item
-  );
-  if (synthetic)
-    out.add(synthetic);
-  const opts = "product_option_item" in row && Array.isArray(row.product_option_item) ? row.product_option_item : [];
-  const bundles = "product_bundle" in row && Array.isArray(row.product_bundle) ? row.product_bundle : [];
-  if (opts.length === 0 && bundles.length === 0 && row.product_id != null && Number.isFinite(Number(row.product_id))) {
-    const vid = Number(row.product_variant_id) || 0;
-    out.add(`${row.product_id}_${vid}_0`);
-  }
-  return out;
-}
 function fingerprintForIdentityWithOptionKeys(x) {
   const row = x;
   const opts = "product_option_item" in row ? Array.isArray(row.product_option_item) ? row.product_option_item : [] : [];
@@ -424,17 +388,10 @@ function fingerprintForIdentityWithOptionKeys(x) {
 function isIdentityMatch(a, b) {
   if (a.product_id !== b.product_id || a.product_variant_id !== b.product_variant_id)
     return false;
-  if (a.identity_key || b.identity_key) {
-    if (a.identity_key && b.identity_key)
-      return a.identity_key === b.identity_key;
-    if (a.identity_key && !b.identity_key) {
-      return collectLineIdentityKeyCandidates(b).has(a.identity_key);
-    }
-    if (!a.identity_key && b.identity_key) {
-      return collectLineIdentityKeyCandidates(a).has(b.identity_key);
-    }
-    return false;
-  }
+  const aHasKey = typeof a.identity_key === "string" && a.identity_key.length > 0;
+  const bHasKey = typeof b.identity_key === "string" && b.identity_key.length > 0;
+  if (aHasKey && bHasKey)
+    return a.identity_key === b.identity_key;
   if (isSkuOnlyDeleteIdentity(a) || isSkuOnlyDeleteIdentity(b))
     return true;
   return fingerprintForIdentityWithOptionKeys(a) === fingerprintForIdentityWithOptionKeys(b);
@@ -445,39 +402,91 @@ function getProductIdentityIndex(products, identity) {
 function normalizeOrderProduct(product) {
   var _a, _b;
   const metadata = { ...product.metadata || {} };
-  if (product.identity_key && !metadata.unique_identification_number) {
-    metadata.unique_identification_number = product.identity_key;
-  }
-  const resolvedSellingPrice = product.selling_price || "0.00";
-  const resolvedOriginalPrice = product.original_price || resolvedSellingPrice;
-  if (metadata.main_product_original_price === void 0) {
-    metadata.main_product_original_price = resolvedOriginalPrice;
-  }
-  if (metadata.main_product_selling_price === void 0) {
-    metadata.main_product_selling_price = resolvedSellingPrice;
-  }
-  if (metadata.source_product_price === void 0) {
-    metadata.source_product_price = ((_a = product._origin) == null ? void 0 : _a.price) ?? ((_b = product._origin) == null ? void 0 : _b.base_price) ?? resolvedSellingPrice;
+  const resolvedIdentityKey = product.identity_key && String(product.identity_key).length > 0 ? String(product.identity_key) : (0, import_utils.createUuidV4)();
+  if (!metadata.unique_identification_number) {
+    metadata.unique_identification_number = resolvedIdentityKey;
   }
   const normalizedBundle = (product.product_bundle || []).map((item) => ({
     ...item,
     bundle_selling_price: item.bundle_selling_price ?? item.price ?? "0.00",
     custom_price: item.custom_price ?? item.bundle_selling_price ?? item.price ?? "0.00"
   }));
+  const normalizedOptions = product.product_option_item || [];
+  const optionSum = (0, import_utils.sumOptionUnitPrice)(normalizedOptions);
+  const isV2 = metadata.price_schema_version === 2 || metadata.price_schema_version === "2";
+  const variantId = Number(product.product_variant_id || 0);
+  const variantList = variantId ? (_a = metadata == null ? void 0 : metadata.origin) == null ? void 0 : _a.variant : null;
+  const variantPrice = Array.isArray(variantList) ? (_b = variantList.find((v) => Number(v == null ? void 0 : v.id) === variantId)) == null ? void 0 : _b.price : void 0;
+  const resolvedSource = (() => {
+    var _a2, _b2;
+    if (metadata.source_product_price !== void 0) {
+      return String(metadata.source_product_price);
+    }
+    if (variantPrice !== void 0 && variantPrice !== null) {
+      return String(variantPrice);
+    }
+    const originPrice = (_a2 = product._origin) == null ? void 0 : _a2.price;
+    if (originPrice !== void 0 && originPrice !== null) {
+      return String(originPrice);
+    }
+    const originBasePrice = (_b2 = product._origin) == null ? void 0 : _b2.base_price;
+    if (originBasePrice !== void 0 && originBasePrice !== null) {
+      return String(originBasePrice);
+    }
+    if (!isV2 && metadata.main_product_original_price !== void 0) {
+      return String(metadata.main_product_original_price);
+    }
+    return product.original_price ?? product.selling_price ?? "0.00";
+  })();
+  const mainOriginalDec = new import_decimal.default(Number(resolvedSource) || 0).plus(optionSum);
+  const mainOriginalStr = mainOriginalDec.toDecimalPlaces(2).toFixed(2);
+  let mainSellingDec;
+  if (isV2 && metadata.main_product_selling_price != null) {
+    mainSellingDec = new import_decimal.default(Number(metadata.main_product_selling_price) || 0);
+  } else if (metadata.main_product_selling_price != null && metadata.main_product_original_price != null) {
+    const legacyOriginal = new import_decimal.default(Number(metadata.main_product_original_price) || 0);
+    const legacySelling = new import_decimal.default(Number(metadata.main_product_selling_price) || 0);
+    const legacyDiscount = legacyOriginal.minus(legacySelling);
+    mainSellingDec = mainOriginalDec.minus(legacyDiscount);
+  } else if (product.original_price != null && product.selling_price != null && new import_decimal.default(Number(product.original_price) || 0).greaterThan(
+    new import_decimal.default(Number(product.selling_price) || 0)
+  )) {
+    const topOriginal = new import_decimal.default(Number(product.original_price) || 0);
+    const topSelling = new import_decimal.default(Number(product.selling_price) || 0);
+    const legacyDiscount = topOriginal.minus(topSelling);
+    mainSellingDec = mainOriginalDec.minus(legacyDiscount);
+  } else {
+    mainSellingDec = mainOriginalDec;
+  }
+  const mainSellingStr = mainSellingDec.toDecimalPlaces(2).toFixed(2);
+  metadata.source_product_price = resolvedSource;
+  metadata.main_product_original_price = mainOriginalStr;
+  metadata.main_product_selling_price = mainSellingStr;
+  metadata.price_schema_version = 2;
+  const composedSellingPrice = (0, import_utils.composeLinePrice)({
+    mainPrice: mainSellingStr,
+    bundle: normalizedBundle
+  });
+  const composedOriginalPrice = (0, import_utils.composeLinePrice)({
+    mainPrice: mainOriginalStr,
+    bundle: normalizedBundle,
+    useOriginalBundle: true
+  });
   return {
     order_detail_id: product.order_detail_id || null,
     product_id: product.product_id,
     num: getSafeProductNum(product.num),
     product_variant_id: product.product_variant_id,
-    identity_key: product.identity_key,
-    product_option_item: product.product_option_item || [],
-    selling_price: resolvedSellingPrice,
-    original_price: resolvedOriginalPrice,
+    identity_key: resolvedIdentityKey,
+    product_option_item: normalizedOptions,
+    selling_price: composedSellingPrice,
+    original_price: composedOriginalPrice,
     tax_fee: product.tax_fee || "0.00",
     is_charge_tax: product.is_charge_tax ?? 0,
     discount_list: product.discount_list || [],
     product_bundle: normalizedBundle,
     metadata,
+    note: product.note != null ? String(product.note) : "",
     _origin: product._origin
   };
 }
@@ -539,7 +548,7 @@ function computeResourceIsFull(params) {
         occupied += pax;
     }
   }
-  return occupied > totalCapacity;
+  return occupied >= totalCapacity;
 }
 function pickFirstCustomCapacityPaxBounds(products) {
   for (const p of products) {
@@ -600,7 +609,6 @@ function pickFirstCustomCapacityDimensionId(products) {
   buildProductKey,
   buildProductLineFingerprint,
   buildQuantityLimitIndex,
-  buildSyntheticSingleOptionIdentityKey,
   collectLinkProductIdsFromReservationRules,
   computeResourceIsFull,
   createEmptySummary,

package/lib/solution/VenueBooking/index.d.ts

@@ -2,6 +2,7 @@ import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { VenueBookingAddLogParams, VenueBookingSlotConfig, VenueDateSummaryItem, VenueSlotSelection, VenueTimeSlotGrid } from './types';
 import type { ScanOrderOrderProduct, ScanOrderOrderProductIdentity } from '../ScanOrder/types';
+import type { UpdateProductInOrderParams } from '../../modules/Order/types';
 import type { OpenDataAvailabilityResult } from '../../modules/OpenData';
 import type { ProductData } from '../../modules/Product/types';
 import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
@@ -165,11 +166,7 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     getSummary(): Promise<import("./types").ScanOrderSummary>;
     submitOrder<T = any>(): Promise<T>;
     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[]>;
     getProductList(): Promise<ProductData[]>;
     private loadOpenDataConfig;