@pisell/pisellos 2.3.144 → 2.3.145

package/dist/modules/Order/index.js

@@ -55,7 +55,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_;
@@ -1236,49 +1236,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,
           _this6 = this;
-        var tempOrder, strategyConfigs, result, removeSet, _iterator3, _step3, reduce, _iterator6, _step6, _loop2, _iterator4, _step4, _loop, payload;
+        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));
@@ -1290,16 +1296,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) {
@@ -1319,47 +1325,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) {
@@ -1370,13 +1376,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:
@@ -1394,10 +1400,14 @@ 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;
+                      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,
@@ -1405,32 +1415,51 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                         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 = _this6.createLinkedProductAndBooking({
@@ -1439,66 +1468,98 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       });
                       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;
@@ -1516,22 +1577,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;
@@ -1949,7 +2010,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee10, this);
       }));
-      function hydrateTempOrderFromLocalRecord(_x8) {
+      function hydrateTempOrderFromLocalRecord(_x9) {
         return _hydrateTempOrderFromLocalRecord.apply(this, arguments);
       }
       return hydrateTempOrderFromLocalRecord;
@@ -3022,7 +3083,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee11, this);
       }));
-      function replaceTempOrder(_x9, _x10) {
+      function replaceTempOrder(_x10, _x11) {
         return _replaceTempOrder.apply(this, arguments);
       }
       return replaceTempOrder;
@@ -3509,30 +3570,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 || []);
               }
@@ -3541,7 +3608,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), {}, {
@@ -3568,8 +3635,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,
@@ -3578,9 +3649,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 || []);
@@ -3625,13 +3711,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;
@@ -3702,7 +3788,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee15, this);
       }));
-      function syncTempOrderNoteToRemote(_x12, _x13) {
+      function syncTempOrderNoteToRemote(_x13, _x14) {
         return _syncTempOrderNoteToRemote.apply(this, arguments);
       }
       return syncTempOrderNoteToRemote;
@@ -3918,7 +4004,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee16, this);
       }));
-      function setSalesNote(_x14) {
+      function setSalesNote(_x15) {
         return _setSalesNote.apply(this, arguments);
       }
       return setSalesNote;
@@ -3954,7 +4040,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee17, this);
       }));
-      function removeSalesNote(_x15) {
+      function removeSalesNote(_x16) {
         return _removeSalesNote.apply(this, arguments);
       }
       return removeSalesNote;
@@ -4413,7 +4499,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee19, this);
       }));
-      function addOrderPaymentAsync(_x16) {
+      function addOrderPaymentAsync(_x17) {
         return _addOrderPaymentAsync.apply(this, arguments);
       }
       return addOrderPaymentAsync;
@@ -4507,7 +4593,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee20, this);
       }));
-      function updateOrderPayment(_x17, _x18) {
+      function updateOrderPayment(_x18, _x19) {
         return _updateOrderPayment.apply(this, arguments);
       }
       return updateOrderPayment;
@@ -4734,7 +4820,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee21, this);
       }));
-      function updateVoucherOrderPaymentsAsync(_x19, _x20) {
+      function updateVoucherOrderPaymentsAsync(_x20, _x21) {
         return _updateVoucherOrderPaymentsAsync.apply(this, arguments);
       }
       return updateVoucherOrderPaymentsAsync;
@@ -4890,52 +4976,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;
@@ -5181,12 +5297,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(product, booking, options) {
         var _this34 = this;
-        var tempOrder, beforeCommit, salesNoteDrafts, mutationSnapshot, attachSalesNoteDrafts, rollbackProductAndNotesMutation, insertAfterProductUid, anchorIndex, insertAtIndex, _ref71, _productRecord$num, productRecord, splitCount, i, splitLine, committedProduct, _committedProduct, _committedProduct2;
+        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();
-              beforeCommit = this.createCartIntentCommitGuard('add_product', tempOrder);
+              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(),
@@ -5234,21 +5361,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return uid !== undefined && uid !== null && String(uid) === String(insertAfterProductUid);
               }) : -1;
               insertAtIndex = anchorIndex >= 0 ? anchorIndex + 1 : undefined;
-              _context25.prev = 9;
+              _context25.prev = 15;
               if (!booking) {
-                _context25.next = 34;
+                _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 = 28;
+                _context25.next = 35;
                 break;
               }
               i = 0;
-            case 15:
+            case 21:
               if (!(i < splitCount)) {
-                _context25.next = 26;
+                _context25.next = 33;
                 break;
               }
               splitLine = this.createSplitBookingLine(productRecord, booking, i, splitCount);
@@ -5266,70 +5393,125 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   delete splitLine.booking.metadata.unique_identification_number;
                 }
               }
