@pisell/pisellos 2.2.314 → 2.2.316

package/lib/modules/Order/index.js

@@ -4,11 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.OrderModule = void 0;
+Object.defineProperty(exports, "isFulfillmentTimingBooking", {
+  enumerable: true,
+  get: function () {
+    return _pickupTiming.isFulfillmentTimingBooking;
+  }
+});
+var _loadSalesOrderSnapshot = require("../../shared/sales/loadSalesOrderSnapshot");
+var _localEftposState = require("./localEftposState");
 var _BaseModule = require("../BaseModule");
 var _types = require("./types");
 var _utils = require("./utils");
 var _utils2 = require("../Product/utils");
+var _holderRelations = require("./holderRelations");
 var _weighedProduct = require("./utils/weighedProduct");
+var _pickupTiming = require("./pickupTiming");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _availability = require("../Discount/availability");
 var _osPrivatePayload = require("../../utils/os-private-payload");
@@ -433,6 +443,29 @@ class OrderModule extends _BaseModule.BaseModule {
     this.otherParams = otherParams;
   }
 
+  /** Internal intent boundary shared with asynchronous scanner/detail flows. */
+  createCartIntentCommitGuard(action, tempOrder = this.store.tempOrder) {
+    const hook = this.orderHooks?.beforeCartIntentCommit;
+    if (!hook) return () => {};
+    const getScope = this.orderHooks?.getCartIntentScope;
+    const scope = getScope?.();
+    const otherParams = this.otherParams;
+    let committed = false;
+    return () => {
+      if (this.store.tempOrder !== tempOrder || this.otherParams !== otherParams || this.orderHooks?.beforeCartIntentCommit !== hook || this.orderHooks?.getCartIntentScope !== getScope || getScope?.() !== scope) {
+        throw new Error('[Order] Cart intent belongs to a previous order or business');
+      }
+      // Derived gifts, discounts and persistence belong to the accepted intent,
+      // but an asynchronous continuation must never target a different cart.
+      if (committed) return;
+      hook({
+        action,
+        tempOrder
+      });
+      committed = true;
+    };
+  }
+
   /** PC/H5 属于在线店铺；其它或缺失平台统一沿用 POS 行为。 */
   isOnlineStorePlatform() {
     const platform = String(this.otherParams?.platform || '').trim().toLowerCase();
@@ -511,7 +544,7 @@ class OrderModule extends _BaseModule.BaseModule {
     this.store.rules = rules;
   }
   createDefaultRulesHooks() {
-    return (0, _utils.createDefaultOrderRulesHooks)(() => this.store.tempOrder?.bookings || []);
+    return (0, _utils.createDefaultOrderRulesHooks)(() => this.store.tempOrder?.bookings || [], () => this.store.tempOrder?.holder_relations);
   }
 
   /**
@@ -661,6 +694,7 @@ class OrderModule extends _BaseModule.BaseModule {
     });
   }
   async scanCode(code, customerId) {
+    const beforeCommit = this.createCartIntentCommitGuard('scan_promotion');
     if (this.isActiveVirtualSettlementOrder(this.store.tempOrder)) {
       return {
         type: 'clientCalc',
@@ -708,6 +742,7 @@ class OrderModule extends _BaseModule.BaseModule {
     }));
     const currentSelected = this.getDiscountList().filter(n => n.isSelected);
     if (currentSelected.length && currentSelected.some(n => withScanList.some(m => m.id === n.id))) {
+      beforeCommit();
       await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
       return {
         type: 'clientCalc',
@@ -741,6 +776,7 @@ class OrderModule extends _BaseModule.BaseModule {
     const normalizedNewDiscountList = newDiscountList ? markScannedDiscounts(newDiscountList, withScanList) : undefined;
     let resolvedDiscountList = normalizedNewDiscountList || this.getDiscountList();
     if (isAvailable && normalizedNewDiscountList) {
+      beforeCommit();
       await this.store.discount?.setDiscountList(normalizedNewDiscountList);
       // 实际写回商品时沿用扫码试算的优先级，避免旧商品行的选卡覆盖本次扫码。
       this.applyDiscount({
@@ -749,6 +785,7 @@ class OrderModule extends _BaseModule.BaseModule {
       await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
       resolvedDiscountList = this.getDiscountList();
     } else if (shouldRetainForLater) {
+      beforeCommit();
       // 只合并本次识别的卡券；不把试算产生的其他选券状态写回订单。
       const retainedDiscounts = new Map(this.getDiscountList().map(discount => [String(discount.id), discount]));
       evaluatedScannedDiscounts.forEach(discount => {
@@ -821,7 +858,7 @@ class OrderModule extends _BaseModule.BaseModule {
           discount_list: (0, _utils.normalizeOrderProductDiscountList)((0, _manualProductDiscount.syncManualProductDiscountProductNum)(mergedProduct.discount_list, mergedProduct.num))
         };
       }));
-      (0, _discountProductLineIdentity.ensureUniqueProductLineUids)(tempOrder);
+      (0, _discountProductLineIdentity.ensureUniqueProductLineUids)(tempOrder, discountList);
       (0, _discountProductLineIdentity.consolidateDiscountFreeProductLines)(tempOrder);
     }
     if (result?.discountList) {
@@ -878,7 +915,8 @@ class OrderModule extends _BaseModule.BaseModule {
    * - 不主动调用 applyDiscount / recalculateSummary，调用方负责跟进；
    * - 返回的 payload 只能在 applyDiscount（商品写路径还需 summary/persist）完成后发布。
    */
-  async evaluatePromotion() {
+  async evaluatePromotion(options) {
+    if (options?.isCurrentOrder && !options.isCurrentOrder()) return null;
     if (this.isApplyingPromotion || this.isEmittingPromotionApplied) {
       return null;
     }
@@ -939,6 +977,10 @@ class OrderModule extends _BaseModule.BaseModule {
                 continue;
               }
             }
+            const giftMutationBaseline = options?.isCurrentOrder ? (0, _lodashEs.cloneDeep)({
+              products: tempOrder.products,
+              bookings: tempOrder.bookings
+            }) : null;
             try {
               const giftResult = await this.giftSelectResolver({
                 strategyId: addAction.strategyId,
@@ -947,6 +989,11 @@ class OrderModule extends _BaseModule.BaseModule {
                 giftOptions: addAction.giftOptions,
                 sourceProductIds: addAction.sourceProductIds
               });
+              if (options?.isCurrentOrder && !options.isCurrentOrder()) return null;
+              if (options?.isCurrentOrder && !(0, _lodashEs.isEqual)({
+                products: tempOrder.products,
+                bookings: tempOrder.bookings
+              }, giftMutationBaseline)) return null;
               const giftProducts = Array.isArray(giftResult) ? giftResult : giftResult?.products;
               const giftBookings = Array.isArray(giftResult) ? [] : giftResult?.bookings || [];
               if (Array.isArray(giftProducts) && giftProducts.length > 0) {
@@ -967,12 +1014,18 @@ class OrderModule extends _BaseModule.BaseModule {
                 }
               }
             } catch (error) {
+              if (options?.isCurrentOrder && !options.isCurrentOrder()) return null;
+              if (options?.isCurrentOrder && !(0, _lodashEs.isEqual)({
+                products: tempOrder.products,
+                bookings: tempOrder.bookings
+              }, giftMutationBaseline)) return null;
               // 用户取消 / 选择失败 → 视为放弃本次新增
               console.warn('[OrderModule] giftSelectResolver rejected, skip add gift', addAction.strategyId, error);
             }
           }
         }
       }
