@pisell/pisellos 2.3.27 → 2.3.29

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

@@ -68,6 +68,10 @@ export interface DiscountWithReason {
     discountList: Discount[];
     unavailableReasonKey: DiscountFilterRejectKey | null;
 }
+export interface DiscountPrepareConfigResult {
+    discountList: Discount[];
+    availableWalletIds: number[];
+}
 interface ExtensionData {
     id: number;
     shop_id: number;

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

@@ -75,6 +75,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         apply?: boolean;
     }): Promise<Discount[]>;
     getDiscountList(): Discount[];
+    getAvailableWalletIds(): number[];
     private syncScannedDiscountsToOriginalDiscountList;
     private ensureEditDiscountConfigForProductChange;
     scanCode(code: string, customerId?: number): Promise<{
@@ -467,7 +468,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;
@@ -524,6 +525,11 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * this.normalizeHydratedBookingHolder({ metadata: { holder: { form_record: [1] } } });
      */
     private normalizeHydratedBookingHolder;
+    /**
+     * 匿名 booking 没有服务端行 ID 时，商品侧已有的 booking_uid 就是唯一可用的强引用。
+     * 在统一规范化生成 UUID 前先复用它；已落库 booking 仍按 schedule_event_id 派生稳定 UID。
+     */
+    private seedAnonymousBookingUidsFromProducts;
     private normalizeTempOrderForRuntime;
     private hydrateLinkedBookingIdentity;
     private pickHydratedDisplayText;

package/dist/modules/Order/index.js

@@ -39,6 +39,7 @@ import { processCartPromotion, appendPromotionTags as _appendPromotionTags, getO
 import { buildProductLineFingerprint, getProductIdentityIndex, getSafeProductNum, isIdentityMatch, normalizeOrderProduct } from "../../solution/ScanOrder/utils";
 import { syncManualProductDiscountProductNum } from "./utils/manualProductDiscount";
 import { expandHydratedProductsForDiscountCollection, restoreHydratedBundleDiscounts } from "./utils/bundleDiscountHydration";
+import { getOrderCollectionPersistentId, getOrderCollectionUid, normalizeOrderCollections, setOrderCollectionUid } from "./utils/orderCollectionIdentity";
 import { DiscountModule } from "../Discount";
 import { RulesModule } from "../Rules";
 import { UnavailableReason } from "../Rules/types";
@@ -295,14 +296,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!this.store.summary) {
                 this.store.summary = createEmptySummary();
               }
+              if (!Array.isArray(this.store.availableWalletIds)) {
+                this.store.availableWalletIds = [];
+              }
               this.request = this.core.getPlugin('request');
               appPlugin = this.core.getPlugin('app');
               if (appPlugin) {
-                _context.next = 8;
+                _context.next = 9;
                 break;
               }
               throw new Error('Order 模块需要 app 插件支持');
-            case 8:
+            case 9:
               app = appPlugin.getApp();
               this.logger = app.logger;
               this.window = this.core.getPlugin('window');
@@ -315,7 +319,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.otherParams = otherParams;
               this.registerDiscountModules(options);
               this.logInfo('OrderModule initialized successfully');
-            case 20:
+            case 21:
             case "end":
               return _context.stop();
           }
@@ -492,7 +496,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
         var _this$store$tempOrder, _this$store$discount, _this$store$tempOrder2;
-        var orderId, discountList, _this$store$discount2, _this$store$discount3, _this$store$discount4, currentDiscountList, currentEditDiscounts, currentScanDiscounts, currentScanDiscountIds, runtimeDiscountIds, runtimeDiscounts, mergedDiscountList;
+        var orderId, prepareConfigResult, discountList, _this$store$discount2, _this$store$discount3, _this$store$discount4, currentDiscountList, currentEditDiscounts, currentScanDiscounts, currentScanDiscountIds, runtimeDiscountIds, runtimeDiscounts, mergedDiscountList;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -504,14 +508,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 with_good_pass: 1,
                 with_discount_card: 1,
                 with_wallet_pass_holder: 1,
+                with_available_wallet_flag: 1,
+                with_available_wallet_pass_flag: 1,
                 request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
               }, orderId ? {
                 order_id: orderId
               } : {}));
             case 3:
