@pisell/pisellos 2.2.313 → 2.2.315

package/dist/modules/Order/index.js

@@ -30,11 +30,14 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { loadSalesOrderSnapshot } from "../../shared/sales/loadSalesOrderSnapshot";
+import { PAYMENT_REFRESH_MESSAGE, requiresLocalPaymentRefresh, stripLocalEftposState } from "./localEftposState";
 import { BaseModule } from "../BaseModule";
 import { OrderHooks } from "./types";
 import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, ensureCartItemOriginHolder, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeOrderMetaList, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, collectPointCardSnapshotCodeCandidates, mergePointCardSnapshotCodes as _mergePointCardSnapshotCodes, buildVirtualCurrencySnapshotFromList, mergeOrderProductDisplayFields, resolveIsFormSubject, isMarkdownBundle } from "./utils";
 import { isNormalProduct } from "../Product/utils";
 import { getWeighedProductPriceFingerprint, resolveWeighedSourcePrice, withOriginalBundleOptionPrices } from "./utils/weighedProduct";
+import { buildPickupTimingBooking, isFulfillmentTimingBooking } from "./pickupTiming";
 import dayjs from 'dayjs';
 import { getDiscountLifecycleReason } from "../Discount/availability";
 import { stripOsPrivatePayloadFields } from "../../utils/os-private-payload";
@@ -53,7 +56,7 @@ import { RulesModule } from "../Rules";
 import { isEntitlementPass, isFullCoveragePass } from "../Discount/entitlementPass";
 import { UnavailableReason } from "../Rules/types";
 import Decimal from 'decimal.js';
-import { cloneDeep } from 'lodash-es';
+import { cloneDeep, isEqual } from 'lodash-es';
 function normalizeDiscountListSignature(discountList) {
   return (discountList || []).map(function (item) {
     var _item$type, _item$discount_id, _item$order_discount_;
@@ -520,6 +523,36 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       this.otherParams = otherParams;
     }
 
+    /** Internal intent boundary shared with asynchronous scanner/detail flows. */
+  }, {
+    key: "createCartIntentCommitGuard",
+    value: function createCartIntentCommitGuard(action) {
+      var _this$orderHooks,
+        _this$orderHooks2,
+        _this2 = this;
+      var tempOrder = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.store.tempOrder;
+      var hook = (_this$orderHooks = this.orderHooks) === null || _this$orderHooks === void 0 ? void 0 : _this$orderHooks.beforeCartIntentCommit;
+      if (!hook) return function () {};
+      var getScope = (_this$orderHooks2 = this.orderHooks) === null || _this$orderHooks2 === void 0 ? void 0 : _this$orderHooks2.getCartIntentScope;
+      var scope = getScope === null || getScope === void 0 ? void 0 : getScope();
+      var otherParams = this.otherParams;
+      var committed = false;
+      return function () {
+        var _this2$orderHooks, _this2$orderHooks2;
+        if (_this2.store.tempOrder !== tempOrder || _this2.otherParams !== otherParams || ((_this2$orderHooks = _this2.orderHooks) === null || _this2$orderHooks === void 0 ? void 0 : _this2$orderHooks.beforeCartIntentCommit) !== hook || ((_this2$orderHooks2 = _this2.orderHooks) === null || _this2$orderHooks2 === void 0 ? void 0 : _this2$orderHooks2.getCartIntentScope) !== getScope || (getScope === null || getScope === void 0 ? void 0 : 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: action,
+          tempOrder: tempOrder
+        });
+        committed = true;
+      };
+    }
+
     /** PC/H5 属于在线店铺；其它或缺失平台统一沿用 POS 行为。 */
   }, {
     key: "isOnlineStorePlatform",
@@ -611,10 +644,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createDefaultRulesHooks",
     value: function createDefaultRulesHooks() {
-      var _this2 = this;
+      var _this3 = this;
       return createDefaultOrderRulesHooks(function () {
-        var _this2$store$tempOrde;
-        return ((_this2$store$tempOrde = _this2.store.tempOrder) === null || _this2$store$tempOrde === void 0 ? void 0 : _this2$store$tempOrde.bookings) || [];
+        var _this3$store$tempOrde;
+        return ((_this3$store$tempOrde = _this3.store.tempOrder) === null || _this3$store$tempOrde === void 0 ? void 0 : _this3$store$tempOrde.bookings) || [];
       });
     }
 
@@ -637,7 +670,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
         var _this$store$tempOrder,
           _this$store$discount,
-          _this3 = this,
+          _this4 = this,
           _this$store$tempOrder2;
         var orderId, requestEpoch, requestOrderIdentityKey, prepareConfigResult, isCurrentRequest, discountList, _this$store$discount2, _this$store$discount3, _this$store$discount4, currentDiscountList, currentCommittedDiscounts, currentScanDiscounts, currentScanDiscountById, committedDiscountById, mergedCommittedDiscountIds, refreshedScanDiscountIds, runtimeDiscountIds, runtimeDiscounts, retainedCommittedDiscounts, retainedScanDiscounts, mergedDiscountList;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
@@ -665,8 +698,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 5:
               prepareConfigResult = _context3.sent;
               isCurrentRequest = function isCurrentRequest() {
-                var _this3$store$tempOrde, _this3$store$tempOrde2;
-                return requestEpoch === _this3.customerWalletPrepareConfigEpoch && _this3.getDiscountConfigOrderIdentityKey(_this3.store.tempOrder) === requestOrderIdentityKey && String((_this3$store$tempOrde = (_this3$store$tempOrde2 = _this3.store.tempOrder) === null || _this3$store$tempOrde2 === void 0 ? void 0 : _this3$store$tempOrde2.customer_id) !== null && _this3$store$tempOrde !== void 0 ? _this3$store$tempOrde : '') === String(params.customerId);
+                var _this4$store$tempOrde, _this4$store$tempOrde2;
+                return requestEpoch === _this4.customerWalletPrepareConfigEpoch && _this4.getDiscountConfigOrderIdentityKey(_this4.store.tempOrder) === requestOrderIdentityKey && String((_this4$store$tempOrde = (_this4$store$tempOrde2 = _this4.store.tempOrder) === null || _this4$store$tempOrde2 === void 0 ? void 0 : _this4$store$tempOrde2.customer_id) !== null && _this4$store$tempOrde !== void 0 ? _this4$store$tempOrde : '') === String(params.customerId);
               };
               if (isCurrentRequest()) {
                 _context3.next = 9;
@@ -898,12 +931,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(code, customerId) {
         var _this$store$discount11, _tempOrder$holder, _this$store$summary;
-        var resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelected, tempOrder, holders, _ref16, isAvailable, newDiscountList, evaluatedDiscountList, unavailableReason, scannedIds, evaluatedScannedDiscounts, shouldRetainForLater, normalizedNewDiscountList, resolvedDiscountList, _this$store$discount12, _this$store$discount13, retainedDiscounts;
+        var beforeCommit, resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelected, tempOrder, holders, _ref16, isAvailable, newDiscountList, evaluatedDiscountList, unavailableReason, scannedIds, evaluatedScannedDiscounts, shouldRetainForLater, normalizedNewDiscountList, resolvedDiscountList, _this$store$discount12, _this$store$discount13, retainedDiscounts;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
+              beforeCommit = this.createCartIntentCommitGuard('scan_promotion');
               if (!this.isActiveVirtualSettlementOrder(this.store.tempOrder)) {
-                _context6.next = 2;
+                _context6.next = 3;
                 break;
               }
               return _context6.abrupt("return", {
@@ -914,27 +948,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 scannedDiscountList: [],
                 unavailableReason: UnavailableReason.ProductNotApplicable
               });
-            case 2:
-              _context6.next = 4;
+            case 3:
+              _context6.next = 5;
               return (_this$store$discount11 = this.store.discount) === null || _this$store$discount11 === void 0 ? void 0 : _this$store$discount11.batchSearch(code, {
                 customerId: customerId
               });
-            case 4:
+            case 5:
               _context6.t0 = _context6.sent;
               if (_context6.t0) {
-                _context6.next = 7;
+                _context6.next = 8;
                 break;
               }
               _context6.t0 = {
                 discountList: [],
                 unavailableReasonKey: null
               };
-            case 7:
+            case 8:
               resultDiscountWithReason = _context6.t0;
               resultDiscountList = resultDiscountWithReason.discountList, unavailableReasonKey = resultDiscountWithReason.unavailableReasonKey;
               rulesModule = this.store.rules;
               if (rulesModule) {
-                _context6.next = 12;
+                _context6.next = 13;
                 break;
               }
               return _context6.abrupt("return", {
@@ -945,9 +979,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 scannedDiscountList: resultDiscountList,
                 unavailableReason: UnavailableReason.Unknown
               });
-            case 12:
+            case 13:
               if (resultDiscountList.length) {
-                _context6.next = 14;
+                _context6.next = 15;
                 break;
               }
               return _context6.abrupt("return", {
@@ -958,7 +992,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 scannedDiscountList: resultDiscountList,
                 unavailableReasonKey: unavailableReasonKey
               });
-            case 14:
+            case 15:
               withScanList = resultDiscountList.map(function (item) {
                 return _objectSpread(_objectSpread({}, item), {}, {
                   isScan: true
@@ -972,12 +1006,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   return m.id === n.id;
                 });
               }))) {
-                _context6.next = 20;
+                _context6.next = 22;
                 break;
               }
-              _context6.next = 19;
+              beforeCommit();
+              _context6.next = 21;
               return this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
-            case 19:
+            case 21:
               return _context6.abrupt("return", {
                 type: 'clientCalc',
                 isAvailable: true,
@@ -985,7 +1020,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList(),
                 scannedDiscountList: resultDiscountList
               });
-            case 20:
+            case 22:
               tempOrder = this.store.tempOrder;
               holders = (tempOrder === null || tempOrder === void 0 || (_tempOrder$holder = tempOrder.holder) === null || _tempOrder$holder === void 0 ? void 0 : _tempOrder$holder.form_record) || [];
               _ref16 = rulesModule.isDiscountListAvailable({
@@ -1011,12 +1046,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               normalizedNewDiscountList = newDiscountList ? markScannedDiscounts(newDiscountList, withScanList) : undefined;
               resolvedDiscountList = normalizedNewDiscountList || this.getDiscountList();
               if (!(isAvailable && normalizedNewDiscountList)) {
-                _context6.next = 37;
+                _context6.next = 40;
                 break;
               }
-              _context6.next = 31;
+              beforeCommit();
+              _context6.next = 34;
               return (_this$store$discount12 = this.store.discount) === null || _this$store$discount12 === void 0 ? void 0 : _this$store$discount12.setDiscountList(normalizedNewDiscountList);
-            case 31:
+            case 34:
               // 实际写回商品时沿用扫码试算的优先级，避免旧商品行的选卡覆盖本次扫码。
               this.applyDiscount({
                 preferredEntitlementPassIds: withScanList.filter(function (discount) {
@@ -1025,17 +1061,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   return discount.id;
                 })
               });
-              _context6.next = 34;
+              _context6.next = 37;
               return this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
-            case 34:
+            case 37:
               resolvedDiscountList = this.getDiscountList();
-              _context6.next = 45;
+              _context6.next = 49;
               break;
-            case 37:
+            case 40:
               if (!shouldRetainForLater) {
-                _context6.next = 45;
+                _context6.next = 49;
                 break;
               }
+              beforeCommit();
               // 只合并本次识别的卡券；不把试算产生的其他选券状态写回订单。
               retainedDiscounts = new Map(this.getDiscountList().map(function (discount) {
                 return [String(discount.id), discount];
@@ -1050,14 +1087,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   savedAmount: 0
                 }));
               });
-              _context6.next = 42;
+              _context6.next = 46;
               return (_this$store$discount13 = this.store.discount) === null || _this$store$discount13 === void 0 ? void 0 : _this$store$discount13.setDiscountList(_toConsumableArray(retainedDiscounts.values()));
-            case 42:
-              _context6.next = 44;
+            case 46:
+              _context6.next = 48;
               return this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
-            case 44:
+            case 48:
               resolvedDiscountList = this.getDiscountList();
-            case 45:
+            case 49:
               return _context6.abrupt("return", {
                 type: 'clientCalc',
                 isAvailable: isAvailable || false,
@@ -1066,7 +1103,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 scannedDiscountList: evaluatedScannedDiscounts,
                 unavailableReason: unavailableReason
               });
-            case 46:
+            case 50:
             case "end":
               return _context6.stop();
           }
@@ -1082,7 +1119,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function applyDiscount(options) {
       var _this$store$discount16,
         _this$store$summary2,
-        _this4 = this;
+        _this5 = this;
       var tempOrder = this.store.tempOrder;
       // 任意 products CRUD 后都应当重算 discount 状态；即使 products 为空，
       // 也需要让 Rules.calcDiscount 把 DiscountModule 的 isSelected / isAvailable /
@@ -1140,7 +1177,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         (_this$store$discount17 = this.store.discount) === null || _this$store$discount17 === void 0 || _this$store$discount17.setDiscountList(result.discountList);
       }
       this.hasActiveCustomerBoundDiscount = (tempOrder.products || []).some(function (product) {
-        return _this4.productHasCustomerBoundDiscount(product);
+        return _this5.productHasCustomerBoundDiscount(product);
       });
     }
 
