@pisell/pisellos 2.2.314 → 2.2.315

package/lib/modules/Order/index.js

@@ -4,11 +4,20 @@ 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 _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 +442,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();
@@ -661,6 +693,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 +741,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 +775,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 +784,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 => {
@@ -878,7 +914,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 +976,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 +988,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 +1013,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;
@@ -2275,6 +2327,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 +2378,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 +2419,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 +2444,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 +2486,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 +2496,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 +2534,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 +2547,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 +2868,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;
@@ -3086,6 +3174,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 +3493,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 +3539,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)));
@@ -3491,6 +3600,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);
@@ -3642,7 +3753,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: {
@@ -3685,7 +3805,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 +3833,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 +3917,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 +3930,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 +4025,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,
@@ -4110,6 +4286,9 @@ class OrderModule extends _BaseModule.BaseModule {
   }
   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 +4312,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 +4333,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 +4401,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 +4489,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;
@@ -4361,7 +4558,14 @@ class OrderModule extends _BaseModule.BaseModule {
       }
     }
     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
     });
@@ -4525,6 +4729,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 +5204,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 +5249,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;

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

@@ -0,0 +1,13 @@
+/** Local reconciliation state; never part of a cloud checkout payload. */
+export declare const LOCAL_EFTPOS_REFRESH_REQUIRED = "_local_eftpos_refresh_required";
+export declare const LOCAL_EFTPOS_FINALIZED = "_local_eftpos_finalized";
+export declare const PAYMENT_REFRESH_MESSAGE = "\u8BA2\u5355\u9700\u8981\u5237\u65B0\uFF0C\u8BF7\u8054\u7F51\u5237\u65B0\u8BA2\u5355\u540E\u518D\u4ED8\u6B3E";
+export interface LocalEftposFinalization {
+    saleId: string | number;
+    paymentNumber: string;
+    result: 'failed' | 'not_started';
+    failedTransactionNumbers: string[];
+}
+export declare function requiresLocalPaymentRefresh(order: any): boolean;
+export declare function isLocalFinalizedPayment(payment: any): boolean;
+export declare function stripLocalEftposState<T extends Record<string, any>>(order: T): T;

package/lib/modules/Order/localEftposState.js

@@ -0,0 +1,44 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PAYMENT_REFRESH_MESSAGE = exports.LOCAL_EFTPOS_REFRESH_REQUIRED = exports.LOCAL_EFTPOS_FINALIZED = void 0;
+exports.isLocalFinalizedPayment = isLocalFinalizedPayment;
+exports.requiresLocalPaymentRefresh = requiresLocalPaymentRefresh;
+exports.stripLocalEftposState = stripLocalEftposState;
+/** Local reconciliation state; never part of a cloud checkout payload. */
+const LOCAL_EFTPOS_REFRESH_REQUIRED = exports.LOCAL_EFTPOS_REFRESH_REQUIRED = '_local_eftpos_refresh_required';
+const LOCAL_EFTPOS_FINALIZED = exports.LOCAL_EFTPOS_FINALIZED = '_local_eftpos_finalized';
+const PAYMENT_REFRESH_MESSAGE = exports.PAYMENT_REFRESH_MESSAGE = '订单需要刷新，请联网刷新订单后再付款';
+function requiresLocalPaymentRefresh(order) {
+  return order?.metadata?.[LOCAL_EFTPOS_REFRESH_REQUIRED] === true;
+}
+function isLocalFinalizedPayment(payment) {
+  return payment?.status === 'voided' && payment?.metadata?.[LOCAL_EFTPOS_FINALIZED] === true;
+}
+function stripLocalEftposState(order) {
+  const result = {
+    ...order
+  };
+  if (order.metadata) {
+    result.metadata = {
+      ...order.metadata
+    };
+    delete result.metadata[LOCAL_EFTPOS_REFRESH_REQUIRED];
+  }
+  if (Array.isArray(order.payments)) {
+    result.payments = order.payments.filter(payment => !isLocalFinalizedPayment(payment)).map(payment => {
+      if (!payment.metadata?.[LOCAL_EFTPOS_FINALIZED]) return payment;
+      const metadata = {
+        ...payment.metadata
+      };
+      delete metadata[LOCAL_EFTPOS_FINALIZED];
+      return {
+        ...payment,
+        metadata
+      };
+    });
+  }
+  return result;
+}