-              discountList = _context3.sent;
+              prepareConfigResult = _context3.sent;
+              discountList = prepareConfigResult === null || prepareConfigResult === void 0 ? void 0 : prepareConfigResult.discountList;
+              this.store.availableWalletIds = (prepareConfigResult === null || prepareConfigResult === void 0 ? void 0 : prepareConfigResult.availableWalletIds) || [];
               if (!discountList) {
-                _context3.next = 16;
+                _context3.next = 18;
                 break;
               }
               currentDiscountList = ((_this$store$discount2 = this.store.discount) === null || _this$store$discount2 === void 0 ? void 0 : _this$store$discount2.getDiscountList()) || [];
@@ -532,17 +540,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return true;
               });
               mergedDiscountList = [].concat(_toConsumableArray(currentEditDiscounts), _toConsumableArray(currentScanDiscounts), _toConsumableArray(runtimeDiscounts));
-              _context3.next = 14;
-              return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.setOriginalDiscountList(mergedDiscountList);
-            case 14:
               _context3.next = 16;
-              return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.setDiscountList(mergedDiscountList);
+              return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.setOriginalDiscountList(mergedDiscountList);
             case 16:
+              _context3.next = 18;
+              return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.setDiscountList(mergedDiscountList);
+            case 18:
               if (params.apply !== false && (_this$store$tempOrder2 = this.store.tempOrder) !== null && _this$store$tempOrder2 !== void 0 && (_this$store$tempOrder2 = _this$store$tempOrder2.products) !== null && _this$store$tempOrder2 !== void 0 && _this$store$tempOrder2.length) {
                 this.applyDiscount();
               }
               return _context3.abrupt("return", this.getDiscountList());
-            case 18:
+            case 20:
             case "end":
               return _context3.stop();
           }
@@ -559,6 +567,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _this$store$discount5;
       return ((_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 ? void 0 : _this$store$discount5.getDiscountList()) || [];
     }
