@pisell/pisellos 2.1.129 → 2.1.131

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

@@ -1,4 +1,4 @@
-import { OrderModule, ProductList, SalesSummaryModule, ScanOrderLogInput, ScanOrderLoggerModule, ScanOrderLoggerProviderConfig, ScanOrderLoggerProviderType } from '../../modules';
+import { OrderModule, ProductList, SalesSummaryModule, ScanOrderLogInput, ScanOrderLoggerModule, ScanOrderLoggerProviderConfig, ScanOrderLoggerProviderType, ScheduleModule } from '../../modules';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 /**
  * 扫码下单流程 hook
@@ -31,26 +31,70 @@ export interface ScanOrderOrderProductIdentity {
     product_id: number | null;
     product_variant_id: number;
     identity_key?: string;
+    /** 参与合并/匹配；与 remove 通配语义见 isSkuOnlyDeleteIdentity */
+    product_option_item?: any[];
+    product_bundle?: any[];
 }
 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;
 }
@@ -114,6 +158,9 @@ export interface ScanOrderTempOrder {
     shop_discount: string;
     surcharge_fee: string;
     note: string;
+    buzzer?: string;
+    delivery_type?: string;
+    table_number?: Record<string, any>;
     schedule_date: string;
     created_at: string;
     products: ScanOrderOrderProduct[];
@@ -134,14 +181,15 @@ export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platfo
     request_unique_idempotency_token?: string;
     form_record_ids?: Array<{
         form_id: number | string;
-        form_record_ids: Array<number | string>;
+        form_record_id: number | string;
     }>;
     products: ScanOrderSubmitProduct[];
 }
