@pisell/pisellos 2.2.261 → 2.2.262

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

@@ -198,6 +198,7 @@ export interface OrderProduct extends OrderProductIdentity {
     product_bundle: any[];
     booking_uid?: string;
     product_title?: OrderLocalizedText;
+    product_cover?: string;
     metadata: Record<string, any>;
     note?: string;
 }
@@ -308,6 +309,7 @@ export interface OrderState {
     lastOrderInfo?: Record<string, any>;
     syncState?: OrderSyncState;
     discountList: any[];
+    availableWalletIds?: number[];
     discount: DiscountModule | null;
     rules: RulesModule | null;
 }
@@ -340,6 +342,19 @@ export interface UpdateOrderProductParams {
      * });
      */
     allow_booking_reprice?: boolean;
+    /**
+     * Change time 重报价后，允许当前预约商品行重新应用已选编辑态折扣卡。
+     *
+     * @example
+     * await order.updateOrderProduct({
+     *   product_id: 1,
+     *   product_variant_id: 0,
+     *   updates: { discount_list: [] },
+     *   booking: { duration: 2 },
+     *   allow_booking_discount_reapply: true,
+     * });
+     */
+    allow_booking_discount_reapply?: boolean;
 }
 /** 仅更新购物车行数量；行定位语义与 updateOrderProduct / removeProductFromOrder 保持一致 */
 export interface UpdateOrderProductQuantityParams extends OrderProductIdentity {
@@ -761,6 +776,7 @@ export interface OrderModuleAPI {
         apply?: boolean;
     }) => Promise<Discount[]>;
     getDiscountList: () => Discount[];
+    getAvailableWalletIds: () => number[];
     applyDiscount: () => void;
     /**
      * 注入促销评估器。

package/dist/modules/Order/utils/orderCollectionIdentity.d.ts

@@ -0,0 +1,53 @@
+export type OrderCollectionKind = 'product' | 'booking' | 'payment';
+export interface OrderCollectionIdentityStats {
+    backfilledUidCount: number;
+    collapsedDuplicateCount: number;
+    uidConflictCount: number;
+    anonymousRowCount: number;
+}
+export interface OrderCollectionUidRemap {
+    kind: OrderCollectionKind;
+    from: string;
+    to: string;
+    persistentId: string | null;
+    /** 默认全局迁移；UID 冲突时只能迁移能由另一侧 UID 明确定位的引用。 */
+    scope?: 'global' | 'linked-owner';
+    referenceOwnerUid?: string | null;
+}
+export interface NormalizeOrderCollectionResult<T> {
+    items: T[];
+    stats: OrderCollectionIdentityStats;
+    uidRemaps: OrderCollectionUidRemap[];
+}
+export interface NormalizeOrderCollectionsResult<T> {
+    order: T;
+    stats: Record<OrderCollectionKind, OrderCollectionIdentityStats>;
+    uidRemaps: OrderCollectionUidRemap[];
+}
+export declare function createUuidV4(): string;
+export declare function isBlankOrderCollectionIdentity(value: unknown): boolean;
+export declare function getOrderCollectionPersistentId(kind: OrderCollectionKind, item: unknown): string | null;
+export declare function getOrderCollectionUid(kind: OrderCollectionKind, item: unknown): string | null;
+export declare function buildOrderCollectionFallbackUid(kind: OrderCollectionKind, persistentId: string | number): string;
+export declare function getOrderCollectionReferenceUid(kind: OrderCollectionKind, item: unknown): string | null;
+export declare function setOrderCollectionUid<T>(kind: OrderCollectionKind, item: T, uid: string): T;
+/**
+ * 持久化行 ID 是服务端事实主键；只有至少一侧尚未持久化时，才允许用 runtime UID 对齐。
+ */
+export declare function isSameOrderCollectionItem(kind: OrderCollectionKind, left: unknown, right: unknown): boolean;
+export declare function mergeOrderCollectionItems<T>(kind: OrderCollectionKind, currentItem: T, incomingItem: T, options?: {
+    ensureUid?: boolean;
+    createAnonymousUid?: () => string;
+}): T;
+/**
+ * 规范化单一数组：强身份重复时保留首次位置、用最后一条业务字段覆盖，并统一补 UID。
+ */
+export declare function normalizeOrderCollection<T>(kind: OrderCollectionKind, items: T[] | null | undefined, options?: {
+    ensureUid?: boolean;
+    createAnonymousUid?: () => string;
+}): NormalizeOrderCollectionResult<T>;
+export declare function applyOrderCollectionUidRemaps<T extends Record<string, any>>(sourceOrder: T, uidRemaps: OrderCollectionUidRemap[]): T;
+export declare function normalizeOrderCollections<T extends Record<string, any>>(sourceOrder: T, options?: {
+    ensureUid?: boolean;
+    createAnonymousUid?: () => string;
+}): NormalizeOrderCollectionsResult<T>;