+  }, {
+    key: "getAvailableWalletIds",
+    value: function getAvailableWalletIds() {
+      return Array.isArray(this.store.availableWalletIds) ? _toConsumableArray(this.store.availableWalletIds) : [];
+    }
   }, {
     key: "syncScannedDiscountsToOriginalDiscountList",
     value: function () {
@@ -3194,6 +3207,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       var nextCustomerId = (_tempOrder$customer_i5 = tempOrder.customer_id) !== null && _tempOrder$customer_i5 !== void 0 ? _tempOrder$customer_i5 : null;
       if (String(previousCustomerId !== null && previousCustomerId !== void 0 ? previousCustomerId : '') !== String(nextCustomerId !== null && nextCustomerId !== void 0 ? nextCustomerId : '')) {
+        this.store.availableWalletIds = [];
         clearTempOrderHolderAssignments(tempOrder);
         this.clearCustomerBoundDiscounts(tempOrder);
         this.applyDiscount();
@@ -3238,6 +3252,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       tempOrder.email = '';
       tempOrder.customer = null;
       if (tempOrder._extend) delete tempOrder._extend.customerSnapshot;
+      this.store.availableWalletIds = [];
       this.clearCustomerBoundDiscounts(tempOrder);
       this.persistTempOrder();
       this.saveDraftInBackground();
@@ -5483,11 +5498,31 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(record, options) {
         var _this$store$discount19;
-        var raw, nextTempOrder, rawSummary, summarySurcharges, hydratedEditDiscounts, currentDiscounts, currentScanDiscounts, hydratedDiscountIds, retainedScanDiscounts, nextDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount20, _this$store$discount21;
+        var sourceRaw, identityReadySource, normalizedCollections, raw, hasIdentityChanges, identityLogMetadata, hasIdentityWarnings, nextTempOrder, rawSummary, summarySurcharges, hydratedEditDiscounts, currentDiscounts, currentScanDiscounts, hydratedDiscountIds, retainedScanDiscounts, nextDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount20, _this$store$discount21;
         return _regeneratorRuntime().wrap(function _callee40$(_context43) {
           while (1) switch (_context43.prev = _context43.next) {
             case 0:
-              raw = record && _typeof(record) === 'object' && record.data && record.order_id == null ? record.data : record || {};
+              sourceRaw = record && _typeof(record) === 'object' && record.data && record.order_id == null ? record.data : record || {};
+              identityReadySource = this.seedAnonymousBookingUidsFromProducts(sourceRaw);
+              normalizedCollections = normalizeOrderCollections(identityReadySource);
+              raw = normalizedCollections.order;
+              hasIdentityChanges = Object.values(normalizedCollections.stats).some(function (stats) {
+                return stats.backfilledUidCount > 0 || stats.collapsedDuplicateCount > 0 || stats.uidConflictCount > 0 || stats.anonymousRowCount > 0;
+              });
+              if (hasIdentityChanges) {
+                identityLogMetadata = {
+                  collections: normalizedCollections.stats,
+                  uidRemapCount: normalizedCollections.uidRemaps.length
+                };
+                hasIdentityWarnings = Object.values(normalizedCollections.stats).some(function (stats) {
+                  return stats.uidConflictCount > 0 || stats.anonymousRowCount > 0;
+                });
+                if (hasIdentityWarnings) {
+                  this.logWarning('Normalized hydrated order collection identities', identityLogMetadata);
+                } else {
+                  this.logInfo('Normalized hydrated order collection identities', identityLogMetadata);
+                }
+              }
               nextTempOrder = this.normalizeTempOrderForRuntime(raw, {
                 makeEditMark: true
               });
@@ -5503,13 +5538,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 originalSalesSnapshot: {
                   summary: cloneDeep(this.store.summary),
                   products: cloneDeep(nextTempOrder.products || []),
+                  bookings: cloneDeep(nextTempOrder.bookings || []),
                   payments: cloneDeep(nextTempOrder.payments || []),
                   surcharges: cloneDeep(nextTempOrder.surcharges || []),
                   shop_discount: nextTempOrder.shop_discount || '0.00',
                   productFingerprint: this.buildOrderProductsFingerprint(nextTempOrder.products || [])
                 }
               });
-              this.store.lastOrderInfo = raw.lastOrderInfo || raw;
+              // lastOrderInfo carries the exact backend snapshot used by deposit/type recovery.
+              // Runtime collection repair lives in tempOrder/originalSalesSnapshot and must not
+              // rewrite this protocol snapshot as a side effect of hydration.
+              this.store.lastOrderInfo = sourceRaw.lastOrderInfo || sourceRaw;
               hydratedEditDiscounts = this.collectHydratedEditDiscounts(nextTempOrder.products);
               currentDiscounts = typeof ((_this$store$discount19 = this.store.discount) === null || _this$store$discount19 === void 0 ? void 0 : _this$store$discount19.getDiscountList) === 'function' ? this.store.discount.getDiscountList() || [] : [];
               currentScanDiscounts = currentDiscounts.filter(function (discount) {
@@ -5524,28 +5563,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               nextDiscounts = [].concat(_toConsumableArray(hydratedEditDiscounts), _toConsumableArray(retainedScanDiscounts));
               shouldSkipEmptyDiscountSync = nextDiscounts.length === 0 && currentDiscounts.length === 0;
               if (shouldSkipEmptyDiscountSync) {
-                _context43.next = 21;
+                _context43.next = 26;
                 break;
               }
               OrderModule.populateSavedAmounts(nextTempOrder.products, nextDiscounts);
-              _context43.next = 19;
+              _context43.next = 24;
               return (_this$store$discount20 = this.store.discount) === null || _this$store$discount20 === void 0 ? void 0 : _this$store$discount20.setOriginalDiscountList(nextDiscounts);
-            case 19:
-              _context43.next = 21;
+            case 24:
+              _context43.next = 26;
               return (_this$store$discount21 = this.store.discount) === null || _this$store$discount21 === void 0 ? void 0 : _this$store$discount21.setDiscountList(nextDiscounts);
-            case 21:
+            case 26:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context43.next = 24;
+                _context43.next = 29;
                 break;
               }
-              _context43.next = 24;
+              _context43.next = 29;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 24:
+            case 29:
               this.persistTempOrder();
               return _context43.abrupt("return", nextTempOrder);
-            case 26:
+            case 31:
             case "end":
               return _context43.stop();
           }
@@ -5589,6 +5628,79 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return next;
     }
+
+    /**
+     * 匿名 booking 没有服务端行 ID 时，商品侧已有的 booking_uid 就是唯一可用的强引用。
+     * 在统一规范化生成 UUID 前先复用它；已落库 booking 仍按 schedule_event_id 派生稳定 UID。
+     */
+  }, {
+    key: "seedAnonymousBookingUidsFromProducts",
+    value: function seedAnonymousBookingUidsFromProducts(raw) {
+      if (!raw || _typeof(raw) !== 'object') return {};
+      if (!Array.isArray(raw.bookings) || !Array.isArray(raw.products)) return raw;
+      var bookingUidsByProductUid = new Map();
+      var _iterator22 = _createForOfIteratorHelper(raw.products),
+        _step22;
+      try {
+        for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
+          var _product$metadata10;
+          var product = _step22.value;
+          var productUid = getOrderCollectionUid('product', product);
+          var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.booking_uid);
+          if (!productUid || bookingUid === undefined || bookingUid === null || bookingUid === '') {
+            continue;
+          }
+          var candidates = bookingUidsByProductUid.get(productUid) || new Set();
+          candidates.add(String(bookingUid));
+          bookingUidsByProductUid.set(productUid, candidates);
+        }
+      } catch (err) {
+        _iterator22.e(err);
+      } finally {
+        _iterator22.f();
+      }
+      if (bookingUidsByProductUid.size === 0) return raw;
+      var anonymousBookingCountByProductUid = new Map();
+      var _iterator23 = _createForOfIteratorHelper(raw.bookings),
+        _step23;
+      try {
+        for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
+          var _booking$metadata7;
+          var booking = _step23.value;
+          if (getOrderCollectionPersistentId('booking', booking) || getOrderCollectionUid('booking', booking)) {
+            continue;
+          }
+          var _productUid = (booking === null || booking === void 0 ? void 0 : booking.product_uid) || (booking === null || booking === void 0 || (_booking$metadata7 = booking.metadata) === null || _booking$metadata7 === void 0 ? void 0 : _booking$metadata7.product_uid);
+          if (_productUid === undefined || _productUid === null || _productUid === '') continue;
+          var key = String(_productUid);
+          anonymousBookingCountByProductUid.set(key, (anonymousBookingCountByProductUid.get(key) || 0) + 1);
+        }
+      } catch (err) {
+        _iterator23.e(err);
+      } finally {
+        _iterator23.f();
+      }
+      return _objectSpread(_objectSpread({}, raw), {}, {
+        bookings: raw.bookings.map(function (booking) {
+          var _booking$metadata6;
+          if (getOrderCollectionPersistentId('booking', booking) || getOrderCollectionUid('booking', booking)) {
+            return booking;
+          }
+          var productUid = (booking === null || booking === void 0 ? void 0 : booking.product_uid) || (booking === null || booking === void 0 || (_booking$metadata6 = booking.metadata) === null || _booking$metadata6 === void 0 ? void 0 : _booking$metadata6.product_uid);
+          if (productUid === undefined || productUid === null || productUid === '') {
+            return booking;
+          }
+          var productUidKey = String(productUid);
+          // 多条匿名 booking 共用同一商品引用时身份仍然不明确，不能借商品字段猜测合并。
+          if (anonymousBookingCountByProductUid.get(productUidKey) !== 1) {
+            return booking;
+          }
+          var bookingUidCandidates = bookingUidsByProductUid.get(productUidKey);
+          var bookingUid = (bookingUidCandidates === null || bookingUidCandidates === void 0 ? void 0 : bookingUidCandidates.size) === 1 ? _toConsumableArray(bookingUidCandidates)[0] : null;
+          return bookingUid ? setOrderCollectionUid('booking', booking, bookingUid) : booking;
+        })
+      });
+    }
   }, {
     key: "normalizeTempOrderForRuntime",
     value: function normalizeTempOrderForRuntime(raw, options) {
@@ -5646,15 +5758,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       };
       var tempOrderExtend = nextTempOrder._extend;
       var productsByUid = tempOrderExtend.productsByUid || {};
-      var _iterator22 = _createForOfIteratorHelper(nextTempOrder.products.entries()),
-        _step22;
+      var _iterator24 = _createForOfIteratorHelper(nextTempOrder.products.entries()),
+        _step24;
       try {
-        for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
-          var _product$metadata10, _ref74, _ref75, _existed$origin, _rawProduct$metadata;
-          var _step22$value = _slicedToArray(_step22.value, 2),
-            index = _step22$value[0],
-            product = _step22$value[1];
-          var uid = (_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.unique_identification_number;
+        for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
+          var _product$metadata11, _ref74, _ref75, _existed$origin, _rawProduct$metadata;
+          var _step24$value = _slicedToArray(_step24.value, 2),
+            index = _step24$value[0],
+            product = _step24$value[1];
+          var uid = (_product$metadata11 = product.metadata) === null || _product$metadata11 === void 0 ? void 0 : _product$metadata11.unique_identification_number;
           if (!uid) continue;
           var existed = productsByUid[uid] && _typeof(productsByUid[uid]) === 'object' ? productsByUid[uid] : {};
           var rawProduct = rawProducts[index] && _typeof(rawProducts[index]) === 'object' ? rawProducts[index] : product;
@@ -5674,9 +5786,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           });
         }
       } catch (err) {
-        _iterator22.e(err);
+        _iterator24.e(err);
       } finally {
-        _iterator22.f();
+        _iterator24.f();
       }
       tempOrderExtend.productsByUid = productsByUid;
       this.hydrateLinkedBookingIdentity(nextTempOrder);