-export type ScanOrderAvailabilityMode = 'idle' | 'shop_closed' | 'resource_block' | 'resource_busy' | 'additional_order_with_code' | 'additional_order';
+export type ScanOrderAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'additional_order_with_code' | 'additional_order';
 export interface ScanOrderTableFormRecord {
     policy?: string | null;
     partyroom_booking?: string | null;
+    capacity?: number | string | null;
     [key: string]: any;
 }
 export interface ScanOrderAvailabilityInfo {
@@ -151,7 +199,9 @@ export interface ScanOrderAvailabilityInfo {
     table_form_id?: string;
     deskmate_valid?: boolean;
     errorTips?: string;
-    /** `/order/dining/table/config` 返回的 `table_form_record` 原样透出 */
+    /** 透传 `availability.closed_behavior`，便于 UI 识别拦截类型（如 show_menu_disabled） */
+    closed_behavior?: string;
+    /** `/order/resource/occupy-detail` 返回的 `form_record` 原样透出 */
     table_form_record?: ScanOrderTableFormRecord | null;
     policy?: string | null;
     partyroom_booking?: string | null;
@@ -162,34 +212,36 @@ export interface ScanOrderAvailabilityInfo {
     /** 首个 `capacity.type === 'custom'` 商品里 `custom[0]` 的 max（人数上限） */
     requestPaxMax?: number;
 }
-export interface ScanOrderTableSnackConfig {
-    snack?: boolean | number | string;
-    table_validate?: boolean | number | string;
+/** `resource_capacity[i].capacity_list[j]` */
+export interface ScanOrderResourceCapacitySlot {
+    start_at?: string;
+    end_at?: string;
+    pax?: number | string;
 }
-export interface ScanOrderOrderNumberPrefixConfig {
-    table_order?: string;
-    pos?: string;
+export interface ScanOrderResourceCapacity {
+    capacity?: number | string;
+    capacity_list?: ScanOrderResourceCapacitySlot[];
 }
-export interface ScanOrderTableConfigApiData {
-    table_max_number?: number | string | null;
-    order_count?: number | string | null;
+/** `/order/resource/occupy-detail` 单条 `occupy_details[i]` */
+export interface ScanOrderResourceOccupyDetail {
+    form_record_id?: number | string | null;
+    form_id?: number | string | null;
     order_id?: number | string | null;
     last_order_id?: number | string | null;
-    relation_id?: number | string | null;
-    table_form_id?: number | string | null;
-    table_snack?: ScanOrderTableSnackConfig[] | null;
-    order_number_prefix?: ScanOrderOrderNumberPrefixConfig[] | null;
+    resource_capacity?: ScanOrderResourceCapacity[] | null;
+    form_record?: ScanOrderTableFormRecord | null;
     [key: string]: any;
 }
-export interface ScanOrderTableConfigApiResponse {
+export interface ScanOrderResourceOccupyDetailApiResponse {
     status?: boolean;
     code?: number;
     message?: string;
-    data?: ScanOrderTableConfigApiData | null;
+    data?: {
+        occupy_details?: ScanOrderResourceOccupyDetail[] | null;
+    } | null;
 }
+export type ScanOrderResourceSelectType = 'single' | 'multiple' | 'capacity';
 export interface ScanOrderResourceState extends ScanOrderAvailabilityInfo {
-    tableMaxNumber: number;
-    orderCount: number;
     relationId?: string;
     tableFormId?: string;
     currentOrderId?: string;
@@ -198,13 +250,14 @@ export interface ScanOrderResourceState extends ScanOrderAvailabilityInfo {
     deskmateValid: boolean;
     isExclusive: boolean;
     isFull: boolean;
-    orderNumberPrefix: ScanOrderOrderNumberPrefixConfig[];
-    raw: ScanOrderTableConfigApiData | null;
+    /** 来自首个预约规则商品 product_resource.resources 中与 form_id 匹配的 resource type */
+    resourceSelectType?: ScanOrderResourceSelectType;
+    raw: ScanOrderResourceOccupyDetail | null;
 }
 export interface ScanOrderState {
     entryContext: ScanOrderEntryContext | null;
     status: ScanOrderStatus;
-    config: ScanOrderTableConfigApiData | null;
+    config: Record<string, any> | null;
     resource: ScanOrderResourceState | null;
     flow: Record<string, any>;
     error: string | null;
@@ -212,6 +265,7 @@ export interface ScanOrderState {
     order?: OrderModule;
     salesSummary?: SalesSummaryModule;
     scanOrderLogger?: ScanOrderLoggerModule;
+    schedule?: ScheduleModule;
     itemRuleQuantityLimits: QuantityLimitResult[];
     cartValidation: {
         passed: boolean | null;
@@ -225,3 +279,9 @@ export interface ScanOrderLoggerRuntimeConfig {
 }
 export interface ScanOrderAddLogParams extends ScanOrderLogInput {
 }
+/** ScanOrder.scanCode 对外的轻量结果（不含 discountList，UI 在 resolve 后调 getDiscountList） */
+export interface ScanOrderScanCodeResult {
+    isAvailable: boolean;
+    type?: 'server' | string;
+    unavailableReason?: 'time_limit' | string;
+}

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

@@ -1,4 +1,4 @@
-import { ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderSummary, ScanOrderTempOrder } from './types';
+import { ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderResourceCapacitySlot, ScanOrderResourceSelectType, ScanOrderSummary, ScanOrderTempOrder } from './types';
 import type { CartItemSummary, ItemRuleBusinessData, PaxInfo, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { StrategyConfig } from '../../model/strategy/type';
 import type { ProductData } from '../../modules/Product/types';
@@ -82,9 +82,24 @@ export declare function buildItemRuleBusinessData(params: {
 }): ItemRuleBusinessData;
 export declare function attachItemRuleLimitsToTopLevelProducts<T>(productList: T, limits: QuantityLimitResult[]): T;
 /**
- * 判断两个商品 identity 是否匹配。
- * 当双方都没有 identity_key 时回退到 product_id + product_variant_id 比较（向后兼容）；
- * 一旦有一方携带 identity_key，则必须严格相等。
+ * 将选项行 / 套餐行归一成稳定 JSON，用于「同 SKU 是否合并」判断。
+ * 数组元素先按主键排序再序列化，避免顺序差异导致误判为不同行。
+ */
+export declare function buildProductLineFingerprint(productOptionItem?: unknown, productBundle?: unknown): string;
+/**
+ * removeProductFromOrder 仅传 SKU 时的通配 identity（对象上未声明选项键）。
+ * 与显式 `product_option_item: []` 区分：后者只匹配「无选项」行。
+ */
+export declare function isSkuOnlyDeleteIdentity(x: ScanOrderOrderProductIdentity): boolean;
+/**
+ * 判断两个商品 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;
 /**
@@ -93,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;
 /**
@@ -109,6 +140,18 @@ export declare function collectLinkProductIdsFromReservationRules(rules: unknown
 export declare function pickFirstDurationMinutesFromProducts(products: ProductData[]): number | undefined;
 /** 是否存在 capacity.type === 'custom' 的商品 */
 export declare function hasCustomCapacityProduct(products: ProductData[]): boolean;
+/**
+ * 根据预约规则商品的 resource.type 计算桌台是否已被"占满"。
+ * - single：只要有 `lastOrderId` 即视为占用
+ * - multiple：当前时间落在 `capacity_list[i]` 的 `[start_at, end_at]`（inclusive）内的 pax 之和 >= 总容量
+ * - 其他（'capacity' / undefined）：返回 false，不施加限制
+ */
+export declare function computeResourceIsFull(params: {
+    resourceSelectType?: ScanOrderResourceSelectType;
+    lastOrderId?: string;
+    capacityList?: ScanOrderResourceCapacitySlot[];
+    capacity?: number | string | null;
+}): boolean;
 /**
  * 在商品列表中找到第一个 `capacity.type === 'custom'` 的商品，取其 `custom` 数组第一项的 min/max。
  * 仅返回有限数字字段；若均无法解析则返回 `undefined`。
@@ -117,3 +160,8 @@ export declare function pickFirstCustomCapacityPaxBounds(products: ProductData[]
     min?: number;
     max?: number;
 } | undefined;
+/**
+ * 第一个 `capacity.type === 'custom'` 的商品，取其 `custom[0].id`（提交 booking metadata.capacity 维度 id）。
+ * 无匹配时返回 `undefined`，调用方应回退为 `0`。
+ */
+export declare function pickFirstCustomCapacityDimensionId(products: ProductData[]): string | number | undefined;

package/lib/solution/ScanOrder/utils.js

@@ -1,6 +1,8 @@
+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)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   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);
 
 // src/solution/ScanOrder/utils.ts
@@ -23,8 +33,10 @@ __export(utils_exports, {
   attachItemRuleLimitsToTopLevelProducts: () => attachItemRuleLimitsToTopLevelProducts,
   buildItemRuleBusinessData: () => buildItemRuleBusinessData,
   buildProductKey: () => buildProductKey,
+  buildProductLineFingerprint: () => buildProductLineFingerprint,
   buildQuantityLimitIndex: () => buildQuantityLimitIndex,
   collectLinkProductIdsFromReservationRules: () => collectLinkProductIdsFromReservationRules,
+  computeResourceIsFull: () => computeResourceIsFull,
   createEmptySummary: () => createEmptySummary,
   extractStrategyModelIdsFromTableConfig: () => extractStrategyModelIdsFromTableConfig,
   getProductIdentityIndex: () => getProductIdentityIndex,
@@ -33,9 +45,11 @@ __export(utils_exports, {
   getTopLevelVariantId: () => getTopLevelVariantId,
   hasCustomCapacityProduct: () => hasCustomCapacityProduct,
   isIdentityMatch: () => isIdentityMatch,
+  isSkuOnlyDeleteIdentity: () => isSkuOnlyDeleteIdentity,
   normalizeEnabledItemRuleIds: () => normalizeEnabledItemRuleIds,
   normalizeItemRuleStrategies: () => normalizeItemRuleStrategies,
   normalizeOrderProduct: () => normalizeOrderProduct,
+  pickFirstCustomCapacityDimensionId: () => pickFirstCustomCapacityDimensionId,
   pickFirstCustomCapacityPaxBounds: () => pickFirstCustomCapacityPaxBounds,
   pickFirstDurationMinutesFromProducts: () => pickFirstDurationMinutesFromProducts,
   resolveSkuMatchedQuantityLimits: () => resolveSkuMatchedQuantityLimits,
@@ -46,6 +60,9 @@ __export(utils_exports, {
   toPriceString: () => toPriceString
 });
 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,
@@ -326,12 +343,58 @@ function attachItemRuleLimitsToTopLevelProducts(productList, limits) {
   }
   return productList;
 }
+function buildProductLineFingerprint(productOptionItem, productBundle) {
+  const optArr = Array.isArray(productOptionItem) ? productOptionItem : [];
+  const normalizedOpts = optArr.map((item) => ({
+    product_option_item_id: Number(item == null ? void 0 : item.product_option_item_id) || 0,
+    option_group_id: Number(item == null ? void 0 : item.option_group_id) || 0,
+    num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+    price: String((item == null ? void 0 : item.price) ?? "")
+  })).sort((p, q) => {
+    if (p.product_option_item_id !== q.product_option_item_id) {
+      return p.product_option_item_id - q.product_option_item_id;
+    }
+    if (p.option_group_id !== q.option_group_id)
+      return p.option_group_id - q.option_group_id;
+    if (p.num !== q.num)
+      return p.num - q.num;
+    return p.price.localeCompare(q.price);
+  });
+  const bundleArr = Array.isArray(productBundle) ? productBundle : [];
+  const normalizedBundles = bundleArr.map((item) => ({
+    bundle_id: Number((item == null ? void 0 : item.bundle_id) ?? (item == null ? void 0 : item.id) ?? 0) || 0,
+    product_id: Number(item == null ? void 0 : item.product_id) || 0,
+    num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1
+  })).sort((p, q) => {
+    if (p.bundle_id !== q.bundle_id)
+      return p.bundle_id - q.bundle_id;
+    if (p.product_id !== q.product_id)
+      return p.product_id - q.product_id;
+    return p.num - q.num;
+  });
+  return JSON.stringify([normalizedOpts, normalizedBundles]);
+}
+function isSkuOnlyDeleteIdentity(x) {
+  if (x.identity_key)
+    return false;
+  return !("product_option_item" in x) && !("product_bundle" in x);
+}
+function fingerprintForIdentityWithOptionKeys(x) {
+  const row = x;
+  const opts = "product_option_item" in row ? Array.isArray(row.product_option_item) ? row.product_option_item : [] : [];
+  const buds = "product_bundle" in row ? Array.isArray(row.product_bundle) ? row.product_bundle : [] : [];
+  return buildProductLineFingerprint(opts, buds);
+}
 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)
+  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 a.identity_key === b.identity_key;
+  return fingerprintForIdentityWithOptionKeys(a) === fingerprintForIdentityWithOptionKeys(b);
 }
 function getProductIdentityIndex(products, identity) {
   return products.findIndex((item) => isIdentityMatch(item, identity));
@@ -339,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
   };
 }
@@ -411,6 +526,30 @@ function hasCustomCapacityProduct(products) {
     return ((_a = p == null ? void 0 : p.capacity) == null ? void 0 : _a.type) === "custom";
   });
 }
+function computeResourceIsFull(params) {
+  const { resourceSelectType, lastOrderId, capacityList, capacity } = params;
+  if (resourceSelectType === "single")
+    return Boolean(lastOrderId);
+  if (resourceSelectType !== "multiple")
+    return false;
+  const totalCapacity = Number(capacity);
+  if (!Number.isFinite(totalCapacity) || totalCapacity <= 0)
+    return false;
+  const now = (0, import_dayjs.default)();
+  let occupied = 0;
+  for (const slot of capacityList || []) {
+    const start = (0, import_dayjs.default)(slot == null ? void 0 : slot.start_at);
+    const end = (0, import_dayjs.default)(slot == null ? void 0 : slot.end_at);
+    if (!start.isValid() || !end.isValid())
+      continue;
+    if ((now.isAfter(start) || now.isSame(start)) && (now.isBefore(end) || now.isSame(end))) {
+      const pax = Number(slot == null ? void 0 : slot.pax);
+      if (Number.isFinite(pax) && pax > 0)
+        occupied += pax;
+    }
+  }
+  return occupied >= totalCapacity;
+}
 function pickFirstCustomCapacityPaxBounds(products) {
   for (const p of products) {
     const cap = p == null ? void 0 : p.capacity;
@@ -438,14 +577,40 @@ function pickFirstCustomCapacityPaxBounds(products) {
   }
   return void 0;
 }
+function pickFirstCustomCapacityDimensionId(products) {
+  for (const p of products) {
+    const cap = p == null ? void 0 : p.capacity;
+    if (!cap || cap.type !== "custom")
+      continue;
+    if (!Array.isArray(cap.custom) || cap.custom.length === 0)
+      continue;
+    const row = cap.custom[0];
+    if (!row || typeof row !== "object")
+      continue;
+    const id = row.id;
+    if (id === null || id === void 0 || id === "")
+      continue;
+    if (typeof id === "number" && Number.isFinite(id))
+      return id;
+    if (typeof id === "string") {
+      const trimmed = id.trim();
+      if (!trimmed)
+        continue;
+      return trimmed;
+    }
+  }
+  return void 0;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   aggregateItemRuleLimit,
   attachItemRuleLimitsToTopLevelProducts,
   buildItemRuleBusinessData,
   buildProductKey,
+  buildProductLineFingerprint,
   buildQuantityLimitIndex,
   collectLinkProductIdsFromReservationRules,
+  computeResourceIsFull,
   createEmptySummary,
   extractStrategyModelIdsFromTableConfig,
   getProductIdentityIndex,
@@ -454,9 +619,11 @@ function pickFirstCustomCapacityPaxBounds(products) {
   getTopLevelVariantId,
   hasCustomCapacityProduct,
   isIdentityMatch,
+  isSkuOnlyDeleteIdentity,
   normalizeEnabledItemRuleIds,
   normalizeItemRuleStrategies,
   normalizeOrderProduct,
+  pickFirstCustomCapacityDimensionId,
   pickFirstCustomCapacityPaxBounds,
   pickFirstDurationMinutesFromProducts,
   resolveSkuMatchedQuantityLimits,