package/dist/modules/Order/utils/orderCollectionIdentity.js

@@ -0,0 +1,405 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { cloneDeep } from 'lodash-es';
+var IDENTITY_CONFIG = {
+  product: {
+    persistentIdField: 'order_detail_id',
+    uidField: 'unique_identification_number',
+    fallbackPrefix: 'os-fallback:product:order-detail'
+  },
+  booking: {
+    persistentIdField: 'schedule_event_id',
+    uidField: 'unique_identification_number',
+    fallbackPrefix: 'os-fallback:booking:schedule-event'
+  },
+  payment: {
+    persistentIdField: 'order_payment_id',
+    uidField: 'unique_payment_number',
+    fallbackPrefix: 'os-fallback:payment:order-payment'
+  }
+};
+export function createUuidV4() {
+  var template = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx';
+  return template.replace(/[xy]/g, function (char) {
+    var randomValue = Math.floor(Math.random() * 16);
+    var value = char === 'x' ? randomValue : randomValue & 0x3 | 0x8;
+    return value.toString(16);
+  });
+}
+export function isBlankOrderCollectionIdentity(value) {
+  return value === undefined || value === null || value === '';
+}
+export function getOrderCollectionPersistentId(kind, item) {
+  var record = item;
+  if (!record) return null;
+  var value = record[IDENTITY_CONFIG[kind].persistentIdField];
+  if (isBlankOrderCollectionIdentity(value)) return null;
+  return String(value);
+}
+export function getOrderCollectionUid(kind, item) {
+  var _record$metadata;
+  var record = item;
+  if (!record) return null;
+  var uidField = IDENTITY_CONFIG[kind].uidField;
+  var metadataValue = (_record$metadata = record.metadata) === null || _record$metadata === void 0 ? void 0 : _record$metadata[uidField];
+  if (!isBlankOrderCollectionIdentity(metadataValue)) return String(metadataValue);
+  var topLevelValue = record[uidField];
+  if (isBlankOrderCollectionIdentity(topLevelValue)) return null;
+  return String(topLevelValue);
+}
+export function buildOrderCollectionFallbackUid(kind, persistentId) {
+  return "".concat(IDENTITY_CONFIG[kind].fallbackPrefix, ":").concat(String(persistentId));
+}
+export function getOrderCollectionReferenceUid(kind, item) {
+  var uid = getOrderCollectionUid(kind, item);
+  if (uid) return uid;
+  var persistentId = getOrderCollectionPersistentId(kind, item);
+  return persistentId ? buildOrderCollectionFallbackUid(kind, persistentId) : null;
+}
+export function setOrderCollectionUid(kind, item, uid) {
+  var record = cloneDeep(item || {});
+  var uidField = IDENTITY_CONFIG[kind].uidField;
+  record.metadata = _objectSpread(_objectSpread({}, record.metadata && _typeof(record.metadata) === 'object' ? record.metadata : {}), {}, _defineProperty({}, uidField, uid));
+  delete record[uidField];
+  return record;
+}
+
+/**
+ * 持久化行 ID 是服务端事实主键；只有至少一侧尚未持久化时，才允许用 runtime UID 对齐。
+ */
+export function isSameOrderCollectionItem(kind, left, right) {
+  var leftPersistentId = getOrderCollectionPersistentId(kind, left);
+  var rightPersistentId = getOrderCollectionPersistentId(kind, right);
+  if (leftPersistentId && rightPersistentId) {
+    return leftPersistentId === rightPersistentId;
+  }
+  var leftUid = getOrderCollectionUid(kind, left);
+  var rightUid = getOrderCollectionUid(kind, right);
+  return Boolean(leftUid && rightUid && leftUid === rightUid);
+}
+export function mergeOrderCollectionItems(kind, currentItem, incomingItem, options) {
+  var _options$createAnonym;
+  var current = cloneDeep(currentItem || {});
+  var incoming = cloneDeep(incomingItem || {});
+  var persistentIdField = IDENTITY_CONFIG[kind].persistentIdField;
+  var currentPersistentIdValue = current[persistentIdField];
+  var incomingPersistentIdValue = incoming[persistentIdField];
+  var incomingUid = getOrderCollectionUid(kind, incoming);
+  var currentUid = getOrderCollectionUid(kind, current);
+  var persistentId = getOrderCollectionPersistentId(kind, incoming) || getOrderCollectionPersistentId(kind, current);
+  var merged = _objectSpread(_objectSpread(_objectSpread({}, current), incoming), {}, {
+    metadata: _objectSpread(_objectSpread({}, current.metadata && _typeof(current.metadata) === 'object' ? current.metadata : {}), incoming.metadata && _typeof(incoming.metadata) === 'object' ? incoming.metadata : {})
+  });
+
+  // UID 对齐允许一侧尚未持久化，但稀疏 incoming 的 null/空值不能擦掉已存在行 ID。
+  if (!isBlankOrderCollectionIdentity(incomingPersistentIdValue)) {
+    merged[persistentIdField] = incomingPersistentIdValue;
+  } else if (!isBlankOrderCollectionIdentity(currentPersistentIdValue)) {
+    merged[persistentIdField] = currentPersistentIdValue;
+  }
+  var incomingUidIsDerived = Boolean(incomingUid && persistentId && (incomingUid === buildOrderCollectionFallbackUid(kind, persistentId) || incomingUid.startsWith("".concat(buildOrderCollectionFallbackUid(kind, persistentId), ":conflict:"))));
+  var uid = (incomingUid && !incomingUidIsDerived ? incomingUid : null) || currentUid || incomingUid || ((options === null || options === void 0 ? void 0 : options.ensureUid) === false ? null : persistentId ? buildOrderCollectionFallbackUid(kind, persistentId) : (options === null || options === void 0 || (_options$createAnonym = options.createAnonymousUid) === null || _options$createAnonym === void 0 ? void 0 : _options$createAnonym.call(options)) || createUuidV4());
+  return uid ? setOrderCollectionUid(kind, merged, uid) : merged;
+}
+function createEmptyIdentityStats() {
+  return {
+    backfilledUidCount: 0,
+    collapsedDuplicateCount: 0,
+    uidConflictCount: 0,
+    anonymousRowCount: 0
+  };
+}
+function allocateAnonymousUid(occupiedUids, createAnonymousUid) {
+  var uid = createAnonymousUid();
+  while (occupiedUids.has(uid)) uid = createAnonymousUid();
+  return uid;
+}
+function allocatePersistentConflictUid(kind, persistentId, occupiedUids) {
+  var fallbackUid = buildOrderCollectionFallbackUid(kind, persistentId);
+  if (!occupiedUids.has(fallbackUid)) return fallbackUid;
+
+  // 极端情况下其它行可能把本行 fallback 当作显式 UID 使用；继续派生稳定后缀，
+  // 避免修复冲突后仍留下重复 UID。规范化结果一旦持久化，后续读取保持幂等。
+  var suffix = 1;
+  var candidate = "".concat(fallbackUid, ":conflict:").concat(suffix);
+  while (occupiedUids.has(candidate)) {
+    suffix += 1;
+    candidate = "".concat(fallbackUid, ":conflict:").concat(suffix);
+  }
+  return candidate;
+}
+
+/**
+ * 规范化单一数组：强身份重复时保留首次位置、用最后一条业务字段覆盖，并统一补 UID。
+ */
+export function normalizeOrderCollection(kind, items, options) {
+  var stats = createEmptyIdentityStats();
+  var uidRemaps = [];
+  var result = [];
+  var ensureUid = (options === null || options === void 0 ? void 0 : options.ensureUid) !== false;
+  var createAnonymousUid = (options === null || options === void 0 ? void 0 : options.createAnonymousUid) || createUuidV4;
+  var _iterator = _createForOfIteratorHelper(items || []),
+    _step;
+  try {
+    var _loop = function _loop() {
+      var rawItem = _step.value;
+      var item = cloneDeep(rawItem);
+      var existingIndex = result.findIndex(function (existing) {
+        return isSameOrderCollectionItem(kind, existing, item);
+      });
+      if (existingIndex === -1) {
+        result.push(item);
+        return 1; // continue
+      }
+      var previousReferenceUid = getOrderCollectionReferenceUid(kind, result[existingIndex]);
+      var incomingReferenceUid = getOrderCollectionReferenceUid(kind, item);
+      result[existingIndex] = mergeOrderCollectionItems(kind, result[existingIndex], item, {
+        ensureUid: false
+      });
+      var nextUid = getOrderCollectionUid(kind, result[existingIndex]);
+      if (nextUid) {
+        var _iterator2 = _createForOfIteratorHelper(new Set([previousReferenceUid, incomingReferenceUid])),
+          _step2;
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var from = _step2.value;
+            if (!from || from === nextUid) continue;
+            uidRemaps.push({
+              kind: kind,
+              from: from,
+              to: nextUid,
+              persistentId: getOrderCollectionPersistentId(kind, result[existingIndex])
+            });
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+      }
+      stats.collapsedDuplicateCount += 1;
+    };
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      if (_loop()) continue;
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  if (!ensureUid) return {
+    items: result,
+    stats: stats,
+    uidRemaps: uidRemaps
+  };
+  var occupiedUids = new Set();
+  for (var index = 0; index < result.length; index += 1) {
+    var item = result[index];
+    var persistentId = getOrderCollectionPersistentId(kind, item);
+    var uid = getOrderCollectionUid(kind, item);
+    if (!uid) {
+      uid = persistentId ? buildOrderCollectionFallbackUid(kind, persistentId) : allocateAnonymousUid(occupiedUids, createAnonymousUid);
+      item = setOrderCollectionUid(kind, item, uid);
+      result[index] = item;
+      stats.backfilledUidCount += 1;
+      if (!persistentId) stats.anonymousRowCount += 1;
+    }
+    if (occupiedUids.has(uid)) {
+      var _item, _item2, _item3, _item4;
+      var replacementUid = persistentId ? allocatePersistentConflictUid(kind, persistentId, occupiedUids) : allocateAnonymousUid(occupiedUids, createAnonymousUid);
+      result[index] = setOrderCollectionUid(kind, item, replacementUid);
+      uidRemaps.push({
+        kind: kind,
+        from: uid,
+        to: replacementUid,
+        persistentId: persistentId,
+        scope: 'linked-owner',
+        referenceOwnerUid: kind === 'product' ? String(((_item = item) === null || _item === void 0 ? void 0 : _item.booking_uid) || ((_item2 = item) === null || _item2 === void 0 || (_item2 = _item2.metadata) === null || _item2 === void 0 ? void 0 : _item2.booking_uid) || '') || null : kind === 'booking' ? String(((_item3 = item) === null || _item3 === void 0 ? void 0 : _item3.product_uid) || ((_item4 = item) === null || _item4 === void 0 || (_item4 = _item4.metadata) === null || _item4 === void 0 ? void 0 : _item4.product_uid) || '') || null : null
+      });
+      uid = replacementUid;
+      stats.uidConflictCount += 1;
+    }
+    occupiedUids.add(uid);
+  }
+  return {
+    items: result,
+    stats: stats,
+    uidRemaps: uidRemaps
+  };
+}
+export function applyOrderCollectionUidRemaps(sourceOrder, uidRemaps) {
+  if (!uidRemaps.length) return sourceOrder;
+  var order = cloneDeep(sourceOrder);
+  var hasAmbiguousLinkedOwner = function hasAmbiguousLinkedOwner(remap) {
+    if (remap.scope !== 'linked-owner' || !remap.referenceOwnerUid) return false;
+    var ownerKind = remap.kind === 'product' ? 'booking' : remap.kind === 'booking' ? 'product' : null;
+    if (!ownerKind) return false;
+    return uidRemaps.some(function (candidate) {
+      return candidate.scope === 'linked-owner' && candidate.kind === ownerKind && candidate.from === remap.referenceOwnerUid;
+    });
+  };
+  var _iterator3 = _createForOfIteratorHelper(uidRemaps),
+    _step3;
+  try {
+    var _loop2 = function _loop2() {
+        var remap = _step3.value;
+        if (remap.from === remap.to) return 0; // continue
+        var linkedOwnerIsAmbiguous = hasAmbiguousLinkedOwner(remap);
+        if (remap.kind === 'product') {
+          var _order$_extend;
+          var _iterator4 = _createForOfIteratorHelper(order.bookings || []),
+            _step4;
+          try {
+            for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+              var _booking$metadata;
+              var booking = _step4.value;
+              if (remap.scope === 'linked-owner' && (linkedOwnerIsAmbiguous || getOrderCollectionUid('booking', booking) !== remap.referenceOwnerUid)) {
+                continue;
+              }
+              if (String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === remap.from) {
+                booking.product_uid = remap.to;
+              }
+              if (String((booking === null || booking === void 0 || (_booking$metadata = booking.metadata) === null || _booking$metadata === void 0 ? void 0 : _booking$metadata.product_uid) || '') === remap.from) {
+                booking.metadata = _objectSpread(_objectSpread({}, booking.metadata || {}), {}, {
+                  product_uid: remap.to
+                });
+              }
+            }
+            // 冲突 UID 仍由第一条持有；赠品父引用缺少可用的持久化行定位时不能全局改写。
+          } catch (err) {
+            _iterator4.e(err);
+          } finally {
+            _iterator4.f();
+          }
+          if (remap.scope !== 'linked-owner') {
+            var _iterator5 = _createForOfIteratorHelper(order.products || []),
+              _step5;
+            try {
+              for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                var _product$metadata, _product$metadata2;
+                var product = _step5.value;
+                if (String((product === null || product === void 0 || (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.parent_unique_identification_number) || '') === remap.from) {
+                  product.metadata = _objectSpread(_objectSpread({}, product.metadata || {}), {}, {
+                    parent_unique_identification_number: remap.to
+                  });
+                }
+                var giftInfo = product === null || product === void 0 || (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2._giftInfo;
+                if (giftInfo && _typeof(giftInfo) === 'object') {
+                  var sourceProductIds = Array.isArray(giftInfo.sourceProductIds) ? giftInfo.sourceProductIds.map(function (uid) {
+                    return String(uid) === remap.from ? remap.to : uid;
+                  }) : giftInfo.sourceProductIds;
+                  var sourceProductId = String(giftInfo.sourceProductId || '') === remap.from ? remap.to : giftInfo.sourceProductId;
+                  product.metadata = _objectSpread(_objectSpread({}, product.metadata || {}), {}, {
+                    _giftInfo: _objectSpread(_objectSpread(_objectSpread({}, giftInfo), sourceProductIds !== undefined ? {
+                      sourceProductIds: sourceProductIds
+                    } : {}), sourceProductId !== undefined ? {
+                      sourceProductId: sourceProductId
+                    } : {})
+                  });
+                }
+              }
+            } catch (err) {
+              _iterator5.e(err);
+            } finally {
+              _iterator5.f();
+            }
+          }
+          var productsByUid = (_order$_extend = order._extend) === null || _order$_extend === void 0 ? void 0 : _order$_extend.productsByUid;
+          var cachedProduct = productsByUid === null || productsByUid === void 0 ? void 0 : productsByUid[remap.from];
+          var cachedPersistentId = getOrderCollectionPersistentId('product', (cachedProduct === null || cachedProduct === void 0 ? void 0 : cachedProduct.origin) || cachedProduct);
+          if (productsByUid && remap.scope === 'linked-owner') {
+            var retainedProduct = (order.products || []).find(function (product) {
+              return getOrderCollectionUid('product', product) === remap.from;
+            });
+            var remappedProduct = (order.products || []).find(function (product) {
+              return getOrderCollectionUid('product', product) === remap.to;
+            });
+            if (cachedProduct && remap.persistentId && cachedPersistentId === remap.persistentId) {
+              productsByUid[remap.to] = _objectSpread(_objectSpread({}, cachedProduct || {}), productsByUid[remap.to] || {});
+              if (retainedProduct) {
+                productsByUid[remap.from] = _objectSpread(_objectSpread({}, cachedProduct || {}), {}, {
+                  origin: cloneDeep(retainedProduct)
+                });
+              }
+            } else if (remappedProduct && !productsByUid[remap.to]) {
+              productsByUid[remap.to] = {
+                origin: cloneDeep(remappedProduct)
+              };
+            }
+            return 0; // continue
+          }
+          if (cachedProduct && remap.scope !== 'linked-owner') {
+            productsByUid[remap.to] = _objectSpread(_objectSpread({}, cachedProduct || {}), productsByUid[remap.to] || {});
+            delete productsByUid[remap.from];
+          }
+        }
+        if (remap.kind === 'booking') {
+          var _iterator6 = _createForOfIteratorHelper(order.products || []),
+            _step6;
+          try {
+            for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+              var _product$metadata3;
+              var _product = _step6.value;
+              if (remap.scope === 'linked-owner' && (linkedOwnerIsAmbiguous || getOrderCollectionUid('product', _product) !== remap.referenceOwnerUid)) {
+                continue;
+              }
+              if (String((_product === null || _product === void 0 ? void 0 : _product.booking_uid) || '') === remap.from) {
+                _product.booking_uid = remap.to;
+              }
+              if (String((_product === null || _product === void 0 || (_product$metadata3 = _product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.booking_uid) || '') === remap.from) {
+                _product.metadata = _objectSpread(_objectSpread({}, _product.metadata || {}), {}, {
+                  booking_uid: remap.to
+                });
+              }
+            }
+          } catch (err) {
+            _iterator6.e(err);
+          } finally {
+            _iterator6.f();
+          }
+        }
+      },
+      _ret;
+    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+      _ret = _loop2();
+      if (_ret === 0) continue;
+    }
+  } catch (err) {
+    _iterator3.e(err);
+  } finally {
+    _iterator3.f();
+  }
+  return order;
+}
+export function normalizeOrderCollections(sourceOrder, options) {
+  var order = cloneDeep(sourceOrder || {});
+  var orderRecord = order;
+  var productResult = normalizeOrderCollection('product', Array.isArray(orderRecord.products) ? orderRecord.products : [], options);
+  var bookingResult = normalizeOrderCollection('booking', Array.isArray(orderRecord.bookings) ? orderRecord.bookings : [], options);
+  var paymentResult = normalizeOrderCollection('payment', Array.isArray(orderRecord.payments) ? orderRecord.payments : [], options);
+  if (Array.isArray(orderRecord.products)) orderRecord.products = productResult.items;
+  if (Array.isArray(orderRecord.bookings)) orderRecord.bookings = bookingResult.items;
+  if (Array.isArray(orderRecord.payments)) orderRecord.payments = paymentResult.items;
+  var uidRemaps = [].concat(_toConsumableArray(productResult.uidRemaps), _toConsumableArray(bookingResult.uidRemaps), _toConsumableArray(paymentResult.uidRemaps));
+  order = applyOrderCollectionUidRemaps(order, uidRemaps);
+  return {
+    order: order,
+    stats: {
+      product: productResult.stats,
+      booking: bookingResult.stats,
+      payment: paymentResult.stats
+    },
+    uidRemaps: uidRemaps
+  };
+}