-              _context25.next = 20;
+              _context25.next = 26;
               return this.appendProductLineToTempOrder(tempOrder, splitLine.product, splitLine.booking, {
                 insertAtIndex: insertAtIndex,
                 disableMerge: options === null || options === void 0 ? void 0 : options.disableMerge,
                 beforeCommit: beforeCommit
               });
-            case 20:
+            case 26:
               committedProduct = _context25.sent;
+              availabilityCommitGuard === null || availabilityCommitGuard === void 0 || availabilityCommitGuard();
               attachSalesNoteDrafts(committedProduct);
               if (insertAtIndex !== undefined) insertAtIndex += 1;
-            case 23:
+            case 30:
               i += 1;
-              _context25.next = 15;
+              _context25.next = 21;
               break;
-            case 26:
-              _context25.next = 32;
+            case 33:
+              _context25.next = 40;
               break;
-            case 28:
-              _context25.next = 30;
+            case 35:
+              _context25.next = 37;
               return this.appendProductLineToTempOrder(tempOrder, product, cloneDeep(booking), {
                 insertAtIndex: insertAtIndex,
                 disableMerge: options === null || options === void 0 ? void 0 : options.disableMerge,
                 beforeCommit: beforeCommit
               });
-            case 30:
+            case 37:
               _committedProduct = _context25.sent;
+              availabilityCommitGuard === null || availabilityCommitGuard === void 0 || availabilityCommitGuard();
               attachSalesNoteDrafts(_committedProduct);
-            case 32:
-              _context25.next = 38;
+            case 40:
+              _context25.next = 47;
               break;
-            case 34:
-              _context25.next = 36;
+            case 42:
+              _context25.next = 44;
               return this.appendProductLineToTempOrder(tempOrder, product, undefined, {
                 insertAtIndex: insertAtIndex,
                 disableMerge: options === null || options === void 0 ? void 0 : options.disableMerge,
                 beforeCommit: beforeCommit
               });
-            case 36:
+            case 44:
               _committedProduct2 = _context25.sent;
+              availabilityCommitGuard === null || availabilityCommitGuard === void 0 || availabilityCommitGuard();
               attachSalesNoteDrafts(_committedProduct2);
-            case 38:
-              _context25.next = 44;
+            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 40:
-              _context25.prev = 40;
-              _context25.t0 = _context25["catch"](9);
+            case 55:
+              _context25.prev = 55;
+              _context25.t0 = _context25["catch"](15);
               rollbackProductAndNotesMutation();
               throw _context25.t0;
-            case 44:
-              _context25.next = 46;
-              return this.finalizeProductOrderMutation(tempOrder);
-            case 46:
+            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 48:
+              return _context25.abrupt("return", liveTempOrder.products);
+            case 77:
             case "end":
               return _context25.stop();
           }
-        }, _callee23, this, [[9, 40]]);
+        }, _callee23, this, [[15, 55], [62, 68]]);
       }));
-      function addProductToOrder(_x23, _x24, _x25) {
+      function addProductToOrder(_x24, _x25, _x26) {
         return _addProductToOrder.apply(this, arguments);
       }
       return addProductToOrder;
@@ -5446,7 +5628,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee24, this, [[5, 35, 38, 41]]);
       }));
-      function addProductsToOrder(_x26, _x27) {
+      function addProductsToOrder(_x27, _x28) {
         return _addProductsToOrder.apply(this, arguments);
       }
       return addProductsToOrder;
@@ -5852,7 +6034,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee25, this);
       }));
-      function updateOrderProduct(_x28) {
+      function updateOrderProduct(_x29) {
         return _updateOrderProduct.apply(this, arguments);
       }
       return updateOrderProduct;
@@ -5903,7 +6085,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee26, this);
       }));
-      function updateOrderProducts(_x29) {
+      function updateOrderProducts(_x30) {
         return _updateOrderProducts.apply(this, arguments);
       }
       return updateOrderProducts;
@@ -6027,7 +6209,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee27, this);
       }));
-      function updateOrderProductQuantity(_x30) {
+      function updateOrderProductQuantity(_x31) {
         return _updateOrderProductQuantity.apply(this, arguments);
       }
       return updateOrderProductQuantity;
@@ -6096,7 +6278,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee28, this);
       }));
-      function finalizeAfterProductsMutation(_x31, _x32) {
+      function finalizeAfterProductsMutation(_x32, _x33) {
         return _finalizeAfterProductsMutation.apply(this, arguments);
       }
       return finalizeAfterProductsMutation;
@@ -6256,7 +6438,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee29, this, [[16, 27, 30, 33]]);
       }));