@@ -1200,49 +1237,55 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "evaluatePromotion",
     value: (function () {
-      var _evaluatePromotion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+      var _evaluatePromotion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(options) {
         var _this$promotionEvalua,
           _this$promotionEvalua2,
-          _this5 = this;
-        var tempOrder, strategyConfigs, result, removeSet, _iterator3, _step3, reduce, _iterator6, _step6, _loop2, _iterator4, _step4, _loop, payload;
+          _this6 = this;
+        var tempOrder, strategyConfigs, result, removeSet, _iterator3, _step3, reduce, _iterator6, _step6, _loop2, _iterator4, _step4, _loop, _ret, payload;
         return _regeneratorRuntime().wrap(function _callee7$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              if (!(this.isApplyingPromotion || this.isEmittingPromotionApplied)) {
+              if (!(options !== null && options !== void 0 && options.isCurrentOrder && !options.isCurrentOrder())) {
                 _context9.next = 2;
                 break;
               }
               return _context9.abrupt("return", null);
             case 2:
-              if (this.promotionEvaluator) {
+              if (!(this.isApplyingPromotion || this.isEmittingPromotionApplied)) {
                 _context9.next = 4;
                 break;
               }
               return _context9.abrupt("return", null);
             case 4:
+              if (this.promotionEvaluator) {
+                _context9.next = 6;
+                break;
+              }
+              return _context9.abrupt("return", null);
+            case 6:
               tempOrder = this.store.tempOrder;
               if (tempOrder) {
-                _context9.next = 7;
+                _context9.next = 9;
                 break;
               }
               return _context9.abrupt("return", null);
-            case 7:
+            case 9:
               if (!this.isActiveVirtualSettlementOrder(tempOrder)) {
-                _context9.next = 10;
+                _context9.next = 12;
                 break;
               }
               tempOrder.products = normalizeVirtualSettlementProducts(tempOrder.products);
               return _context9.abrupt("return", null);
-            case 10:
+            case 12:
               strategyConfigs = (_this$promotionEvalua = (_this$promotionEvalua2 = this.promotionEvaluator).getStrategyConfigs) === null || _this$promotionEvalua === void 0 ? void 0 : _this$promotionEvalua.call(_this$promotionEvalua2);
               if (!(Array.isArray(strategyConfigs) && strategyConfigs.length === 0)) {
-                _context9.next = 13;
+                _context9.next = 15;
                 break;
               }
               return _context9.abrupt("return", null);
-            case 13:
+            case 15:
               this.isApplyingPromotion = true;
-              _context9.prev = 14;
+              _context9.prev = 16;
               result = processCartPromotion(tempOrder.products, this.promotionEvaluator); // step 1: toRemove —— 直接过滤
               if (result.giftActions.toRemove.length > 0) {
                 removeSet = new Set(result.giftActions.toRemove.map(String));
@@ -1254,16 +1297,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
 
               // step 2: toReduce —— 调整数量
               _iterator3 = _createForOfIteratorHelper(result.giftActions.toReduce);
-              _context9.prev = 18;
+              _context9.prev = 20;
               _iterator3.s();
-            case 20:
+            case 22:
               if ((_step3 = _iterator3.n()).done) {
-                _context9.next = 40;
+                _context9.next = 42;
                 break;
               }
               reduce = _step3.value;
               _iterator6 = _createForOfIteratorHelper(reduce.items);
-              _context9.prev = 23;
+              _context9.prev = 25;
               _loop2 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop2() {
                 var item, product;
                 return _regeneratorRuntime().wrap(function _loop2$(_context8) {
@@ -1283,47 +1326,47 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }, _loop2);
               });
               _iterator6.s();
-            case 26:
+            case 28:
               if ((_step6 = _iterator6.n()).done) {
-                _context9.next = 30;
+                _context9.next = 32;
                 break;
               }
-              return _context9.delegateYield(_loop2(), "t0", 28);
-            case 28:
-              _context9.next = 26;
-              break;
+              return _context9.delegateYield(_loop2(), "t0", 30);
             case 30:
-              _context9.next = 35;
+              _context9.next = 28;
               break;
             case 32:
-              _context9.prev = 32;
-              _context9.t1 = _context9["catch"](23);
+              _context9.next = 37;
+              break;
+            case 34:
+              _context9.prev = 34;
+              _context9.t1 = _context9["catch"](25);
               _iterator6.e(_context9.t1);
-            case 35:
-              _context9.prev = 35;
+            case 37:
+              _context9.prev = 37;
               _iterator6.f();
-              return _context9.finish(35);
-            case 38:
-              _context9.next = 20;
-              break;
+              return _context9.finish(37);
             case 40:
-              _context9.next = 45;
+              _context9.next = 22;
               break;
             case 42:
-              _context9.prev = 42;
-              _context9.t2 = _context9["catch"](18);
+              _context9.next = 47;
+              break;
+            case 44:
+              _context9.prev = 44;
+              _context9.t2 = _context9["catch"](20);
               _iterator3.e(_context9.t2);
-            case 45:
-              _context9.prev = 45;
+            case 47:
+              _context9.prev = 47;
               _iterator3.f();
-              return _context9.finish(45);
-            case 48:
+              return _context9.finish(47);
+            case 50:
               if (!(result.giftActions.toAdd.length > 0)) {
-                _context9.next = 71;
+                _context9.next = 76;
                 break;
               }
               if (this.giftSelectResolver) {
-                _context9.next = 53;
+                _context9.next = 55;
                 break;
               }
               if (result.giftActions.toAdd.some(function (g) {
@@ -1334,13 +1377,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               } else {
                 console.warn('[OrderModule] giftSelectResolver not set, skip applying single-option gifts', result.giftActions.toAdd);
               }
-              _context9.next = 71;
+              _context9.next = 76;
               break;
-            case 53:
+            case 55:
               _iterator4 = _createForOfIteratorHelper(result.giftActions.toAdd);
-              _context9.prev = 54;
+              _context9.prev = 56;
               _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
-                var addAction, _sameStrategy$metadat, sameStrategy, giftResult, giftProducts, giftBookings, _iterator5, _step5, _step5$value, index, gp, booking, linked;
+                var addAction, _sameStrategy$metadat, sameStrategy, giftMutationBaseline, giftResult, giftProducts, giftBookings, _iterator5, _step5, _step5$value, index, gp, booking, linked;
                 return _regeneratorRuntime().wrap(function _loop$(_context7) {
                   while (1) switch (_context7.prev = _context7.next) {
                     case 0:
@@ -1358,111 +1401,166 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                         break;
                       }
                       sameStrategy.num = (Number(sameStrategy.num) || 0) + (addAction.giftCount || 1);
-                      return _context7.abrupt("return", 1);
+                      return _context7.abrupt("return", 0);
                     case 6:
-                      _context7.prev = 6;
-                      _context7.next = 9;
-                      return _this5.giftSelectResolver({
+                      giftMutationBaseline = options !== null && options !== void 0 && options.isCurrentOrder ? cloneDeep({
+                        products: tempOrder.products,
+                        bookings: tempOrder.bookings
+                      }) : null;
+                      _context7.prev = 7;
+                      _context7.next = 10;
+                      return _this6.giftSelectResolver({
                         strategyId: addAction.strategyId,
                         strategyName: addAction.strategyName,
                         giftCount: addAction.giftCount,
                         giftOptions: addAction.giftOptions,
                         sourceProductIds: addAction.sourceProductIds
                       });
-                    case 9:
+                    case 10:
                       giftResult = _context7.sent;
+                      if (!(options !== null && options !== void 0 && options.isCurrentOrder && !options.isCurrentOrder())) {
+                        _context7.next = 13;
+                        break;
+                      }
+                      return _context7.abrupt("return", {
+                        v: null
+                      });
+                    case 13:
+                      if (!(options !== null && options !== void 0 && options.isCurrentOrder && !isEqual({
+                        products: tempOrder.products,
+                        bookings: tempOrder.bookings
+                      }, giftMutationBaseline))) {
+                        _context7.next = 15;
+                        break;
+                      }
+                      return _context7.abrupt("return", {
+                        v: null
+                      });
+                    case 15:
                       giftProducts = Array.isArray(giftResult) ? giftResult : giftResult === null || giftResult === void 0 ? void 0 : giftResult.products;
                       giftBookings = Array.isArray(giftResult) ? [] : (giftResult === null || giftResult === void 0 ? void 0 : giftResult.bookings) || [];
                       if (!(Array.isArray(giftProducts) && giftProducts.length > 0)) {
-                        _context7.next = 37;
+                        _context7.next = 42;
                         break;
                       }
                       _iterator5 = _createForOfIteratorHelper(giftProducts.entries());
-                      _context7.prev = 14;
+                      _context7.prev = 19;
                       _iterator5.s();
-                    case 16:
+                    case 21:
                       if ((_step5 = _iterator5.n()).done) {
-                        _context7.next = 29;
+                        _context7.next = 34;
                         break;
                       }
                       _step5$value = _slicedToArray(_step5.value, 2), index = _step5$value[0], gp = _step5$value[1];
                       if (gp) {
-                        _context7.next = 20;
+                        _context7.next = 25;
                         break;
                       }
-                      return _context7.abrupt("continue", 27);
-                    case 20:
+                      return _context7.abrupt("continue", 32);
+                    case 25:
                       booking = giftBookings[index];
                       if (!booking) {
-                        _context7.next = 26;
+                        _context7.next = 31;
                         break;
                       }
-                      linked = _this5.createLinkedProductAndBooking({
+                      linked = _this6.createLinkedProductAndBooking({
                         product: gp,
                         booking: booking
                       });
                       result.products.push(linked.product);
                       tempOrder.bookings = [].concat(_toConsumableArray(tempOrder.bookings || []), [linked.booking]);
-                      return _context7.abrupt("continue", 27);
-                    case 26:
+                      return _context7.abrupt("continue", 32);
+                    case 31:
                       // normalize 略过：调用方应保证返回完整 OrderProduct。
                       result.products.push(gp);
-                    case 27:
-                      _context7.next = 16;
-                      break;
-                    case 29:
-                      _context7.next = 34;
+                    case 32:
+                      _context7.next = 21;
                       break;
-                    case 31:
-                      _context7.prev = 31;
-                      _context7.t0 = _context7["catch"](14);
-                      _iterator5.e(_context7.t0);
                     case 34:
-                      _context7.prev = 34;
-                      _iterator5.f();
-                      return _context7.finish(34);
-                    case 37:
-                      _context7.next = 42;
+                      _context7.next = 39;
                       break;
+                    case 36:
+                      _context7.prev = 36;
+                      _context7.t0 = _context7["catch"](19);
+                      _iterator5.e(_context7.t0);
                     case 39:
                       _context7.prev = 39;
-                      _context7.t1 = _context7["catch"](6);
+                      _iterator5.f();
+                      return _context7.finish(39);
+                    case 42:
+                      _context7.next = 51;
+                      break;
+                    case 44:
+                      _context7.prev = 44;
+                      _context7.t1 = _context7["catch"](7);
+                      if (!(options !== null && options !== void 0 && options.isCurrentOrder && !options.isCurrentOrder())) {
+                        _context7.next = 48;
+                        break;
+                      }
+                      return _context7.abrupt("return", {
+                        v: null
+                      });
+                    case 48:
+                      if (!(options !== null && options !== void 0 && options.isCurrentOrder && !isEqual({
+                        products: tempOrder.products,
+                        bookings: tempOrder.bookings
+                      }, giftMutationBaseline))) {
+                        _context7.next = 50;
+                        break;
+                      }
+                      return _context7.abrupt("return", {
+                        v: null
+                      });
+                    case 50:
                       // 用户取消 / 选择失败 → 视为放弃本次新增
                       console.warn('[OrderModule] giftSelectResolver rejected, skip add gift', addAction.strategyId, _context7.t1);
-                    case 42:
+                    case 51:
                     case "end":
                       return _context7.stop();
                   }
-                }, _loop, null, [[6, 39], [14, 31, 34, 37]]);
+                }, _loop, null, [[7, 44], [19, 36, 39, 42]]);
               });
               _iterator4.s();
-            case 57:
+            case 59:
               if ((_step4 = _iterator4.n()).done) {
-                _context9.next = 63;
+                _context9.next = 68;
                 break;
               }
-              return _context9.delegateYield(_loop(), "t3", 59);
-            case 59:
-              if (!_context9.t3) {
-                _context9.next = 61;
+              return _context9.delegateYield(_loop(), "t3", 61);
+            case 61:
+              _ret = _context9.t3;
+              if (!(_ret === 0)) {
+                _context9.next = 64;
                 break;
               }
-              return _context9.abrupt("continue", 61);
-            case 61:
-              _context9.next = 57;
+              return _context9.abrupt("continue", 66);
+            case 64:
+              if (!_ret) {
+                _context9.next = 66;
+                break;
+              }
+              return _context9.abrupt("return", _ret.v);
+            case 66:
+              _context9.next = 59;
               break;
-            case 63:
-              _context9.next = 68;
+            case 68:
+              _context9.next = 73;
               break;
-            case 65:
-              _context9.prev = 65;
-              _context9.t4 = _context9["catch"](54);
+            case 70:
+              _context9.prev = 70;
+              _context9.t4 = _context9["catch"](56);
               _iterator4.e(_context9.t4);
-            case 68:
-              _context9.prev = 68;
+            case 73:
+              _context9.prev = 73;
               _iterator4.f();
-              return _context9.finish(68);
-            case 71:
+              return _context9.finish(73);
+            case 76:
+              if (!(options !== null && options !== void 0 && options.isCurrentOrder && !options.isCurrentOrder())) {
+                _context9.next = 78;
+                break;
+              }
+              return _context9.abrupt("return", null);
+            case 78:
               tempOrder.products = result.products;
               this.lastUnfulfilledPromotions = result.unfulfilledPromotions;
               this.lastGiftActions = result.giftActions;
@@ -1480,22 +1578,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 products: tempOrder.products
               };
               return _context9.abrupt("return", payload);
-            case 78:
-              _context9.prev = 78;
-              _context9.t5 = _context9["catch"](14);
+            case 85:
+              _context9.prev = 85;
+              _context9.t5 = _context9["catch"](16);
               console.error('[OrderModule] applyPromotion failed', _context9.t5);
               return _context9.abrupt("return", null);
-            case 82:
-              _context9.prev = 82;
+            case 89:
+              _context9.prev = 89;
               this.isApplyingPromotion = false;
-              return _context9.finish(82);
-            case 85:
+              return _context9.finish(89);
+            case 92:
             case "end":
               return _context9.stop();
           }
-        }, _callee7, this, [[14, 78, 82, 85], [18, 42, 45, 48], [23, 32, 35, 38], [54, 65, 68, 71]]);
+        }, _callee7, this, [[16, 85, 89, 92], [20, 44, 47, 50], [25, 34, 37, 40], [56, 70, 73, 76]]);
       }));
-      function evaluatePromotion() {
+      function evaluatePromotion(_x8) {
         return _evaluatePromotion.apply(this, arguments);
       }
       return evaluatePromotion;
@@ -1727,12 +1825,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "rememberPointCardSnapshotCodeCandidates",
     value: function rememberPointCardSnapshotCodeCandidates(value) {
-      var _this6 = this;
+      var _this7 = this;
       collectPointCardSnapshotCodeCandidates(value).forEach(function (_ref18) {
         var id = _ref18.id,
           code = _ref18.code;
-        if (!_this6.pointCardSnapshotCodeCandidates.has(id)) {
-          _this6.pointCardSnapshotCodeCandidates.set(id, code);
+        if (!_this7.pointCardSnapshotCodeCandidates.has(id)) {
+          _this7.pointCardSnapshotCodeCandidates.set(id, code);
         }
       });
     }
@@ -1913,7 +2011,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee10, this);
       }));