+      if (options?.isCurrentOrder && !options.isCurrentOrder()) return null;
       tempOrder.products = result.products;
       this.lastUnfulfilledPromotions = result.unfulfilledPromotions;
       this.lastGiftActions = result.giftActions;
@@ -1066,7 +1119,9 @@ class OrderModule extends _BaseModule.BaseModule {
    * sessionStorage 的 cacheId 分桶。写入失败由 BaseModule 静默降级。
    */
   persistTempOrder() {
-    if (!this.sessionStoragePersistEnabled || !this.store.tempOrder) return;
+    if (!this.store.tempOrder) return;
+    (0, _holderRelations.ensureHolderRelationUuids)(this.store.tempOrder);
+    if (!this.sessionStoragePersistEnabled) return;
     this.checkSaveCache({
       cacheId: this.cacheId,
       fatherModule: this.fatherModule,
@@ -1775,7 +1830,10 @@ class OrderModule extends _BaseModule.BaseModule {
         source_product_price: this.normalizeFingerprintMoney(metadata.source_product_price),
         main_product_selling_price: this.normalizeFingerprintMoney(metadata.main_product_selling_price),
         main_product_original_price: this.normalizeFingerprintMoney(metadata.main_product_original_price),
-        product_discount_difference: this.normalizeFingerprintMoney(metadata.product_discount_difference)
+        product_discount_difference: this.normalizeFingerprintMoney(metadata.product_discount_difference),
+        ...(!(0, _holderRelations.hasProductBooking)(product) ? {
+          holder_relations: this.normalizeFingerprintValue((0, _holderRelations.getProductHolderRelations)(this.store.tempOrder || {}, product))
+        } : {})
       },
       product_sku: this.normalizeFingerprintValue({
         code: sku.code ?? '',
@@ -1811,7 +1869,7 @@ class OrderModule extends _BaseModule.BaseModule {
     items.sort((left, right) => JSON.stringify(left).localeCompare(JSON.stringify(right)));
     return JSON.stringify(items);
   }
-  buildProductStructuralFingerprintItem(product) {
+  buildProductStructuralFingerprintItem(product, order = this.store.tempOrder || {}) {
     const sku = product?.product_sku || {};
     const metadata = product?.metadata || {};
     const discountTypes = (product?.discount_list || []).map(discount => discount?.type ?? discount?.tag);
@@ -1826,7 +1884,10 @@ class OrderModule extends _BaseModule.BaseModule {
         unique_identification_number: metadata.unique_identification_number ?? product?.unique_identification_number ?? '',
         price_override: metadata.price_override ?? '',
         is_manual_discount: metadata.is_manual_discount ?? '',
-        product_discount_reason: metadata.product_discount_reason ?? ''
+        product_discount_reason: metadata.product_discount_reason ?? '',
+        ...(!(0, _holderRelations.hasProductBooking)(product) ? {
+          holder_relations: this.normalizeFingerprintValue((0, _holderRelations.getProductHolderRelations)(order, product))
+        } : {})
       },
       product_sku: this.normalizeFingerprintValue({
         code: sku.code ?? '',
@@ -1864,8 +1925,8 @@ class OrderModule extends _BaseModule.BaseModule {
       })))
     };
   }
-  buildOrderProductsStructuralFingerprint(products) {
-    const items = (products || []).map(product => this.buildProductStructuralFingerprintItem(product));
+  buildOrderProductsStructuralFingerprint(products, order = this.store.tempOrder || {}) {
+    const items = (products || []).map(product => this.buildProductStructuralFingerprintItem(product, order));
     items.sort((left, right) => JSON.stringify(left).localeCompare(JSON.stringify(right)));
     return JSON.stringify(items);
   }
@@ -1932,7 +1993,7 @@ class OrderModule extends _BaseModule.BaseModule {
     const manualDepositOverride = this.getManualDepositOverride(tempOrder);
     if (currentFingerprint !== snapshot.productFingerprint) {
       const currentStructuralFingerprint = this.buildOrderProductsStructuralFingerprint(tempOrder.products);
-      const snapshotStructuralFingerprint = this.buildOrderProductsStructuralFingerprint(Array.isArray(snapshot.products) ? snapshot.products : []);
+      const snapshotStructuralFingerprint = this.buildOrderProductsStructuralFingerprint(Array.isArray(snapshot.products) ? snapshot.products : [], snapshot);
       if (currentStructuralFingerprint !== snapshotStructuralFingerprint) return null;
     }
     let summary = {
@@ -2153,9 +2214,16 @@ class OrderModule extends _BaseModule.BaseModule {
     product.metadata = metadata;
     return String(uid);
   }
-  sanitizeOrderProductForTempOrder(product) {
+  sanitizeOrderProductForTempOrder(product, deferHolderCleanup = false) {
     if (product.metadata && typeof product.metadata === 'object') {
       delete product.metadata.origin;
+      if (!deferHolderCleanup && !(0, _holderRelations.hasProductBooking)(product)) {
+        delete product.metadata.holder;
+        delete product.metadata.holder_id;
+      }
+    }
+    if (product._extend?.holder_relations !== undefined) {
+      delete product._extend.holder_relations;
     }
     return product;
   }
@@ -2275,6 +2343,7 @@ class OrderModule extends _BaseModule.BaseModule {
     const bookingByBookingUid = new Map();
     bookings.forEach(booking => {
       if (!booking || typeof booking !== 'object') return;
+      if ((0, _pickupTiming.isFulfillmentTimingBooking)(booking)) return;
       const productUid = booking.product_uid || booking.metadata?.product_uid;
       if (productUid !== undefined && productUid !== null && String(productUid) !== '') {
         bookingByProductUid.set(String(productUid), booking);
@@ -2325,6 +2394,7 @@ class OrderModule extends _BaseModule.BaseModule {
     let baseHolder = null;
     const seen = new Set();
     for (const booking of tempOrder.bookings || []) {
+      if ((0, _pickupTiming.isFulfillmentTimingBooking)(booking)) continue;
       const holder = booking?.holder && typeof booking.holder === 'object' ? booking.holder : null;
       if (!baseHolder && holder) {
         baseHolder = holder;
@@ -2365,7 +2435,7 @@ class OrderModule extends _BaseModule.BaseModule {
    * this.syncTempOrderHolderFromBookings(tempOrder);
    */
   syncTempOrderHolderFromBookings(tempOrder) {
-    const bookings = tempOrder.bookings || [];
+    const bookings = (tempOrder.bookings || []).filter(booking => !(0, _pickupTiming.isFulfillmentTimingBooking)(booking));
     const hasHolderSource = bookings.some(booking => {
       return booking?.holder !== undefined || booking?.metadata?.holder_id !== undefined;
     });
@@ -2390,6 +2460,7 @@ class OrderModule extends _BaseModule.BaseModule {
     const bookingUid = product?.booking_uid || product?.metadata?.booking_uid;
     if (!productUid && !bookingUid) return;
     tempOrder.bookings = (tempOrder.bookings || []).filter(booking => {
+      if ((0, _pickupTiming.isFulfillmentTimingBooking)(booking)) return true;
       const currentBookingUid = this.getBookingUniqueIdentificationNumber(booking);
       if (bookingUid && currentBookingUid === String(bookingUid)) return false;
       if (productUid && String(booking?.product_uid || '') === String(productUid)) return false;
@@ -2431,6 +2502,7 @@ class OrderModule extends _BaseModule.BaseModule {
     return shouldUseManualDepositOverride ? nextSummary : this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
   }
   async recalculateSummary(options) {
+    if (options?.isCurrentOrder && !options.isCurrentOrder()) return null;
     const tempOrder = options?.createIfMissing ? this.ensureTempOrder() : this.store.tempOrder;
     if (!tempOrder) return null;
     this.sanitizeTempOrderProducts(tempOrder);
@@ -2440,7 +2512,7 @@ class OrderModule extends _BaseModule.BaseModule {
     const snapshotSummary = shouldReuseOriginalSnapshot ? this.restoreOriginalSnapshotIfProductsUnchanged(tempOrder, originalSnapshot) : null;
     if (snapshotSummary) return snapshotSummary;
     const shouldFullRecalculateFromSnapshot = Boolean(originalSnapshot);
-    const summaryProducts = shouldFullRecalculateFromSnapshot ? (0, _lodashEs.cloneDeep)(tempOrder.products || []) : tempOrder.products;
+    const summaryProducts = shouldFullRecalculateFromSnapshot || options?.isCurrentOrder ? (0, _lodashEs.cloneDeep)(tempOrder.products || []) : tempOrder.products;
     if (shouldFullRecalculateFromSnapshot) {
       this.clearPersistedAmountFieldsForFullRecalc(summaryProducts || []);
     }
@@ -2478,6 +2550,10 @@ class OrderModule extends _BaseModule.BaseModule {
       });
       return this.store.summary;
     }
+    const summaryMutationBaseline = options?.isCurrentOrder ? (0, _lodashEs.cloneDeep)({
+      tempOrder,
+      summary: this.store.summary
+    }) : null;
     const salesSummaryResult = await salesSummary.getSummary({
       products: summaryProducts,
       isPriceIncludeTax: tempOrder.is_price_include_tax,
@@ -2487,7 +2563,12 @@ class OrderModule extends _BaseModule.BaseModule {
         channel: this.otherParams.channel
       } : {})
     });
-    if (shouldFullRecalculateFromSnapshot) {
+    if (options?.isCurrentOrder && !options.isCurrentOrder()) return null;
+    if (options?.isCurrentOrder && !(0, _lodashEs.isEqual)({
+      tempOrder,
+      summary: this.store.summary
+    }, summaryMutationBaseline)) return null;
+    if (shouldFullRecalculateFromSnapshot || options?.isCurrentOrder) {
       tempOrder.products = summaryProducts;
     }
     this.syncSummaryProductMetadata(tempOrder.products || []);
@@ -2803,10 +2884,33 @@ class OrderModule extends _BaseModule.BaseModule {
     });
   }
   updateTempOrderServiceType(serviceType) {
+    if (serviceType !== 'pick_up') {
+      const tempOrder = this.ensureTempOrder();
+      tempOrder.bookings = (tempOrder.bookings || []).filter(booking => !(0, _pickupTiming.isFulfillmentTimingBooking)(booking));
+    }
     return this.updateTempOrderShopServiceData({
       service_type: serviceType
     });
   }
+  getPickupTimingBooking() {
+    return (this.store.tempOrder?.bookings || []).find(_pickupTiming.isFulfillmentTimingBooking) || null;
+  }
+  setPickupTimingBooking(input) {
+    const tempOrder = this.ensureTempOrder();
+    const bookings = tempOrder.bookings || [];
+    const firstIndex = bookings.findIndex(_pickupTiming.isFulfillmentTimingBooking);
+    const nextBooking = (0, _pickupTiming.buildPickupTimingBooking)(input, bookings[firstIndex]);
+    // Keep the first row's identity and position; repair duplicate marked rows only.
+    tempOrder.bookings = firstIndex === -1 ? [...bookings, nextBooking] : bookings.flatMap((booking, index) => index === firstIndex ? [nextBooking] : (0, _pickupTiming.isFulfillmentTimingBooking)(booking) ? [] : [booking]);
+    this.notifyTempOrderChanged();
+    return nextBooking;
+  }
+  clearPickupTimingBooking() {
+    const tempOrder = this.store.tempOrder;
+    if (!tempOrder?.bookings?.some(_pickupTiming.isFulfillmentTimingBooking)) return;
+    tempOrder.bookings = tempOrder.bookings.filter(booking => !(0, _pickupTiming.isFulfillmentTimingBooking)(booking));
+    this.notifyTempOrderChanged();
+  }
   updateTempOrderContactsInfo(contactsInfo) {
     const tempOrder = this.ensureTempOrder();
     tempOrder.contacts_info = contactsInfo && typeof contactsInfo === 'object' && !Array.isArray(contactsInfo) ? contactsInfo : null;
@@ -2918,6 +3022,7 @@ class OrderModule extends _BaseModule.BaseModule {
     const nextCustomerId = tempOrder.customer_id ?? null;
     if (String(previousCustomerId ?? '') !== String(nextCustomerId ?? '')) {
       this.clearCustomerWalletState(tempOrder);
+      (0, _holderRelations.removeProductHolderRelations)(tempOrder, tempOrder.products.filter(product => !(0, _holderRelations.hasProductBooking)(product)));
     }
     this.persistTempOrder();
     return {
@@ -3086,6 +3191,18 @@ class OrderModule extends _BaseModule.BaseModule {
     const matchMode = options.matchBy === 'compat' || options.matchBy === 'legacy' ? 'compat' : 'payment_number';
     const matchedPayment = (0, _paymentUtils.resolveOrderPaymentIdentity)(tempOrder.payments || [], identity, matchMode);
     if (!matchedPayment) {
+      try {
+        void Promise.resolve(this.logger?.addLog?.({
+          type: 'warning',
+          title: '[PaymentTrace] payment-missing',
+          metadata: {
+            moduleName: this.name,
+            saleId: tempOrder.external_sale_number,
+            paymentNumber: identity,
+            currentPaymentNumbers: (tempOrder.payments || []).map(p => p.payment_number)
+          }
+        })).catch(() => {});
+      } catch {/* 日志失败不影响原异常。 */}
       throw new Error(`未找到支付项: ${identity}`);
     }
     let updatedPayment = null;
@@ -3393,20 +3510,30 @@ class OrderModule extends _BaseModule.BaseModule {
    * await this.finalizeProductOrderMutation(tempOrder);
    */
   async finalizeProductOrderMutation(tempOrder, options) {
+    const isCurrentOrder = options?.isCurrentOrder;
+    if (isCurrentOrder && !isCurrentOrder()) return;
     this.syncTempOrderHolderFromBookings(tempOrder);
     this.prepareVirtualSettlementTempOrder(tempOrder);
     const isVirtualSettlement = this.isActiveVirtualSettlementOrder(tempOrder);
     if (!options?.skipEditDiscountConfigRefresh && !isVirtualSettlement) {
       await this.ensureEditDiscountConfigForProductChange(tempOrder);
     }
-    const promotionPayload = !options?.skipDiscountRecalculation && !isVirtualSettlement ? await this.evaluatePromotion() : null;
+    if (isCurrentOrder && !isCurrentOrder()) return;
+    const promotionPayload = !options?.skipDiscountRecalculation && !isVirtualSettlement ? await this.evaluatePromotion(isCurrentOrder ? {
+      isCurrentOrder
+    } : undefined) : null;
+    if (isCurrentOrder && !isCurrentOrder()) return;
     if (!options?.skipDiscountRecalculation && !isVirtualSettlement) {
       this.applyDiscount();
     }
     this.sanitizeTempOrderProducts(tempOrder);
-    await this.recalculateSummary({
-      createIfMissing: true
+    const summary = await this.recalculateSummary({
+      createIfMissing: true,
+      ...(isCurrentOrder ? {
+        isCurrentOrder
+      } : {})
     });
+    if (isCurrentOrder && (!isCurrentOrder() || !summary)) return;
     this.persistTempOrder();
     this.emitPromotionApplied(promotionPayload);
   }
@@ -3429,7 +3556,6 @@ class OrderModule extends _BaseModule.BaseModule {
       booking
     }) : null;
     const productToAdd = linked?.product || product;
-    this.assertAndLockProductSettlement(tempOrder, productToAdd);
     const disableMerge = options?.disableMerge === true;
     const incomingFingerprint = disableMerge ? '' : (0, _utils3.buildProductLineFingerprint)((0, _utils.getProductSkuOptions)(productToAdd), productToAdd.product_bundle);
     const normalizedIncoming = this.normalizeVirtualSettlementProductIfEnabled((0, _utils.mergeOrderProductDisplayFields)(productToAdd, (0, _utils3.normalizeOrderProduct)(productToAdd)));
@@ -3460,10 +3586,13 @@ class OrderModule extends _BaseModule.BaseModule {
     const hasIncomingProductNote = this.hasOrderProductLineNote(normalizedIncoming);
     const hasIncomingManualProductDiscount = isManualProductDiscountProduct(normalizedIncoming);
     const hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
+    const holderRelationsPatch = !hasIncomingBookingUid ? productToAdd._extend?.holder_relations : undefined;
+    const hasIncomingHolder = Array.isArray(holderRelationsPatch) && holderRelationsPatch.length > 0;
     const isIncomingCustomItem = productToAdd.metadata?.origin?.isCustomItem === true || productToAdd._origin?.isCustomItem === true;
-    const shouldForceNewLine = disableMerge || !!booking || hasIncomingGoodPass || isIncomingPersistedEntitlementPass || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
+    const shouldForceNewLine = disableMerge || !!booking || hasIncomingGoodPass || isIncomingPersistedEntitlementPass || hasIncomingBookingUid || hasIncomingHolder || isIncomingCustomItem || isWeighingProduct;
     const matchedIndex = shouldForceNewLine ? -1 : tempOrder.products.findIndex(item => {
       if (this.hasGoodPassDiscount(item)) return false;
+      if ((0, _holderRelations.getProductHolderRelations)(tempOrder, item).length > 0 || (0, _utils.hasAssignedHolderId)(item.metadata?.holder_id)) return false;
       const isRuntimeEntitlementPass = this.isRuntimeEntitlementAppend(item, tempOrder);
       if (isIncomingEntitlementAppend !== isRuntimeEntitlementPass) {
         return false;
@@ -3491,6 +3620,8 @@ class OrderModule extends _BaseModule.BaseModule {
     const matchedProduct = matchedIndex === -1 ? null : tempOrder.products[matchedIndex];
     const existedFingerprint = matchedProduct ? (0, _utils3.buildProductLineFingerprint)((0, _utils.getProductSkuOptions)(matchedProduct), matchedProduct.product_bundle) : '';
     const commitProductLine = shouldMerge => {
+      options?.beforeCommit?.();
+      this.assertAndLockProductSettlement(tempOrder, productToAdd);
       let committedProduct;
       if (matchedIndex === -1 || !matchedProduct || !shouldMerge) {
         this.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
@@ -3552,6 +3683,7 @@ class OrderModule extends _BaseModule.BaseModule {
       if (linked) {
         tempOrder.bookings = [...(tempOrder.bookings || []), linked.booking];
       }
+      (0, _holderRelations.replaceProductHolderRelations)(tempOrder, committedProduct, holderRelationsPatch);
       return committedProduct;
     };
     if (!matchedProduct) {
@@ -3642,7 +3774,16 @@ class OrderModule extends _BaseModule.BaseModule {
    * // → tempOrder.products 新增 3 行，每行 num=1，bookings 3 条
    */
   async addProductToOrder(product, booking, options) {
-    const tempOrder = this.ensureTempOrder();
+    const availabilityCommitGuard = options?.availabilityCommitGuard;
+    availabilityCommitGuard?.();
+    const liveTempOrder = this.ensureTempOrder();
+    const beforeCommit = this.createCartIntentCommitGuard('add_product', liveTempOrder);
+    // 自动预约在草稿上准备完整批次，避免拆票期间暴露半成品，或在失败时
+    // 用整单快照回滚而抹掉其他入口的并发修改。人工路径保持原有写入行为。
+    const tempOrder = availabilityCommitGuard ? (0, _lodashEs.cloneDeep)(liveTempOrder) : liveTempOrder;
+    const guardedMutationFields = ['products', 'bookings', 'notes', '_extend', 'metadata', 'currency_code', 'currency_symbol', 'currency_format'];
+    const readGuardedMutationFields = order => Object.fromEntries(guardedMutationFields.map(key => [key, order[key]]));
+    const guardedMutationBaseline = availabilityCommitGuard ? (0, _lodashEs.cloneDeep)(readGuardedMutationFields(liveTempOrder)) : null;
     const salesNoteDrafts = (options?.salesNotes || []).map(draft => ({
       note_type: String(draft.note_type || '').trim(),
       text: {
@@ -3652,6 +3793,7 @@ class OrderModule extends _BaseModule.BaseModule {
     }));
     const mutationSnapshot = salesNoteDrafts.length > 0 ? {
       products: (0, _lodashEs.cloneDeep)(tempOrder.products || []),
+      holder_relations: (0, _lodashEs.cloneDeep)(tempOrder.holder_relations),
       bookings: (0, _lodashEs.cloneDeep)(tempOrder.bookings || []),
       notes: (0, _lodashEs.cloneDeep)(tempOrder.notes || []),
       extend: (0, _lodashEs.cloneDeep)(tempOrder._extend || {})
@@ -3676,6 +3818,7 @@ class OrderModule extends _BaseModule.BaseModule {
     const rollbackProductAndNotesMutation = () => {
       if (!mutationSnapshot) return;
       tempOrder.products = mutationSnapshot.products;
+      if (mutationSnapshot.holder_relations === undefined) delete tempOrder.holder_relations;else tempOrder.holder_relations = mutationSnapshot.holder_relations;
       tempOrder.bookings = mutationSnapshot.bookings;
       tempOrder.notes = mutationSnapshot.notes;
       tempOrder._extend = mutationSnapshot.extend;
@@ -3685,7 +3828,7 @@ class OrderModule extends _BaseModule.BaseModule {
       const uid = line.metadata?.unique_identification_number || line.unique_identification_number;
       return uid !== undefined && uid !== null && String(uid) === String(insertAfterProductUid);
     }) : -1;
-    let insertAtIndex = anchorIndex >= 0 ? anchorIndex + 1 : undefined;
+    let insertAtIndex = options?.insertAtStart ? 0 : anchorIndex >= 0 ? anchorIndex + 1 : undefined;
     try {
       if (booking) {
         const productRecord = product;
@@ -3713,35 +3856,76 @@ class OrderModule extends _BaseModule.BaseModule {
             }
             const committedProduct = await this.appendProductLineToTempOrder(tempOrder, splitLine.product, splitLine.booking, {
               insertAtIndex,
-              disableMerge: options?.disableMerge
+              disableMerge: options?.disableMerge,
+              beforeCommit
             });
+            availabilityCommitGuard?.();
             attachSalesNoteDrafts(committedProduct);
             if (insertAtIndex !== undefined) insertAtIndex += 1;
           }
         } else {
           const committedProduct = await this.appendProductLineToTempOrder(tempOrder, product, (0, _lodashEs.cloneDeep)(booking), {
             insertAtIndex,
-            disableMerge: options?.disableMerge
+            disableMerge: options?.disableMerge,
+            beforeCommit
           });
+          availabilityCommitGuard?.();
           attachSalesNoteDrafts(committedProduct);
         }
       } else {
         const committedProduct = await this.appendProductLineToTempOrder(tempOrder, product, undefined, {
           insertAtIndex,
-          disableMerge: options?.disableMerge
+          disableMerge: options?.disableMerge,
+          beforeCommit
         });
+        availabilityCommitGuard?.();
         attachSalesNoteDrafts(committedProduct);
       }
+      if (availabilityCommitGuard) {
+        availabilityCommitGuard();
+        beforeCommit();
+        // 调用方的结构 revision 可能不包括备注、价格或结算元数据。
+        // 本次会覆盖的字段也要保持原值，不能让草稿覆盖并发编辑。
+        if (!(0, _lodashEs.isEqual)(readGuardedMutationFields(liveTempOrder), guardedMutationBaseline)) {
+          throw Object.assign(new Error('预约加购期间订单已变化，请重新选择'), {
+            code: 'AVAILABILITY_SELECTION_STALE'
+          });
+        }
+        // 从最后一次门禁到真正新增之间不再 await。只发布本次新增会改写的
+        // 字段；其余订单字段继续使用 live 对象，外部持有的订单引用也不变。
+        Object.assign(liveTempOrder, readGuardedMutationFields(tempOrder));
+      }
     } catch (error) {
       rollbackProductAndNotesMutation();
       throw error;
     }
-    await this.finalizeProductOrderMutation(tempOrder);
+    // 发布后预约已加购；后续促销/summary 沿用既有收尾，不用自身新增后的
+    // revision 再执行提交 CAS，也不会把已加购预约因收尾耗时而撤回。
+    if (availabilityCommitGuard) {
+      const committedIdentity = [liveTempOrder.order_id, liveTempOrder.external_sale_number];
+      const isCurrentOrder = () => this.store.tempOrder === liveTempOrder && liveTempOrder.order_id === committedIdentity[0] && liveTempOrder.external_sale_number === committedIdentity[1] && (options?.availabilityCommitTargetGuard?.() ?? true);
+      try {
+        // 新增已发布，即使后续报价/促销收尾失败，也不能向调用方报告未加购。
+        // 先保存已提交行；异步结果只允许写回仍属于本次提交的订单。
+        if (isCurrentOrder()) this.persistTempOrder();
+        await this.finalizeProductOrderMutation(liveTempOrder, {
+          isCurrentOrder
+        });
+      } catch (error) {
+        this.logWarning('addProductToOrder committed; finalization failed', {
+          product_id: product.product_id,
+          committed: true,
+          error: error instanceof Error ? error.message : String(error)
+        });
+      }
+    } else {
+      await this.finalizeProductOrderMutation(liveTempOrder);
+    }
     this.logInfo('addProductToOrder success', {
       product_id: product.product_id,
       with_booking: !!booking
     });
-    return tempOrder.products;
+    return liveTempOrder.products;
   }
 
   /**
@@ -3756,6 +3940,7 @@ class OrderModule extends _BaseModule.BaseModule {
   async addProductsToOrder(items, options) {
     const tempOrder = this.ensureTempOrder();
     if (!Array.isArray(items) || items.length === 0) return tempOrder.products;
+    const beforeCommit = this.createCartIntentCommitGuard('add_product', tempOrder);
     for (const item of items || []) {
       const {
         product,
@@ -3768,13 +3953,17 @@ class OrderModule extends _BaseModule.BaseModule {
         if (splitCount > 1) {
           for (let i = 0; i < splitCount; i += 1) {
             const splitLine = this.createSplitBookingLine(productRecord, booking, i, splitCount);
-            const appendResult = this.appendProductLineToTempOrder(tempOrder, splitLine.product, splitLine.booking);
+            const appendResult = this.appendProductLineToTempOrder(tempOrder, splitLine.product, splitLine.booking, {
+              beforeCommit
+            });
             if (appendResult) await appendResult;
           }
           continue;
         }
       }
-      const appendResult = this.appendProductLineToTempOrder(tempOrder, product, booking);
+      const appendResult = this.appendProductLineToTempOrder(tempOrder, product, booking, {
+        beforeCommit
+      });
       if (appendResult) await appendResult;
     }
     await this.finalizeProductOrderMutation(tempOrder, options);
@@ -3859,6 +4048,16 @@ class OrderModule extends _BaseModule.BaseModule {
       };
     });
   }
+  isRestrictedCartProductUpdate(tempOrder, params) {
+    if (!this.orderHooks?.beforeCartIntentCommit) return false;
+    if (params.booking || Object.keys(params.updates || {}).some(key => key !== 'num')) {
+      return true;
+    }
+    if (params.updates?.num === undefined) return false;
+    const uid = params.unique_identification_number;
+    const product = uid !== undefined ? tempOrder.products.find(item => String(item.metadata?.unique_identification_number || item.unique_identification_number || '') === String(uid)) : tempOrder.products[(0, _utils3.getProductIdentityIndex)(tempOrder.products, params)];
+    return !product || (0, _utils3.getSafeProductNum)(params.updates.num) > product.num;
+  }
   applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids) {
     const {
       product_id,
@@ -4104,12 +4303,16 @@ class OrderModule extends _BaseModule.BaseModule {
       if (uid) reapplyWeighedDiscountProductUids?.push(String(uid));
     }
     tempOrder.products[productIndex] = normalizedProduct;
+    (0, _holderRelations.replaceProductHolderRelations)(tempOrder, normalizedProduct, updates._extend?.holder_relations);
     this.syncTempOrderHolderFromBookings(tempOrder);
     this.captureProductRuntime(tempOrder, updates, tempOrder.products[productIndex], tempOrder.products[productIndex].metadata?.unique_identification_number);
     return tempOrder.products[productIndex].metadata?.unique_identification_number;
   }
   async updateOrderProduct(params) {
     const tempOrder = this.ensureTempOrder();
+    if (this.isRestrictedCartProductUpdate(tempOrder, params)) {
+      this.createCartIntentCommitGuard('update_product', tempOrder)();
+    }
     const reapplyWeighedDiscountProductUids = [];
     const updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids);
     const promotionPayload = await this.evaluatePromotion();
@@ -4133,6 +4336,9 @@ class OrderModule extends _BaseModule.BaseModule {
     if (!paramsList.length) {
       return tempOrder.products;
     }
+    if (paramsList.some(params => this.isRestrictedCartProductUpdate(tempOrder, params))) {
+      this.createCartIntentCommitGuard('update_product', tempOrder)();
+    }
     const reapplyWeighedDiscountProductUids = [];
     const reapplyBookingDiscountProductUids = paramsList.reduce((acc, params) => {
       const updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids);
@@ -4151,7 +4357,9 @@ class OrderModule extends _BaseModule.BaseModule {
     });
     return tempOrder.products;
   }
-  async updateOrderProductQuantity(params) {
+  async updateOrderProductQuantity(params, options) {
+    const isCurrentOrder = options?.isCurrentOrder;
+    if (isCurrentOrder && !isCurrentOrder()) return this.store.tempOrder?.products || [];
     const {
       product_id,
       product_variant_id,
@@ -4217,19 +4425,30 @@ class OrderModule extends _BaseModule.BaseModule {
         throw new _virtualSettlement.VirtualCurrencyBalanceError(balance.toFixed(2), requiredAmount.toFixed(2));
       }
     }
+    if (normalizedProduct.num > targetProduct.num) {
+      this.createCartIntentCommitGuard('increase_quantity', tempOrder)();
+    }
+    if (isCurrentOrder && !isCurrentOrder()) return tempOrder.products;
     tempOrder.products[productIndex] = normalizedProduct;
-    this.prepareVirtualSettlementTempOrder(tempOrder);
-    const isVirtualSettlement = this.isActiveVirtualSettlementOrder(tempOrder);
-    const promotionPayload = !isVirtualSettlement ? await this.evaluatePromotion() : null;
-    if (!isVirtualSettlement) {
-      this.applyDiscount();
+    if (isCurrentOrder) {
+      await this.finalizeProductOrderMutation(tempOrder, {
+        skipEditDiscountConfigRefresh: true,
+        isCurrentOrder
+      });
+    } else {
+      this.prepareVirtualSettlementTempOrder(tempOrder);
+      const isVirtualSettlement = this.isActiveVirtualSettlementOrder(tempOrder);
+      const promotionPayload = !isVirtualSettlement ? await this.evaluatePromotion() : null;
+      if (!isVirtualSettlement) {
+        this.applyDiscount();
+      }
+      this.sanitizeTempOrderProducts(tempOrder);
+      await this.recalculateSummary({
+        createIfMissing: true
+      });
+      this.persistTempOrder();
+      this.emitPromotionApplied(promotionPayload);
     }
-    this.sanitizeTempOrderProducts(tempOrder);
-    await this.recalculateSummary({
-      createIfMissing: true
-    });
-    this.persistTempOrder();
-    this.emitPromotionApplied(promotionPayload);
     this.logInfo('updateOrderProductQuantity success', {
       params
     });
@@ -4294,6 +4513,8 @@ class OrderModule extends _BaseModule.BaseModule {
    * await order.removeProductsFromOrder([identityA, identityB]);
    */
   async removeProductsFromOrder(identities, options) {
+    const isCurrentOrder = options?.isCurrentOrder;
+    if (isCurrentOrder && !isCurrentOrder()) return this.store.tempOrder?.products || [];
     const tempOrder = this.ensureTempOrder();
     if (!identities.length) {
       return tempOrder.products;
@@ -4360,8 +4581,16 @@ class OrderModule extends _BaseModule.BaseModule {
         tempOrder.products = nextProductIndex >= 0 ? [...productsWithoutRemaining.slice(0, nextProductIndex), remainingProduct, ...productsWithoutRemaining.slice(nextProductIndex)] : [...productsWithoutRemaining, remainingProduct];
       }
     }
+    (0, _holderRelations.removeProductHolderRelations)(tempOrder, productsBeforeRemove.filter(product => !tempOrder.products.includes(product)));
     this.removeSalesNotesForMissingProductLines(tempOrder);
-    await this.finalizeAfterProductsMutation(tempOrder);
+    if (isCurrentOrder) {
+      await this.finalizeProductOrderMutation(tempOrder, {
+        skipEditDiscountConfigRefresh: true,
+        isCurrentOrder
+      });
+    } else {
+      await this.finalizeAfterProductsMutation(tempOrder);
+    }
     this.logInfo('removeProductsFromOrder success', {
       identities
     });
@@ -4378,6 +4607,7 @@ class OrderModule extends _BaseModule.BaseModule {
   async clearOrderCartLines() {
     const tempOrder = this.ensureTempOrder();
     this.ensureSalesNotesLoadedForMutation(tempOrder);
+    (0, _holderRelations.removeProductHolderRelations)(tempOrder, tempOrder.products);
     tempOrder.products = [];
     tempOrder.bookings = [];
     (0, _virtualSettlement.releaseTempOrderSettlementState)(tempOrder);
@@ -4407,6 +4637,7 @@ class OrderModule extends _BaseModule.BaseModule {
   async clearOrderForSettlementSwitch() {
     const tempOrder = this.ensureTempOrder();
     this.ensureSalesNotesLoadedForMutation(tempOrder);
+    (0, _holderRelations.removeProductHolderRelations)(tempOrder, tempOrder.products);
     tempOrder.products = [];
     tempOrder.bookings = [];
     this.removeSalesNotesForMissingProductLines(tempOrder);
@@ -4525,6 +4756,7 @@ class OrderModule extends _BaseModule.BaseModule {
   }
   async runSubmitTempOrder(params) {
     const tempOrder = this.ensureTempOrder();
+    if ((0, _localEftposState.requiresLocalPaymentRefresh)(tempOrder)) throw new Error(_localEftposState.PAYMENT_REFRESH_MESSAGE);
     this.prepareVirtualSettlementTempOrder(tempOrder);
     const isOnlineStorePlatform = this.isOnlineStorePlatform();
     const shouldConfirmPendingVoucherPayments = params?.confirmPendingVoucherPayments !== false;
@@ -4999,7 +5231,7 @@ class OrderModule extends _BaseModule.BaseModule {
       query
     } = params;
     const fetchUrl = url || '/order/sales/checkout';
-    const requestQuery = this.isSalesCheckoutHandledByOsServer(fetchUrl) ? query : (0, _osPrivatePayload.stripOsPrivatePayloadFields)(query);
+    const requestQuery = this.isSalesCheckoutHandledByOsServer(fetchUrl) ? query : (0, _localEftposState.stripLocalEftposState)((0, _osPrivatePayload.stripOsPrivatePayloadFields)(query));
     return this.request.post(fetchUrl, requestQuery, {
       osServer: true,
       customToast: () => {}
@@ -5044,13 +5276,10 @@ class OrderModule extends _BaseModule.BaseModule {
     if (lookup.startsWith('LOCAL_')) {
       params.forceRemote = false;
     }
-    const res = await this.request.get(`/order/sales/${encodeURIComponent(lookup)}`, {
-      with: ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info', 'order_meta_list', 'refunds', 'notes'],
-      ...(params.forceRemote ? {
-        forceRemote: true
-      } : {})
-    }, {
-      osServer: true
+    const res = await (0, _loadSalesOrderSnapshot.loadSalesOrderSnapshot)(this.request, {
+      lookup,
+      transport: 'os-server',
+      forceRemote: params.forceRemote
     });
     if (res.code === 200) {
       this.store.lastOrderInfo = res.data;
@@ -5152,6 +5381,7 @@ class OrderModule extends _BaseModule.BaseModule {
       originalSalesSnapshot: {
         summary: (0, _lodashEs.cloneDeep)(this.store.summary),
         products: (0, _lodashEs.cloneDeep)(nextTempOrder.products || []),
+        holder_relations: (0, _lodashEs.cloneDeep)(nextTempOrder.holder_relations),
         bookings: (0, _lodashEs.cloneDeep)(nextTempOrder.bookings || []),
         payments: (0, _lodashEs.cloneDeep)(nextTempOrder.payments || []),
         surcharges: (0, _lodashEs.cloneDeep)(nextTempOrder.surcharges || []),
@@ -5304,6 +5534,9 @@ class OrderModule extends _BaseModule.BaseModule {
     nextTempOrder.metadata = raw.metadata && typeof raw.metadata === 'object' ? {
       ...raw.metadata
     } : {};
+    const holderRelations = (0, _holderRelations.restoreLegacyHolderRelations)(raw);
+    if (holderRelations === undefined) delete nextTempOrder.holder_relations;else nextTempOrder.holder_relations = (0, _lodashEs.cloneDeep)(holderRelations);
+    (0, _holderRelations.ensureHolderRelationUuids)(nextTempOrder);
     nextTempOrder.holder = raw.holder && typeof raw.holder === 'object' ? {
       ...raw.holder
     } : null;
@@ -5381,6 +5614,7 @@ class OrderModule extends _BaseModule.BaseModule {
     }
     tempOrderExtend.productsByUid = productsByUid;
     this.hydrateLinkedBookingIdentity(nextTempOrder);
+    nextTempOrder.products.forEach(product => this.sanitizeOrderProductForTempOrder(product));
     if (options?.ensureIdentity !== false) {
       this.ensureExternalSaleNumber(nextTempOrder);
     }
@@ -5541,7 +5775,7 @@ class OrderModule extends _BaseModule.BaseModule {
     };
     if (result.metadata) delete result.metadata.price_schema_version;
     const restored = (0, _bundleDiscountHydration.restoreHydratedBundleDiscounts)(result, _utils.normalizeOrderProductDiscountList);
-    return this.sanitizeOrderProductForTempOrder(this.normalizeVirtualSettlementProductIfEnabled(restored));
+    return this.sanitizeOrderProductForTempOrder(this.normalizeVirtualSettlementProductIfEnabled(restored), true);
   }
   getLastOrderInfo() {
     return this.store?.lastOrderInfo;