@pisell/pisellos 0.0.509 → 0.0.511

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

@@ -31,6 +31,9 @@ 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;
@@ -45,8 +48,22 @@ export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     discount_list: any[];
     product_bundle: any[];
     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，

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

@@ -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;
 /**

package/lib/solution/ScanOrder/utils.js

@@ -33,6 +33,7 @@ __export(utils_exports, {
   attachItemRuleLimitsToTopLevelProducts: () => attachItemRuleLimitsToTopLevelProducts,
   buildItemRuleBusinessData: () => buildItemRuleBusinessData,
   buildProductKey: () => buildProductKey,
+  buildProductLineFingerprint: () => buildProductLineFingerprint,
   buildQuantityLimitIndex: () => buildQuantityLimitIndex,
   collectLinkProductIdsFromReservationRules: () => collectLinkProductIdsFromReservationRules,
   computeResourceIsFull: () => computeResourceIsFull,
@@ -44,6 +45,7 @@ __export(utils_exports, {
   getTopLevelVariantId: () => getTopLevelVariantId,
   hasCustomCapacityProduct: () => hasCustomCapacityProduct,
   isIdentityMatch: () => isIdentityMatch,
+  isSkuOnlyDeleteIdentity: () => isSkuOnlyDeleteIdentity,
   normalizeEnabledItemRuleIds: () => normalizeEnabledItemRuleIds,
   normalizeItemRuleStrategies: () => normalizeItemRuleStrategies,
   normalizeOrderProduct: () => normalizeOrderProduct,
@@ -59,6 +61,7 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
+var import_utils = require("../../modules/Order/utils");
 function createEmptySummary() {
   return {
     product_quantity: 0,
@@ -339,12 +342,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));
@@ -352,8 +401,9 @@ 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 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 resolvedSellingPrice = product.selling_price || "0.00";
   const resolvedOriginalPrice = product.original_price || resolvedSellingPrice;
@@ -376,7 +426,7 @@ function normalizeOrderProduct(product) {
     product_id: product.product_id,
     num: getSafeProductNum(product.num),
     product_variant_id: product.product_variant_id,
-    identity_key: product.identity_key,
+    identity_key: resolvedIdentityKey,
     product_option_item: product.product_option_item || [],
     selling_price: resolvedSellingPrice,
     original_price: resolvedOriginalPrice,
@@ -385,6 +435,7 @@ function normalizeOrderProduct(product) {
     discount_list: product.discount_list || [],
     product_bundle: normalizedBundle,
     metadata,
+    note: product.note != null ? String(product.note) : "",
     _origin: product._origin
   };
 }
@@ -505,6 +556,7 @@ function pickFirstCustomCapacityDimensionId(products) {
   attachItemRuleLimitsToTopLevelProducts,
   buildItemRuleBusinessData,
   buildProductKey,
+  buildProductLineFingerprint,
   buildQuantityLimitIndex,
   collectLinkProductIdsFromReservationRules,
   computeResourceIsFull,
@@ -516,6 +568,7 @@ function pickFirstCustomCapacityDimensionId(products) {
   getTopLevelVariantId,
   hasCustomCapacityProduct,
   isIdentityMatch,
+  isSkuOnlyDeleteIdentity,
   normalizeEnabledItemRuleIds,
   normalizeItemRuleStrategies,
   normalizeOrderProduct,

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;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.509",
+  "version": "0.0.511",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",