@pisell/pisellos 0.0.510 → 0.0.511

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,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,
@@ -378,43 +378,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 +387,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,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;
@@ -469,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,
@@ -478,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
   };
 }
@@ -600,7 +558,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;

package/package.json

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