package/dist/modules/Order/utils.d.ts

@@ -3,6 +3,7 @@ import type { CartItem } from "../Cart";
 import type { OrderProductDiscountItem, OrderProduct, OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder } from './types';
 import type { RulesParamsHooks } from '../Rules/types';
 import type { MapOrderPaymentsOptions, OrderPaymentData, OrderPaymentSource } from './types';
+import { createUuidV4 } from './utils/orderCollectionIdentity';
 export interface OrderProductsDepositProtocol {
     id: number;
     title: string;
@@ -67,8 +68,8 @@ export declare function sumOptionUnitPrice(options?: Array<{
 /**
  * 仅基于 tempOrder.products 重算整单定金。
  *
- * 对齐 Checkout relation_products 分支：商品定金先按商品规则计算，
- * 再扣减商品券/折扣卡抵扣金额；tempOrder.bookings 不参与这里的计算。
+ * 商品折扣在进入定金计算前已体现在商品行价格字段中，
+ * 因此这里只按商品定金规则汇总，不再扣减 discount_list；tempOrder.bookings 不参与这里的计算。
  */
 export declare function calculateOrderProductsDeposit(products?: OrderProduct[], options?: {
     productsByUid?: Record<string, Record<string, any>>;
@@ -177,7 +178,7 @@ export declare const mergeRelationForms: (relationForms: {
     form_record_ids: number[];
 }[];
 export declare const getAllDiscountList: (cartItem: CartItem) => any;
-export declare function createUuidV4(): string;
+export { createUuidV4 };
 export declare function isTempOrder(data: any): data is OrderTempOrder;
 export declare function formatDateTime(date: Date): string;
 export declare function normalizeBookingIsAll(booking: Record<string, any>): 0 | 1;