@pisell/pisellos 2.2.282 → 2.2.284

package/lib/modules/Order/payment-utils.js

@@ -1,84 +1,62 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/modules/Order/payment-utils.ts
-var payment_utils_exports = {};
-__export(payment_utils_exports, {
-  ensureOrderPaymentNumber: () => ensureOrderPaymentNumber,
-  getOrderPaymentIdentityKeys: () => getOrderPaymentIdentityKeys,
-  hasOrderPaymentIdentityOverlap: () => hasOrderPaymentIdentityOverlap,
-  isIdentifiedPendingOrderPayment: () => isIdentifiedPendingOrderPayment,
-  isPendingOrderPayment: () => isPendingOrderPayment,
-  mergeOrderPaymentListsByIdentity: () => mergeOrderPaymentListsByIdentity,
-  mergeOrderPaymentRecord: () => mergeOrderPaymentRecord,
-  mergeOrderPaymentSnapshot: () => mergeOrderPaymentSnapshot,
-  mergeOrderPaymentTransactions: () => mergeOrderPaymentTransactions,
-  resolveOrderPaymentIdentity: () => resolveOrderPaymentIdentity
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(payment_utils_exports);
-var PAYMENT_IDENTITY_TYPES = [
-  "payment_number",
-  "order_payment_id",
-  "unique_payment_number"
-];
+exports.ensureOrderPaymentNumber = ensureOrderPaymentNumber;
+exports.getOrderPaymentIdentityKeys = getOrderPaymentIdentityKeys;
+exports.hasOrderPaymentIdentityOverlap = hasOrderPaymentIdentityOverlap;
+exports.isIdentifiedPendingOrderPayment = isIdentifiedPendingOrderPayment;
+exports.isPendingOrderPayment = isPendingOrderPayment;
+exports.mergeOrderPaymentListsByIdentity = mergeOrderPaymentListsByIdentity;
+exports.mergeOrderPaymentRecord = mergeOrderPaymentRecord;
+exports.mergeOrderPaymentSnapshot = mergeOrderPaymentSnapshot;
+exports.mergeOrderPaymentTransactions = mergeOrderPaymentTransactions;
+exports.resolveOrderPaymentIdentity = resolveOrderPaymentIdentity;
+const PAYMENT_IDENTITY_TYPES = ['payment_number', 'order_payment_id', 'unique_payment_number'];
 function normalizePaymentIdentityValue(value) {
-  if (value === void 0 || value === null || value === "")
-    return null;
+  if (value === undefined || value === null || value === '') return null;
   return String(value);
 }
 function getPaymentIdentityValue(payment, type) {
-  var _a;
-  if (type === "unique_payment_number") {
-    return (_a = payment == null ? void 0 : payment.metadata) == null ? void 0 : _a.unique_payment_number;
+  if (type === 'unique_payment_number') {
+    return payment?.metadata?.unique_payment_number;
   }
-  return payment == null ? void 0 : payment[type];
+  return payment?.[type];
 }
 function getOrderPaymentIdentityKeys(payment) {
   const record = payment;
-  if (!record)
-    return [];
-  return PAYMENT_IDENTITY_TYPES.flatMap((type) => {
+  if (!record) return [];
+  return PAYMENT_IDENTITY_TYPES.flatMap(type => {
     const value = normalizePaymentIdentityValue(getPaymentIdentityValue(record, type));
     return value === null ? [] : [`${type}:${value}`];
   });
 }
 function isPendingOrderPayment(payment) {
   const record = payment;
-  return String((record == null ? void 0 : record.status) || "").toLowerCase() === "payment_pending";
+  return String(record?.status || '').toLowerCase() === 'payment_pending';
 }
 function isIdentifiedPendingOrderPayment(payment) {
   return isPendingOrderPayment(payment) && getOrderPaymentIdentityKeys(payment).length > 0;
 }
 function hasOrderPaymentIdentityOverlap(left, right) {
   const leftKeys = new Set(getOrderPaymentIdentityKeys(left));
-  if (leftKeys.size === 0)
-    return false;
-  return getOrderPaymentIdentityKeys(right).some((key) => leftKeys.has(key));
+  if (leftKeys.size === 0) return false;
+  return getOrderPaymentIdentityKeys(right).some(key => leftKeys.has(key));
 }
-function resolveOrderPaymentIdentity(payments, identity, mode = "payment_number") {
+function resolveOrderPaymentIdentity(payments, identity, mode = 'payment_number') {
   const target = String(identity);
-  const identityTypes = mode === "payment_number" ? ["payment_number"] : PAYMENT_IDENTITY_TYPES;
-  const matchesByIndex = /* @__PURE__ */ new Map();
+  const identityTypes = mode === 'payment_number' ? ['payment_number'] : PAYMENT_IDENTITY_TYPES;
+  const matchesByIndex = new Map();
   for (const type of identityTypes) {
     (payments || []).forEach((payment, index) => {
       const value = normalizePaymentIdentityValue(getPaymentIdentityValue(payment, type));
       if (value === target && !matchesByIndex.has(index)) {
-        matchesByIndex.set(index, { index, payment, matchedBy: type });
+        matchesByIndex.set(index, {
+          index,
+          payment,
+          matchedBy: type
+        });
       }
     });
   }
@@ -90,26 +68,32 @@ function resolveOrderPaymentIdentity(payments, identity, mode = "payment_number"
 }
 function ensureOrderPaymentNumber(payment, devicePrefix, createPaymentNumber) {
   const existing = normalizePaymentIdentityValue(payment.payment_number);
-  if (existing)
-    return { ...payment, payment_number: existing };
+  if (existing) return {
+    ...payment,
+    payment_number: existing
+  };
   const uuid = normalizePaymentIdentityValue(payment.uuid) || createPaymentNumber();
-  const prefix = normalizePaymentIdentityValue(devicePrefix) || "LOCAL";
-  return { ...payment, payment_number: `${prefix}_${uuid}` };
+  const prefix = normalizePaymentIdentityValue(devicePrefix) || 'LOCAL';
+  // TODO: 使用 ID Generator 替换当前 UUID 段生成器。
+  return {
+    ...payment,
+    payment_number: `${prefix}_${uuid}`
+  };
 }
 function mergeOrderPaymentTransactions(current, incoming) {
-  const records = /* @__PURE__ */ new Map();
-  const append = (value) => {
-    if (!Array.isArray(value))
-      return;
-    value.forEach((item) => {
-      const number = item && typeof item === "object" ? String(item.number || "") : "";
-      const status = item && typeof item === "object" ? item.status : void 0;
-      if (!number || status !== "success" && status !== "fail")
-        return;
+  const records = new Map();
+  const append = value => {
+    if (!Array.isArray(value)) return;
+    value.forEach(item => {
+      const number = item && typeof item === 'object' ? String(item.number || '') : '';
+      const status = item && typeof item === 'object' ? item.status : undefined;
+      if (!number || status !== 'success' && status !== 'fail') return;
       const previous = records.get(number);
-      if ((previous == null ? void 0 : previous.status) === "success" && status === "fail")
-        return;
-      records.set(number, { number, status });
+      if (previous?.status === 'success' && status === 'fail') return;
+      records.set(number, {
+        number,
+        status
+      });
     });
   };
   append(current);
@@ -119,12 +103,9 @@ function mergeOrderPaymentTransactions(current, incoming) {
 function mergeOrderPaymentRecord(payment, updates) {
   const currentMetadata = payment.metadata || {};
   const incomingMetadata = updates.metadata || {};
-  const transactions = mergeOrderPaymentTransactions(
-    currentMetadata.transactions,
-    incomingMetadata.transactions
-  );
-  const currentPaid = payment.status === "paid";
-  const nextStatus = currentPaid && updates.status !== "paid" ? "paid" : updates.status ?? payment.status;
+  const transactions = mergeOrderPaymentTransactions(currentMetadata.transactions, incomingMetadata.transactions);
+  const currentPaid = payment.status === 'paid';
+  const nextStatus = currentPaid && updates.status !== 'paid' ? 'paid' : updates.status ?? payment.status;
   return {
     ...payment,
     ...updates,
@@ -133,30 +114,21 @@ function mergeOrderPaymentRecord(payment, updates) {
     metadata: {
       ...currentMetadata,
       ...incomingMetadata,
-      ...transactions.length > 0 || Array.isArray(incomingMetadata.transactions) ? { transactions } : {}
+      ...(transactions.length > 0 || Array.isArray(incomingMetadata.transactions) ? {
+        transactions
+      } : {})
     }
   };
 }
 function mergeOrderPaymentSnapshot(current, incoming) {
   const currentMetadata = current.metadata || {};
   const incomingMetadata = incoming.metadata || {};
-  const currentUniquePaymentNumber = normalizePaymentIdentityValue(
-    currentMetadata.unique_payment_number
-  );
-  const incomingUniquePaymentNumber = normalizePaymentIdentityValue(
-    incomingMetadata.unique_payment_number
-  );
-  const incomingOrderPaymentId = normalizePaymentIdentityValue(
-    incoming.order_payment_id
-  );
+  const currentUniquePaymentNumber = normalizePaymentIdentityValue(currentMetadata.unique_payment_number);
+  const incomingUniquePaymentNumber = normalizePaymentIdentityValue(incomingMetadata.unique_payment_number);
+  const incomingOrderPaymentId = normalizePaymentIdentityValue(incoming.order_payment_id);
   const incomingFallbackPrefix = incomingOrderPaymentId ? `os-fallback:payment:order-payment:${incomingOrderPaymentId}` : null;
-  const incomingUsesDerivedUniquePaymentNumber = Boolean(
-    incomingUniquePaymentNumber && incomingFallbackPrefix && (incomingUniquePaymentNumber === incomingFallbackPrefix || incomingUniquePaymentNumber.startsWith(`${incomingFallbackPrefix}:conflict:`))
-  );
-  const transactions = mergeOrderPaymentTransactions(
-    currentMetadata.transactions,
-    incomingMetadata.transactions
-  );
+  const incomingUsesDerivedUniquePaymentNumber = Boolean(incomingUniquePaymentNumber && incomingFallbackPrefix && (incomingUniquePaymentNumber === incomingFallbackPrefix || incomingUniquePaymentNumber.startsWith(`${incomingFallbackPrefix}:conflict:`)));
+  const transactions = mergeOrderPaymentTransactions(currentMetadata.transactions, incomingMetadata.transactions);
   return {
     ...current,
     ...incoming,
@@ -165,8 +137,12 @@ function mergeOrderPaymentSnapshot(current, incoming) {
     metadata: {
       ...currentMetadata,
       ...incomingMetadata,
-      ...incomingUsesDerivedUniquePaymentNumber && currentUniquePaymentNumber ? { unique_payment_number: currentUniquePaymentNumber } : {},
-      ...transactions.length > 0 ? { transactions } : {}
+      ...(incomingUsesDerivedUniquePaymentNumber && currentUniquePaymentNumber ? {
+        unique_payment_number: currentUniquePaymentNumber
+      } : {}),
+      ...(transactions.length > 0 ? {
+        transactions
+      } : {})
     }
   };
 }
@@ -191,34 +167,15 @@ function compactOrderPaymentList(payments) {
   return result;
 }
 function mergeOrderPaymentListsByIdentity(existing, incoming, options = {}) {
-  const existingList = compactOrderPaymentList([...existing || []]);
-  const incomingList = compactOrderPaymentList([...incoming || []]);
+  const existingList = compactOrderPaymentList([...(existing || [])]);
+  const incomingList = compactOrderPaymentList([...(incoming || [])]);
   if (options.preserveUnmatchedExisting) {
     return compactOrderPaymentList([...existingList, ...incomingList]);
   }
-  const mergedIncoming = incomingList.map((incomingPayment) => {
-    const matchingExisting = existingList.filter((existingPayment) => hasOrderPaymentIdentityOverlap(existingPayment, incomingPayment));
-    return matchingExisting.reduce(
-      (merged, existingPayment) => mergeOrderPaymentSnapshot(existingPayment, merged),
-      incomingPayment
-    );
+  const mergedIncoming = incomingList.map(incomingPayment => {
+    const matchingExisting = existingList.filter(existingPayment => hasOrderPaymentIdentityOverlap(existingPayment, incomingPayment));
+    return matchingExisting.reduce((merged, existingPayment) => mergeOrderPaymentSnapshot(existingPayment, merged), incomingPayment);
   });
-  const preservedExisting = options.preserveUnmatchedExistingWhen ? existingList.filter((existingPayment) => {
-    var _a;
-    return !incomingList.some((incomingPayment) => hasOrderPaymentIdentityOverlap(existingPayment, incomingPayment)) && ((_a = options.preserveUnmatchedExistingWhen) == null ? void 0 : _a.call(options, existingPayment));
-  }) : [];
+  const preservedExisting = options.preserveUnmatchedExistingWhen ? existingList.filter(existingPayment => !incomingList.some(incomingPayment => hasOrderPaymentIdentityOverlap(existingPayment, incomingPayment)) && options.preserveUnmatchedExistingWhen?.(existingPayment)) : [];
   return compactOrderPaymentList([...mergedIncoming, ...preservedExisting]);
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ensureOrderPaymentNumber,
-  getOrderPaymentIdentityKeys,
-  hasOrderPaymentIdentityOverlap,
-  isIdentifiedPendingOrderPayment,
-  isPendingOrderPayment,
-  mergeOrderPaymentListsByIdentity,
-  mergeOrderPaymentRecord,
-  mergeOrderPaymentSnapshot,
-  mergeOrderPaymentTransactions,
-  resolveOrderPaymentIdentity
-});
+}

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

@@ -328,6 +328,8 @@ export type AddProductBookingInput = Record<string, any>;
  */
 export interface AddProductToOrderOptions {
     insertAfterProductUid?: string;
+    /** 跳过同商品/规格匹配，始终新增购物车行。 */
+    disableMerge?: boolean;
 }
 /**
  * 删除商品后的可选位置保持策略。
@@ -819,7 +821,7 @@ export interface OrderModuleAPI {
     saveDraft: () => Promise<void>;
     hydrateTempOrderFromRecord: (record: Record<string, any>, options?: {
         recalcOnHydrate?: boolean;
-        source?: 'salesDetail' | 'sessionStorage';
+        source?: 'salesDetail' | 'mergedSalesDetail' | 'sessionStorage';
     }) => Promise<OrderTempOrder>;
     syncPaymentsToOrder: <T = any>(params: SyncPaymentsToOrderParams) => Promise<SyncPaymentsToOrderResult<T>>;
     getSalesOrderByLookup: (params: SalesOrderLookupParams) => Promise<any>;

package/lib/modules/Order/types.js

@@ -1,37 +1,89 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/modules/Order/types.ts
-var types_exports = {};
-__export(types_exports, {
-  OrderHooks: () => OrderHooks
-});
-module.exports = __toCommonJS(types_exports);
-var OrderHooks = /* @__PURE__ */ ((OrderHooks2) => {
-  OrderHooks2["OnOrderCreate"] = "order:onOrderCreate";
-  OrderHooks2["OnOrderUpdate"] = "order:onOrderUpdate";
-  OrderHooks2["OnOrderCancel"] = "order:onOrderCancel";
-  OrderHooks2["OnOrderStatusChange"] = "order:onOrderStatusChange";
-  OrderHooks2["OnOrderCustomerChange"] = "order:onOrderCustomerChange";
-  OrderHooks2["OnPromotionApplied"] = "order:onPromotionApplied";
-  return OrderHooks2;
-})(OrderHooks || {});
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  OrderHooks
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
+exports.OrderHooks = void 0;
+let OrderHooks = exports.OrderHooks = /*#__PURE__*/function (OrderHooks) {
+  OrderHooks["OnOrderCreate"] = "order:onOrderCreate";
+  OrderHooks["OnOrderUpdate"] = "order:onOrderUpdate";
+  OrderHooks["OnOrderCancel"] = "order:onOrderCancel";
+  OrderHooks["OnOrderStatusChange"] = "order:onOrderStatusChange";
+  OrderHooks["OnOrderCustomerChange"] = "order:onOrderCustomerChange";
+  OrderHooks["OnPromotionApplied"] = "order:onPromotionApplied";
+  return OrderHooks;
+}({});
+/**
+ * 促销评估器协议（OS 与 PromotionEvaluator 之间的桥接接口）。
+ *
+ * 与 `pisell_os/src/model/strategy/adapter/promotion/evaluator.ts` 中的
+ * `PromotionEvaluator` 实例结构保持兼容。SalesSdkProvider 会从 `appHelper.utils.promotionEvaluator`
+ * 读取实例并通过 `setPromotionEvaluator` 注入到 OrderModule。
+ *
+ * 这里只声明 OrderModule 需要调用的子集，避免反向依赖具体 evaluator 实现。
+ */
+/** 赠品解析回调 context（OS → SDK 的请求体） */
+/**
+ * 赠品 resolver 返回值。
+ *
+ * @example
+ * return { products: [giftProduct], bookings: [giftBooking] };
+ */
+/**
+ * 赠品解析回调签名（SDK → OS 的返回值）。
+ *
+ * - 单选项：SDK 内部自动构造商品，不弹窗
+ * - 多选项：SDK 弹窗等用户确认后构造
+ * - 用户取消：抛错或返回空数组（OS 视为放弃本次添加）
+ *
+ * 返回数组时沿用旧协议，只写 tempOrder.products；返回对象时可同时写入预约 bookings。
+ */
+/** 未满足的促销策略（购物车底部 alert 渲染源） */
+/** 上一次 applyPromotion 计算出的赠品操作（仅供调试/读取使用） */
+/** onPromotionApplied 事件 payload */
+/**
+ * tempOrder 上的下单客户协议字段视图。
+ * 这些字段会随订单提交到后端。
+ *
+ * customer_id 与 OrderTempOrder.customer_id 保持一致（number | null），
+ * 调用方若持有 string id（如 ICustomer.id 联合类型），需自行 Number() 转型。
+ */
+/**
+ * 写入下单客户的协议字段输入。
+ * `customer_id` 必传（null 表示无客户）；其余字段缺省视为「清空」（全量覆盖语义）。
+ */
+/**
+ * 下单客户变更事件 payload。
+ * - `patch`：tempOrder 上的协议字段视图（会随订单提交）
+ * - `snapshot`：UI 富字段快照（仅本地，不随订单提交）
+ * 清空时整个 payload 为 null。
+ */
+/**
+ * 添加商品行时的顺序控制。
+ * 默认追加到 products 尾部；预约数量同步可插入到既有预约组的最新行之后，
+ * 避免步进器修改数量改变该组展示位置。
+ */
+/**
+ * 删除商品后的可选位置保持策略。
+ * 预约合并行减量时仍删除最新真实行，再把剩余代表行移动到被删除代表行原位置。
+ */
+/** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 unique_identification_number / 选项指纹等 */
+/** 仅更新购物车行数量；行定位语义与 updateOrderProduct / removeProductFromOrder 保持一致 */
+/**
+ * 订单信息
+ */
+/**
+ * 支付项数据
+ */
+/**
+ * Checkout 专用订单创建参数
+ */
+/**
+ * 取消订单参数
+ */
+/**
+ * 变更预约状态参数
+ */
+/**
+ * 订单模块 API
+ */

package/lib/modules/Order/utils/bundleDiscountHydration.js

@@ -1,99 +1,72 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/modules/Order/utils/bundleDiscountHydration.ts
-var bundleDiscountHydration_exports = {};
-__export(bundleDiscountHydration_exports, {
-  expandHydratedProductsForDiscountCollection: () => expandHydratedProductsForDiscountCollection,
-  restoreHydratedBundleDiscounts: () => restoreHydratedBundleDiscounts
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(bundleDiscountHydration_exports);
-var BUNDLE_MAP_ID_KEY = "custom_product_bundle_map_id";
+exports.expandHydratedProductsForDiscountCollection = expandHydratedProductsForDiscountCollection;
+exports.restoreHydratedBundleDiscounts = restoreHydratedBundleDiscounts;
+const BUNDLE_MAP_ID_KEY = 'custom_product_bundle_map_id';
 function getBundleMapId(bundle) {
-  var _a;
-  const metadataMapId = (_a = bundle == null ? void 0 : bundle.metadata) == null ? void 0 : _a[BUNDLE_MAP_ID_KEY];
-  if (metadataMapId !== void 0 && metadataMapId !== null && metadataMapId !== "") {
+  const metadataMapId = bundle?.metadata?.[BUNDLE_MAP_ID_KEY];
+  if (metadataMapId !== undefined && metadataMapId !== null && metadataMapId !== '') {
     return String(metadataMapId);
   }
-  if ((bundle == null ? void 0 : bundle._id) !== void 0 && bundle._id !== null && bundle._id !== "") {
+  if (bundle?._id !== undefined && bundle._id !== null && bundle._id !== '') {
     return String(bundle._id);
   }
   return null;
 }
 function getDiscountBundleMapId(discount) {
-  var _a;
-  const mapId = (_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a[BUNDLE_MAP_ID_KEY];
-  if (mapId === void 0 || mapId === null || mapId === "")
-    return null;
+  const mapId = discount?.metadata?.[BUNDLE_MAP_ID_KEY];
+  if (mapId === undefined || mapId === null || mapId === '') return null;
   return String(mapId);
 }
 function hasSameBundleDiscount(discountList, discount) {
-  var _a;
   const targetOrderDiscountId = discount.order_discount_id;
-  if (targetOrderDiscountId !== void 0 && targetOrderDiscountId !== null) {
-    return discountList.some((item) => (item == null ? void 0 : item.order_discount_id) === targetOrderDiscountId);
+  if (targetOrderDiscountId !== undefined && targetOrderDiscountId !== null) {
+    return discountList.some(item => item?.order_discount_id === targetOrderDiscountId);
   }
-  const targetResourceId = ((_a = discount == null ? void 0 : discount.discount) == null ? void 0 : _a.resource_id) ?? (discount == null ? void 0 : discount.resource_id) ?? (discount == null ? void 0 : discount.discount_id);
+  const targetResourceId = discount?.discount?.resource_id ?? discount?.resource_id ?? discount?.discount_id;
   const targetMapId = getDiscountBundleMapId(discount);
-  return discountList.some((item) => {
-    var _a2;
-    const resourceId = ((_a2 = item == null ? void 0 : item.discount) == null ? void 0 : _a2.resource_id) ?? (item == null ? void 0 : item.resource_id) ?? (item == null ? void 0 : item.discount_id);
-    return resourceId === targetResourceId && String((item == null ? void 0 : item.amount) ?? "") === String((discount == null ? void 0 : discount.amount) ?? "") && getDiscountBundleMapId(item) === targetMapId;
+  return discountList.some(item => {
+    const resourceId = item?.discount?.resource_id ?? item?.resource_id ?? item?.discount_id;
+    return resourceId === targetResourceId && String(item?.amount ?? '') === String(discount?.amount ?? '') && getDiscountBundleMapId(item) === targetMapId;
   });
 }
 function restoreHydratedBundleDiscounts(product, normalizeDiscountList) {
   if (!Array.isArray(product.product_bundle) || !Array.isArray(product.discount_list)) {
     return product;
   }
-  const bundleByMapId = /* @__PURE__ */ new Map();
-  product.product_bundle.forEach((bundle) => {
-    if (!bundle || typeof bundle !== "object")
-      return;
+  const bundleByMapId = new Map();
+  product.product_bundle.forEach(bundle => {
+    if (!bundle || typeof bundle !== 'object') return;
     const mapId = getBundleMapId(bundle);
-    if (mapId)
-      bundleByMapId.set(mapId, bundle);
+    if (mapId) bundleByMapId.set(mapId, bundle);
   });
-  if (!bundleByMapId.size)
-    return product;
+  if (!bundleByMapId.size) return product;
   const mainDiscountList = [];
   const bundleDiscounts = [];
-  product.discount_list.forEach((discount) => {
+  product.discount_list.forEach(discount => {
     const mapId = getDiscountBundleMapId(discount);
     if (mapId && bundleByMapId.has(mapId)) {
-      bundleDiscounts.push({ mapId, discount });
+      bundleDiscounts.push({
+        mapId,
+        discount
+      });
     } else {
       mainDiscountList.push(discount);
     }
   });
-  if (!bundleDiscounts.length)
-    return product;
+  if (!bundleDiscounts.length) return product;
   return {
     ...product,
     discount_list: normalizeDiscountList(mainDiscountList),
-    product_bundle: product.product_bundle.map((bundle) => {
-      if (!bundle || typeof bundle !== "object")
-        return bundle;
+    product_bundle: product.product_bundle.map(bundle => {
+      if (!bundle || typeof bundle !== 'object') return bundle;
       const mapId = getBundleMapId(bundle);
-      if (!mapId)
-        return bundle;
-      const matchedDiscounts = bundleDiscounts.filter((item) => item.mapId === mapId).map((item) => item.discount);
-      if (!matchedDiscounts.length)
-        return bundle;
+      if (!mapId) return bundle;
+      const matchedDiscounts = bundleDiscounts.filter(item => item.mapId === mapId).map(item => item.discount);
+      if (!matchedDiscounts.length) return bundle;
       const currentDiscountList = Array.isArray(bundle.discount_list) ? [...bundle.discount_list] : [];
       for (const discount of matchedDiscounts) {
         if (!hasSameBundleDiscount(currentDiscountList, discount)) {
@@ -104,7 +77,7 @@ function restoreHydratedBundleDiscounts(product, normalizeDiscountList) {
         ...bundle,
         discount_list: normalizeDiscountList(currentDiscountList),
         metadata: {
-          ...bundle.metadata || {},
+          ...(bundle.metadata || {}),
           [BUNDLE_MAP_ID_KEY]: mapId
         }
       };
@@ -115,25 +88,19 @@ function expandHydratedProductsForDiscountCollection(products) {
   const expanded = [];
   for (const product of products || []) {
     expanded.push(product);
-    for (const bundle of (product == null ? void 0 : product.product_bundle) || []) {
-      if (!Array.isArray(bundle == null ? void 0 : bundle.discount_list) || bundle.discount_list.length === 0)
-        continue;
+    for (const bundle of product?.product_bundle || []) {
+      if (!Array.isArray(bundle?.discount_list) || bundle.discount_list.length === 0) continue;
       expanded.push({
         ...product,
-        product_id: bundle.bundle_product_id ?? bundle._bundle_product_id ?? bundle.product_id ?? (product == null ? void 0 : product.product_id),
-        num: bundle.num ?? bundle.quantity ?? (product == null ? void 0 : product.num),
-        product_quantity: bundle.quantity ?? bundle.num ?? (product == null ? void 0 : product.product_quantity),
+        product_id: bundle.bundle_product_id ?? bundle._bundle_product_id ?? bundle.product_id ?? product?.product_id,
+        num: bundle.num ?? bundle.quantity ?? product?.num,
+        product_quantity: bundle.quantity ?? bundle.num ?? product?.product_quantity,
         original_price: bundle.original_price ?? bundle.product_price ?? bundle.price,
         selling_price: bundle.bundle_selling_price ?? bundle.price,
-        is_charge_tax: bundle.is_charge_tax ?? (product == null ? void 0 : product.is_charge_tax),
+        is_charge_tax: bundle.is_charge_tax ?? product?.is_charge_tax,
         discount_list: bundle.discount_list
       });
     }
   }
   return expanded;
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  expandHydratedProductsForDiscountCollection,
-  restoreHydratedBundleDiscounts
-});
+}