@@ -5692,8 +5804,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var bookingUidByProductUid = new Map();
       var productByUid = new Map();
       (tempOrder.products || []).forEach(function (product) {
-        var _product$metadata11;
-        var productUid = (product === null || product === void 0 || (_product$metadata11 = product.metadata) === null || _product$metadata11 === void 0 ? void 0 : _product$metadata11.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+        var _product$metadata12;
+        var productUid = (product === null || product === void 0 || (_product$metadata12 = product.metadata) === null || _product$metadata12 === void 0 ? void 0 : _product$metadata12.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
         if (productUid !== undefined && productUid !== null && String(productUid) !== '') {
           productByUid.set(String(productUid), product);
         }
@@ -5714,15 +5826,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         bookingUidByProductUid.set(String(productUid), bookingUid);
       });
       (tempOrder.products || []).forEach(function (product) {
-        var _product$metadata12;
-        var productUid = (product === null || product === void 0 || (_product$metadata12 = product.metadata) === null || _product$metadata12 === void 0 ? void 0 : _product$metadata12.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+        var _product$metadata13;
+        var productUid = (product === null || product === void 0 || (_product$metadata13 = product.metadata) === null || _product$metadata13 === void 0 ? void 0 : _product$metadata13.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
         if (productUid === undefined || productUid === null || String(productUid) === '') return;
         var bookingUid = bookingUidByProductUid.get(String(productUid));
         if (!bookingUid) return;
         if (!product.metadata || _typeof(product.metadata) !== 'object') {
           product.metadata = {};
         }
-        var linkedBookingUid = String(product.booking_uid || product.metadata.booking_uid || bookingUid);
+        // booking 已经过统一身份规范化；以它为准同步商品侧旧引用，避免两侧 UID 断链。
+        var linkedBookingUid = String(bookingUid);
         product.booking_uid = linkedBookingUid;
         product.metadata.booking_uid = linkedBookingUid;
       });
@@ -5750,18 +5863,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var segments = [];
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
       if (Array.isArray(sku.variant)) {
-        var _iterator23 = _createForOfIteratorHelper(sku.variant),
-          _step23;
+        var _iterator25 = _createForOfIteratorHelper(sku.variant),
+          _step25;
         try {
-          for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
-            var variant = _step23.value;
+          for (_iterator25.s(); !(_step25 = _iterator25.n()).done;) {
+            var variant = _step25.value;
             var segment = this.formatHydratedNamePair(variant === null || variant === void 0 ? void 0 : variant.group, variant === null || variant === void 0 ? void 0 : variant.item);
             if (segment) segments.push(segment);
           }
         } catch (err) {
-          _iterator23.e(err);
+          _iterator25.e(err);
         } finally {
-          _iterator23.f();
+          _iterator25.f();
         }
       }
       return segments.join(', ');
@@ -5890,70 +6003,70 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         addDiscountAmount(savedMap, discountKey, amount);
         addDiscountAmount(isPersistedProduct || discount.order_discount_id != null ? editModeSavedMap : runtimeSavedMap, discountKey, amount);
       };
-      var _iterator24 = _createForOfIteratorHelper(productList),
-        _step24;
+      var _iterator26 = _createForOfIteratorHelper(productList),
+        _step26;
       try {
-        for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
-          var product = _step24.value;
+        for (_iterator26.s(); !(_step26 = _iterator26.n()).done;) {
+          var product = _step26.value;
           var qty = product.num || 1;
           var isPersistedProduct = Boolean(product.order_detail_id || product.orderDetailId || product.booking_id);
-          var _iterator26 = _createForOfIteratorHelper(product.discount_list || []),
-            _step26;
+          var _iterator28 = _createForOfIteratorHelper(product.discount_list || []),
+            _step28;
           try {
-            for (_iterator26.s(); !(_step26 = _iterator26.n()).done;) {
-              var pd = _step26.value;
+            for (_iterator28.s(); !(_step28 = _iterator28.n()).done;) {
+              var pd = _step28.value;
               addProductDiscountAmount(pd, qty, isPersistedProduct);
             }
           } catch (err) {
-            _iterator26.e(err);
+            _iterator28.e(err);
           } finally {
-            _iterator26.f();
+            _iterator28.f();
           }
-          var _iterator27 = _createForOfIteratorHelper(product.product_bundle || []),
-            _step27;
+          var _iterator29 = _createForOfIteratorHelper(product.product_bundle || []),
+            _step29;
           try {
-            for (_iterator27.s(); !(_step27 = _iterator27.n()).done;) {
+            for (_iterator29.s(); !(_step29 = _iterator29.n()).done;) {
               var _ref78, _bundle$num3;
-              var bundle = _step27.value;
+              var bundle = _step29.value;
               var isPersistedBundleProduct = isPersistedProduct || Boolean((bundle === null || bundle === void 0 ? void 0 : bundle.order_detail_id) || (bundle === null || bundle === void 0 ? void 0 : bundle.orderDetailId) || (bundle === null || bundle === void 0 ? void 0 : bundle.booking_id));
               var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref78 = (_bundle$num3 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num3 !== void 0 ? _bundle$num3 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref78 !== void 0 ? _ref78 : 1) || 1).toNumber();
-              var _iterator28 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
-                _step28;
+              var _iterator30 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
+                _step30;
               try {
-                for (_iterator28.s(); !(_step28 = _iterator28.n()).done;) {
-                  var _pd = _step28.value;
+                for (_iterator30.s(); !(_step30 = _iterator30.n()).done;) {
+                  var _pd = _step30.value;
                   addProductDiscountAmount(_pd, bundleQty, isPersistedBundleProduct);
                 }
               } catch (err) {
-                _iterator28.e(err);
+                _iterator30.e(err);
               } finally {
-                _iterator28.f();
+                _iterator30.f();
               }
             }
           } catch (err) {
-            _iterator27.e(err);
+            _iterator29.e(err);
           } finally {
-            _iterator27.f();
+            _iterator29.f();
           }
         }
       } catch (err) {
-        _iterator24.e(err);
+        _iterator26.e(err);
       } finally {
-        _iterator24.f();
+        _iterator26.f();
       }
-      var _iterator25 = _createForOfIteratorHelper(discountList),
-        _step25;
+      var _iterator27 = _createForOfIteratorHelper(discountList),
+        _step27;
       try {
-        for (_iterator25.s(); !(_step25 = _iterator25.n()).done;) {
-          var d = _step25.value;
+        for (_iterator27.s(); !(_step27 = _iterator27.n()).done;) {
+          var d = _step27.value;
           var key = d.id;
           var sourceMap = d.isEditMode ? editModeSavedMap : editModeDiscountKeys.has(key) ? runtimeSavedMap : savedMap;
           d.savedAmount = d.isSelected && key != null && sourceMap.has(key) ? sourceMap.get(key).toNumber() : 0;
         }
       } catch (err) {
-        _iterator25.e(err);
+        _iterator27.e(err);
       } finally {
-        _iterator25.f();
+        _iterator27.f();
       }
     }
   }]);

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

@@ -309,6 +309,7 @@ export interface OrderState {
     lastOrderInfo?: Record<string, any>;
     syncState?: OrderSyncState;
     discountList: any[];
+    availableWalletIds?: number[];
     discount: DiscountModule | null;
     rules: RulesModule | null;
 }
@@ -775,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>;