-      function removeProductsFromOrder(_x33, _x34) {
+      function removeProductsFromOrder(_x34, _x35) {
         return _removeProductsFromOrder.apply(this, arguments);
       }
       return removeProductsFromOrder;
@@ -6275,7 +6457,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee30, this);
       }));
-      function removeProductFromOrder(_x35, _x36) {
+      function removeProductFromOrder(_x36, _x37) {
         return _removeProductFromOrder.apply(this, arguments);
       }
       return removeProductFromOrder;
@@ -6450,7 +6632,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee33, this);
       }));
-      function applyLocalPrintOrderNumbers(_x37) {
+      function applyLocalPrintOrderNumbers(_x38) {
         return _applyLocalPrintOrderNumbers.apply(this, arguments);
       }
       return applyLocalPrintOrderNumbers;
@@ -6517,7 +6699,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee34, this);
       }));
-      function saveTempOrderAsDraft(_x38) {
+      function saveTempOrderAsDraft(_x39) {
         return _saveTempOrderAsDraft.apply(this, arguments);
       }
       return saveTempOrderAsDraft;
@@ -6542,7 +6724,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee35, this);
       }));
-      function submitTempOrder(_x39) {
+      function submitTempOrder(_x40) {
         return _submitTempOrder.apply(this, arguments);
       }
       return submitTempOrder;
@@ -6563,7 +6745,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee36, this);
       }));
-      function submitTempOrderAsync(_x40) {
+      function submitTempOrderAsync(_x41) {
         return _submitTempOrderAsync.apply(this, arguments);
       }
       return submitTempOrderAsync;
@@ -6739,7 +6921,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee37, this, [[28, 35]]);
       }));
-      function runSubmitTempOrder(_x41) {
+      function runSubmitTempOrder(_x42) {
         return _runSubmitTempOrder.apply(this, arguments);
       }
       return runSubmitTempOrder;
@@ -6766,7 +6948,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee38, this);
       }));
-      function markLocalOrderSynced(_x42, _x43) {
+      function markLocalOrderSynced(_x43, _x44) {
         return _markLocalOrderSynced.apply(this, arguments);
       }
       return markLocalOrderSynced;
@@ -6936,7 +7118,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee39, this);
       }));
-      function syncPaymentsToOrder(_x44) {
+      function syncPaymentsToOrder(_x45) {
         return _syncPaymentsToOrder.apply(this, arguments);
       }
       return syncPaymentsToOrder;
@@ -7064,7 +7246,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee40, this);
       }));
-      function submitOrder(_x45) {
+      function submitOrder(_x46) {
         return _submitOrder.apply(this, arguments);
       }
       return submitOrder;
@@ -7103,7 +7285,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee41, this);
       }));
-      function cancelOrder(_x46) {
+      function cancelOrder(_x47) {
         return _cancelOrder.apply(this, arguments);
       }
       return cancelOrder;
@@ -7147,7 +7329,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee42, this);
       }));
-      function changeBookingStatus(_x47) {
+      function changeBookingStatus(_x48) {
         return _changeBookingStatus.apply(this, arguments);
       }
       return changeBookingStatus;
@@ -7267,7 +7449,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee43, this, [[3, 15]]);
       }));
-      function createOrderByCheckout(_x48) {
+      function createOrderByCheckout(_x49) {
         return _createOrderByCheckout.apply(this, arguments);
       }
       return createOrderByCheckout;
@@ -7293,7 +7475,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee44, this);
       }));
-      function submitSalesOrder(_x49) {
+      function submitSalesOrder(_x50) {
         return _submitSalesOrder.apply(this, arguments);
       }
       return submitSalesOrder;
@@ -7350,7 +7532,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee45, this);
       }));
-      function sendCustomerPayLink(_x50) {
+      function sendCustomerPayLink(_x51) {
         return _sendCustomerPayLink.apply(this, arguments);
       }
       return sendCustomerPayLink;
@@ -7392,7 +7574,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee46, this);
       }));
-      function getSalesOrderByLookup(_x51) {
+      function getSalesOrderByLookup(_x52) {
         return _getSalesOrderByLookup.apply(this, arguments);
       }
       return getSalesOrderByLookup;
@@ -7563,7 +7745,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee47, this);
       }));
-      function hydrateTempOrderFromRecord(_x52, _x53) {
+      function hydrateTempOrderFromRecord(_x53, _x54) {
         return _hydrateTempOrderFromRecord.apply(this, arguments);
       }
       return hydrateTempOrderFromRecord;
@@ -8002,7 +8184,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee48, this);
       }));
-      function getOrderInfo(_x54) {
+      function getOrderInfo(_x55) {
         return _getOrderInfo.apply(this, arguments);
       }
       return getOrderInfo;