-      function hydrateTempOrderFromLocalRecord(_x8) {
+      function hydrateTempOrderFromLocalRecord(_x9) {
         return _hydrateTempOrderFromLocalRecord.apply(this, arguments);
       }
       return hydrateTempOrderFromLocalRecord;
@@ -1939,23 +2037,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculatePaymentTotal",
     value: function calculatePaymentTotal(payments) {
-      var _this7 = this;
+      var _this8 = this;
       return mapPaymentItemsToOrderPayments(payments, {
         includeVoided: false
       }).reduce(function (sum, payment) {
         if (!isPaidPaymentRecord(payment)) return sum;
-        return sum.plus(_this7.calculatePaymentEffectiveAmount(payment));
+        return sum.plus(_this8.calculatePaymentEffectiveAmount(payment));
       }, new Decimal(0));
     }
   }, {
     key: "calculateOrderPaidPaymentTotal",
     value: function calculateOrderPaidPaymentTotal(payments) {
-      var _this8 = this;
+      var _this9 = this;
       return mapPaymentItemsToOrderPayments(payments, {
         includeVoided: false
       }).reduce(function (sum, payment) {
         if (!isPaidPaymentRecord(payment)) return sum;
-        return sum.plus(_this8.calculatePaymentGapAmount(payment));
+        return sum.plus(_this9.calculatePaymentGapAmount(payment));
       }, new Decimal(0));
     }
   }, {
@@ -2091,13 +2189,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculateDepositPaidAmount",
     value: function calculateDepositPaidAmount(payments) {
-      var _this9 = this;
+      var _this10 = this;
       return (payments || []).reduce(function (sum, payment) {
         var paymentRecord = payment;
         if (!isPaidPaymentRecord(paymentRecord)) return sum;
         var isDepositPayment = paymentRecord.type === 'deposit' || paymentRecord.order_payment_type === 'deposit';
         if (!isDepositPayment) return sum;
-        return sum.plus(_this9.calculatePaymentGapAmount(paymentRecord));
+        return sum.plus(_this10.calculatePaymentGapAmount(paymentRecord));
       }, new Decimal(0));
     }
   }, {
@@ -2134,17 +2232,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getPaymentNumberDevicePrefixSync",
     value: function getPaymentNumberDevicePrefixSync() {
-      var _this10 = this;
+      var _this11 = this;
       return resolvePaymentNumberDevicePrefixFromDeviceId(function (key) {
-        return _this10.getPaymentNumberAppData(key);
+        return _this11.getPaymentNumberAppData(key);
       });
     }
   }, {
     key: "getPaymentNumberDevicePrefixAsync",
     value: function getPaymentNumberDevicePrefixAsync() {
-      var _this11 = this;
+      var _this12 = this;
       return resolvePaymentNumberDevicePrefix(function (key) {
-        return _this11.getPaymentNumberAppData(key);
+        return _this12.getPaymentNumberAppData(key);
       });
     }
   }, {
@@ -2274,16 +2372,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculatePaidPaymentSummary",
     value: function calculatePaidPaymentSummary(payments) {
-      var _this12 = this;
+      var _this13 = this;
       return (payments || []).reduce(function (summary, payment) {
         var paymentRecord = payment;
         if (!isPaidPaymentRecord(paymentRecord)) return summary;
         return {
           customerPaidAmount: summary.customerPaidAmount.plus(paymentRecord.amount || 0),
-          orderPaidAmount: summary.orderPaidAmount.plus(_this12.calculatePaymentOrderAmount(paymentRecord)),
-          gapPaidAmount: summary.gapPaidAmount.plus(_this12.calculatePaymentGapAmount(paymentRecord)),
-          payServiceChargeAmount: summary.payServiceChargeAmount.plus(_this12.calculatePaymentServiceFee(paymentRecord)),
-          roundingAmount: summary.roundingAmount.plus(_this12.calculatePaymentRoundingAmount(paymentRecord))
+          orderPaidAmount: summary.orderPaidAmount.plus(_this13.calculatePaymentOrderAmount(paymentRecord)),
+          gapPaidAmount: summary.gapPaidAmount.plus(_this13.calculatePaymentGapAmount(paymentRecord)),
+          payServiceChargeAmount: summary.payServiceChargeAmount.plus(_this13.calculatePaymentServiceFee(paymentRecord)),
+          roundingAmount: summary.roundingAmount.plus(_this13.calculatePaymentRoundingAmount(paymentRecord))
         };
       }, {
         customerPaidAmount: new Decimal(0),
@@ -2490,15 +2588,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeFingerprintValue",
     value: function normalizeFingerprintValue(value) {
-      var _this13 = this;
+      var _this14 = this;
       if (Array.isArray(value)) {
         return value.map(function (item) {
-          return _this13.normalizeFingerprintValue(item);
+          return _this14.normalizeFingerprintValue(item);
         });
       }
       if (!value || _typeof(value) !== 'object') return value !== null && value !== void 0 ? value : '';
       return Object.keys(value).sort().reduce(function (result, key) {
-        result[key] = _this13.normalizeFingerprintValue(value[key]);
+        result[key] = _this14.normalizeFingerprintValue(value[key]);
         return result;
       }, {});
     }
@@ -2513,7 +2611,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _sku$barcode,
         _ref26,
         _sku$variant_id,
-        _this14 = this;
+        _this15 = this;
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
       var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
       var discountTypes = ((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
@@ -2550,7 +2648,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               option_group_id: (_option$option_group_ = option === null || option === void 0 ? void 0 : option.option_group_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : null,
               option_group_item_id: (_ref28 = (_option$option_group_2 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_2 !== void 0 ? _option$option_group_2 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref28 !== void 0 ? _ref28 : null,
               num: Number((_option$num = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num !== void 0 ? _option$num : 1) || 1,
-              add_price: _this14.normalizeFingerprintMoney((_option$add_price = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price !== void 0 ? _option$add_price : option === null || option === void 0 ? void 0 : option.price)
+              add_price: _this15.normalizeFingerprintMoney((_option$add_price = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price !== void 0 ? _option$add_price : option === null || option === void 0 ? void 0 : option.price)
             };
           })
         }),
@@ -2560,8 +2658,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             bundle_product_id: (_ref29 = (_ref30 = (_bundle$bundle_produc = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref30 !== void 0 ? _ref30 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref29 !== void 0 ? _ref29 : null,
             bundle_variant_id: (_ref31 = (_bundle$bundle_varian = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle === null || bundle === void 0 ? void 0 : bundle.product_variant_id) !== null && _ref31 !== void 0 ? _ref31 : 0,
             num: getSafeProductNum((_bundle$num = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle === null || bundle === void 0 ? void 0 : bundle.quantity),
-            price: _this14.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.price),
-            bundle_selling_price: _this14.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price),
+            price: _this15.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.price),
+            bundle_selling_price: _this15.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price),
             price_type: (_bundle$price_type = bundle === null || bundle === void 0 ? void 0 : bundle.price_type) !== null && _bundle$price_type !== void 0 ? _bundle$price_type : '',
             price_type_ext: (_bundle$price_type_ex = bundle === null || bundle === void 0 ? void 0 : bundle.price_type_ext) !== null && _bundle$price_type_ex !== void 0 ? _bundle$price_type_ex : ''
           };
@@ -2571,7 +2669,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           return {
             type: (_ref32 = (_discount$type2 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type2 !== void 0 ? _discount$type2 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref32 !== void 0 ? _ref32 : '',
             discount_id: (_ref33 = (_ref34 = (_discount$discount_id = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id !== void 0 ? _discount$discount_id : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref34 !== void 0 ? _ref34 : discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) !== null && _ref33 !== void 0 ? _ref33 : null,
-            amount: _this14.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
+            amount: _this15.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
           };
         }))
       };
@@ -2579,9 +2677,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildOrderProductsFingerprint",
     value: function buildOrderProductsFingerprint(products) {
-      var _this15 = this;
+      var _this16 = this;
       var items = (products || []).map(function (product) {
-        return _this15.buildProductFingerprintItem(product);
+        return _this16.buildProductFingerprintItem(product);
       });
       items.sort(function (left, right) {
         return JSON.stringify(left).localeCompare(JSON.stringify(right));
@@ -2603,7 +2701,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _sku$barcode2,
         _ref36,
         _sku$variant_id2,
-        _this16 = this;
+        _this17 = this;
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
       var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
       var discountTypes = ((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
@@ -2637,7 +2735,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               option_group_id: (_option$option_group_3 = option === null || option === void 0 ? void 0 : option.option_group_id) !== null && _option$option_group_3 !== void 0 ? _option$option_group_3 : null,
               option_group_item_id: (_ref38 = (_option$option_group_4 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_4 !== void 0 ? _option$option_group_4 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref38 !== void 0 ? _ref38 : null,
               num: Number((_option$num2 = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num2 !== void 0 ? _option$num2 : 1) || 1,
-              add_price: _this16.normalizeFingerprintMoney((_option$add_price2 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price2 !== void 0 ? _option$add_price2 : option === null || option === void 0 ? void 0 : option.price)
+              add_price: _this17.normalizeFingerprintMoney((_option$add_price2 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price2 !== void 0 ? _option$add_price2 : option === null || option === void 0 ? void 0 : option.price)
             };
           })
         }),
@@ -2651,14 +2749,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             num: getSafeProductNum((_bundle$num2 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num2 !== void 0 ? _bundle$num2 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity),
             price_type: (_bundle$price_type2 = bundle === null || bundle === void 0 ? void 0 : bundle.price_type) !== null && _bundle$price_type2 !== void 0 ? _bundle$price_type2 : '',
             price_type_ext: (_bundle$price_type_ex2 = bundle === null || bundle === void 0 ? void 0 : bundle.price_type_ext) !== null && _bundle$price_type_ex2 !== void 0 ? _bundle$price_type_ex2 : '',
-            option: _this16.normalizeFingerprintValue(((bundle === null || bundle === void 0 ? void 0 : bundle.option) || []).map(function (option) {
+            option: _this17.normalizeFingerprintValue(((bundle === null || bundle === void 0 ? void 0 : bundle.option) || []).map(function (option) {
               var _ref44, _option$id3, _option$option_group_5, _ref45, _option$option_group_6, _option$num3, _option$add_price3;
               return {
                 id: (_ref44 = (_option$id3 = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id3 !== void 0 ? _option$id3 : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref44 !== void 0 ? _ref44 : null,
                 option_group_id: (_option$option_group_5 = option === null || option === void 0 ? void 0 : option.option_group_id) !== null && _option$option_group_5 !== void 0 ? _option$option_group_5 : null,
                 option_group_item_id: (_ref45 = (_option$option_group_6 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_6 !== void 0 ? _option$option_group_6 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref45 !== void 0 ? _ref45 : null,
                 num: Number((_option$num3 = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num3 !== void 0 ? _option$num3 : 1) || 1,
-                add_price: _this16.normalizeFingerprintMoney((_option$add_price3 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price3 !== void 0 ? _option$add_price3 : option === null || option === void 0 ? void 0 : option.price)
+                add_price: _this17.normalizeFingerprintMoney((_option$add_price3 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price3 !== void 0 ? _option$add_price3 : option === null || option === void 0 ? void 0 : option.price)
               };
             }))
           };
@@ -2668,7 +2766,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           return {
             type: (_ref46 = (_discount$type4 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type4 !== void 0 ? _discount$type4 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref46 !== void 0 ? _ref46 : '',
             discount_id: (_ref47 = (_ref48 = (_discount$discount_id2 = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id2 !== void 0 ? _discount$discount_id2 : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref48 !== void 0 ? _ref48 : discount === null || discount === void 0 || (_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) !== null && _ref47 !== void 0 ? _ref47 : null,
-            amount: _this16.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
+            amount: _this17.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
           };
         }))
       };
@@ -2676,9 +2774,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildOrderProductsStructuralFingerprint",
     value: function buildOrderProductsStructuralFingerprint(products) {
-      var _this17 = this;
+      var _this18 = this;
       var items = (products || []).map(function (product) {
-        return _this17.buildProductStructuralFingerprintItem(product);
+        return _this18.buildProductStructuralFingerprintItem(product);
       });
       items.sort(function (left, right) {
         return JSON.stringify(left).localeCompare(JSON.stringify(right));
@@ -2986,7 +3084,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee11, this);
       }));
-      function replaceTempOrder(_x9, _x10) {
+      function replaceTempOrder(_x10, _x11) {
         return _replaceTempOrder.apply(this, arguments);
       }
       return replaceTempOrder;
@@ -3130,9 +3228,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sanitizeTempOrderProducts",
     value: function sanitizeTempOrderProducts(tempOrder) {
-      var _this18 = this;
+      var _this19 = this;
       tempOrder.products = (tempOrder.products || []).map(function (product) {
-        return _this18.sanitizeOrderProductForTempOrder(_this18.normalizeVirtualSettlementProductIfEnabled(product));
+        return _this19.sanitizeOrderProductForTempOrder(_this19.normalizeVirtualSettlementProductIfEnabled(product));
       });
       this.syncTempOrderSettlementState(tempOrder);
       ensureUniqueProductLineUids(tempOrder);
@@ -3252,7 +3350,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncLinkedBookingHoldersToProducts",
     value: function syncLinkedBookingHoldersToProducts(tempOrder) {
-      var _this19 = this;
+      var _this20 = this;
       var bookings = tempOrder.bookings || [];
       var products = tempOrder.products || [];
       if (!bookings.length || !products.length) return;
@@ -3261,6 +3359,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       bookings.forEach(function (booking) {
         var _booking$metadata2, _booking$metadata3;
         if (!booking || _typeof(booking) !== 'object') return;
+        if (isFulfillmentTimingBooking(booking)) return;
         var productUid = booking.product_uid || ((_booking$metadata2 = booking.metadata) === null || _booking$metadata2 === void 0 ? void 0 : _booking$metadata2.product_uid);
         if (productUid !== undefined && productUid !== null && String(productUid) !== '') {
           bookingByProductUid.set(String(productUid), booking);
@@ -3277,7 +3376,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         var bookingUid = product.booking_uid || ((_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.booking_uid);
         var linkedBooking = (productUid !== undefined && productUid !== null && String(productUid) !== '' ? bookingByProductUid.get(String(productUid)) : undefined) || (bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '' ? bookingByBookingUid.get(String(bookingUid)) : undefined);
         if (linkedBooking) {
-          _this19.setProductHolderFromBooking(product, linkedBooking);
+          _this20.setProductHolderFromBooking(product, linkedBooking);
         }
       });
     }
@@ -3325,6 +3424,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       try {
         for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
           var booking = _step18.value;
+          if (isFulfillmentTimingBooking(booking)) continue;
           var holder = booking !== null && booking !== void 0 && booking.holder && _typeof(booking.holder) === 'object' ? booking.holder : null;
           if (!baseHolder && holder) {
             baseHolder = holder;
@@ -3383,7 +3483,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncTempOrderHolderFromBookings",
     value: function syncTempOrderHolderFromBookings(tempOrder) {
-      var bookings = tempOrder.bookings || [];
+      var bookings = (tempOrder.bookings || []).filter(function (booking) {
+        return !isFulfillmentTimingBooking(booking);
+      });
       var hasHolderSource = bookings.some(function (booking) {
         var _booking$metadata4;
         return (booking === null || booking === void 0 ? void 0 : booking.holder) !== undefined || (booking === null || booking === void 0 || (_booking$metadata4 = booking.metadata) === null || _booking$metadata4 === void 0 ? void 0 : _booking$metadata4.holder_id) !== undefined;
@@ -3405,9 +3507,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "findBookingIndexByUniqueIdentificationNumber",
     value: function findBookingIndexByUniqueIdentificationNumber(tempOrder, uniqueIdentificationNumber) {
-      var _this20 = this;
+      var _this21 = this;
       return (tempOrder.bookings || []).findIndex(function (booking) {
-        return _this20.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
+        return _this21.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
       });
     }
   }, {
@@ -3415,12 +3517,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function removeLinkedBookingsForProduct(tempOrder, product) {
       var _product$metadata5,
         _product$metadata6,
-        _this21 = this;
+        _this22 = this;
       var productUid = (product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
       var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.booking_uid);
       if (!productUid && !bookingUid) return;
       tempOrder.bookings = (tempOrder.bookings || []).filter(function (booking) {
-        var currentBookingUid = _this21.getBookingUniqueIdentificationNumber(booking);
+        if (isFulfillmentTimingBooking(booking)) return true;
+        var currentBookingUid = _this22.getBookingUniqueIdentificationNumber(booking);
         if (bookingUid && currentBookingUid === String(bookingUid)) return false;
         if (productUid && String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === String(productUid)) return false;
         return true;
@@ -3468,30 +3571,36 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _recalculateSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(options) {
         var _this$otherParams3, _ref53, _salesSummaryResult$e;
-        var tempOrder, originalSnapshot, hasShopDiscountChanged, shouldReuseOriginalSnapshot, snapshotSummary, shouldFullRecalculateFromSnapshot, summaryProducts, salesSummary, existedSummary, totalRefundAmount, paidPaymentSummary, emptyBaseSummary, emptySummaryBase, emptySummaryWithDeposit, emptySummary, salesSummaryResult, roundingAmount, payServiceChargeAmount, hasSalesSummaryAmount, expectAmount, amountPaymentPatch, normalizedExpectAmountPatch, summaryForGap, summary;
+        var tempOrder, originalSnapshot, hasShopDiscountChanged, shouldReuseOriginalSnapshot, snapshotSummary, shouldFullRecalculateFromSnapshot, summaryProducts, salesSummary, existedSummary, totalRefundAmount, paidPaymentSummary, emptyBaseSummary, emptySummaryBase, emptySummaryWithDeposit, emptySummary, summaryMutationBaseline, salesSummaryResult, roundingAmount, payServiceChargeAmount, hasSalesSummaryAmount, expectAmount, amountPaymentPatch, normalizedExpectAmountPatch, summaryForGap, summary;
         return _regeneratorRuntime().wrap(function _callee13$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
+              if (!(options !== null && options !== void 0 && options.isCurrentOrder && !options.isCurrentOrder())) {
+                _context15.next = 2;
+                break;
+              }
+              return _context15.abrupt("return", null);
+            case 2:
               tempOrder = options !== null && options !== void 0 && options.createIfMissing ? this.ensureTempOrder() : this.store.tempOrder;
               if (tempOrder) {
-                _context15.next = 3;
+                _context15.next = 5;
                 break;
               }
               return _context15.abrupt("return", null);
-            case 3:
+            case 5:
               this.sanitizeTempOrderProducts(tempOrder);
               originalSnapshot = this.getOriginalSalesSnapshot(tempOrder);
               hasShopDiscountChanged = originalSnapshot ? this.hasShopDiscountChangedFromSnapshot(tempOrder, originalSnapshot) : false;
               shouldReuseOriginalSnapshot = originalSnapshot && !hasShopDiscountChanged;
               snapshotSummary = shouldReuseOriginalSnapshot ? this.restoreOriginalSnapshotIfProductsUnchanged(tempOrder, originalSnapshot) : null;
               if (!snapshotSummary) {
-                _context15.next = 10;
+                _context15.next = 12;
                 break;
               }
               return _context15.abrupt("return", snapshotSummary);
-            case 10:
+            case 12:
               shouldFullRecalculateFromSnapshot = Boolean(originalSnapshot);
-              summaryProducts = shouldFullRecalculateFromSnapshot ? cloneDeep(tempOrder.products || []) : tempOrder.products;
+              summaryProducts = shouldFullRecalculateFromSnapshot || options !== null && options !== void 0 && options.isCurrentOrder ? cloneDeep(tempOrder.products || []) : tempOrder.products;
               if (shouldFullRecalculateFromSnapshot) {
                 this.clearPersistedAmountFieldsForFullRecalc(summaryProducts || []);
               }
@@ -3500,7 +3609,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               totalRefundAmount = existedSummary.total_refund_amount || '0.00';
               paidPaymentSummary = this.calculatePaidPaymentSummary(tempOrder.payments || []);
               if (salesSummary) {
-                _context15.next = 26;
+                _context15.next = 28;
                 break;
               }
               emptyBaseSummary = _objectSpread(_objectSpread(_objectSpread({}, createEmptySummary()), existedSummary), {}, {
@@ -3527,8 +3636,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 summary: emptySummary
               });
               return _context15.abrupt("return", this.store.summary);
-            case 26:
-              _context15.next = 28;
+            case 28:
+              summaryMutationBaseline = options !== null && options !== void 0 && options.isCurrentOrder ? cloneDeep({
+                tempOrder: tempOrder,
+                summary: this.store.summary
+              }) : null;
+              _context15.next = 31;
               return salesSummary.getSummary(_objectSpread({
                 products: summaryProducts,
                 isPriceIncludeTax: tempOrder.is_price_include_tax,
@@ -3537,9 +3650,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }, (_this$otherParams3 = this.otherParams) !== null && _this$otherParams3 !== void 0 && _this$otherParams3.channel ? {
                 channel: this.otherParams.channel
               } : {}));
-            case 28:
+            case 31:
               salesSummaryResult = _context15.sent;
-              if (shouldFullRecalculateFromSnapshot) {
+              if (!(options !== null && options !== void 0 && options.isCurrentOrder && !options.isCurrentOrder())) {
+                _context15.next = 34;
+                break;
+              }
+              return _context15.abrupt("return", null);
+            case 34:
+              if (!(options !== null && options !== void 0 && options.isCurrentOrder && !isEqual({
+                tempOrder: tempOrder,
+                summary: this.store.summary
+              }, summaryMutationBaseline))) {
+                _context15.next = 36;
+                break;
+              }
+              return _context15.abrupt("return", null);
+            case 36:
+              if (shouldFullRecalculateFromSnapshot || options !== null && options !== void 0 && options.isCurrentOrder) {
                 tempOrder.products = summaryProducts;
               }
               this.syncSummaryProductMetadata(tempOrder.products || []);
@@ -3584,13 +3712,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 summary: summary
               });
               return _context15.abrupt("return", this.store.summary);
-            case 46:
+            case 53:
             case "end":
               return _context15.stop();
           }
         }, _callee13, this);
       }));
-      function recalculateSummary(_x11) {
+      function recalculateSummary(_x12) {
         return _recalculateSummary.apply(this, arguments);
       }
       return recalculateSummary;
@@ -3661,7 +3789,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee15, this);
       }));
-      function syncTempOrderNoteToRemote(_x12, _x13) {
+      function syncTempOrderNoteToRemote(_x13, _x14) {
         return _syncTempOrderNoteToRemote.apply(this, arguments);
       }
       return syncTempOrderNoteToRemote;
@@ -3722,7 +3850,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeSalesNotesForMissingProductLines",
     value: function removeSalesNotesForMissingProductLines(tempOrder) {
-      var _this22 = this;
+      var _this23 = this;
       var state = this.ensureSalesNotesRuntimeState(tempOrder);
       if (!state.loaded || !Array.isArray(tempOrder.notes) || tempOrder.notes.length === 0) {
         return;
@@ -3734,7 +3862,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         return typeof uid === 'string' && uid.length > 0;
       }));
       var nextNotes = tempOrder.notes.filter(function (note) {
-        var primary = _this22.getSalesNotePrimaryRelation(note);
+        var primary = _this23.getSalesNotePrimaryRelation(note);
         if (!primary || primary.target_type !== 'order_detail') return true;
         return remainingProductUids.has(primary.target_uuid);
       });
@@ -3746,7 +3874,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "setSalesNoteOnTempOrder",
     value: function setSalesNoteOnTempOrder(tempOrder, input) {
       var _input$target,
-        _this23 = this,
+        _this24 = this,
         _tempOrder$shop_order;
       this.ensureSalesNotesLoadedForMutation(tempOrder);
       var note_type = String(input.note_type || '').trim();
@@ -3770,7 +3898,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var notes = tempOrder.notes || [];
       // 当前 allergy policy 固定同一商品行只保留一条；业务调用方不参与去重规则。
       var existingIndex = policy.uniquePerPrimaryTarget ? notes.findIndex(function (note) {
-        var primary = _this23.getSalesNotePrimaryRelation(note);
+        var primary = _this24.getSalesNotePrimaryRelation(note);
         return note.note_type === note_type && (primary === null || primary === void 0 ? void 0 : primary.target_type) === 'order_detail' && primary.target_uuid === target_uuid;
       }) : -1;
       var existing = existingIndex >= 0 ? notes[existingIndex] : null;
@@ -3877,7 +4005,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee16, this);
       }));
-      function setSalesNote(_x14) {
+      function setSalesNote(_x15) {
         return _setSalesNote.apply(this, arguments);
       }
       return setSalesNote;
@@ -3913,7 +4041,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee17, this);
       }));
-      function removeSalesNote(_x15) {
+      function removeSalesNote(_x16) {
         return _removeSalesNote.apply(this, arguments);
       }
       return removeSalesNote;
@@ -4007,10 +4135,47 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateTempOrderServiceType",
     value: function updateTempOrderServiceType(serviceType) {
+      if (serviceType !== 'pick_up') {
+        var tempOrder = this.ensureTempOrder();
+        tempOrder.bookings = (tempOrder.bookings || []).filter(function (booking) {
+          return !isFulfillmentTimingBooking(booking);
+        });
+      }
       return this.updateTempOrderShopServiceData({
         service_type: serviceType
       });
     }
+  }, {
+    key: "getPickupTimingBooking",
+    value: function getPickupTimingBooking() {
+      var _this$store$tempOrder7;
+      return (((_this$store$tempOrder7 = this.store.tempOrder) === null || _this$store$tempOrder7 === void 0 ? void 0 : _this$store$tempOrder7.bookings) || []).find(isFulfillmentTimingBooking) || null;
+    }
+  }, {
+    key: "setPickupTimingBooking",
+    value: function setPickupTimingBooking(input) {
+      var tempOrder = this.ensureTempOrder();
+      var bookings = tempOrder.bookings || [];
+      var firstIndex = bookings.findIndex(isFulfillmentTimingBooking);
+      var nextBooking = buildPickupTimingBooking(input, bookings[firstIndex]);
+      // Keep the first row's identity and position; repair duplicate marked rows only.
+      tempOrder.bookings = firstIndex === -1 ? [].concat(_toConsumableArray(bookings), [nextBooking]) : bookings.flatMap(function (booking, index) {
+        return index === firstIndex ? [nextBooking] : isFulfillmentTimingBooking(booking) ? [] : [booking];
+      });
+      this.notifyTempOrderChanged();
+      return nextBooking;
+    }
+  }, {
+    key: "clearPickupTimingBooking",
+    value: function clearPickupTimingBooking() {
+      var _tempOrder$bookings;
+      var tempOrder = this.store.tempOrder;
+      if (!(tempOrder !== null && tempOrder !== void 0 && (_tempOrder$bookings = tempOrder.bookings) !== null && _tempOrder$bookings !== void 0 && _tempOrder$bookings.some(isFulfillmentTimingBooking))) return;
+      tempOrder.bookings = tempOrder.bookings.filter(function (booking) {
+        return !isFulfillmentTimingBooking(booking);
+      });
+      this.notifyTempOrderChanged();
+    }
   }, {
     key: "updateTempOrderContactsInfo",
     value: function updateTempOrderContactsInfo(contactsInfo) {
@@ -4052,15 +4217,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "productHasCustomerBoundDiscount",
     value: function productHasCustomerBoundDiscount(product) {
-      var _this24 = this;
+      var _this25 = this;
       if (((product === null || product === void 0 ? void 0 : product.discount_list) || []).some(function (discount) {
-        return _this24.isCustomerBoundDiscount(discount);
+        return _this25.isCustomerBoundDiscount(discount);
       })) {
         return true;
       }
       return ((product === null || product === void 0 ? void 0 : product.product_bundle) || []).some(function (bundle) {
         return ((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []).some(function (discount) {
-          return _this24.isCustomerBoundDiscount(discount);
+          return _this25.isCustomerBoundDiscount(discount);
         });
       });
     }
@@ -4069,18 +4234,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function shouldSkipDiscountCalculation(tempOrder) {
       var _this$store$discount20,
         _this$store$discount21,
-        _this25 = this;
+        _this26 = this;
       if (this.hasActiveCustomerBoundDiscount) return false;
       var discountList = ((_this$store$discount20 = this.store.discount) === null || _this$store$discount20 === void 0 || (_this$store$discount21 = _this$store$discount20.getDiscountList) === null || _this$store$discount21 === void 0 ? void 0 : _this$store$discount21.call(_this$store$discount20)) || [];
       if (discountList.length > 0) return false;
       return !(tempOrder.products || []).some(function (product) {
-        return _this25.productHasCustomerBoundDiscount(product);
+        return _this26.productHasCustomerBoundDiscount(product);
       });
     }
   }, {
     key: "clearCustomerBoundDiscounts",
     value: function clearCustomerBoundDiscounts(tempOrder) {
-      var _this26 = this,
+      var _this27 = this,
         _discountModule$getDi,
         _discountModule$getOr,
         _discountModule$setDi,
@@ -4089,7 +4254,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var filterDiscountList = function filterDiscountList(discountList) {
         if (!Array.isArray(discountList)) return [];
         return discountList.filter(function (discount) {
-          var shouldRemove = _this26.isCustomerBoundDiscount(discount);
+          var shouldRemove = _this27.isCustomerBoundDiscount(discount);
           if (shouldRemove) didRemoveCustomerBoundDiscount = true;
           return !shouldRemove;
         });
@@ -4116,12 +4281,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var currentDiscounts = ((_discountModule$getDi = discountModule.getDiscountList) === null || _discountModule$getDi === void 0 ? void 0 : _discountModule$getDi.call(discountModule)) || [];
       var currentOriginalDiscounts = ((_discountModule$getOr = discountModule.getOriginalDiscountList) === null || _discountModule$getOr === void 0 ? void 0 : _discountModule$getOr.call(discountModule)) || [];
       var nextDiscounts = currentDiscounts.filter(function (discount) {
-        if (_this26.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
-        return !_this26.isCustomerBoundDiscount(discount);
+        if (_this27.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
+        return !_this27.isCustomerBoundDiscount(discount);
       });
       var nextOriginalDiscounts = currentOriginalDiscounts.filter(function (discount) {
-        if (_this26.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
-        return !_this26.isCustomerBoundDiscount(discount);
+        if (_this27.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
+        return !_this27.isCustomerBoundDiscount(discount);
       });
       void ((_discountModule$setDi = discountModule.setDiscountList) === null || _discountModule$setDi === void 0 ? void 0 : _discountModule$setDi.call(discountModule, nextDiscounts));
       void ((_discountModule$setOr = discountModule.setOriginalDiscountList) === null || _discountModule$setOr === void 0 ? void 0 : _discountModule$setOr.call(discountModule, nextOriginalDiscounts));
@@ -4224,8 +4389,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderCustomerSnapshot",
     value: function getOrderCustomerSnapshot() {
-      var _this$store$tempOrder7;
-      var snapshot = (_this$store$tempOrder7 = this.store.tempOrder) === null || _this$store$tempOrder7 === void 0 || (_this$store$tempOrder7 = _this$store$tempOrder7._extend) === null || _this$store$tempOrder7 === void 0 ? void 0 : _this$store$tempOrder7.customerSnapshot;
+      var _this$store$tempOrder8;
+      var snapshot = (_this$store$tempOrder8 = this.store.tempOrder) === null || _this$store$tempOrder8 === void 0 || (_this$store$tempOrder8 = _this$store$tempOrder8._extend) === null || _this$store$tempOrder8 === void 0 ? void 0 : _this$store$tempOrder8.customerSnapshot;
       return snapshot ? cloneDeep(snapshot) : null;
     }
   }, {
@@ -4285,10 +4450,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setOrderPayments",
     value: function setOrderPayments(payments) {
-      var _this27 = this;
+      var _this28 = this;
       var tempOrder = this.ensureTempOrder();
       tempOrder.payments = mapPaymentItemsToOrderPayments((payments || []).map(function (payment) {
-        return _this27.normalizePaymentSource(payment, {
+        return _this28.normalizePaymentSource(payment, {
           defaultPaid: false
         });
       }));
@@ -4335,7 +4500,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee19, this);
       }));
-      function addOrderPaymentAsync(_x16) {
+      function addOrderPaymentAsync(_x17) {
         return _addOrderPaymentAsync.apply(this, arguments);
       }
       return addOrderPaymentAsync;
@@ -4343,7 +4508,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addOrderPaymentWithDevicePrefix",
     value: function addOrderPaymentWithDevicePrefix(payment, devicePrefix) {
-      var _this28 = this;
+      var _this29 = this;
       this.logInfo('addOrderPayment', {
         payment: payment
       });
@@ -4361,7 +4526,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this28.logError('recalculate summary after addOrderPayment failed', {
+        _this29.logError('recalculate summary after addOrderPayment failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -4381,6 +4546,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           identity,
           matchMode,
           matchedPayment,
+          _this$logger,
+          _this$logger$addLog,
           updatedPayment,
           summary,
           payments,
@@ -4394,11 +4561,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               matchMode = options.matchBy === 'compat' || options.matchBy === 'legacy' ? 'compat' : 'payment_number';
               matchedPayment = resolveOrderPaymentIdentity(tempOrder.payments || [], identity, matchMode);
               if (matchedPayment) {
-                _context22.next = 7;
+                _context22.next = 8;
                 break;
               }
+              try {
+                void Promise.resolve((_this$logger = this.logger) === null || _this$logger === void 0 || (_this$logger$addLog = _this$logger.addLog) === null || _this$logger$addLog === void 0 ? void 0 : _this$logger$addLog.call(_this$logger, {
+                  type: 'warning',
+                  title: '[PaymentTrace] payment-missing',
+                  metadata: {
+                    moduleName: this.name,
+                    saleId: tempOrder.external_sale_number,
+                    paymentNumber: identity,
+                    currentPaymentNumbers: (tempOrder.payments || []).map(function (p) {
+                      return p.payment_number;
+                    })
+                  }
+                })).catch(function () {});
+              } catch (_unused4) {/* 日志失败不影响原异常。 */}
               throw new Error("\u672A\u627E\u5230\u652F\u4ED8\u9879: ".concat(identity));
-            case 7:
+            case 8:
               updatedPayment = null;
               tempOrder.payments = (tempOrder.payments || []).map(function (payment, index) {
                 if (index !== matchedPayment.index) return payment;
@@ -4409,11 +4590,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return nextPayment;
               });
               this.persistTempOrder();
-              _context22.next = 12;
+              _context22.next = 13;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 12:
+            case 13:
               summary = _context22.sent;
               this.persistTempOrder();
               payments = tempOrder.payments;
@@ -4423,13 +4604,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 payments: payments,
                 summary: summary
               });
-            case 16:
+            case 17:
             case "end":
               return _context22.stop();
           }
         }, _callee20, this);
       }));
-      function updateOrderPayment(_x17, _x18) {
+      function updateOrderPayment(_x18, _x19) {
         return _updateOrderPayment.apply(this, arguments);
       }
       return updateOrderPayment;
@@ -4474,7 +4655,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyPaymentLifecycleChange",
     value: function applyPaymentLifecycleChange(tempOrder, options) {
-      var _this29 = this;
+      var _this30 = this;
       this.updateTempOrderPaymentStatus(tempOrder);
       if ((options === null || options === void 0 ? void 0 : options.persist) !== false) {
         this.persistTempOrder();
@@ -4484,7 +4665,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this29.logError("recalculate summary after ".concat(logContext, " failed"), {
+        _this30.logError("recalculate summary after ".concat(logContext, " failed"), {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -4528,7 +4709,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateVoucherOrderPayments",
     value: function updateVoucherOrderPayments(payments, options) {
-      var _this30 = this;
+      var _this31 = this;
       var tempOrder = this.ensureTempOrder();
       var isOrderPaymentType = function isOrderPaymentType(value) {
         return value === 'normal' || value === 'deposit';
@@ -4563,7 +4744,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         });
       };
       var mappedVouchers = mapPaymentItemsToOrderPayments(payments.map(function (payment) {
-        return _this30.normalizePaymentSource(normalizeVoucherPaymentStatus(withVoucherPaymentType(payment)), {
+        return _this31.normalizePaymentSource(normalizeVoucherPaymentStatus(withVoucherPaymentType(payment)), {
           defaultPaid: false,
           devicePrefix: options === null || options === void 0 ? void 0 : options.devicePrefix
         });
@@ -4616,7 +4797,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this30.logError('recalculate summary after updateVoucherOrderPayments failed', {
+        _this31.logError('recalculate summary after updateVoucherOrderPayments failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -4656,7 +4837,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee21, this);
       }));
-      function updateVoucherOrderPaymentsAsync(_x19, _x20) {
+      function updateVoucherOrderPaymentsAsync(_x20, _x21) {
         return _updateVoucherOrderPaymentsAsync.apply(this, arguments);
       }
       return updateVoucherOrderPaymentsAsync;
@@ -4673,16 +4854,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "shouldMergeProductToOrder",
     value: function shouldMergeProductToOrder(params) {
-      var _this$orderHooks,
-        _this31 = this;
-      var onBeforeMergeProductToOrder = (_this$orderHooks = this.orderHooks) === null || _this$orderHooks === void 0 ? void 0 : _this$orderHooks.onBeforeMergeProductToOrder;
+      var _this$orderHooks3,
+        _this32 = this;
+      var onBeforeMergeProductToOrder = (_this$orderHooks3 = this.orderHooks) === null || _this$orderHooks3 === void 0 ? void 0 : _this$orderHooks3.onBeforeMergeProductToOrder;
       if (!onBeforeMergeProductToOrder) return true;
       var result = onBeforeMergeProductToOrder(_objectSpread(_objectSpread({}, params), {}, {
         defaultShouldMerge: true
       }));
       if (result && _typeof(result) === 'object' && typeof result.then === 'function') {
         return Promise.resolve(result).then(function (resolved) {
-          return _this31.normalizeShouldMergeProductResult(resolved);
+          return _this32.normalizeShouldMergeProductResult(resolved);
         });
       }
       return this.normalizeShouldMergeProductResult(result);
@@ -4812,52 +4993,82 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "finalizeProductOrderMutation",
     value: function () {
       var _finalizeProductOrderMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(tempOrder, options) {
-        var isVirtualSettlement, promotionPayload;
+        var isCurrentOrder, isVirtualSettlement, promotionPayload, summary;
         return _regeneratorRuntime().wrap(function _callee22$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
             case 0:
+              isCurrentOrder = options === null || options === void 0 ? void 0 : options.isCurrentOrder;
+              if (!(isCurrentOrder && !isCurrentOrder())) {
+                _context24.next = 3;
+                break;
+              }
+              return _context24.abrupt("return");
+            case 3:
               this.syncTempOrderHolderFromBookings(tempOrder);
               this.prepareVirtualSettlementTempOrder(tempOrder);
               isVirtualSettlement = this.isActiveVirtualSettlementOrder(tempOrder);
               if (!(!(options !== null && options !== void 0 && options.skipEditDiscountConfigRefresh) && !isVirtualSettlement)) {
-                _context24.next = 6;
+                _context24.next = 9;
                 break;
               }
-              _context24.next = 6;
+              _context24.next = 9;
               return this.ensureEditDiscountConfigForProductChange(tempOrder);
-            case 6:
+            case 9:
+              if (!(isCurrentOrder && !isCurrentOrder())) {
+                _context24.next = 11;
+                break;
+              }
+              return _context24.abrupt("return");
+            case 11:
               if (!(!(options !== null && options !== void 0 && options.skipDiscountRecalculation) && !isVirtualSettlement)) {
-                _context24.next = 12;
+                _context24.next = 17;
                 break;
               }
-              _context24.next = 9;
-              return this.evaluatePromotion();
-            case 9:
+              _context24.next = 14;
+              return this.evaluatePromotion(isCurrentOrder ? {
+                isCurrentOrder: isCurrentOrder
+              } : undefined);
+            case 14:
               _context24.t0 = _context24.sent;
-              _context24.next = 13;
+              _context24.next = 18;
               break;
-            case 12:
+            case 17:
               _context24.t0 = null;
-            case 13:
+            case 18:
               promotionPayload = _context24.t0;
+              if (!(isCurrentOrder && !isCurrentOrder())) {
+                _context24.next = 21;
+                break;
+              }
+              return _context24.abrupt("return");
+            case 21:
               if (!(options !== null && options !== void 0 && options.skipDiscountRecalculation) && !isVirtualSettlement) {
                 this.applyDiscount();
               }
               this.sanitizeTempOrderProducts(tempOrder);
-              _context24.next = 18;
-              return this.recalculateSummary({
+              _context24.next = 25;
+              return this.recalculateSummary(_objectSpread({
                 createIfMissing: true
-              });
-            case 18:
+              }, isCurrentOrder ? {
+                isCurrentOrder: isCurrentOrder
+              } : {}));
+            case 25:
+              summary = _context24.sent;
+              if (!(isCurrentOrder && (!isCurrentOrder() || !summary))) {
+                _context24.next = 28;
+                break;
+              }
+              return _context24.abrupt("return");
+            case 28:
               this.persistTempOrder();
               this.emitPromotionApplied(promotionPayload);
-            case 20:
+            case 30:
             case "end":
               return _context24.stop();
           }
         }, _callee22, this);
       }));
-      function finalizeProductOrderMutation(_x21, _x22) {
+      function finalizeProductOrderMutation(_x22, _x23) {
         return _finalizeProductOrderMutation.apply(this, arguments);
       }
       return finalizeProductOrderMutation;
@@ -4883,13 +5094,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _metadata,
         _productToAdd$metadat,
         _origin,
-        _this32 = this;
+        _this33 = this;
       var linked = booking ? this.createLinkedProductAndBooking({
         product: product,
         booking: booking
       }) : null;
       var productToAdd = (linked === null || linked === void 0 ? void 0 : linked.product) || product;
-      this.assertAndLockProductSettlement(tempOrder, productToAdd);
       var disableMerge = (options === null || options === void 0 ? void 0 : options.disableMerge) === true;
       var incomingFingerprint = disableMerge ? '' : buildProductLineFingerprint(getProductSkuOptions(productToAdd), productToAdd.product_bundle);
       var normalizedIncoming = this.normalizeVirtualSettlementProductIfEnabled(mergeOrderProductDisplayFields(productToAdd, normalizeOrderProduct(productToAdd)));
@@ -4919,26 +5129,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var isIncomingCustomItem = ((_productToAdd$metadat = productToAdd.metadata) === null || _productToAdd$metadat === void 0 || (_productToAdd$metadat = _productToAdd$metadat.origin) === null || _productToAdd$metadat === void 0 ? void 0 : _productToAdd$metadat.isCustomItem) === true || ((_origin = productToAdd._origin) === null || _origin === void 0 ? void 0 : _origin.isCustomItem) === true;
       var shouldForceNewLine = disableMerge || !!booking || hasIncomingGoodPass || isIncomingPersistedEntitlementPass || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
       var matchedIndex = shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
-        if (_this32.hasGoodPassDiscount(item)) return false;
-        var isRuntimeEntitlementPass = _this32.isRuntimeEntitlementAppend(item, tempOrder);
+        if (_this33.hasGoodPassDiscount(item)) return false;
+        var isRuntimeEntitlementPass = _this33.isRuntimeEntitlementAppend(item, tempOrder);
         if (isIncomingEntitlementAppend !== isRuntimeEntitlementPass) {
           return false;
         }
-        if (isIncomingEntitlementAppend && _this32.isPersistedProductLine(item)) {
+        if (isIncomingEntitlementAppend && _this33.isPersistedProductLine(item)) {
           return false;
         }
-        var hasExistingProductNote = _this32.hasOrderProductLineNote(item);
+        var hasExistingProductNote = _this33.hasOrderProductLineNote(item);
         if ((hasIncomingProductNote || hasExistingProductNote) && (!isRuntimeEntitlementPass || String(normalizedIncoming.note || '').trim() !== String(item.note || '').trim())) {
           return false;
         }
         var hasExistingManualProductDiscount = isManualProductDiscountProduct(item);
-        if (isRuntimeEntitlementPass && !_this32.hasSameEntitlementMergePriceConfig(normalizedIncoming, item)) {
+        if (isRuntimeEntitlementPass && !_this33.hasSameEntitlementMergePriceConfig(normalizedIncoming, item)) {
           return false;
         }
         if ((hasIncomingManualProductDiscount || hasExistingManualProductDiscount) && !isRuntimeEntitlementPass) {
           return false;
         }
-        if (_this32.isPersistedProductLine(item)) return false;
+        if (_this33.isPersistedProductLine(item)) return false;
         if (item.product_id !== productToAdd.product_id) return false;
         if (item.product_variant_id !== productToAdd.product_variant_id) return false;
         var existedFingerprint = buildProductLineFingerprint(getProductSkuOptions(item), item.product_bundle);
@@ -4947,9 +5157,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var matchedProduct = matchedIndex === -1 ? null : tempOrder.products[matchedIndex];
       var existedFingerprint = matchedProduct ? buildProductLineFingerprint(getProductSkuOptions(matchedProduct), matchedProduct.product_bundle) : '';
       var commitProductLine = function commitProductLine(shouldMerge) {
+        var _options$beforeCommit;
+        options === null || options === void 0 || (_options$beforeCommit = options.beforeCommit) === null || _options$beforeCommit === void 0 || _options$beforeCommit.call(options);
+        _this33.assertAndLockProductSettlement(tempOrder, productToAdd);
         var committedProduct;
         if (matchedIndex === -1 || !matchedProduct || !shouldMerge) {
-          _this32.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
+          _this33.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
           if (linked) {
             normalizedIncoming.booking_uid = linked.bookingUid;
             normalizedIncoming.metadata = _objectSpread(_objectSpread({}, normalizedIncoming.metadata || {}), {}, {
@@ -4967,7 +5180,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           var _targetProduct$metada;
           var targetProduct = matchedProduct;
           var targetUid = (_targetProduct$metada = targetProduct.metadata) === null || _targetProduct$metada === void 0 ? void 0 : _targetProduct$metada.unique_identification_number;
-          var normalizedProduct = _this32.normalizeVirtualSettlementProductIfEnabled(mergeOrderProductDisplayFields(targetProduct, normalizeOrderProduct(_objectSpread(_objectSpread({}, productToAdd), {}, {
+          var normalizedProduct = _this33.normalizeVirtualSettlementProductIfEnabled(mergeOrderProductDisplayFields(targetProduct, normalizeOrderProduct(_objectSpread(_objectSpread({}, productToAdd), {}, {
             metadata: _objectSpread(_objectSpread({}, productToAdd.metadata || {}), {}, {
               unique_identification_number: targetUid
             })
@@ -4990,7 +5203,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             order_detail_id: targetProduct.order_detail_id,
             num: nextNum
           });
-          _this32.captureProductRuntime(tempOrder, productToAdd, tempOrder.products[matchedIndex], targetUid);
+          _this33.captureProductRuntime(tempOrder, productToAdd, tempOrder.products[matchedIndex], targetUid);
           committedProduct = tempOrder.products[matchedIndex];
           if (matchedIndex !== tempOrder.products.length - 1) {
             var mergedProduct = tempOrder.products[matchedIndex];
@@ -5100,12 +5313,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "addProductToOrder",
     value: (function () {
       var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(product, booking, options) {
-        var _this33 = this;
-        var tempOrder, salesNoteDrafts, mutationSnapshot, attachSalesNoteDrafts, rollbackProductAndNotesMutation, insertAfterProductUid, anchorIndex, insertAtIndex, _ref71, _productRecord$num, productRecord, splitCount, i, splitLine, committedProduct, _committedProduct, _committedProduct2;
+        var _this34 = this;
+        var availabilityCommitGuard, liveTempOrder, beforeCommit, tempOrder, guardedMutationFields, readGuardedMutationFields, guardedMutationBaseline, salesNoteDrafts, mutationSnapshot, attachSalesNoteDrafts, rollbackProductAndNotesMutation, insertAfterProductUid, anchorIndex, insertAtIndex, _ref71, _productRecord$num, productRecord, splitCount, i, splitLine, committedProduct, _committedProduct, _committedProduct2, committedIdentity, isCurrentOrder;
         return _regeneratorRuntime().wrap(function _callee23$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
-              tempOrder = this.ensureTempOrder();
+              availabilityCommitGuard = options === null || options === void 0 ? void 0 : options.availabilityCommitGuard;
+              availabilityCommitGuard === null || availabilityCommitGuard === void 0 || availabilityCommitGuard();
+              liveTempOrder = this.ensureTempOrder();
+              beforeCommit = this.createCartIntentCommitGuard('add_product', liveTempOrder); // 自动预约在草稿上准备完整批次，避免拆票期间暴露半成品，或在失败时
+              // 用整单快照回滚而抹掉其他入口的并发修改。人工路径保持原有写入行为。
+              tempOrder = availabilityCommitGuard ? cloneDeep(liveTempOrder) : liveTempOrder;
+              guardedMutationFields = ['products', 'bookings', 'notes', '_extend', 'metadata', 'currency_code', 'currency_symbol', 'currency_format'];
+              readGuardedMutationFields = function readGuardedMutationFields(order) {
+                return Object.fromEntries(guardedMutationFields.map(function (key) {
+                  return [key, order[key]];
+                }));
+              };
+              guardedMutationBaseline = availabilityCommitGuard ? cloneDeep(readGuardedMutationFields(liveTempOrder)) : null;
               salesNoteDrafts = ((options === null || options === void 0 ? void 0 : options.salesNotes) || []).map(function (draft) {
                 return {
                   note_type: String(draft.note_type || '').trim(),
@@ -5129,7 +5354,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   throw new Error('[Order Notes] 商品行缺少 unique_identification_number');
                 }
                 salesNoteDrafts.forEach(function (draft) {
-                  _this33.setSalesNoteOnTempOrder(tempOrder, {
+                  _this34.setSalesNoteOnTempOrder(tempOrder, {
                     note_type: draft.note_type,
                     target: {
                       target_type: 'order_detail',
@@ -5152,22 +5377,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 var uid = ((_line$metadata = line.metadata) === null || _line$metadata === void 0 ? void 0 : _line$metadata.unique_identification_number) || line.unique_identification_number;
                 return uid !== undefined && uid !== null && String(uid) === String(insertAfterProductUid);
               }) : -1;
-              insertAtIndex = anchorIndex >= 0 ? anchorIndex + 1 : undefined;
-              _context25.prev = 8;
+              insertAtIndex = options !== null && options !== void 0 && options.insertAtStart ? 0 : anchorIndex >= 0 ? anchorIndex + 1 : undefined;
+              _context25.prev = 15;
               if (!booking) {
-                _context25.next = 33;
+                _context25.next = 42;
                 break;
               }
               productRecord = product;
               splitCount = getSafeProductNum((_ref71 = (_productRecord$num = productRecord.num) !== null && _productRecord$num !== void 0 ? _productRecord$num : productRecord.product_quantity) !== null && _ref71 !== void 0 ? _ref71 : 1);
               if (!(splitCount > 1)) {
-                _context25.next = 27;
+                _context25.next = 35;
                 break;
               }
               i = 0;
-            case 14:
+            case 21:
               if (!(i < splitCount)) {
-                _context25.next = 25;
+                _context25.next = 33;
                 break;
               }
               splitLine = this.createSplitBookingLine(productRecord, booking, i, splitCount);
@@ -5185,67 +5410,125 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   delete splitLine.booking.metadata.unique_identification_number;
                 }
               }
-              _context25.next = 19;
+              _context25.next = 26;
               return this.appendProductLineToTempOrder(tempOrder, splitLine.product, splitLine.booking, {
                 insertAtIndex: insertAtIndex,
-                disableMerge: options === null || options === void 0 ? void 0 : options.disableMerge
+                disableMerge: options === null || options === void 0 ? void 0 : options.disableMerge,
+                beforeCommit: beforeCommit
               });
-            case 19:
+            case 26:
               committedProduct = _context25.sent;
+              availabilityCommitGuard === null || availabilityCommitGuard === void 0 || availabilityCommitGuard();
               attachSalesNoteDrafts(committedProduct);
               if (insertAtIndex !== undefined) insertAtIndex += 1;
-            case 22:
+            case 30:
               i += 1;
-              _context25.next = 14;
+              _context25.next = 21;
               break;
-            case 25:
-              _context25.next = 31;
+            case 33:
+              _context25.next = 40;
               break;
-            case 27:
-              _context25.next = 29;
+            case 35:
+              _context25.next = 37;
               return this.appendProductLineToTempOrder(tempOrder, product, cloneDeep(booking), {
                 insertAtIndex: insertAtIndex,
-                disableMerge: options === null || options === void 0 ? void 0 : options.disableMerge
+                disableMerge: options === null || options === void 0 ? void 0 : options.disableMerge,
+                beforeCommit: beforeCommit
               });
-            case 29:
+            case 37:
               _committedProduct = _context25.sent;
+              availabilityCommitGuard === null || availabilityCommitGuard === void 0 || availabilityCommitGuard();
               attachSalesNoteDrafts(_committedProduct);
-            case 31:
-              _context25.next = 37;
+            case 40:
+              _context25.next = 47;
               break;
-            case 33:
-              _context25.next = 35;
+            case 42:
+              _context25.next = 44;
               return this.appendProductLineToTempOrder(tempOrder, product, undefined, {
                 insertAtIndex: insertAtIndex,
-                disableMerge: options === null || options === void 0 ? void 0 : options.disableMerge
+                disableMerge: options === null || options === void 0 ? void 0 : options.disableMerge,
+                beforeCommit: beforeCommit
               });
-            case 35:
+            case 44:
               _committedProduct2 = _context25.sent;
+              availabilityCommitGuard === null || availabilityCommitGuard === void 0 || availabilityCommitGuard();
               attachSalesNoteDrafts(_committedProduct2);
-            case 37:
-              _context25.next = 43;
+            case 47:
+              if (!availabilityCommitGuard) {
+                _context25.next = 53;
+                break;
+              }
+              availabilityCommitGuard();
+              beforeCommit();
+              // 调用方的结构 revision 可能不包括备注、价格或结算元数据。
+              // 本次会覆盖的字段也要保持原值，不能让草稿覆盖并发编辑。
+              if (isEqual(readGuardedMutationFields(liveTempOrder), guardedMutationBaseline)) {
+                _context25.next = 52;
+                break;
+              }
+              throw Object.assign(new Error('预约加购期间订单已变化，请重新选择'), {
+                code: 'AVAILABILITY_SELECTION_STALE'
+              });
+            case 52:
+              // 从最后一次门禁到真正新增之间不再 await。只发布本次新增会改写的
+              // 字段；其余订单字段继续使用 live 对象，外部持有的订单引用也不变。
+              Object.assign(liveTempOrder, readGuardedMutationFields(tempOrder));
+            case 53:
+              _context25.next = 59;
               break;
-            case 39:
-              _context25.prev = 39;
-              _context25.t0 = _context25["catch"](8);
+            case 55:
+              _context25.prev = 55;
+              _context25.t0 = _context25["catch"](15);
               rollbackProductAndNotesMutation();
               throw _context25.t0;
-            case 43:
-              _context25.next = 45;
-              return this.finalizeProductOrderMutation(tempOrder);
-            case 45:
+            case 59:
+              if (!availabilityCommitGuard) {
+                _context25.next = 73;
+                break;
+              }
+              committedIdentity = [liveTempOrder.order_id, liveTempOrder.external_sale_number];
+              isCurrentOrder = function isCurrentOrder() {
+                var _options$availability, _options$availability2;
+                return _this34.store.tempOrder === liveTempOrder && liveTempOrder.order_id === committedIdentity[0] && liveTempOrder.external_sale_number === committedIdentity[1] && ((_options$availability = options === null || options === void 0 || (_options$availability2 = options.availabilityCommitTargetGuard) === null || _options$availability2 === void 0 ? void 0 : _options$availability2.call(options)) !== null && _options$availability !== void 0 ? _options$availability : true);
+              };
+              _context25.prev = 62;
+              // 新增已发布，即使后续报价/促销收尾失败，也不能向调用方报告未加购。
+              // 先保存已提交行；异步结果只允许写回仍属于本次提交的订单。
+              if (isCurrentOrder()) this.persistTempOrder();
+              _context25.next = 66;
+              return this.finalizeProductOrderMutation(liveTempOrder, {
+                isCurrentOrder: isCurrentOrder
+              });
+            case 66:
+              _context25.next = 71;
+              break;
+            case 68:
+              _context25.prev = 68;
+              _context25.t1 = _context25["catch"](62);
+              this.logWarning('addProductToOrder committed; finalization failed', {
+                product_id: product.product_id,
+                committed: true,
+                error: _context25.t1 instanceof Error ? _context25.t1.message : String(_context25.t1)
+              });
+            case 71:
+              _context25.next = 75;
+              break;
+            case 73:
+              _context25.next = 75;
+              return this.finalizeProductOrderMutation(liveTempOrder);
+            case 75:
               this.logInfo('addProductToOrder success', {
                 product_id: product.product_id,
                 with_booking: !!booking
               });
-              return _context25.abrupt("return", tempOrder.products);
-            case 47:
+              return _context25.abrupt("return", liveTempOrder.products);
+            case 77:
             case "end":
               return _context25.stop();
           }
-        }, _callee23, this, [[8, 39]]);
+        }, _callee23, this, [[15, 55], [62, 68]]);
       }));
-      function addProductToOrder(_x23, _x24, _x25) {
+      function addProductToOrder(_x24, _x25, _x26) {
         return _addProductToOrder.apply(this, arguments);
       }
       return addProductToOrder;
@@ -5264,7 +5547,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "addProductsToOrder",
     value: (function () {
       var _addProductsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(items, options) {
-        var tempOrder, _iterator20, _step20, item, product, booking, _ref72, _productRecord$num2, productRecord, splitCount, i, splitLine, _appendResult, appendResult;
+        var tempOrder, beforeCommit, _iterator20, _step20, item, product, booking, _ref72, _productRecord$num2, productRecord, splitCount, i, splitLine, _appendResult, appendResult;
         return _regeneratorRuntime().wrap(function _callee24$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
@@ -5275,89 +5558,94 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               return _context26.abrupt("return", tempOrder.products);
             case 3:
+              beforeCommit = this.createCartIntentCommitGuard('add_product', tempOrder);
               _iterator20 = _createForOfIteratorHelper(items || []);
-              _context26.prev = 4;
+              _context26.prev = 5;
               _iterator20.s();
-            case 6:
+            case 7:
               if ((_step20 = _iterator20.n()).done) {
-                _context26.next = 32;
+                _context26.next = 33;
                 break;
               }
               item = _step20.value;
               product = item.product, booking = item.booking;
               if (product) {
-                _context26.next = 11;
+                _context26.next = 12;
                 break;
               }
-              return _context26.abrupt("continue", 30);
-            case 11:
+              return _context26.abrupt("continue", 31);
+            case 12:
               if (!booking) {
-                _context26.next = 26;
+                _context26.next = 27;
                 break;
               }
               productRecord = product;
               splitCount = getSafeProductNum((_ref72 = (_productRecord$num2 = productRecord.num) !== null && _productRecord$num2 !== void 0 ? _productRecord$num2 : productRecord.product_quantity) !== null && _ref72 !== void 0 ? _ref72 : 1);
               if (!(splitCount > 1)) {
-                _context26.next = 26;
+                _context26.next = 27;
                 break;
               }
               i = 0;
-            case 16:
+            case 17:
               if (!(i < splitCount)) {
-                _context26.next = 25;
+                _context26.next = 26;
                 break;
               }
               splitLine = this.createSplitBookingLine(productRecord, booking, i, splitCount);
-              _appendResult = this.appendProductLineToTempOrder(tempOrder, splitLine.product, splitLine.booking);
+              _appendResult = this.appendProductLineToTempOrder(tempOrder, splitLine.product, splitLine.booking, {
+                beforeCommit: beforeCommit
+              });
               if (!_appendResult) {
-                _context26.next = 22;
+                _context26.next = 23;
                 break;
               }
-              _context26.next = 22;
+              _context26.next = 23;
               return _appendResult;
-            case 22:
+            case 23:
               i += 1;
-              _context26.next = 16;
+              _context26.next = 17;
               break;
-            case 25:
-              return _context26.abrupt("continue", 30);
             case 26:
-              appendResult = this.appendProductLineToTempOrder(tempOrder, product, booking);
+              return _context26.abrupt("continue", 31);
+            case 27:
+              appendResult = this.appendProductLineToTempOrder(tempOrder, product, booking, {
+                beforeCommit: beforeCommit
+              });
               if (!appendResult) {
-                _context26.next = 30;
+                _context26.next = 31;
                 break;
               }
-              _context26.next = 30;
+              _context26.next = 31;
               return appendResult;
-            case 30:
-              _context26.next = 6;
+            case 31:
+              _context26.next = 7;
               break;
-            case 32:
-              _context26.next = 37;
+            case 33:
+              _context26.next = 38;
               break;
-            case 34:
-              _context26.prev = 34;
-              _context26.t0 = _context26["catch"](4);
+            case 35:
+              _context26.prev = 35;
+              _context26.t0 = _context26["catch"](5);
               _iterator20.e(_context26.t0);
-            case 37:
-              _context26.prev = 37;
+            case 38:
+              _context26.prev = 38;
               _iterator20.f();
-              return _context26.finish(37);
-            case 40:
-              _context26.next = 42;
+              return _context26.finish(38);
+            case 41:
+              _context26.next = 43;
               return this.finalizeProductOrderMutation(tempOrder, options);
-            case 42:
+            case 43:
               this.logInfo('addProductsToOrder success', {
                 itemsCount: items.length
               });
               return _context26.abrupt("return", tempOrder.products);
-            case 44:
+            case 45:
             case "end":
               return _context26.stop();
           }
-        }, _callee24, this, [[4, 34, 37, 40]]);
+        }, _callee24, this, [[5, 35, 38, 41]]);
       }));
-      function addProductsToOrder(_x26, _x27) {
+      function addProductsToOrder(_x27, _x28) {
         return _addProductsToOrder.apply(this, arguments);
       }
       return addProductsToOrder;
@@ -5409,7 +5697,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hasSameEntitlementMergePriceConfig",
     value: function hasSameEntitlementMergePriceConfig(incoming, existing) {
-      var _this34 = this;
+      var _this35 = this;
       var buildPriceConfig = function buildPriceConfig(product) {
         var metadata = product.metadata || {};
         var bundle = (product.product_bundle || []).map(function (item) {
@@ -5425,10 +5713,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           return JSON.stringify(left).localeCompare(JSON.stringify(right));
         });
         return JSON.stringify({
-          original_price: _this34.normalizeFingerprintMoney(product.original_price),
-          source_product_price: _this34.normalizeFingerprintMoney(metadata.source_product_price),
-          main_product_original_price: _this34.normalizeFingerprintMoney(metadata.main_product_original_price),
-          price_override: _this34.normalizeFingerprintMoney(metadata.price_override),
+          original_price: _this35.normalizeFingerprintMoney(product.original_price),
+          source_product_price: _this35.normalizeFingerprintMoney(metadata.source_product_price),
+          main_product_original_price: _this35.normalizeFingerprintMoney(metadata.main_product_original_price),
+          price_override: _this35.normalizeFingerprintMoney(metadata.price_override),
           is_manual_discount: Boolean(metadata.is_manual_discount),
           bundle: bundle
         });
@@ -5445,17 +5733,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "preservePersistedBundlePriceFields",
     value: function preservePersistedBundlePriceFields(previousBundles, nextBundles) {
-      var _this35 = this;
+      var _this36 = this;
       if (!Array.isArray(nextBundles)) return nextBundles;
       if (!Array.isArray(previousBundles) || previousBundles.length === 0) return nextBundles;
       var previousByIdentity = new Map();
       previousBundles.forEach(function (bundle) {
-        var identity = _this35.getBundleRuntimeIdentity(bundle);
+        var identity = _this36.getBundleRuntimeIdentity(bundle);
         if (identity) previousByIdentity.set(identity, bundle);
       });
       return nextBundles.map(function (bundle, index) {
         if (!bundle || _typeof(bundle) !== 'object') return bundle;
-        var previous = previousByIdentity.get(_this35.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
+        var previous = previousByIdentity.get(_this36.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
         if (!previous || _typeof(previous) !== 'object') return bundle;
         return _objectSpread(_objectSpread(_objectSpread({}, bundle), (bundle.cover === undefined || bundle.cover === null || bundle.cover === '') && previous.cover !== undefined && previous.cover !== null && previous.cover !== '' ? {
           cover: previous.cover
@@ -5469,6 +5757,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         });
       });
     }
+  }, {
+    key: "isRestrictedCartProductUpdate",
+    value: function isRestrictedCartProductUpdate(tempOrder, params) {
+      var _this$orderHooks4, _params$updates;
+      if (!((_this$orderHooks4 = this.orderHooks) !== null && _this$orderHooks4 !== void 0 && _this$orderHooks4.beforeCartIntentCommit)) return false;
+      if (params.booking || Object.keys(params.updates || {}).some(function (key) {
+        return key !== 'num';
+      })) {
+        return true;
+      }
+      if (((_params$updates = params.updates) === null || _params$updates === void 0 ? void 0 : _params$updates.num) === undefined) return false;
+      var uid = params.unique_identification_number;
+      var product = uid !== undefined ? tempOrder.products.find(function (item) {
+        var _item$metadata4;
+        return String(((_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.unique_identification_number) || item.unique_identification_number || '') === String(uid);
+      }) : tempOrder.products[getProductIdentityIndex(tempOrder.products, params)];
+      return !product || getSafeProductNum(params.updates.num) > product.num;
+    }
   }, {
     key: "applyOrderProductUpdateToTempOrder",
     value: function applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids) {
@@ -5500,8 +5806,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (unique_identification_number !== undefined) {
         var targetUid = String(unique_identification_number);
         productIndex = tempOrder.products.findIndex(function (item) {
-          var _item$metadata4;
-          return String(((_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.unique_identification_number) || item.unique_identification_number || '') === targetUid;
+          var _item$metadata5;
+          return String(((_item$metadata5 = item.metadata) === null || _item$metadata5 === void 0 ? void 0 : _item$metadata5.unique_identification_number) || item.unique_identification_number || '') === targetUid;
         });
       }
       if (productIndex === -1) {
@@ -5714,35 +6020,38 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context27.prev = _context27.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
+              if (this.isRestrictedCartProductUpdate(tempOrder, params)) {
+                this.createCartIntentCommitGuard('update_product', tempOrder)();
+              }
               reapplyWeighedDiscountProductUids = [];
               updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids);
-              _context27.next = 5;
+              _context27.next = 6;
               return this.evaluatePromotion();
-            case 5:
+            case 6:
               promotionPayload = _context27.sent;
               this.applyDiscount({
                 reapplyWeighedDiscountProductUids: reapplyWeighedDiscountProductUids,
                 reapplyBookingDiscountProductUids: params.allow_booking_discount_reapply && updatedProductUid ? [String(updatedProductUid)] : undefined
               });
               this.sanitizeTempOrderProducts(tempOrder);
-              _context27.next = 10;
+              _context27.next = 11;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 10:
+            case 11:
               this.persistTempOrder();
               this.emitPromotionApplied(promotionPayload);
               this.logInfo('updateOrderProduct success', {
                 params: params
               });
               return _context27.abrupt("return", tempOrder.products);
-            case 14:
+            case 15:
             case "end":
               return _context27.stop();
           }
         }, _callee25, this);
       }));
-      function updateOrderProduct(_x28) {
+      function updateOrderProduct(_x29) {
         return _updateOrderProduct.apply(this, arguments);
       }
       return updateOrderProduct;
@@ -5751,7 +6060,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderProducts",
     value: function () {
       var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(paramsList) {
-        var _this36 = this;
+        var _this37 = this;
         var tempOrder, reapplyWeighedDiscountProductUids, reapplyBookingDiscountProductUids;
         return _regeneratorRuntime().wrap(function _callee26$(_context28) {
           while (1) switch (_context28.prev = _context28.next) {
@@ -5763,32 +6072,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               return _context28.abrupt("return", tempOrder.products);
             case 3:
+              if (paramsList.some(function (params) {
+                return _this37.isRestrictedCartProductUpdate(tempOrder, params);
+              })) {
+                this.createCartIntentCommitGuard('update_product', tempOrder)();
+              }
               reapplyWeighedDiscountProductUids = [];
               reapplyBookingDiscountProductUids = paramsList.reduce(function (acc, params) {
-                var updatedProductUid = _this36.applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids);
+                var updatedProductUid = _this37.applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids);
                 // 批量改预约时间时，延迟到最后一次折扣计算里统一恢复已选预约折扣卡。
                 if (params.allow_booking_discount_reapply && updatedProductUid) {
                   acc.push(String(updatedProductUid));
                 }
                 return acc;
               }, []);
-              _context28.next = 7;
+              _context28.next = 8;
               return this.finalizeAfterProductsMutation(tempOrder, {
                 reapplyWeighedDiscountProductUids: reapplyWeighedDiscountProductUids,
                 reapplyBookingDiscountProductUids: reapplyBookingDiscountProductUids.length ? reapplyBookingDiscountProductUids : undefined
               });
-            case 7:
+            case 8:
               this.logInfo('updateOrderProduct success', {
                 paramsList: paramsList
               });
               return _context28.abrupt("return", tempOrder.products);
-            case 9:
+            case 10:
             case "end":
               return _context28.stop();
           }
         }, _callee26, this);
       }));
-      function updateOrderProducts(_x29) {
+      function updateOrderProducts(_x30) {
         return _updateOrderProducts.apply(this, arguments);
       }
       return updateOrderProducts;
@@ -5796,12 +6110,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProductQuantity",
     value: function () {
-      var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(params) {
-        var _targetProduct$metada22;
-        var product_id, product_variant_id, num, unique_identification_number, identity_key, product_sku, product_bundle, tempOrder, identityLookup, productIndex, targetUid, targetProduct, isPersistedOrderLine, normalizedProduct, settlementSnapshot, currencyProductId, asset, requiredAmount, balance, isVirtualSettlement, promotionPayload;
+      var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(params, options) {
+        var _this$store$tempOrder9, _targetProduct$metada22;
+        var isCurrentOrder, product_id, product_variant_id, num, unique_identification_number, identity_key, product_sku, product_bundle, tempOrder, identityLookup, productIndex, targetUid, targetProduct, isPersistedOrderLine, normalizedProduct, settlementSnapshot, currencyProductId, asset, requiredAmount, balance, isVirtualSettlement, promotionPayload;
         return _regeneratorRuntime().wrap(function _callee27$(_context29) {
           while (1) switch (_context29.prev = _context29.next) {
             case 0:
+              isCurrentOrder = options === null || options === void 0 ? void 0 : options.isCurrentOrder;
+              if (!(isCurrentOrder && !isCurrentOrder())) {
+                _context29.next = 3;
+                break;
+              }
+              return _context29.abrupt("return", ((_this$store$tempOrder9 = this.store.tempOrder) === null || _this$store$tempOrder9 === void 0 ? void 0 : _this$store$tempOrder9.products) || []);
+            case 3:
               product_id = params.product_id, product_variant_id = params.product_variant_id, num = params.num, unique_identification_number = params.unique_identification_number, identity_key = params.identity_key, product_sku = params.product_sku, product_bundle = params.product_bundle;
               tempOrder = this.ensureTempOrder();
               this.repairDuplicateProductLineIdentities(tempOrder);
@@ -5822,19 +6143,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (unique_identification_number !== undefined) {
                 targetUid = String(unique_identification_number);
                 productIndex = tempOrder.products.findIndex(function (item) {
-                  var _item$metadata5;
-                  return String(((_item$metadata5 = item.metadata) === null || _item$metadata5 === void 0 ? void 0 : _item$metadata5.unique_identification_number) || item.unique_identification_number || '') === targetUid;
+                  var _item$metadata6;
+                  return String(((_item$metadata6 = item.metadata) === null || _item$metadata6 === void 0 ? void 0 : _item$metadata6.unique_identification_number) || item.unique_identification_number || '') === targetUid;
                 });
               }
               if (productIndex === -1) {
                 productIndex = getProductIdentityIndex(tempOrder.products, identityLookup);
               }
               if (!(productIndex === -1)) {
-                _context29.next = 13;
+                _context29.next = 16;
                 break;
               }
               throw new Error('[Order] 目标商品不存在，无法更新数量');
-            case 13:
+            case 16:
               targetProduct = tempOrder.products[productIndex];
               isPersistedOrderLine = targetProduct.order_detail_id !== undefined && targetProduct.order_detail_id !== null;
               normalizedProduct = this.normalizeVirtualSettlementProductIfEnabled(normalizeOrderProduct(_objectSpread(_objectSpread({}, targetProduct), {}, {
@@ -5846,7 +6167,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               normalizedProduct.discount_list = normalizeOrderProductDiscountList(isPersistedOrderLine ? syncReducedEntitlementPassUsageCount(normalizedProduct.discount_list, targetProduct.num, normalizedProduct.num) : normalizedProduct.discount_list);
               settlementSnapshot = getSelectedSettlementSnapshot(normalizedProduct);
               if (!(this.isMultiCurrencySettlementEnabled() && (settlementSnapshot === null || settlementSnapshot === void 0 ? void 0 : settlementSnapshot.settlement_type) === 'virtual_currency' && tempOrder.customer_id && Number(tempOrder.customer_id) !== 1)) {
-                _context29.next = 27;
+                _context29.next = 30;
                 break;
               }
               currencyProductId = Number(settlementSnapshot.currency_product_id);
@@ -5854,11 +6175,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return Number(item === null || item === void 0 ? void 0 : item.product_id) === currencyProductId;
               });
               if (asset) {
-                _context29.next = 23;
+                _context29.next = 26;
                 break;
               }
               throw new VirtualCurrencyAssetNotFoundError(currencyProductId);
-            case 23:
+            case 26:
               requiredAmount = tempOrder.products.reduce(function (sum, item, index) {
                 var current = index === productIndex ? normalizedProduct : item;
                 var currentSnapshot = getSelectedSettlementSnapshot(current);
@@ -5866,50 +6187,73 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }, new Decimal(0));
               balance = new Decimal(asset.balance || 0);
               if (!balance.lt(requiredAmount)) {
-                _context29.next = 27;
+                _context29.next = 30;
                 break;
               }
               throw new VirtualCurrencyBalanceError(balance.toFixed(2), requiredAmount.toFixed(2));
-            case 27:
+            case 30:
+              if (normalizedProduct.num > targetProduct.num) {
+                this.createCartIntentCommitGuard('increase_quantity', tempOrder)();
+              }
+              if (!(isCurrentOrder && !isCurrentOrder())) {
+                _context29.next = 33;
+                break;
+              }
+              return _context29.abrupt("return", tempOrder.products);
+            case 33:
               tempOrder.products[productIndex] = normalizedProduct;
+              if (!isCurrentOrder) {
+                _context29.next = 39;
+                break;
+              }
+              _context29.next = 37;
+              return this.finalizeProductOrderMutation(tempOrder, {
+                skipEditDiscountConfigRefresh: true,
+                isCurrentOrder: isCurrentOrder
+              });
+            case 37:
+              _context29.next = 55;
+              break;
+            case 39:
               this.prepareVirtualSettlementTempOrder(tempOrder);
               isVirtualSettlement = this.isActiveVirtualSettlementOrder(tempOrder);
               if (isVirtualSettlement) {
-                _context29.next = 36;
+                _context29.next = 47;
                 break;
               }
-              _context29.next = 33;
+              _context29.next = 44;
               return this.evaluatePromotion();
-            case 33:
+            case 44:
               _context29.t0 = _context29.sent;
-              _context29.next = 37;
+              _context29.next = 48;
               break;
-            case 36:
+            case 47:
               _context29.t0 = null;
-            case 37:
+            case 48:
               promotionPayload = _context29.t0;
               if (!isVirtualSettlement) {
                 this.applyDiscount();
               }
               this.sanitizeTempOrderProducts(tempOrder);
-              _context29.next = 42;
+              _context29.next = 53;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 42:
+            case 53:
               this.persistTempOrder();
               this.emitPromotionApplied(promotionPayload);
+            case 55:
               this.logInfo('updateOrderProductQuantity success', {
                 params: params
               });
               return _context29.abrupt("return", tempOrder.products);
-            case 46:
+            case 57:
             case "end":
               return _context29.stop();
           }
         }, _callee27, this);
       }));
-      function updateOrderProductQuantity(_x30) {
+      function updateOrderProductQuantity(_x31, _x32) {
         return _updateOrderProductQuantity.apply(this, arguments);
       }
       return updateOrderProductQuantity;
@@ -5978,7 +6322,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee28, this);
       }));
-      function finalizeAfterProductsMutation(_x31, _x32) {
+      function finalizeAfterProductsMutation(_x33, _x34) {
         return _finalizeAfterProductsMutation.apply(this, arguments);
       }
       return finalizeAfterProductsMutation;
@@ -5994,18 +6338,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "removeProductsFromOrder",
     value: (function () {
       var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(identities, options) {
-        var _this37 = this;
-        var tempOrder, productsBeforeRemove, bookingsBeforeRemove, preserveDisplayPosition, anchorIndex, productsAfterAnchor, matchedProducts, removedProducts, _i2, _removedProducts, product, linkedBookingUidsToRemove, _iterator21, _step21, _loop3, remainingProductIndex, remainingProduct, nextProduct, productsWithoutRemaining, nextProductIndex;
+        var _this$store$tempOrder10,
+          _this38 = this;
+        var isCurrentOrder, tempOrder, productsBeforeRemove, bookingsBeforeRemove, preserveDisplayPosition, anchorIndex, productsAfterAnchor, matchedProducts, removedProducts, _i2, _removedProducts, product, linkedBookingUidsToRemove, _iterator21, _step21, _loop3, remainingProductIndex, remainingProduct, nextProduct, productsWithoutRemaining, nextProductIndex;
         return _regeneratorRuntime().wrap(function _callee29$(_context32) {
           while (1) switch (_context32.prev = _context32.next) {
             case 0:
+              isCurrentOrder = options === null || options === void 0 ? void 0 : options.isCurrentOrder;
+              if (!(isCurrentOrder && !isCurrentOrder())) {
+                _context32.next = 3;
+                break;
+              }
+              return _context32.abrupt("return", ((_this$store$tempOrder10 = this.store.tempOrder) === null || _this$store$tempOrder10 === void 0 ? void 0 : _this$store$tempOrder10.products) || []);
+            case 3:
               tempOrder = this.ensureTempOrder();
               if (identities.length) {
-                _context32.next = 3;
+                _context32.next = 6;
                 break;
               }
               return _context32.abrupt("return", tempOrder.products);
-            case 3:
+            case 6:
               // 商品删除会同步删除以商品行为主关系的 Notes；快照不完整时禁止产生孤儿 Relation。
               this.ensureSalesNotesLoadedForMutation(tempOrder);
               this.repairDuplicateProductLineIdentities(tempOrder);
@@ -6013,8 +6365,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               bookingsBeforeRemove = tempOrder.bookings || [];
               preserveDisplayPosition = options === null || options === void 0 ? void 0 : options.preserveDisplayPosition;
               anchorIndex = preserveDisplayPosition ? productsBeforeRemove.findIndex(function (item) {
-                var _item$metadata6;
-                var uid = ((_item$metadata6 = item.metadata) === null || _item$metadata6 === void 0 ? void 0 : _item$metadata6.unique_identification_number) || item.unique_identification_number;
+                var _item$metadata7;
+                var uid = ((_item$metadata7 = item.metadata) === null || _item$metadata7 === void 0 ? void 0 : _item$metadata7.unique_identification_number) || item.unique_identification_number;
                 return uid !== undefined && uid !== null && String(uid) === String(preserveDisplayPosition.anchorProductUid);
               }) : -1;
               productsAfterAnchor = anchorIndex >= 0 ? productsBeforeRemove.slice(anchorIndex + 1) : [];
@@ -6037,7 +6389,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               linkedBookingUidsToRemove = new Set();
               _iterator21 = _createForOfIteratorHelper(matchedProducts);
-              _context32.prev = 16;
+              _context32.prev = 19;
               _loop3 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop3() {
                 var _metadata11, _metadata12, _metadata13, _metadata14;
                 var product, productUid, productBookingUid, isAddTimeProduct;
@@ -6059,7 +6411,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }
                       if (productUid !== undefined && productUid !== null && productUid !== '') {
                         bookingsBeforeRemove.forEach(function (booking) {
-                          var bookingUid = _this37.getBookingUniqueIdentificationNumber(booking);
+                          var bookingUid = _this38.getBookingUniqueIdentificationNumber(booking);
                           if (bookingUid && String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === String(productUid)) {
                             linkedBookingUidsToRemove.add(bookingUid);
                           }
@@ -6072,33 +6424,33 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }, _loop3);
               });
               _iterator21.s();
-            case 19:
+            case 22:
               if ((_step21 = _iterator21.n()).done) {
-                _context32.next = 25;
+                _context32.next = 28;
                 break;
               }
-              return _context32.delegateYield(_loop3(), "t0", 21);
-            case 21:
+              return _context32.delegateYield(_loop3(), "t0", 24);
+            case 24:
               if (!_context32.t0) {
-                _context32.next = 23;
+                _context32.next = 26;
                 break;
               }
-              return _context32.abrupt("continue", 23);
-            case 23:
-              _context32.next = 19;
+              return _context32.abrupt("continue", 26);
+            case 26:
+              _context32.next = 22;
               break;
-            case 25:
-              _context32.next = 30;
+            case 28:
+              _context32.next = 33;
               break;
-            case 27:
-              _context32.prev = 27;
-              _context32.t1 = _context32["catch"](16);
-              _iterator21.e(_context32.t1);
             case 30:
               _context32.prev = 30;
-              _iterator21.f();
-              return _context32.finish(30);
+              _context32.t1 = _context32["catch"](19);
+              _iterator21.e(_context32.t1);
             case 33:
+              _context32.prev = 33;
+              _iterator21.f();
+              return _context32.finish(33);
+            case 36:
               if (linkedBookingUidsToRemove.size > 0) {
                 // 删除主预约商品时，同步移除挂在同一 booking_uid 下的加时商品，避免残留孤儿行。
                 tempOrder.products = (tempOrder.products || []).filter(function (line) {
@@ -6110,8 +6462,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               if (preserveDisplayPosition && anchorIndex >= 0) {
                 remainingProductIndex = tempOrder.products.findIndex(function (item) {
-                  var _item$metadata7;
-                  var uid = ((_item$metadata7 = item.metadata) === null || _item$metadata7 === void 0 ? void 0 : _item$metadata7.unique_identification_number) || item.unique_identification_number;
+                  var _item$metadata8;
+                  var uid = ((_item$metadata8 = item.metadata) === null || _item$metadata8 === void 0 ? void 0 : _item$metadata8.unique_identification_number) || item.unique_identification_number;
                   return uid !== undefined && uid !== null && String(uid) === String(preserveDisplayPosition.remainingProductUid);
                 });
                 if (remainingProductIndex >= 0) {
@@ -6125,20 +6477,33 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               this.removeSalesNotesForMissingProductLines(tempOrder);
-              _context32.next = 38;
+              if (!isCurrentOrder) {
+                _context32.next = 44;
+                break;
+              }
+              _context32.next = 42;
+              return this.finalizeProductOrderMutation(tempOrder, {
+                skipEditDiscountConfigRefresh: true,
+                isCurrentOrder: isCurrentOrder
+              });
+            case 42:
+              _context32.next = 46;
+              break;
+            case 44:
+              _context32.next = 46;
               return this.finalizeAfterProductsMutation(tempOrder);
-            case 38:
+            case 46:
               this.logInfo('removeProductsFromOrder success', {
                 identities: identities
               });
               return _context32.abrupt("return", tempOrder.products);
-            case 40:
+            case 48:
             case "end":
               return _context32.stop();
           }
-        }, _callee29, this, [[16, 27, 30, 33]]);
+        }, _callee29, this, [[19, 30, 33, 36]]);
       }));
-      function removeProductsFromOrder(_x33, _x34) {
+      function removeProductsFromOrder(_x35, _x36) {
         return _removeProductsFromOrder.apply(this, arguments);
       }
       return removeProductsFromOrder;
@@ -6157,7 +6522,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee30, this);
       }));
-      function removeProductFromOrder(_x35, _x36) {
+      function removeProductFromOrder(_x37, _x38) {
         return _removeProductFromOrder.apply(this, arguments);
       }
       return removeProductFromOrder;
@@ -6332,7 +6697,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee33, this);
       }));
-      function applyLocalPrintOrderNumbers(_x37) {
+      function applyLocalPrintOrderNumbers(_x39) {
         return _applyLocalPrintOrderNumbers.apply(this, arguments);
       }
       return applyLocalPrintOrderNumbers;
@@ -6399,7 +6764,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee34, this);
       }));
-      function saveTempOrderAsDraft(_x38) {
+      function saveTempOrderAsDraft(_x40) {
         return _saveTempOrderAsDraft.apply(this, arguments);
       }
       return saveTempOrderAsDraft;
@@ -6424,7 +6789,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee35, this);
       }));
-      function submitTempOrder(_x39) {
+      function submitTempOrder(_x41) {
         return _submitTempOrder.apply(this, arguments);
       }
       return submitTempOrder;
@@ -6445,7 +6810,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee36, this);
       }));
-      function submitTempOrderAsync(_x40) {
+      function submitTempOrderAsync(_x42) {
         return _submitTempOrderAsync.apply(this, arguments);
       }
       return submitTempOrderAsync;
@@ -6460,6 +6825,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context40.prev = _context40.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
+              if (!requiresLocalPaymentRefresh(tempOrder)) {
+                _context40.next = 3;
+                break;
+              }
+              throw new Error(PAYMENT_REFRESH_MESSAGE);
+            case 3:
               this.prepareVirtualSettlementTempOrder(tempOrder);
               isOnlineStorePlatform = this.isOnlineStorePlatform();
               shouldConfirmPendingVoucherPayments = (params === null || params === void 0 ? void 0 : params.confirmPendingVoucherPayments) !== false;
@@ -6481,25 +6852,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               this.persistTempOrder();
-              _context40.next = 10;
+              _context40.next = 12;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 10:
+            case 12:
               _context40.t1 = _context40.sent;
               if (_context40.t1) {
-                _context40.next = 13;
+                _context40.next = 15;
                 break;
               }
               _context40.t1 = this.store.summary;
-            case 13:
+            case 15:
               _context40.t0 = _context40.t1;
               if (_context40.t0) {
-                _context40.next = 16;
+                _context40.next = 18;
                 break;
               }
               _context40.t0 = createEmptySummary();
-            case 16:
+            case 18:
               latestSummary = _context40.t0;
               effectiveCacheId = (_params$cacheId3 = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId3 !== void 0 ? _params$cacheId3 : this.cacheId;
               hasPaymentStatusOverride = (params === null || params === void 0 ? void 0 : params.paymentStatus) !== undefined;
@@ -6536,10 +6907,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!payload.created_at) {
                 payload.created_at = dayjs().format('YYYY-MM-DD HH:mm:ss');
               }
-              _context40.next = 28;
+              _context40.next = 30;
               return this.saveDraft();
-            case 28:
-              _context40.prev = 28;
+            case 30:
+              _context40.prev = 30;
               this.logInfo('submitTempOrder calling sales checkout', {
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
@@ -6549,26 +6920,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 smallTicketDataFlag: payload.small_ticket_data_flag,
                 syncMode: payload.sync_mode
               });
-              _context40.next = 32;
+              _context40.next = 34;
               return this.submitSalesOrder({
                 query: payload
               });
-            case 32:
+            case 34:
               result = _context40.sent;
-              _context40.next = 45;
+              _context40.next = 47;
               break;
-            case 35:
-              _context40.prev = 35;
-              _context40.t2 = _context40["catch"](28);
+            case 37:
+              _context40.prev = 37;
+              _context40.t2 = _context40["catch"](30);
               backendErrorResponse = this.extractSubmitErrorResponse(_context40.t2);
               if (!backendErrorResponse) {
-                _context40.next = 42;
+                _context40.next = 44;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
               return _context40.abrupt("return", backendErrorResponse);
-            case 42:
+            case 44:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
                 error: _context40.t2 instanceof Error ? _context40.t2.message : String(_context40.t2),
@@ -6578,15 +6949,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 paymentsCount: ((_payload$payments2 = payload.payments) === null || _payload$payments2 === void 0 ? void 0 : _payload$payments2.length) || 0
               });
               throw _context40.t2;
-            case 45:
+            case 47:
               if (!this.isSubmitResponseRejected(result)) {
-                _context40.next = 49;
+                _context40.next = 51;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
               return _context40.abrupt("return", result);
-            case 49:
+            case 51:
               isLocalPendingSubmit = this.isLocalPendingSubmitResult(result); // need_sync=1 仅表示已进入本地同步队列，不能视为远端已确认 Notes。
               if (Object.prototype.hasOwnProperty.call(payload, 'notes') && !isLocalPendingSubmit) {
                 salesNotesState = this.ensureSalesNotesRuntimeState(tempOrder);
@@ -6601,27 +6972,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 })
               });
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
-                _context40.next = 58;
+                _context40.next = 60;
                 break;
               }
               tempOrder.order_id = submittedOrderId;
               resultRecord = result;
-              _context40.next = 58;
+              _context40.next = 60;
               return this.markLocalOrderSynced(submittedOrderId, (resultRecord === null || resultRecord === void 0 ? void 0 : resultRecord.data) || resultRecord || {});
-            case 58:
+            case 60:
               if (isLocalPendingSubmit) {
                 this.store.syncState = 'local';
               } else if (submittedOrderId === null || submittedOrderId === undefined) {
                 this.store.syncState = 'submitted';
               }
               return _context40.abrupt("return", result);
-            case 60:
+            case 62:
             case "end":
               return _context40.stop();
           }
-        }, _callee37, this, [[28, 35]]);
+        }, _callee37, this, [[30, 37]]);
       }));
-      function runSubmitTempOrder(_x41) {
+      function runSubmitTempOrder(_x43) {
         return _runSubmitTempOrder.apply(this, arguments);
       }
       return runSubmitTempOrder;
@@ -6648,7 +7019,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee38, this);
       }));
-      function markLocalOrderSynced(_x42, _x43) {
+      function markLocalOrderSynced(_x44, _x45) {
         return _markLocalOrderSynced.apply(this, arguments);
       }
       return markLocalOrderSynced;
@@ -6691,10 +7062,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function extractSubmitErrorResponse(error) {
       var _error$response,
         _error$response2,
-        _this38 = this;
+        _this39 = this;
       var candidates = [error === null || error === void 0 || (_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.data, error === null || error === void 0 ? void 0 : error.data, error === null || error === void 0 || (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : _error$response2.body, error === null || error === void 0 ? void 0 : error.body];
       return candidates.find(function (candidate) {
-        return _this38.isSubmitErrorResponse(candidate);
+        return _this39.isSubmitErrorResponse(candidate);
       }) || null;
     }
   }, {
@@ -6722,7 +7093,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "syncPaymentsToOrder",
     value: function () {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(params) {
-        var _this39 = this,
+        var _this40 = this,
           _params$confirmPendin;
         var tempOrder, needsPaymentNumber, devicePrefix, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, orderPaidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, enhancePayload, submitParams, submitResult;
         return _regeneratorRuntime().wrap(function _callee39$(_context42) {
@@ -6747,7 +7118,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 9:
               devicePrefix = _context42.t0;
               mappedPayments = mapPaymentItemsToOrderPayments((params.payments || []).map(function (payment) {
-                return _this39.normalizePaymentSource(payment, {
+                return _this40.normalizePaymentSource(payment, {
                   defaultPaid: false,
                   devicePrefix: devicePrefix
                 });
@@ -6818,7 +7189,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee39, this);
       }));
-      function syncPaymentsToOrder(_x44) {
+      function syncPaymentsToOrder(_x46) {
         return _syncPaymentsToOrder.apply(this, arguments);
       }
       return syncPaymentsToOrder;
@@ -6826,7 +7197,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createOrder",
     value: function createOrder(params) {
-      var _this40 = this;
+      var _this41 = this;
       var order = _objectSpread({
         type: (params === null || params === void 0 ? void 0 : params.type) || 'appointment_booking',
         // 要从外面拿，virtual
@@ -6858,7 +7229,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
 
           // 为预约补齐 holder 信息
           if (params !== null && params !== void 0 && (_params$extraData = params.extraData) !== null && _params$extraData !== void 0 && _params$extraData.is_add_holder_info) {
-            ensureCartItemOriginHolder(item, _this40.window);
+            ensureCartItemOriginHolder(item, _this41.window);
           }
 
           // 购物车是否为普通商品
@@ -6946,7 +7317,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee40, this);
       }));
-      function submitOrder(_x45) {
+      function submitOrder(_x47) {
         return _submitOrder.apply(this, arguments);
       }
       return submitOrder;
@@ -6985,7 +7356,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee41, this);
       }));
-      function cancelOrder(_x46) {
+      function cancelOrder(_x48) {
         return _cancelOrder.apply(this, arguments);
       }
       return cancelOrder;
@@ -7029,7 +7400,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee42, this);
       }));
-      function changeBookingStatus(_x47) {
+      function changeBookingStatus(_x49) {
         return _changeBookingStatus.apply(this, arguments);
       }
       return changeBookingStatus;
@@ -7149,7 +7520,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee43, this, [[3, 15]]);
       }));
-      function createOrderByCheckout(_x48) {
+      function createOrderByCheckout(_x50) {
         return _createOrderByCheckout.apply(this, arguments);
       }
       return createOrderByCheckout;
@@ -7164,7 +7535,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               url = params.url, query = params.query;
               fetchUrl = url || '/order/sales/checkout';
-              requestQuery = this.isSalesCheckoutHandledByOsServer(fetchUrl) ? query : stripOsPrivatePayloadFields(query);
+              requestQuery = this.isSalesCheckoutHandledByOsServer(fetchUrl) ? query : stripLocalEftposState(stripOsPrivatePayloadFields(query));
               return _context47.abrupt("return", this.request.post(fetchUrl, requestQuery, {
                 osServer: true,
                 customToast: function customToast() {}
@@ -7175,7 +7546,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee44, this);
       }));
-      function submitSalesOrder(_x49) {
+      function submitSalesOrder(_x51) {
         return _submitSalesOrder.apply(this, arguments);
       }
       return submitSalesOrder;
@@ -7232,7 +7603,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee45, this);
       }));
-      function sendCustomerPayLink(_x50) {
+      function sendCustomerPayLink(_x52) {
         return _sendCustomerPayLink.apply(this, arguments);
       }
       return sendCustomerPayLink;
@@ -7257,12 +7628,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 params.forceRemote = false;
               }
               _context49.next = 6;
-              return this.request.get("/order/sales/".concat(encodeURIComponent(lookup)), _objectSpread({
-                with: ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info', 'order_meta_list', 'refunds', 'notes']
-              }, params.forceRemote ? {
-                forceRemote: true
-              } : {}), {
-                osServer: true
+              return loadSalesOrderSnapshot(this.request, {
+                lookup: lookup,
+                transport: 'os-server',
+                forceRemote: params.forceRemote
               });
             case 6:
               res = _context49.sent;
@@ -7276,7 +7645,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee46, this);
       }));
-      function getSalesOrderByLookup(_x51) {
+      function getSalesOrderByLookup(_x53) {
         return _getSalesOrderByLookup.apply(this, arguments);
       }
       return getSalesOrderByLookup;
@@ -7447,7 +7816,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee47, this);
       }));
-      function hydrateTempOrderFromRecord(_x52, _x53) {
+      function hydrateTempOrderFromRecord(_x54, _x55) {
         return _hydrateTempOrderFromRecord.apply(this, arguments);
       }
       return hydrateTempOrderFromRecord;
@@ -7561,7 +7930,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeTempOrderForRuntime",
     value: function normalizeTempOrderForRuntime(raw, options) {
-      var _this41 = this,
+      var _this42 = this,
         _raw$_extend;
       var runtimeRaw = this.withoutSyntheticDraftOrderIdForRuntime(raw);
       var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), runtimeRaw || {});
@@ -7586,12 +7955,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       nextTempOrder.holder = raw.holder && _typeof(raw.holder) === 'object' ? _objectSpread({}, raw.holder) : null;
       var rawProducts = Array.isArray(raw.products) ? raw.products : [];
       nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map(function (p) {
-        return _this41.normalizeHydratedOrderProduct(p, {
+        return _this42.normalizeHydratedOrderProduct(p, {
           makeEditMark: options === null || options === void 0 ? void 0 : options.makeEditMark
         });
       }) : [];
       nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map(function (b) {
-        var booking = _this41.normalizeHydratedBookingHolder(b || {});
+        var booking = _this42.normalizeHydratedBookingHolder(b || {});
         return _objectSpread(_objectSpread({}, booking), {}, {
           is_all: normalizeBookingIsAll(booking),
           sub_type: normalizeBookingSubType(booking)
@@ -7798,7 +8167,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedOrderProduct",
     value: function normalizeHydratedOrderProduct(product, options) {
-      var _this42 = this;
+      var _this43 = this;
       var row = _objectSpread({}, product || {});
       if (row.num === undefined && row.product_quantity !== undefined) {
         row.num = row.product_quantity;
@@ -7806,7 +8175,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var productSku = ensureProductSku(row);
       row.product_sku = _objectSpread(_objectSpread({}, productSku), {}, {
         option: normalizeProductSkuOptions(productSku.option.map(function (optionItem) {
-          return _this42.normalizeHydratedProductOptionItem(optionItem || {});
+          return _this43.normalizeHydratedProductOptionItem(optionItem || {});
         }))
       });
       delete row["product_".concat('option', "_item")];
@@ -7886,7 +8255,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee48, this);
       }));
-      function getOrderInfo(_x54) {
+      function getOrderInfo(_x56) {
         return _getOrderInfo.apply(this, arguments);
       }
       return getOrderInfo;
@@ -7894,8 +8263,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getVouchers",
     value: function getVouchers() {
-      var _this$store$tempOrder8;
-      return ((_this$store$tempOrder8 = this.store.tempOrder) === null || _this$store$tempOrder8 === void 0 ? void 0 : _this$store$tempOrder8.vouchers) || [];
+      var _this$store$tempOrder11;
+      return ((_this$store$tempOrder11 = this.store.tempOrder) === null || _this$store$tempOrder11 === void 0 ? void 0 : _this$store$tempOrder11.vouchers) || [];
     }
   }], [{
     key: "populateSavedAmounts",
@@ -7989,4 +8358,5 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     }
   }]);
   return OrderModule;
-}(BaseModule);
+}(BaseModule);
+export { isFulfillmentTimingBooking } from "./pickupTiming";