@pisell/pisellos 2.3.66 → 2.3.68

package/dist/modules/Order/index.js

@@ -39,9 +39,9 @@ import { ensureOrderPaymentNumber, mergeOrderPaymentRecord, resolveOrderPaymentI
 import { resolvePaymentNumberDevicePrefix, resolvePaymentNumberDevicePrefixFromDeviceId } from "../../utils/payment-number";
 import { processCartPromotion, appendPromotionTags as _appendPromotionTags, getOrderProductUid as getPromotionUid } from "../../solution/BaseSales/utils/cartPromotion";
 import { buildProductLineFingerprint, getProductIdentityIndex, getSafeProductNum, isIdentityMatch, normalizeOrderProduct } from "../../solution/ScanOrder/utils";
-import { syncManualProductDiscountProductNum } from "./utils/manualProductDiscount";
+import { hasManualProductDiscountFlag, syncManualProductDiscountProductNum } from "./utils/manualProductDiscount";
 import { expandHydratedProductsForDiscountCollection, restoreHydratedBundleDiscounts } from "./utils/bundleDiscountHydration";
-import { getOrderCollectionPersistentId, getOrderCollectionUid, normalizeOrderCollections, setOrderCollectionUid } from "./utils/orderCollectionIdentity";
+import { getOrderCollectionPersistentId, getOrderCollectionUid, normalizeOrderCollections, repairDuplicateProductLineIdentities as repairDuplicateOrderProductLineIdentities, setOrderCollectionUid } from "./utils/orderCollectionIdentity";
 import { consolidateDiscountFreeProductLines, ensureUniqueProductLineUids } from "./utils/discountProductLineIdentity";
 import { DiscountModule } from "../Discount";
 import { RulesModule } from "../Rules";
@@ -64,8 +64,7 @@ function isSameDiscountList(left, right) {
   return JSON.stringify(normalizeDiscountListSignature(left)) === JSON.stringify(normalizeDiscountListSignature(right));
 }
 function isManualProductDiscountProduct(product) {
-  var _product$metadata, _product$metadata2;
-  return (product === null || product === void 0 || (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.is_manual_discount) === true || (product === null || product === void 0 || (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.is_manual_discount) === 1 || ((product === null || product === void 0 ? void 0 : product.discount_list) || []).some(function (item) {
+  return hasManualProductDiscountFlag(product === null || product === void 0 ? void 0 : product.metadata) || ((product === null || product === void 0 ? void 0 : product.discount_list) || []).some(function (item) {
     return (item === null || item === void 0 ? void 0 : item.type) === 'product';
   });
 }
@@ -122,6 +121,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "window", void 0);
     _defineProperty(_assertThisInitialized(_this), "appPlugin", void 0);
     _defineProperty(_assertThisInitialized(_this), "cacheId", void 0);
+    _defineProperty(_assertThisInitialized(_this), "fatherModule", void 0);
+    _defineProperty(_assertThisInitialized(_this), "openCache", false);
+    _defineProperty(_assertThisInitialized(_this), "sessionStoragePersistEnabled", false);
+    _defineProperty(_assertThisInitialized(_this), "sessionStorageRestoreRecord", null);
     _defineProperty(_assertThisInitialized(_this), "salesSummaryModuleName", void 0);
     _defineProperty(_assertThisInitialized(_this), "rulesHooksOverride", void 0);
     _defineProperty(_assertThisInitialized(_this), "moduleHooksOverride", void 0);
@@ -270,7 +273,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "applyProductDiscountPrices",
     value: function applyProductDiscountPrices(products) {
       return (products || []).map(function (product) {
-        var _product$metadata$sou, _product$metadata3, _product$metadata4, _product$original_pri2;
+        var _product$metadata$sou, _product$metadata, _product$metadata2, _product$original_pri2;
         if (isManualProductDiscountProduct(product)) return product;
         var discountItems = Array.isArray(product.discount_list) ? product.discount_list : [];
         var hasOnlyPersistedDiscountSnapshots = product.order_detail_id !== undefined && product.order_detail_id !== null && discountItems.length > 0 && discountItems.every(function (discount) {
@@ -281,7 +284,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         }
         var totalPerUnitDiscount = resolveEffectivePerUnitDiscount(product);
         var optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
-        var sourcePrice = (_product$metadata$sou = (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.source_product_price) !== null && _product$metadata$sou !== void 0 ? _product$metadata$sou : ((_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.main_product_original_price) != null ? new Decimal(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : (_product$original_pri2 = product.original_price) !== null && _product$original_pri2 !== void 0 ? _product$original_pri2 : '0';
+        var sourcePrice = (_product$metadata$sou = (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.source_product_price) !== null && _product$metadata$sou !== void 0 ? _product$metadata$sou : ((_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.main_product_original_price) != null ? new Decimal(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : (_product$original_pri2 = product.original_price) !== null && _product$original_pri2 !== void 0 ? _product$original_pri2 : '0';
         var newSourceSellingPrice = new Decimal(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
         var newMainSellingPrice = new Decimal(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
         if (product.metadata) {
@@ -308,18 +311,38 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         return product;
       });
     }
+  }, {
+    key: "syncSessionStorageOptions",
+    value: function syncSessionStorageOptions(otherParams) {
+      this.cacheId = otherParams.cacheId;
+      this.fatherModule = otherParams.fatherModule;
+      this.openCache = Boolean(this.cacheId && otherParams.openCache !== false);
+      this.sessionStoragePersistEnabled = Boolean(this.openCache && otherParams.enableSessionStoragePersist === true);
+    }
   }, {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
         var _appPlugin$getApp, _otherParams$rules, _otherParams$order, _otherParams$hooks;
-        var appPlugin, app, otherParams;
+        var otherParams, cachedTempOrder, appPlugin, app;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               this.core = core;
               this.store = options.store;
-              if (!this.store.tempOrder) {
+              otherParams = options.otherParams || {};
+              this.syncSessionStorageOptions(otherParams);
+              if (this.sessionStoragePersistEnabled) {
+                cachedTempOrder = this.store.tempOrder;
+                this.sessionStorageRestoreRecord = isTempOrder(cachedTempOrder) ? cloneDeep(cachedTempOrder) : null;
+                // 统一由 loadSalesDetail hydrate，初始化阶段不直接把缓存态暴露给业务。
+                this.store.tempOrder = null;
+                this.store.summary = createEmptySummary();
+                this.store.availableWalletIds = [];
+                this.store.lastOrderInfo = undefined;
+                this.store.syncState = undefined;
+                this.store.discountList = [];
+              } else if (!this.store.tempOrder) {
                 this.store.tempOrder = null;
               }
               if (!this.store.summary) {
@@ -336,8 +359,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               app = appPlugin === null || appPlugin === void 0 || (_appPlugin$getApp = appPlugin.getApp) === null || _appPlugin$getApp === void 0 ? void 0 : _appPlugin$getApp.call(appPlugin);
               this.logger = app === null || app === void 0 ? void 0 : app.logger;
               this.window = this.core.getPlugin('window');
-              otherParams = options.otherParams || {};
-              this.cacheId = otherParams.cacheId;
               this.salesSummaryModuleName = otherParams.salesSummaryModuleName;
               this.rulesHooksOverride = (_otherParams$rules = otherParams.rules) === null || _otherParams$rules === void 0 ? void 0 : _otherParams$rules.hooks;
               this.moduleHooksOverride = options.hooks;
@@ -365,49 +386,50 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
+              this.sessionStorageRestoreRecord = null;
               childModules = [(_this$store = this.store) === null || _this$store === void 0 ? void 0 : _this$store.discount, (_this$store2 = this.store) === null || _this$store2 === void 0 ? void 0 : _this$store2.rules];
               _i = 0, _childModules = childModules;
-            case 2:
+            case 3:
               if (!(_i < _childModules.length)) {
-                _context2.next = 18;
+                _context2.next = 19;
                 break;
               }
               childModule = _childModules[_i];
               if (!(!childModule || typeof childModule.destroy !== 'function')) {
-                _context2.next = 6;
+                _context2.next = 7;
                 break;
               }
-              return _context2.abrupt("continue", 15);
-            case 6:
-              _context2.prev = 6;
-              _context2.next = 9;
+              return _context2.abrupt("continue", 16);
+            case 7:
+              _context2.prev = 7;
+              _context2.next = 10;
               return childModule.destroy();
-            case 9:
-              _context2.next = 15;
+            case 10:
+              _context2.next = 16;
               break;
-            case 11:
-              _context2.prev = 11;
-              _context2.t0 = _context2["catch"](6);
+            case 12:
+              _context2.prev = 12;
+              _context2.t0 = _context2["catch"](7);
               errorMessage = _context2.t0 instanceof Error ? _context2.t0.message : String(_context2.t0);
               this.logWarning('Destroy child module failed', {
                 module: childModule.name,
                 error: errorMessage
               });
-            case 15:
+            case 16:
               _i++;
-              _context2.next = 2;
+              _context2.next = 3;
               break;
-            case 18:
+            case 19:
               if (this.store) {
                 this.store.discount = null;
                 this.store.rules = null;
               }
               _get(_getPrototypeOf(OrderModule.prototype), "destroy", this).call(this);
-            case 20:
+            case 21:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[6, 11]]);
+        }, _callee2, this, [[7, 12]]);
       }));
       function destroy() {
         return _destroy.apply(this, arguments);
@@ -425,7 +447,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function updateOtherParams(params) {
       var _otherParams$rules2, _otherParams$order2, _otherParams$hooks2;
       var otherParams = params || {};
-      this.cacheId = otherParams.cacheId;
+      this.syncSessionStorageOptions(otherParams);
       this.salesSummaryModuleName = otherParams.salesSummaryModuleName;
       this.rulesHooksOverride = (_otherParams$rules2 = otherParams.rules) === null || _otherParams$rules2 === void 0 ? void 0 : _otherParams$rules2.hooks;
       this.orderHooks = this.moduleHooksOverride || ((_otherParams$order2 = otherParams.order) === null || _otherParams$order2 === void 0 ? void 0 : _otherParams$order2.hooks) || ((_otherParams$hooks2 = otherParams.hooks) === null || _otherParams$hooks2 === void 0 ? void 0 : _otherParams$hooks2.order);
@@ -483,15 +505,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function registerDiscountModules(options) {
       var _targetCacheData;
       var targetCacheData = {};
-      if (this.cacheId && this.window) {
-        var sessionData = this.window.sessionStorage.getItem(this.name);
-        if (sessionData) {
-          try {
+      if (!this.sessionStoragePersistEnabled && this.openCache && this.cacheId && this.window) {
+        try {
+          var sessionData = this.window.sessionStorage.getItem(this.name);
+          if (sessionData) {
             var data = JSON.parse(sessionData);
             targetCacheData = (data === null || data === void 0 ? void 0 : data[this.cacheId]) || {};
-          } catch (_unused) {
-            // sessionStorage 损坏则忽略，按空 initialState 走
           }
+        } catch (_unused) {
+          // sessionStorage 损坏或不可用时忽略，按空 initialState 走
         }
       }
       var discount = new DiscountModule("".concat(this.name, "_discount"));
@@ -499,7 +521,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         initialState: (_targetCacheData = targetCacheData) === null || _targetCacheData === void 0 ? void 0 : _targetCacheData[discount.name],
         otherParams: {
           fatherModule: this.name,
-          openCache: !!this.cacheId,
+          // Unified 的单快照由 Order 管理；其他 Solution 保持原有 Discount 缓存语义。
+          openCache: this.openCache && !this.sessionStoragePersistEnabled,
           cacheId: this.cacheId
         }
       });
@@ -1254,7 +1277,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
 
     /**
      * 控制 IndexedDB 草稿（saveDraft）是否写入。
-     * localStorage 版 tempOrder 持久化已废弃，此方法仅影响 saveDraft。
+     * 此开关仅影响 saveDraft；可选 sessionStorage 会话恢复由
+     * enableSessionStoragePersist 独立控制。
      *
      * @example
      * order.setEnableTempOrderPersist(false); // BigSale 弹窗：跳过 ~1s 的 dbUpdate
@@ -1272,11 +1296,76 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return this.draftPersistEnabled;
     }
 
-    /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化；草稿保存请使用 IndexedDB saveDraft。 */
+    /**
+     * 在 UnifiedBookingSales 显式开启会话恢复时，将完整 tempOrder 写入
+     * sessionStorage 的 cacheId 分桶。写入失败由 BaseModule 静默降级。
+     */
   }, {
     key: "persistTempOrder",
     value: function persistTempOrder() {
-      // no-op: OrderModule 的刷新恢复不再依赖 localStorage。
+      if (!this.sessionStoragePersistEnabled || !this.store.tempOrder) return;
+      this.checkSaveCache({
+        cacheId: this.cacheId,
+        fatherModule: this.fatherModule,
+        store: {
+          tempOrder: this.store.tempOrder
+        },
+        cacheKey: ['tempOrder']
+      });
+    }
+
+    /**
+     * 终止当前模块实例的 sessionStorage 订单恢复会话。
+     *
+     * 支付跳转等终态场景需要同时删除当前 cacheId 的 tempOrder 快照，并关闭
+     * 本实例后续异步任务的再次写入；新模块实例初始化时会按 otherParams 重新启用。
+     */
+  }, {
+    key: "clearSessionStoragePersistedTempOrder",
+    value: function clearSessionStoragePersistedTempOrder() {
+      var _this$window;
+      this.sessionStorageRestoreRecord = null;
+      if (!this.sessionStoragePersistEnabled) return;
+      this.sessionStoragePersistEnabled = false;
+      if (!this.cacheId || !this.fatherModule || !((_this$window = this.window) !== null && _this$window !== void 0 && _this$window.sessionStorage)) {
+        return;
+      }
+      var sessionStorage = this.window.sessionStorage;
+      var rawCacheData = sessionStorage.getItem(this.fatherModule);
+      if (!rawCacheData) return;
+      var parsedCacheData;
+      try {
+        parsedCacheData = JSON.parse(rawCacheData);
+      } catch (_unused2) {
+        return;
+      }
+      if (!parsedCacheData || _typeof(parsedCacheData) !== 'object' || Array.isArray(parsedCacheData)) {
+        return;
+      }
+      var cacheRoot = parsedCacheData;
+      var cacheBucket = cacheRoot[this.cacheId];
+      if (!cacheBucket || _typeof(cacheBucket) !== 'object' || Array.isArray(cacheBucket)) {
+        return;
+      }
+      var moduleBucket = cacheBucket[this.name];
+      if (!moduleBucket || _typeof(moduleBucket) !== 'object' || Array.isArray(moduleBucket)) {
+        return;
+      }
+      delete moduleBucket.tempOrder;
+      if (Object.keys(moduleBucket).length === 0) {
+        delete cacheBucket[this.name];
+      }
+      if (Object.keys(cacheBucket).length === 0) {
+        delete cacheRoot[this.cacheId];
+      }
+      sessionStorage.setItem(this.fatherModule, JSON.stringify(cacheRoot));
+    }
+  }, {
+    key: "consumeSessionStorageRestore",
+    value: function consumeSessionStorageRestore() {
+      var record = this.sessionStorageRestoreRecord;
+      this.sessionStorageRestoreRecord = null;
+      return record ? cloneDeep(record) : null;
     }
   }, {
     key: "notifyTempOrderChanged",
@@ -1543,7 +1632,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         paidAmount: netPaidAmount
       });
       var isOrderFullyPaid = orderExpectedAmount.lte(0) ? true : netPaidAmount.gte(orderExpectedAmount);
-      var paymentStage = this.isDepositOrder(tempOrder, depositAmount) && !isDepositFullyPaid ? 'deposit' : 'normal';
+      var paymentStage = this.isDepositOrder(tempOrder, depositAmount) && !isDepositFullyPaid && !this.hasPaidNormalPayment(paymentList) ? 'deposit' : 'normal';
       return {
         isFullyPaid: isOrderFullyPaid,
         isOrderFullyPaid: isOrderFullyPaid,
@@ -1565,12 +1654,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         return sum.plus(_this6.calculatePaymentGapAmount(paymentRecord));
       }, new Decimal(0));
     }
+  }, {
+    key: "hasPaidNormalPayment",
+    value: function hasPaidNormalPayment(payments) {
+      return (payments || []).some(function (payment) {
+        var paymentRecord = payment;
+        if (!isPaidPaymentRecord(paymentRecord)) return false;
+        return paymentRecord.order_payment_type !== 'deposit' && paymentRecord.type !== 'deposit';
+      });
+    }
   }, {
     key: "resolveNextOrderPaymentType",
     value: function resolveNextOrderPaymentType(tempOrder) {
       var depositAmount = new Decimal(tempOrder.deposit_amount || '0.00');
       if (!this.isDepositOrder(tempOrder, depositAmount)) return 'normal';
       if (depositAmount.lte(0)) return 'normal';
+      if (this.hasPaidNormalPayment(tempOrder.payments || [])) return 'normal';
       var depositPaidAmount = this.calculateDepositPaidAmount(tempOrder.payments || []);
       return depositPaidAmount.lt(depositAmount) ? 'deposit' : 'normal';
     }
@@ -1898,10 +1997,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function calculateSummaryAmountGap(params) {
       var tempOrder = params.tempOrder,
         summary = params.summary,
-        orderPaidAmount = params.orderPaidAmount;
+        orderPaidAmount = params.orderPaidAmount,
+        payments = params.payments;
       var refundAmount = this.getSummaryRefundAmount(summary);
       var netOrderPaidAmount = Decimal.max(orderPaidAmount.minus(refundAmount), 0);
-      var targetAmount = this.calculatePaymentTargetAmount(tempOrder, summary, netOrderPaidAmount);
+      var targetAmount = this.calculatePaymentTargetAmount(tempOrder, summary, netOrderPaidAmount, payments);
       return targetAmount.minus(netOrderPaidAmount).toFixed(2);
     }
   }, {
@@ -1913,10 +2013,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "calculatePaymentTargetAmount",
     value: function calculatePaymentTargetAmount(tempOrder, summary) {
       var paidAmount = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new Decimal(0);
+      var payments = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : tempOrder.payments || [];
       var depositAmount = this.getDepositAmount(tempOrder, summary);
       if (!this.isDepositOrder(tempOrder, depositAmount)) {
         return this.getOrderExpectedAmount(summary);
       }
+      if (this.hasPaidNormalPayment(payments)) {
+        return this.getOrderExpectedAmount(summary);
+      }
       if (this.isDepositCovered({
         tempOrder: tempOrder,
         summary: summary,
@@ -1933,7 +2037,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       try {
         var parsed = new Decimal(String(value || 0));
         return parsed.toFixed(4);
-      } catch (_unused2) {
+      } catch (_unused3) {
         return String(value);
       }
     }
@@ -2169,17 +2273,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "isSnapshotPayableAmountUnchanged",
     value: function isSnapshotPayableAmountUnchanged(tempOrder, snapshot, snapshotSummary) {
-      var currentPaidPaymentSummary = this.calculatePaidPaymentSummary(tempOrder.payments || []);
+      var currentPayments = tempOrder.payments || [];
+      var currentPaidPaymentSummary = this.calculatePaidPaymentSummary(currentPayments);
       var currentAmountGap = this.calculateSummaryAmountGap({
         tempOrder: tempOrder,
         summary: snapshotSummary,
-        orderPaidAmount: currentPaidPaymentSummary.gapPaidAmount
+        orderPaidAmount: currentPaidPaymentSummary.gapPaidAmount,
+        payments: currentPayments
       });
-      var snapshotPaidPaymentSummary = this.calculatePaidPaymentSummary(Array.isArray(snapshot.payments) ? snapshot.payments : []);
+      var snapshotPayments = Array.isArray(snapshot.payments) ? snapshot.payments : [];
+      var snapshotPaidPaymentSummary = this.calculatePaidPaymentSummary(snapshotPayments);
       var snapshotAmountGap = this.calculateSummaryAmountGap({
         tempOrder: tempOrder,
         summary: snapshotSummary,
-        orderPaidAmount: snapshotPaidPaymentSummary.gapPaidAmount
+        orderPaidAmount: snapshotPaidPaymentSummary.gapPaidAmount,
+        payments: snapshotPayments
       });
       return currentAmountGap === snapshotAmountGap;
     }
@@ -2213,6 +2321,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       var isPayableAmountUnchanged = this.isSnapshotPayableAmountUnchanged(tempOrder, snapshot, summary);
       if (!isPayableAmountUnchanged) return null;
+      var currentPaidPaymentSummary = this.calculatePaidPaymentSummary(tempOrder.payments || []);
+      summary.amount_gap = this.calculateSummaryAmountGap({
+        tempOrder: tempOrder,
+        summary: summary,
+        orderPaidAmount: currentPaidPaymentSummary.gapPaidAmount
+      });
       if (Array.isArray(snapshot.products)) {
         tempOrder.products = cloneDeep(snapshot.products);
       }
@@ -2341,6 +2455,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function restoreOrder() {
       var _this$store$discount16, _this$store$discount17;
       this.logInfo('restoreOrder start', {});
+      this.sessionStorageRestoreRecord = null;
       var freshTempOrder = this.createDefaultTempOrderInstance();
       this.ensureExternalSaleNumber(freshTempOrder);
       this.store.tempOrder = freshTempOrder;
@@ -2371,36 +2486,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('无效的 tempOrder 数据');
             case 2:
+              this.sessionStorageRestoreRecord = null;
               nextTempOrder = this.normalizeTempOrderForRuntime(cloneDeep(tempOrder), {
                 ensureIdentity: false
               });
               this.store.tempOrder = nextTempOrder;
               if (!((options === null || options === void 0 ? void 0 : options.recalculateSummary) !== false)) {
-                _context12.next = 9;
+                _context12.next = 10;
                 break;
               }
-              _context12.next = 7;
+              _context12.next = 8;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 7:
-              _context12.next = 10;
+            case 8:
+              _context12.next = 11;
               break;
-            case 9:
-              this.store.summary = createEmptySummary();
             case 10:
+              this.store.summary = createEmptySummary();
+            case 11:
               if ((options === null || options === void 0 ? void 0 : options.persist) !== false) {
                 this.persistTempOrder();
               }
               if (!(options !== null && options !== void 0 && options.saveDraft)) {
-                _context12.next = 14;
+                _context12.next = 15;
                 break;
               }
-              _context12.next = 14;
+              _context12.next = 15;
               return this.saveDraft();
-            case 14:
-              return _context12.abrupt("return", nextTempOrder);
             case 15:
+              return _context12.abrupt("return", nextTempOrder);
+            case 16:
             case "end":
               return _context12.stop();
           }
@@ -2569,6 +2685,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return tempOrder._extend;
     }
+  }, {
+    key: "repairDuplicateProductLineIdentities",
+    value: function repairDuplicateProductLineIdentities(tempOrder) {
+      var _tempOrder$_extend7;
+      var result = repairDuplicateOrderProductLineIdentities(tempOrder.products, (_tempOrder$_extend7 = tempOrder._extend) === null || _tempOrder$_extend7 === void 0 ? void 0 : _tempOrder$_extend7.productsByUid);
+      if (!result.repairs.length) return;
+      tempOrder.products = result.products;
+      if (result.productsByUid) {
+        this.ensureExtend(tempOrder).productsByUid = result.productsByUid;
+      }
+      this.logWarning('Repaired duplicate product line identities', {
+        repairCount: result.repairs.length,
+        repairs: result.repairs
+      });
+    }
   }, {
     key: "captureProductRuntime",
     value: function captureProductRuntime(tempOrder, rawProduct, normalizedProduct, existedUid) {
@@ -2675,10 +2806,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         }
       });
       products.forEach(function (product) {
-        var _product$metadata5, _product$metadata6;
+        var _product$metadata3, _product$metadata4;
         if (!product || _typeof(product) !== 'object') return;
-        var productUid = ((_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number) || product.unique_identification_number;
-        var bookingUid = product.booking_uid || ((_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.booking_uid);
+        var productUid = ((_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.unique_identification_number) || product.unique_identification_number;
+        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) {
           _this16.setProductHolderFromBooking(product, linkedBooking);
@@ -2817,11 +2948,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeLinkedBookingsForProduct",
     value: function removeLinkedBookingsForProduct(tempOrder, product) {
-      var _product$metadata7,
-        _product$metadata8,
+      var _product$metadata5,
+        _product$metadata6,
         _this18 = this;
-      var productUid = (product === null || product === void 0 || (_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.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$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.booking_uid);
+      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 = _this18.getBookingUniqueIdentificationNumber(booking);
@@ -2841,9 +2972,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyOrderProductsDepositSummary",
     value: function applyOrderProductsDepositSummary(tempOrder, summary) {
-      var _tempOrder$_extend7;
+      var _tempOrder$_extend8;
       var depositSummary = calculateOrderProductsDeposit(tempOrder.products || [], {
-        productsByUid: (_tempOrder$_extend7 = tempOrder._extend) === null || _tempOrder$_extend7 === void 0 ? void 0 : _tempOrder$_extend7.productsByUid
+        productsByUid: (_tempOrder$_extend8 = tempOrder._extend) === null || _tempOrder$_extend8 === void 0 ? void 0 : _tempOrder$_extend8.productsByUid
       });
       var manualDepositOverride = this.getManualDepositOverride(tempOrder);
       var currentStructuralFingerprint = manualDepositOverride ? this.buildOrderProductsStructuralFingerprint(tempOrder.products) : '';
@@ -3804,8 +3935,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hasLinkedBookingUid",
     value: function hasLinkedBookingUid(product) {
-      var _product$booking_uid, _product$metadata9;
-      var bookingUid = (_product$booking_uid = product === null || product === void 0 ? void 0 : product.booking_uid) !== null && _product$booking_uid !== void 0 ? _product$booking_uid : product === null || product === void 0 || (_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.booking_uid;
+      var _product$booking_uid, _product$metadata7;
+      var bookingUid = (_product$booking_uid = product === null || product === void 0 ? void 0 : product.booking_uid) !== null && _product$booking_uid !== void 0 ? _product$booking_uid : product === null || product === void 0 || (_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.booking_uid;
       return bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '';
     }
 
@@ -3904,13 +4035,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       normalizedIncoming.discount_list = normalizeOrderProductDiscountList(normalizedIncoming.discount_list);
       var hasIncomingGoodPass = this.hasGoodPassDiscount(normalizedIncoming);
       var hasIncomingProductNote = this.hasOrderProductLineNote(normalizedIncoming);
+      var hasIncomingManualProductDiscount = isManualProductDiscountProduct(normalizedIncoming);
       var hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
       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 = !!booking || hasIncomingProductNote || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
+      var shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingManualProductDiscount || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
       var matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
         var _item$metadata3;
         if (_this27.hasGoodPassDiscount(item)) return false;
         if (_this27.hasOrderProductLineNote(item)) return false;
+        if (isManualProductDiscountProduct(item)) return false;
         if (item.order_detail_id !== undefined && item.order_detail_id !== null) return false;
         if ((_item$metadata3 = item.metadata) !== null && _item$metadata3 !== void 0 && _item$metadata3.is_edit_for_runtime) return false;
         if (item.product_id !== productToAdd.product_id) return false;
@@ -3946,10 +4079,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           })));
           normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
           var nextNum = getSafeProductNum(targetProduct.num + normalizedProduct.num);
-          var targetIsManualProductDiscount = isManualProductDiscountProduct(targetProduct);
-          var nextDiscountList = targetIsManualProductDiscount ? normalizeOrderProductDiscountList(syncManualProductDiscountProductNum(targetProduct.discount_list, nextNum)) : normalizedProduct.discount_list;
-          tempOrder.products[matchedIndex] = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, targetProduct), normalizedProduct), {}, {
-            discount_list: nextDiscountList,
+          tempOrder.products[matchedIndex] = _objectSpread(_objectSpread(_objectSpread({}, targetProduct), normalizedProduct), {}, {
+            discount_list: normalizedProduct.discount_list,
             metadata: _objectSpread(_objectSpread(_objectSpread({}, targetProduct.metadata || {}), normalizedProduct.metadata || {}), {}, {
               unique_identification_number: targetUid
             }),
@@ -3959,15 +4090,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               option: []
             }), {}, {
               option: getProductSkuOptions(normalizedProduct)
-            })
-          }, targetIsManualProductDiscount ? {
-            selling_price: targetProduct.selling_price,
-            original_price: targetProduct.original_price,
-            payment_price: targetProduct.payment_price,
-            metadata: _objectSpread(_objectSpread(_objectSpread({}, normalizedProduct.metadata || {}), targetProduct.metadata || {}), {}, {
-              unique_identification_number: targetUid
-            })
-          } : {}), {}, {
+            }),
             note: targetProduct.note,
             order_detail_id: targetProduct.order_detail_id,
             num: nextNum
@@ -4538,6 +4661,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               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);
               identityLookup = {
                 product_id: product_id,
                 product_variant_id: product_variant_id
@@ -4563,11 +4687,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 productIndex = getProductIdentityIndex(tempOrder.products, identityLookup);
               }
               if (!(productIndex === -1)) {
-                _context25.next = 12;
+                _context25.next = 13;
                 break;
               }
               throw new Error('[Order] 目标商品不存在，无法更新数量');
-            case 12:
+            case 13:
               targetProduct = tempOrder.products[productIndex];
               normalizedProduct = normalizeOrderProduct(_objectSpread(_objectSpread({}, targetProduct), {}, {
                 num: getSafeProductNum(num),
@@ -4577,22 +4701,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }));
               normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
               tempOrder.products[productIndex] = normalizedProduct;
-              _context25.next = 18;
+              _context25.next = 19;
               return this.applyPromotion();
-            case 18:
+            case 19:
               this.applyDiscount();
               this.sanitizeTempOrderProducts(tempOrder);
-              _context25.next = 22;
+              _context25.next = 23;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 22:
+            case 23:
               this.persistTempOrder();
               this.logInfo('updateOrderProductQuantity success', {
                 params: params
               });
               return _context25.abrupt("return", tempOrder.products);
-            case 25:
+            case 26:
             case "end":
               return _context25.stop();
           }
@@ -4685,12 +4809,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context28.prev = _context28.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
+              this.repairDuplicateProductLineIdentities(tempOrder);
               if (identities.length) {
-                _context28.next = 3;
+                _context28.next = 4;
                 break;
               }
               return _context28.abrupt("return", tempOrder.products);
-            case 3:
+            case 4:
               productsBeforeRemove = tempOrder.products || [];
               bookingsBeforeRemove = tempOrder.bookings || [];
               preserveDisplayPosition = options === null || options === void 0 ? void 0 : options.preserveDisplayPosition;
@@ -4719,7 +4844,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               linkedBookingUidsToRemove = new Set();
               _iterator21 = _createForOfIteratorHelper(matchedProducts);
-              _context28.prev = 14;
+              _context28.prev = 15;
               _loop3 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop3() {
                 var _metadata11, _metadata12, _metadata13, _metadata14;
                 var product, productUid, productBookingUid, isAddTimeProduct;
@@ -4754,33 +4879,33 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }, _loop3);
               });
               _iterator21.s();
-            case 17:
+            case 18:
               if ((_step21 = _iterator21.n()).done) {
-                _context28.next = 23;
+                _context28.next = 24;
                 break;
               }
-              return _context28.delegateYield(_loop3(), "t0", 19);
-            case 19:
+              return _context28.delegateYield(_loop3(), "t0", 20);
+            case 20:
               if (!_context28.t0) {
-                _context28.next = 21;
+                _context28.next = 22;
                 break;
               }
-              return _context28.abrupt("continue", 21);
-            case 21:
-              _context28.next = 17;
+              return _context28.abrupt("continue", 22);
+            case 22:
+              _context28.next = 18;
               break;
-            case 23:
-              _context28.next = 28;
+            case 24:
+              _context28.next = 29;
               break;
-            case 25:
-              _context28.prev = 25;
-              _context28.t1 = _context28["catch"](14);
+            case 26:
+              _context28.prev = 26;
+              _context28.t1 = _context28["catch"](15);
               _iterator21.e(_context28.t1);
-            case 28:
-              _context28.prev = 28;
+            case 29:
+              _context28.prev = 29;
               _iterator21.f();
-              return _context28.finish(28);
-            case 31:
+              return _context28.finish(29);
+            case 32:
               if (linkedBookingUidsToRemove.size > 0) {
                 // 删除主预约商品时，同步移除挂在同一 booking_uid 下的加时商品，避免残留孤儿行。
                 tempOrder.products = (tempOrder.products || []).filter(function (line) {
@@ -4806,18 +4931,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   tempOrder.products = nextProductIndex >= 0 ? [].concat(_toConsumableArray(productsWithoutRemaining.slice(0, nextProductIndex)), [remainingProduct], _toConsumableArray(productsWithoutRemaining.slice(nextProductIndex))) : [].concat(_toConsumableArray(productsWithoutRemaining), [remainingProduct]);
                 }
               }
-              _context28.next = 35;
+              _context28.next = 36;
               return this.finalizeAfterProductsMutation(tempOrder);
-            case 35:
+            case 36:
               this.logInfo('removeProductsFromOrder success', {
                 identities: identities
               });
               return _context28.abrupt("return", tempOrder.products);
-            case 37:
+            case 38:
             case "end":
               return _context28.stop();
           }
-        }, _callee25, this, [[14, 25, 28, 31]]);
+        }, _callee25, this, [[15, 26, 29, 32]]);
       }));
       function removeProductsFromOrder(_x31, _x32) {
         return _removeProductsFromOrder.apply(this, arguments);
@@ -5915,36 +6040,83 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "hydrateTempOrderFromRecord",
     value: (function () {
       var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee42(record, options) {
-        var _this$store$discount20;
-        var sourceRaw, identityReadySource, normalizedCollections, raw, hasIdentityChanges, identityLogMetadata, hasIdentityWarnings, nextTempOrder, sourceLastOrderInfo, isDraftOrder, syntheticIdentityOptions, rawSummary, summarySurcharges, hadSyntheticDraftOrderId, hydratedEditDiscounts, currentDiscounts, currentScanDiscounts, hydratedDiscountIds, retainedScanDiscounts, nextDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount21, _this$store$discount22;
+        var _sourceRaw$_extend, _this$store$discount22;
+        var sourceRaw, duplicateProductIdentityRepair, duplicateIdentityReadySource, identityReadySource, normalizedCollections, raw, hasIdentityChanges, identityLogMetadata, hasIdentityWarnings, isSessionStorageHydrate, nextTempOrder, _this$store$discount20, _this$store$discount21, restoredSessionDiscounts, nextExtend, sourceLastOrderInfo, isDraftOrder, syntheticIdentityOptions, rawSummary, summarySurcharges, hadSyntheticDraftOrderId, hydratedEditDiscounts, currentDiscounts, currentScanDiscounts, hydratedDiscountIds, retainedScanDiscounts, nextDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount23, _this$store$discount24;
         return _regeneratorRuntime().wrap(function _callee42$(_context45) {
           while (1) switch (_context45.prev = _context45.next) {
             case 0:
               sourceRaw = record && _typeof(record) === 'object' && record.data && record.order_id == null ? record.data : record || {};
-              identityReadySource = this.seedAnonymousBookingUidsFromProducts(sourceRaw);
+              duplicateProductIdentityRepair = repairDuplicateOrderProductLineIdentities(Array.isArray(sourceRaw.products) ? sourceRaw.products : [], (_sourceRaw$_extend = sourceRaw._extend) === null || _sourceRaw$_extend === void 0 ? void 0 : _sourceRaw$_extend.productsByUid);
+              duplicateIdentityReadySource = duplicateProductIdentityRepair.repairs.length ? _objectSpread(_objectSpread({}, sourceRaw), {}, {
+                products: duplicateProductIdentityRepair.products
+              }, duplicateProductIdentityRepair.productsByUid ? {
+                _extend: _objectSpread(_objectSpread({}, sourceRaw._extend || {}), {}, {
+                  productsByUid: duplicateProductIdentityRepair.productsByUid
+                })
+              } : {}) : sourceRaw;
+              identityReadySource = this.seedAnonymousBookingUidsFromProducts(duplicateIdentityReadySource);
               normalizedCollections = normalizeOrderCollections(identityReadySource);
               raw = normalizedCollections.order;
-              hasIdentityChanges = Object.values(normalizedCollections.stats).some(function (stats) {
+              hasIdentityChanges = duplicateProductIdentityRepair.repairs.length > 0 || Object.values(normalizedCollections.stats).some(function (stats) {
                 return stats.backfilledUidCount > 0 || stats.collapsedDuplicateCount > 0 || stats.uidConflictCount > 0 || stats.anonymousRowCount > 0;
               });
               if (hasIdentityChanges) {
                 identityLogMetadata = {
                   collections: normalizedCollections.stats,
-                  uidRemapCount: normalizedCollections.uidRemaps.length
+                  uidRemapCount: normalizedCollections.uidRemaps.length,
+                  duplicateProductUidRepairCount: duplicateProductIdentityRepair.repairs.length
                 };
                 hasIdentityWarnings = Object.values(normalizedCollections.stats).some(function (stats) {
                   return stats.uidConflictCount > 0 || stats.anonymousRowCount > 0;
-                });
+                }) || duplicateProductIdentityRepair.repairs.length > 0;
                 if (hasIdentityWarnings) {
                   this.logWarning('Normalized hydrated order collection identities', identityLogMetadata);
                 } else {
                   this.logInfo('Normalized hydrated order collection identities', identityLogMetadata);
                 }
               }
+              isSessionStorageHydrate = (options === null || options === void 0 ? void 0 : options.source) === 'sessionStorage';
               nextTempOrder = this.normalizeTempOrderForRuntime(raw, {
-                makeEditMark: true
-              }); // Server list compatibility may synthesize order_id from external_sale_number; tempOrder must not.
-              sourceLastOrderInfo = raw.lastOrderInfo || raw;
+                makeEditMark: !isSessionStorageHydrate
+              });
+              this.store.tempOrder = nextTempOrder;
+              if (!isSessionStorageHydrate) {
+                _context45.next = 29;
+                break;
+              }
+              // 会话快照是未提交购物车，不应获得编辑订单的 saved/edit 标记与服务端基线。
+              restoredSessionDiscounts = Array.isArray(raw.discount_list) ? cloneDeep(raw.discount_list) : [];
+              nextExtend = _objectSpread({}, nextTempOrder._extend || {});
+              delete nextExtend.originalSalesSnapshot;
+              nextTempOrder._extend = nextExtend;
+              nextTempOrder.products.forEach(function (product) {
+                if (product.metadata) {
+                  delete product.metadata.is_edit_for_runtime;
+                }
+              });
+              nextTempOrder.discount_list = restoredSessionDiscounts;
+              this.store.summary = createEmptySummary();
+              this.store.lastOrderInfo = undefined;
+              _context45.next = 22;
+              return (_this$store$discount20 = this.store.discount) === null || _this$store$discount20 === void 0 ? void 0 : _this$store$discount20.setOriginalDiscountList(cloneDeep(restoredSessionDiscounts));
+            case 22:
+              _context45.next = 24;
+              return (_this$store$discount21 = this.store.discount) === null || _this$store$discount21 === void 0 ? void 0 : _this$store$discount21.setDiscountList(cloneDeep(restoredSessionDiscounts));
+            case 24:
+              if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
+                _context45.next = 27;
+                break;
+              }
+              _context45.next = 27;
+              return this.recalculateSummary({
+                createIfMissing: false
+              });
+            case 27:
+              this.persistTempOrder();
+              return _context45.abrupt("return", nextTempOrder);
+            case 29:
+              // Server list compatibility may synthesize order_id from external_sale_number; tempOrder must not.
+              sourceLastOrderInfo = sourceRaw.lastOrderInfo || sourceRaw;
               isDraftOrder = Number(nextTempOrder.is_draft_order || 0) === 1;
               syntheticIdentityOptions = {
                 isDraftOrder: isDraftOrder,
@@ -5954,7 +6126,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               summarySurcharges = Array.isArray(rawSummary.surcharges) ? rawSummary.surcharges.map(function (s) {
                 return _objectSpread({}, s || {});
               }) : cloneDeep(nextTempOrder.surcharges || []);
-              this.store.tempOrder = nextTempOrder;
               this.store.summary = _objectSpread(_objectSpread(_objectSpread({}, createEmptySummary()), rawSummary), {}, {
                 surcharges: summarySurcharges
               });
@@ -5975,7 +6146,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 this.store.syncState = 'local';
               }
               hydratedEditDiscounts = this.collectHydratedEditDiscounts(nextTempOrder.products);
-              currentDiscounts = typeof ((_this$store$discount20 = this.store.discount) === null || _this$store$discount20 === void 0 ? void 0 : _this$store$discount20.getDiscountList) === 'function' ? this.store.discount.getDiscountList() || [] : [];
+              currentDiscounts = typeof ((_this$store$discount22 = this.store.discount) === null || _this$store$discount22 === void 0 ? void 0 : _this$store$discount22.getDiscountList) === 'function' ? this.store.discount.getDiscountList() || [] : [];
               currentScanDiscounts = currentDiscounts.filter(function (discount) {
                 return discount === null || discount === void 0 ? void 0 : discount.isScan;
               });
@@ -5988,28 +6159,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               nextDiscounts = [].concat(_toConsumableArray(hydratedEditDiscounts), _toConsumableArray(retainedScanDiscounts));
               shouldSkipEmptyDiscountSync = nextDiscounts.length === 0 && currentDiscounts.length === 0;
               if (shouldSkipEmptyDiscountSync) {
-                _context45.next = 31;
+                _context45.next = 52;
                 break;
               }
               OrderModule.populateSavedAmounts(nextTempOrder.products, nextDiscounts);
-              _context45.next = 29;
-              return (_this$store$discount21 = this.store.discount) === null || _this$store$discount21 === void 0 ? void 0 : _this$store$discount21.setOriginalDiscountList(nextDiscounts);
-            case 29:
-              _context45.next = 31;
-              return (_this$store$discount22 = this.store.discount) === null || _this$store$discount22 === void 0 ? void 0 : _this$store$discount22.setDiscountList(nextDiscounts);
-            case 31:
+              _context45.next = 50;
+              return (_this$store$discount23 = this.store.discount) === null || _this$store$discount23 === void 0 ? void 0 : _this$store$discount23.setOriginalDiscountList(nextDiscounts);
+            case 50:
+              _context45.next = 52;
+              return (_this$store$discount24 = this.store.discount) === null || _this$store$discount24 === void 0 ? void 0 : _this$store$discount24.setDiscountList(nextDiscounts);
+            case 52:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context45.next = 34;
+                _context45.next = 55;
                 break;
               }
-              _context45.next = 34;
+              _context45.next = 55;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 34:
+            case 55:
               this.persistTempOrder();
               return _context45.abrupt("return", nextTempOrder);
-            case 36:
+            case 57:
             case "end":
               return _context45.stop();
           }
@@ -6068,10 +6239,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _step22;
       try {
         for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
-          var _product$metadata10;
+          var _product$metadata8;
           var product = _step22.value;
           var productUid = getOrderCollectionUid('product', product);
-          var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.booking_uid);
+          var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.booking_uid);
           if (!productUid || bookingUid === undefined || bookingUid === null || bookingUid === '') {
             continue;
           }
@@ -6188,11 +6359,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _step24;
       try {
         for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
-          var _product$metadata11, _ref75, _ref76, _existed$origin, _rawProduct$metadata;
+          var _product$metadata9, _ref75, _ref76, _existed$origin, _rawProduct$metadata;
           var _step24$value = _slicedToArray(_step24.value, 2),
             index = _step24$value[0],
             product = _step24$value[1];
-          var uid = (_product$metadata11 = product.metadata) === null || _product$metadata11 === void 0 ? void 0 : _product$metadata11.unique_identification_number;
+          var uid = (_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.unique_identification_number;
           if (!uid) continue;
           var existed = productsByUid[uid] && _typeof(productsByUid[uid]) === 'object' ? productsByUid[uid] : {};
           var rawProduct = rawProducts[index] && _typeof(rawProducts[index]) === 'object' ? rawProducts[index] : product;
@@ -6247,8 +6418,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var bookingUidByProductUid = new Map();
       var productByUid = new Map();
       (tempOrder.products || []).forEach(function (product) {
-        var _product$metadata12;
-        var productUid = (product === null || product === void 0 || (_product$metadata12 = product.metadata) === null || _product$metadata12 === void 0 ? void 0 : _product$metadata12.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+        var _product$metadata10;
+        var productUid = (product === null || product === void 0 || (_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
         if (productUid !== undefined && productUid !== null && String(productUid) !== '') {
           productByUid.set(String(productUid), product);
         }
@@ -6269,8 +6440,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         bookingUidByProductUid.set(String(productUid), bookingUid);
       });
       (tempOrder.products || []).forEach(function (product) {
-        var _product$metadata13;
-        var productUid = (product === null || product === void 0 || (_product$metadata13 = product.metadata) === null || _product$metadata13 === void 0 ? void 0 : _product$metadata13.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+        var _product$metadata11;
+        var productUid = (product === null || product === void 0 || (_product$metadata11 = product.metadata) === null || _product$metadata11 === void 0 ? void 0 : _product$metadata11.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
         if (productUid === undefined || productUid === null || String(productUid) === '') return;
         var bookingUid = bookingUidByProductUid.get(String(productUid));
         if (!bookingUid) return;