@pisell/pisellos 2.2.278 → 2.2.280

package/dist/modules/Order/index.js

@@ -32,16 +32,17 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
 import { OrderHooks } from "./types";
-import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, mergeOrderProductDisplayFields, resolveIsFormSubject } from "./utils";
+import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, ensureCartItemOriginHolder, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, mergeOrderProductDisplayFields, resolveIsFormSubject } from "./utils";
 import { isNormalProduct } from "../Product/utils";
 import dayjs from 'dayjs';
 import { ensureOrderPaymentNumber, mergeOrderPaymentRecord, resolveOrderPaymentIdentity } from "./payment-utils";
 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";
 import { UnavailableReason } from "../Rules/types";
@@ -63,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';
   });
 }
@@ -121,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);
@@ -269,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) {
@@ -280,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) {
@@ -307,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 _otherParams$rules, _otherParams$order, _otherParams$hooks;
-        var app, otherParams;
+        var _appPlugin$getApp, _otherParams$rules, _otherParams$order, _otherParams$hooks;
+        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) {
@@ -328,18 +352,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 this.store.availableWalletIds = [];
               }
               this.request = this.core.getPlugin('request');
-              this.appPlugin = this.core.getPlugin('app');
-              if (this.appPlugin) {
-                _context.next = 9;
-                break;
+              appPlugin = this.core.getPlugin('app');
+              if (!appPlugin) {
+                console.error('Order 模块需要 app 插件支持');
               }
-              throw new Error('Order 模块需要 app 插件支持');
-            case 9:
-              app = this.appPlugin.getApp();
-              this.logger = app.logger;
+              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;
@@ -347,7 +366,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.otherParams = otherParams;
               this.registerDiscountModules(options);
               this.logInfo('OrderModule initialized successfully');
-            case 21:
+            case 20:
             case "end":
               return _context.stop();
           }
@@ -367,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);
@@ -427,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);
@@ -485,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"));
@@ -501,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
         }
       });
@@ -871,6 +892,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             discount_list: normalizeOrderProductDiscountList(syncManualProductDiscountProductNum(mergedProduct.discount_list, mergedProduct.num))
           });
         }));
+        ensureUniqueProductLineUids(tempOrder);
+        consolidateDiscountFreeProductLines(tempOrder);
       }
       if (result !== null && result !== void 0 && result.discountList) {
         var _this$store$discount15;
@@ -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,86 @@ 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",
+    value: function notifyTempOrderChanged() {
+      if (!this.store.tempOrder) return;
+      this.store.tempOrder = _objectSpread(_objectSpread({}, this.store.tempOrder), {}, {
+        products: _toConsumableArray(this.store.tempOrder.products),
+        bookings: this.store.tempOrder.bookings ? _toConsumableArray(this.store.tempOrder.bookings) : []
+      });
+      this.persistTempOrder();
     }
 
     // ─── TempOrder: 创建 & 获取 ───
@@ -1533,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,
@@ -1555,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';
     }
@@ -1888,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);
     }
   }, {
@@ -1903,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,
@@ -1923,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);
       }
     }
@@ -2159,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;
     }
@@ -2203,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);
       }
@@ -2331,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;
@@ -2361,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();
           }
@@ -2544,6 +2670,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       tempOrder.products = (tempOrder.products || []).map(function (product) {
         return _this15.sanitizeOrderProductForTempOrder(product);
       });
+      ensureUniqueProductLineUids(tempOrder);
     }
   }, {
     key: "ensureExtend",
@@ -2558,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) {
@@ -2664,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);
@@ -2806,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);
@@ -2830,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) : '';
@@ -3333,6 +3475,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (tempOrder._extend) delete tempOrder._extend.customerSnapshot;
       this.store.availableWalletIds = [];
       this.clearCustomerBoundDiscounts(tempOrder);
+      this.applyDiscount();
       this.persistTempOrder();
       this.saveDraftInBackground();
       this.core.effects.emit(OrderHooks.OnOrderCustomerChange, null);
@@ -3751,52 +3894,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return updateVoucherOrderPaymentsAsync;
     }()
+  }, {
+    key: "normalizeShouldMergeProductResult",
+    value: function normalizeShouldMergeProductResult(result) {
+      if (typeof result === 'boolean') return result;
+      if (result && _typeof(result) === 'object' && typeof result.shouldMerge === 'boolean') {
+        return result.shouldMerge;
+      }
+      return true;
+    }
   }, {
     key: "shouldMergeProductToOrder",
-    value: function () {
-      var _shouldMergeProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(params) {
-        var _this$orderHooks;
-        var onBeforeMergeProductToOrder, result;
-        return _regeneratorRuntime().wrap(function _callee18$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
-            case 0:
-              onBeforeMergeProductToOrder = (_this$orderHooks = this.orderHooks) === null || _this$orderHooks === void 0 ? void 0 : _this$orderHooks.onBeforeMergeProductToOrder;
-              if (onBeforeMergeProductToOrder) {
-                _context20.next = 3;
-                break;
-              }
-              return _context20.abrupt("return", true);
-            case 3:
-              _context20.next = 5;
-              return onBeforeMergeProductToOrder(_objectSpread(_objectSpread({}, params), {}, {
-                defaultShouldMerge: true
-              }));
-            case 5:
-              result = _context20.sent;
-              if (!(typeof result === 'boolean')) {
-                _context20.next = 8;
-                break;
-              }
-              return _context20.abrupt("return", result);
-            case 8:
-              if (!(result && _typeof(result) === 'object' && typeof result.shouldMerge === 'boolean')) {
-                _context20.next = 10;
-                break;
-              }
-              return _context20.abrupt("return", result.shouldMerge);
-            case 10:
-              return _context20.abrupt("return", true);
-            case 11:
-            case "end":
-              return _context20.stop();
-          }
-        }, _callee18, this);
+    value: function shouldMergeProductToOrder(params) {
+      var _this$orderHooks,
+        _this26 = this;
+      var onBeforeMergeProductToOrder = (_this$orderHooks = this.orderHooks) === null || _this$orderHooks === void 0 ? void 0 : _this$orderHooks.onBeforeMergeProductToOrder;
+      if (!onBeforeMergeProductToOrder) return true;
+      var result = onBeforeMergeProductToOrder(_objectSpread(_objectSpread({}, params), {}, {
+        defaultShouldMerge: true
       }));
-      function shouldMergeProductToOrder(_x19) {
-        return _shouldMergeProductToOrder.apply(this, arguments);
+      if (result && _typeof(result) === 'object' && typeof result.then === 'function') {
+        return Promise.resolve(result).then(function (resolved) {
+          return _this26.normalizeShouldMergeProductResult(resolved);
+        });
       }
-      return shouldMergeProductToOrder;
-    }()
+      return this.normalizeShouldMergeProductResult(result);
+    }
   }, {
     key: "hasOrderProductLineNote",
     value: function hasOrderProductLineNote(product) {
@@ -3812,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) !== '';
     }
 
@@ -3828,30 +3951,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "finalizeProductOrderMutation",
     value: function () {
-      var _finalizeProductOrderMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(tempOrder, options) {
-        return _regeneratorRuntime().wrap(function _callee19$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+      var _finalizeProductOrderMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(tempOrder, options) {
+        return _regeneratorRuntime().wrap(function _callee18$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
               this.syncTempOrderHolderFromBookings(tempOrder);
               if (options !== null && options !== void 0 && options.skipEditDiscountConfigRefresh) {
-                _context21.next = 4;
+                _context20.next = 4;
                 break;
               }
-              _context21.next = 4;
+              _context20.next = 4;
               return this.ensureEditDiscountConfigForProductChange(tempOrder);
             case 4:
               if (options !== null && options !== void 0 && options.skipDiscountRecalculation) {
-                _context21.next = 7;
+                _context20.next = 7;
                 break;
               }
-              _context21.next = 7;
+              _context20.next = 7;
               return this.applyPromotion();
             case 7:
               if (!(options !== null && options !== void 0 && options.skipDiscountRecalculation)) {
                 this.applyDiscount();
               }
               this.sanitizeTempOrderProducts(tempOrder);
-              _context21.next = 11;
+              _context20.next = 11;
               return this.recalculateSummary({
                 createIfMissing: true
               });
@@ -3859,11 +3982,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.persistTempOrder();
             case 12:
             case "end":
-              return _context21.stop();
+              return _context20.stop();
           }
-        }, _callee19, this);
+        }, _callee18, this);
       }));
-      function finalizeProductOrderMutation(_x20, _x21) {
+      function finalizeProductOrderMutation(_x19, _x20) {
         return _finalizeProductOrderMutation.apply(this, arguments);
       }
       return finalizeProductOrderMutation;
@@ -3873,157 +3996,135 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
      * 带 booking 且 num>1 时由 `addProductToOrder` 拆成多次本方法调用（每次 num=1）。
      *
      * @example
-     * await this.appendProductLineToTempOrder(tempOrder, { product_id: 1, num: 1 }, booking);
+     * const pending = this.appendProductLineToTempOrder(
+     *   tempOrder,
+     *   { product_id: 1, num: 1 },
+     *   booking,
+     * );
+     * if (pending) await pending;
      */
   }, {
     key: "appendProductLineToTempOrder",
-    value: (function () {
-      var _appendProductLineToTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(tempOrder, product, booking, options) {
-        var _normalizedIncoming$p,
-          _normalizedIncoming$p2,
-          _booking_uid,
-          _metadata,
-          _productToAdd$metadat,
-          _origin,
-          _this26 = this;
-        var linked, productToAdd, incomingFingerprint, normalizedIncoming, isWeighingProduct, netWeight, incomingBookingUid, hasIncomingGoodPass, hasIncomingProductNote, hasIncomingBookingUid, isIncomingCustomItem, shouldForceNewLine, matchedIndex, matchedProduct, existedFingerprint, shouldMerge, insertAtIndex, _targetProduct$metada, targetProduct, targetUid, normalizedProduct, nextNum, targetIsManualProductDiscount, nextDiscountList, mergedProduct;
-        return _regeneratorRuntime().wrap(function _callee20$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
-            case 0:
-              linked = booking ? this.createLinkedProductAndBooking({
-                product: product,
-                booking: booking
-              }) : null;
-              productToAdd = (linked === null || linked === void 0 ? void 0 : linked.product) || product;
-              incomingFingerprint = buildProductLineFingerprint(getProductSkuOptions(productToAdd), productToAdd.product_bundle);
-              normalizedIncoming = mergeOrderProductDisplayFields(productToAdd, normalizeOrderProduct(productToAdd));
-              isWeighingProduct = Number(((_normalizedIncoming$p = normalizedIncoming.product_sku) === null || _normalizedIncoming$p === void 0 ? void 0 : _normalizedIncoming$p.open_sold_weight) || 0) === 1;
-              netWeight = Number((_normalizedIncoming$p2 = normalizedIncoming.product_sku) === null || _normalizedIncoming$p2 === void 0 ? void 0 : _normalizedIncoming$p2.net_weight);
-              if (!(isWeighingProduct && (!Number.isFinite(netWeight) || netWeight <= 0))) {
-                _context22.next = 8;
-                break;
-              }
-              throw new Error('[Order] 称重商品净重必须大于 0');
-            case 8:
-              incomingBookingUid = (_booking_uid = productToAdd.booking_uid) !== null && _booking_uid !== void 0 ? _booking_uid : (_metadata = productToAdd.metadata) === null || _metadata === void 0 ? void 0 : _metadata.booking_uid;
-              if (incomingBookingUid !== undefined && incomingBookingUid !== null && String(incomingBookingUid) !== '') {
-                normalizedIncoming.booking_uid = String(incomingBookingUid);
-                normalizedIncoming.metadata = _objectSpread(_objectSpread({}, normalizedIncoming.metadata || {}), {}, {
-                  booking_uid: String(incomingBookingUid)
-                });
-              }
-              normalizedIncoming.discount_list = normalizeOrderProductDiscountList(normalizedIncoming.discount_list);
-              hasIncomingGoodPass = this.hasGoodPassDiscount(normalizedIncoming);
-              hasIncomingProductNote = this.hasOrderProductLineNote(normalizedIncoming);
-              hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
-              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;
-              shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
-              matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
-                var _item$metadata3;
-                if (_this26.hasGoodPassDiscount(item)) return false;
-                if (_this26.hasOrderProductLineNote(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;
-                if (item.product_variant_id !== productToAdd.product_variant_id) return false;
-                var existedFingerprint = buildProductLineFingerprint(getProductSkuOptions(item), item.product_bundle);
-                return existedFingerprint === incomingFingerprint;
-              });
-              matchedProduct = matchedIndex === -1 ? null : tempOrder.products[matchedIndex];
-              existedFingerprint = matchedProduct ? buildProductLineFingerprint(getProductSkuOptions(matchedProduct), matchedProduct.product_bundle) : '';
-              if (!matchedProduct) {
-                _context22.next = 25;
-                break;
-              }
-              _context22.next = 22;
-              return this.shouldMergeProductToOrder({
-                incomingProduct: productToAdd,
-                normalizedIncoming: normalizedIncoming,
-                matchedProduct: matchedProduct,
-                matchedIndex: matchedIndex,
-                incomingFingerprint: incomingFingerprint,
-                existedFingerprint: existedFingerprint,
-                tempOrder: tempOrder,
-                booking: booking
-              });
-            case 22:
-              _context22.t0 = _context22.sent;
-              _context22.next = 26;
-              break;
-            case 25:
-              _context22.t0 = false;
-            case 26:
-              shouldMerge = _context22.t0;
-              if (matchedIndex === -1 || !matchedProduct || !shouldMerge) {
-                this.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
-                if (linked) {
-                  normalizedIncoming.booking_uid = linked.bookingUid;
-                  normalizedIncoming.metadata = _objectSpread(_objectSpread({}, normalizedIncoming.metadata || {}), {}, {
-                    booking_uid: linked.bookingUid
-                  });
-                }
-                insertAtIndex = options === null || options === void 0 ? void 0 : options.insertAtIndex;
-                if (Number.isInteger(insertAtIndex) && Number(insertAtIndex) >= 0 && Number(insertAtIndex) < tempOrder.products.length) {
-                  tempOrder.products = [].concat(_toConsumableArray(tempOrder.products.slice(0, insertAtIndex)), [normalizedIncoming], _toConsumableArray(tempOrder.products.slice(insertAtIndex)));
-                } else {
-                  tempOrder.products = [].concat(_toConsumableArray(tempOrder.products), [normalizedIncoming]);
-                }
-              } else {
-                targetProduct = matchedProduct;
-                targetUid = (_targetProduct$metada = targetProduct.metadata) === null || _targetProduct$metada === void 0 ? void 0 : _targetProduct$metada.unique_identification_number;
-                normalizedProduct = mergeOrderProductDisplayFields(targetProduct, normalizeOrderProduct(_objectSpread(_objectSpread({}, productToAdd), {}, {
-                  metadata: _objectSpread(_objectSpread({}, productToAdd.metadata || {}), {}, {
-                    unique_identification_number: targetUid
-                  })
-                })));
-                normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
-                nextNum = getSafeProductNum(targetProduct.num + normalizedProduct.num);
-                targetIsManualProductDiscount = isManualProductDiscountProduct(targetProduct);
-                nextDiscountList = targetIsManualProductDiscount ? normalizeOrderProductDiscountList(syncManualProductDiscountProductNum(targetProduct.discount_list, nextNum)) : normalizedProduct.discount_list;
-                tempOrder.products[matchedIndex] = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, targetProduct), normalizedProduct), {}, {
-                  discount_list: nextDiscountList,
-                  metadata: _objectSpread(_objectSpread(_objectSpread({}, targetProduct.metadata || {}), normalizedProduct.metadata || {}), {}, {
-                    unique_identification_number: targetUid
-                  }),
-                  product_sku: _objectSpread(_objectSpread(_objectSpread({}, targetProduct.product_sku || {
-                    option: []
-                  }), normalizedProduct.product_sku || {
-                    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
-                });
-                this.captureProductRuntime(tempOrder, productToAdd, tempOrder.products[matchedIndex], targetUid);
-                if (matchedIndex !== tempOrder.products.length - 1) {
-                  mergedProduct = tempOrder.products[matchedIndex];
-                  tempOrder.products = [].concat(_toConsumableArray(tempOrder.products.slice(0, matchedIndex)), _toConsumableArray(tempOrder.products.slice(matchedIndex + 1)), [mergedProduct]);
-                }
-              }
-              if (linked) {
-                tempOrder.bookings = [].concat(_toConsumableArray(tempOrder.bookings || []), [linked.booking]);
-              }
-            case 29:
-            case "end":
-              return _context22.stop();
+    value: function appendProductLineToTempOrder(tempOrder, product, booking, options) {
+      var _normalizedIncoming$p,
+        _normalizedIncoming$p2,
+        _booking_uid,
+        _metadata,
+        _productToAdd$metadat,
+        _origin,
+        _this27 = this;
+      var linked = booking ? this.createLinkedProductAndBooking({
+        product: product,
+        booking: booking
+      }) : null;
+      var productToAdd = (linked === null || linked === void 0 ? void 0 : linked.product) || product;
+      var incomingFingerprint = buildProductLineFingerprint(getProductSkuOptions(productToAdd), productToAdd.product_bundle);
+      var normalizedIncoming = mergeOrderProductDisplayFields(productToAdd, normalizeOrderProduct(productToAdd));
+      var isWeighingProduct = Number(((_normalizedIncoming$p = normalizedIncoming.product_sku) === null || _normalizedIncoming$p === void 0 ? void 0 : _normalizedIncoming$p.open_sold_weight) || 0) === 1;
+      var netWeight = Number((_normalizedIncoming$p2 = normalizedIncoming.product_sku) === null || _normalizedIncoming$p2 === void 0 ? void 0 : _normalizedIncoming$p2.net_weight);
+      if (isWeighingProduct && (!Number.isFinite(netWeight) || netWeight <= 0)) {
+        throw new Error('[Order] 称重商品净重必须大于 0');
+      }
+      var incomingBookingUid = (_booking_uid = productToAdd.booking_uid) !== null && _booking_uid !== void 0 ? _booking_uid : (_metadata = productToAdd.metadata) === null || _metadata === void 0 ? void 0 : _metadata.booking_uid;
+      if (incomingBookingUid !== undefined && incomingBookingUid !== null && String(incomingBookingUid) !== '') {
+        normalizedIncoming.booking_uid = String(incomingBookingUid);
+        normalizedIncoming.metadata = _objectSpread(_objectSpread({}, normalizedIncoming.metadata || {}), {}, {
+          booking_uid: String(incomingBookingUid)
+        });
+      }
+      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 || 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;
+        if (item.product_variant_id !== productToAdd.product_variant_id) return false;
+        var existedFingerprint = buildProductLineFingerprint(getProductSkuOptions(item), item.product_bundle);
+        return existedFingerprint === incomingFingerprint;
+      });
+      var matchedProduct = matchedIndex === -1 ? null : tempOrder.products[matchedIndex];
+      var existedFingerprint = matchedProduct ? buildProductLineFingerprint(getProductSkuOptions(matchedProduct), matchedProduct.product_bundle) : '';
+      var commitProductLine = function commitProductLine(shouldMerge) {
+        if (matchedIndex === -1 || !matchedProduct || !shouldMerge) {
+          _this27.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
+          if (linked) {
+            normalizedIncoming.booking_uid = linked.bookingUid;
+            normalizedIncoming.metadata = _objectSpread(_objectSpread({}, normalizedIncoming.metadata || {}), {}, {
+              booking_uid: linked.bookingUid
+            });
           }
-        }, _callee20, this);
-      }));
-      function appendProductLineToTempOrder(_x22, _x23, _x24, _x25) {
-        return _appendProductLineToTempOrder.apply(this, arguments);
+          var insertAtIndex = options === null || options === void 0 ? void 0 : options.insertAtIndex;
+          if (Number.isInteger(insertAtIndex) && Number(insertAtIndex) >= 0 && Number(insertAtIndex) < tempOrder.products.length) {
+            tempOrder.products = [].concat(_toConsumableArray(tempOrder.products.slice(0, insertAtIndex)), [normalizedIncoming], _toConsumableArray(tempOrder.products.slice(insertAtIndex)));
+          } else {
+            tempOrder.products = [].concat(_toConsumableArray(tempOrder.products), [normalizedIncoming]);
+          }
+        } else {
+          var _targetProduct$metada;
+          var targetProduct = matchedProduct;
+          var targetUid = (_targetProduct$metada = targetProduct.metadata) === null || _targetProduct$metada === void 0 ? void 0 : _targetProduct$metada.unique_identification_number;
+          var normalizedProduct = mergeOrderProductDisplayFields(targetProduct, normalizeOrderProduct(_objectSpread(_objectSpread({}, productToAdd), {}, {
+            metadata: _objectSpread(_objectSpread({}, productToAdd.metadata || {}), {}, {
+              unique_identification_number: targetUid
+            })
+          })));
+          normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
+          var nextNum = getSafeProductNum(targetProduct.num + normalizedProduct.num);
+          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
+            }),
+            product_sku: _objectSpread(_objectSpread(_objectSpread({}, targetProduct.product_sku || {
+              option: []
+            }), normalizedProduct.product_sku || {
+              option: []
+            }), {}, {
+              option: getProductSkuOptions(normalizedProduct)
+            }),
+            note: targetProduct.note,
+            order_detail_id: targetProduct.order_detail_id,
+            num: nextNum
+          });
+          _this27.captureProductRuntime(tempOrder, productToAdd, tempOrder.products[matchedIndex], targetUid);
+          if (matchedIndex !== tempOrder.products.length - 1) {
+            var mergedProduct = tempOrder.products[matchedIndex];
+            tempOrder.products = [].concat(_toConsumableArray(tempOrder.products.slice(0, matchedIndex)), _toConsumableArray(tempOrder.products.slice(matchedIndex + 1)), [mergedProduct]);
+          }
+        }
+        if (linked) {
+          tempOrder.bookings = [].concat(_toConsumableArray(tempOrder.bookings || []), [linked.booking]);
+        }
+      };
+      if (!matchedProduct) {
+        commitProductLine(false);
+        return;
       }
-      return appendProductLineToTempOrder;
-    }()
+      var shouldMerge = this.shouldMergeProductToOrder({
+        incomingProduct: productToAdd,
+        normalizedIncoming: normalizedIncoming,
+        matchedProduct: matchedProduct,
+        matchedIndex: matchedIndex,
+        incomingFingerprint: incomingFingerprint,
+        existedFingerprint: existedFingerprint,
+        tempOrder: tempOrder,
+        booking: booking
+      });
+      if (shouldMerge && _typeof(shouldMerge) === 'object' && typeof shouldMerge.then === 'function') {
+        return Promise.resolve(shouldMerge).then(commitProductLine);
+      }
+      commitProductLine(shouldMerge);
+    }
+
     /**
      * 添加商品行。带 booking 时强制独立行；num>1 时拆成多条 num=1 的 product+booking（对齐 BookingByStep / ticketBooking addService）。
      *
@@ -4031,14 +4132,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
      * await order.addProductToOrder({ product_id: 1, num: 3 }, { start_time: '10:00' });
      * // → tempOrder.products 新增 3 行，每行 num=1，bookings 3 条
      */
-    )
   }, {
     key: "addProductToOrder",
     value: (function () {
-      var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(product, booking, options) {
-        var tempOrder, insertAfterProductUid, anchorIndex, insertAtIndex, _ref60, _productRecord$num, productRecord, splitCount, i, singleLine;
-        return _regeneratorRuntime().wrap(function _callee21$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+      var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(product, booking, options) {
+        var tempOrder, insertAfterProductUid, anchorIndex, insertAtIndex, _ref60, _productRecord$num, productRecord, splitCount, i, singleLine, _appendResult, appendResult;
+        return _regeneratorRuntime().wrap(function _callee19$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               insertAfterProductUid = options === null || options === void 0 ? void 0 : options.insertAfterProductUid;
@@ -4049,60 +4149,70 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }) : -1;
               insertAtIndex = anchorIndex >= 0 ? anchorIndex + 1 : undefined;
               if (!booking) {
-                _context23.next = 22;
+                _context21.next = 24;
                 break;
               }
               productRecord = product;
               splitCount = getSafeProductNum((_ref60 = (_productRecord$num = productRecord.num) !== null && _productRecord$num !== void 0 ? _productRecord$num : productRecord.product_quantity) !== null && _ref60 !== void 0 ? _ref60 : 1);
               if (!(splitCount > 1)) {
-                _context23.next = 22;
+                _context21.next = 24;
                 break;
               }
               i = 0;
             case 9:
               if (!(i < splitCount)) {
-                _context23.next = 19;
+                _context21.next = 21;
                 break;
               }
               singleLine = cloneDeep(productRecord);
               singleLine.num = 1;
               delete singleLine.product_quantity;
-              _context23.next = 15;
-              return this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking), {
+              _appendResult = this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking), {
                 insertAtIndex: insertAtIndex
               });
-            case 15:
+              if (!_appendResult) {
+                _context21.next = 17;
+                break;
+              }
+              _context21.next = 17;
+              return _appendResult;
+            case 17:
               if (insertAtIndex !== undefined) insertAtIndex += 1;
-            case 16:
+            case 18:
               i += 1;
-              _context23.next = 9;
+              _context21.next = 9;
               break;
-            case 19:
-              _context23.next = 21;
-              return this.finalizeProductOrderMutation(tempOrder);
             case 21:
-              return _context23.abrupt("return", tempOrder.products);
-            case 22:
-              _context23.next = 24;
-              return this.appendProductLineToTempOrder(tempOrder, product, booking, {
+              _context21.next = 23;
+              return this.finalizeProductOrderMutation(tempOrder);
+            case 23:
+              return _context21.abrupt("return", tempOrder.products);
+            case 24:
+              appendResult = this.appendProductLineToTempOrder(tempOrder, product, booking, {
                 insertAtIndex: insertAtIndex
               });
-            case 24:
-              _context23.next = 26;
+              if (!appendResult) {
+                _context21.next = 28;
+                break;
+              }
+              _context21.next = 28;
+              return appendResult;
+            case 28:
+              _context21.next = 30;
               return this.finalizeProductOrderMutation(tempOrder);
-            case 26:
+            case 30:
               this.logInfo('addProductToOrder success', {
                 product_id: product.product_id,
                 with_booking: !!booking
               });
-              return _context23.abrupt("return", tempOrder.products);
-            case 28:
+              return _context21.abrupt("return", tempOrder.products);
+            case 32:
             case "end":
-              return _context23.stop();
+              return _context21.stop();
           }
-        }, _callee21, this);
+        }, _callee19, this);
       }));
-      function addProductToOrder(_x26, _x27, _x28) {
+      function addProductToOrder(_x21, _x22, _x23) {
         return _addProductToOrder.apply(this, arguments);
       }
       return addProductToOrder;
@@ -4120,93 +4230,103 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProductsToOrder",
     value: (function () {
-      var _addProductsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(items, options) {
-        var tempOrder, _iterator20, _step20, item, product, booking, _ref61, _productRecord$num2, productRecord, splitCount, i, singleLine;
-        return _regeneratorRuntime().wrap(function _callee22$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+      var _addProductsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(items, options) {
+        var tempOrder, _iterator20, _step20, item, product, booking, _ref61, _productRecord$num2, productRecord, splitCount, i, singleLine, _appendResult2, appendResult;
+        return _regeneratorRuntime().wrap(function _callee20$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (!(!Array.isArray(items) || items.length === 0)) {
-                _context24.next = 3;
+                _context22.next = 3;
                 break;
               }
-              return _context24.abrupt("return", tempOrder.products);
+              return _context22.abrupt("return", tempOrder.products);
             case 3:
               _iterator20 = _createForOfIteratorHelper(items || []);
-              _context24.prev = 4;
+              _context22.prev = 4;
               _iterator20.s();
             case 6:
               if ((_step20 = _iterator20.n()).done) {
-                _context24.next = 30;
+                _context22.next = 34;
                 break;
               }
               item = _step20.value;
               product = item.product, booking = item.booking;
               if (product) {
-                _context24.next = 11;
+                _context22.next = 11;
                 break;
               }
-              return _context24.abrupt("continue", 28);
+              return _context22.abrupt("continue", 32);
             case 11:
               if (!booking) {
-                _context24.next = 26;
+                _context22.next = 28;
                 break;
               }
               productRecord = product;
               splitCount = getSafeProductNum((_ref61 = (_productRecord$num2 = productRecord.num) !== null && _productRecord$num2 !== void 0 ? _productRecord$num2 : productRecord.product_quantity) !== null && _ref61 !== void 0 ? _ref61 : 1);
               if (!(splitCount > 1)) {
-                _context24.next = 26;
+                _context22.next = 28;
                 break;
               }
               i = 0;
             case 16:
               if (!(i < splitCount)) {
-                _context24.next = 25;
+                _context22.next = 27;
                 break;
               }
               singleLine = cloneDeep(productRecord);
               singleLine.num = 1;
               delete singleLine.product_quantity;
-              _context24.next = 22;
-              return this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking));
-            case 22:
+              _appendResult2 = this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking));
+              if (!_appendResult2) {
+                _context22.next = 24;
+                break;
+              }
+              _context22.next = 24;
+              return _appendResult2;
+            case 24:
               i += 1;
-              _context24.next = 16;
+              _context22.next = 16;
               break;
-            case 25:
-              return _context24.abrupt("continue", 28);
-            case 26:
-              _context24.next = 28;
-              return this.appendProductLineToTempOrder(tempOrder, product, booking);
+            case 27:
+              return _context22.abrupt("continue", 32);
             case 28:
-              _context24.next = 6;
+              appendResult = this.appendProductLineToTempOrder(tempOrder, product, booking);
+              if (!appendResult) {
+                _context22.next = 32;
+                break;
+              }
+              _context22.next = 32;
+              return appendResult;
+            case 32:
+              _context22.next = 6;
               break;
-            case 30:
-              _context24.next = 35;
+            case 34:
+              _context22.next = 39;
               break;
-            case 32:
-              _context24.prev = 32;
-              _context24.t0 = _context24["catch"](4);
-              _iterator20.e(_context24.t0);
-            case 35:
-              _context24.prev = 35;
+            case 36:
+              _context22.prev = 36;
+              _context22.t0 = _context22["catch"](4);
+              _iterator20.e(_context22.t0);
+            case 39:
+              _context22.prev = 39;
               _iterator20.f();
-              return _context24.finish(35);
-            case 38:
-              _context24.next = 40;
+              return _context22.finish(39);
+            case 42:
+              _context22.next = 44;
               return this.finalizeProductOrderMutation(tempOrder, options);
-            case 40:
+            case 44:
               this.logInfo('addProductsToOrder success', {
                 itemsCount: items.length
               });
-              return _context24.abrupt("return", tempOrder.products);
-            case 42:
+              return _context22.abrupt("return", tempOrder.products);
+            case 46:
             case "end":
-              return _context24.stop();
+              return _context22.stop();
           }
-        }, _callee22, this, [[4, 32, 35, 38]]);
+        }, _callee20, this, [[4, 36, 39, 42]]);
       }));
-      function addProductsToOrder(_x29, _x30) {
+      function addProductsToOrder(_x24, _x25) {
         return _addProductsToOrder.apply(this, arguments);
       }
       return addProductsToOrder;
@@ -4240,17 +4360,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "preservePersistedBundlePriceFields",
     value: function preservePersistedBundlePriceFields(previousBundles, nextBundles) {
-      var _this27 = this;
+      var _this28 = this;
       if (!Array.isArray(nextBundles)) return nextBundles;
       if (!Array.isArray(previousBundles) || previousBundles.length === 0) return nextBundles;
       var previousByIdentity = new Map();
       previousBundles.forEach(function (bundle) {
-        var identity = _this27.getBundleRuntimeIdentity(bundle);
+        var identity = _this28.getBundleRuntimeIdentity(bundle);
         if (identity) previousByIdentity.set(identity, bundle);
       });
       return nextBundles.map(function (bundle, index) {
         if (!bundle || _typeof(bundle) !== 'object') return bundle;
-        var previous = previousByIdentity.get(_this27.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
+        var previous = previousByIdentity.get(_this28.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
         if (!previous || _typeof(previous) !== 'object') return bundle;
         return _objectSpread(_objectSpread(_objectSpread({}, bundle), (bundle.cover === undefined || bundle.cover === null || bundle.cover === '') && previous.cover !== undefined && previous.cover !== null && previous.cover !== '' ? {
           cover: previous.cover
@@ -4451,21 +4571,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProduct",
     value: function () {
-      var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(params) {
+      var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(params) {
         var tempOrder, updatedProductUid;
-        return _regeneratorRuntime().wrap(function _callee23$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+        return _regeneratorRuntime().wrap(function _callee21$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params);
-              _context25.next = 4;
+              _context23.next = 4;
               return this.applyPromotion();
             case 4:
               this.applyDiscount({
                 reapplyBookingDiscountProductUids: params.allow_booking_discount_reapply && updatedProductUid ? [String(updatedProductUid)] : undefined
               });
               this.sanitizeTempOrderProducts(tempOrder);
-              _context25.next = 8;
+              _context23.next = 8;
               return this.recalculateSummary({
                 createIfMissing: true
               });
@@ -4474,14 +4594,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('updateOrderProduct success', {
                 params: params
               });
-              return _context25.abrupt("return", tempOrder.products);
+              return _context23.abrupt("return", tempOrder.products);
             case 11:
             case "end":
-              return _context25.stop();
+              return _context23.stop();
           }
-        }, _callee23, this);
+        }, _callee21, this);
       }));
-      function updateOrderProduct(_x31) {
+      function updateOrderProduct(_x26) {
         return _updateOrderProduct.apply(this, arguments);
       }
       return updateOrderProduct;
@@ -4489,28 +4609,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProducts",
     value: function () {
-      var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(paramsList) {
-        var _this28 = this;
+      var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(paramsList) {
+        var _this29 = this;
         var tempOrder, reapplyBookingDiscountProductUids;
-        return _regeneratorRuntime().wrap(function _callee24$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+        return _regeneratorRuntime().wrap(function _callee22$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (paramsList.length) {
-                _context26.next = 3;
+                _context24.next = 3;
                 break;
               }
-              return _context26.abrupt("return", tempOrder.products);
+              return _context24.abrupt("return", tempOrder.products);
             case 3:
               reapplyBookingDiscountProductUids = paramsList.reduce(function (acc, params) {
-                var updatedProductUid = _this28.applyOrderProductUpdateToTempOrder(tempOrder, params);
+                var updatedProductUid = _this29.applyOrderProductUpdateToTempOrder(tempOrder, params);
                 // 批量改预约时间时，延迟到最后一次折扣计算里统一恢复已选预约折扣卡。
                 if (params.allow_booking_discount_reapply && updatedProductUid) {
                   acc.push(String(updatedProductUid));
                 }
                 return acc;
               }, []);
-              _context26.next = 6;
+              _context24.next = 6;
               return this.finalizeAfterProductsMutation(tempOrder, {
                 reapplyBookingDiscountProductUids: reapplyBookingDiscountProductUids.length ? reapplyBookingDiscountProductUids : undefined
               });
@@ -4518,14 +4638,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('updateOrderProduct success', {
                 paramsList: paramsList
               });
-              return _context26.abrupt("return", tempOrder.products);
+              return _context24.abrupt("return", tempOrder.products);
             case 8:
             case "end":
-              return _context26.stop();
+              return _context24.stop();
           }
-        }, _callee24, this);
+        }, _callee22, this);
       }));
-      function updateOrderProducts(_x32) {
+      function updateOrderProducts(_x27) {
         return _updateOrderProducts.apply(this, arguments);
       }
       return updateOrderProducts;
@@ -4533,14 +4653,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProductQuantity",
     value: function () {
-      var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(params) {
+      var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(params) {
         var _targetProduct$metada17;
         var product_id, product_variant_id, num, unique_identification_number, identity_key, product_sku, product_bundle, tempOrder, identityLookup, productIndex, targetUid, targetProduct, normalizedProduct;
-        return _regeneratorRuntime().wrap(function _callee25$(_context27) {
-          while (1) switch (_context27.prev = _context27.next) {
+        return _regeneratorRuntime().wrap(function _callee23$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             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
@@ -4566,11 +4687,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 productIndex = getProductIdentityIndex(tempOrder.products, identityLookup);
               }
               if (!(productIndex === -1)) {
-                _context27.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),
@@ -4580,28 +4701,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }));
               normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
               tempOrder.products[productIndex] = normalizedProduct;
-              _context27.next = 18;
+              _context25.next = 19;
               return this.applyPromotion();
-            case 18:
+            case 19:
               this.applyDiscount();
               this.sanitizeTempOrderProducts(tempOrder);
-              _context27.next = 22;
+              _context25.next = 23;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 22:
+            case 23:
               this.persistTempOrder();
               this.logInfo('updateOrderProductQuantity success', {
                 params: params
               });
-              return _context27.abrupt("return", tempOrder.products);
-            case 25:
+              return _context25.abrupt("return", tempOrder.products);
+            case 26:
             case "end":
-              return _context27.stop();
+              return _context25.stop();
           }
-        }, _callee25, this);
+        }, _callee23, this);
       }));
-      function updateOrderProductQuantity(_x33) {
+      function updateOrderProductQuantity(_x28) {
         return _updateOrderProductQuantity.apply(this, arguments);
       }
       return updateOrderProductQuantity;
@@ -4642,19 +4763,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "finalizeAfterProductsMutation",
     value: (function () {
-      var _finalizeAfterProductsMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(tempOrder, options) {
-        return _regeneratorRuntime().wrap(function _callee26$(_context28) {
-          while (1) switch (_context28.prev = _context28.next) {
+      var _finalizeAfterProductsMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(tempOrder, options) {
+        return _regeneratorRuntime().wrap(function _callee24$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
               this.syncTempOrderHolderFromBookings(tempOrder);
-              _context28.next = 3;
+              _context26.next = 3;
               return this.applyPromotion();
             case 3:
               this.applyDiscount({
                 reapplyBookingDiscountProductUids: options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids
               });
               this.sanitizeTempOrderProducts(tempOrder);
-              _context28.next = 7;
+              _context26.next = 7;
               return this.recalculateSummary({
                 createIfMissing: true
               });
@@ -4662,11 +4783,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.persistTempOrder();
             case 8:
             case "end":
-              return _context28.stop();
+              return _context26.stop();
           }
-        }, _callee26, this);
+        }, _callee24, this);
       }));
-      function finalizeAfterProductsMutation(_x34, _x35) {
+      function finalizeAfterProductsMutation(_x29, _x30) {
         return _finalizeAfterProductsMutation.apply(this, arguments);
       }
       return finalizeAfterProductsMutation;
@@ -4681,19 +4802,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeProductsFromOrder",
     value: (function () {
-      var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(identities, options) {
-        var _this29 = this;
+      var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(identities, options) {
+        var _this30 = this;
         var tempOrder, productsBeforeRemove, bookingsBeforeRemove, preserveDisplayPosition, anchorIndex, productsAfterAnchor, matchedProducts, removedProducts, _i2, _removedProducts, product, linkedBookingUidsToRemove, _iterator21, _step21, _loop3, remainingProductIndex, remainingProduct, nextProduct, productsWithoutRemaining, nextProductIndex;
-        return _regeneratorRuntime().wrap(function _callee27$(_context30) {
-          while (1) switch (_context30.prev = _context30.next) {
+        return _regeneratorRuntime().wrap(function _callee25$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
+              this.repairDuplicateProductLineIdentities(tempOrder);
               if (identities.length) {
-                _context30.next = 3;
+                _context28.next = 4;
                 break;
               }
-              return _context30.abrupt("return", tempOrder.products);
-            case 3:
+              return _context28.abrupt("return", tempOrder.products);
+            case 4:
               productsBeforeRemove = tempOrder.products || [];
               bookingsBeforeRemove = tempOrder.bookings || [];
               preserveDisplayPosition = options === null || options === void 0 ? void 0 : options.preserveDisplayPosition;
@@ -4722,29 +4844,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               linkedBookingUidsToRemove = new Set();
               _iterator21 = _createForOfIteratorHelper(matchedProducts);
-              _context30.prev = 14;
+              _context28.prev = 15;
               _loop3 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop3() {
                 var _metadata11, _metadata12, _metadata13, _metadata14;
                 var product, productUid, productBookingUid, isAddTimeProduct;
-                return _regeneratorRuntime().wrap(function _loop3$(_context29) {
-                  while (1) switch (_context29.prev = _context29.next) {
+                return _regeneratorRuntime().wrap(function _loop3$(_context27) {
+                  while (1) switch (_context27.prev = _context27.next) {
                     case 0:
                       product = _step21.value;
                       productUid = (product === null || product === void 0 || (_metadata11 = product.metadata) === null || _metadata11 === void 0 ? void 0 : _metadata11.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
                       productBookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_metadata12 = product.metadata) === null || _metadata12 === void 0 ? void 0 : _metadata12.booking_uid);
                       isAddTimeProduct = (product === null || product === void 0 || (_metadata13 = product.metadata) === null || _metadata13 === void 0 ? void 0 : _metadata13.product_add_schedule_time) !== undefined && (product === null || product === void 0 || (_metadata14 = product.metadata) === null || _metadata14 === void 0 ? void 0 : _metadata14.product_add_schedule_time) !== null;
                       if (!isAddTimeProduct) {
-                        _context29.next = 6;
+                        _context27.next = 6;
                         break;
                       }
-                      return _context29.abrupt("return", 1);
+                      return _context27.abrupt("return", 1);
                     case 6:
                       if (productBookingUid !== undefined && productBookingUid !== null && productBookingUid !== '') {
                         linkedBookingUidsToRemove.add(String(productBookingUid));
                       }
                       if (productUid !== undefined && productUid !== null && productUid !== '') {
                         bookingsBeforeRemove.forEach(function (booking) {
-                          var bookingUid = _this29.getBookingUniqueIdentificationNumber(booking);
+                          var bookingUid = _this30.getBookingUniqueIdentificationNumber(booking);
                           if (bookingUid && String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === String(productUid)) {
                             linkedBookingUidsToRemove.add(bookingUid);
                           }
@@ -4752,38 +4874,38 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }
                     case 8:
                     case "end":
-                      return _context29.stop();
+                      return _context27.stop();
                   }
                 }, _loop3);
               });
               _iterator21.s();
-            case 17:
+            case 18:
               if ((_step21 = _iterator21.n()).done) {
-                _context30.next = 23;
+                _context28.next = 24;
                 break;
               }
-              return _context30.delegateYield(_loop3(), "t0", 19);
-            case 19:
-              if (!_context30.t0) {
-                _context30.next = 21;
+              return _context28.delegateYield(_loop3(), "t0", 20);
+            case 20:
+              if (!_context28.t0) {
+                _context28.next = 22;
                 break;
               }
-              return _context30.abrupt("continue", 21);
-            case 21:
-              _context30.next = 17;
+              return _context28.abrupt("continue", 22);
+            case 22:
+              _context28.next = 18;
               break;
-            case 23:
-              _context30.next = 28;
+            case 24:
+              _context28.next = 29;
               break;
-            case 25:
-              _context30.prev = 25;
-              _context30.t1 = _context30["catch"](14);
-              _iterator21.e(_context30.t1);
-            case 28:
-              _context30.prev = 28;
+            case 26:
+              _context28.prev = 26;
+              _context28.t1 = _context28["catch"](15);
+              _iterator21.e(_context28.t1);
+            case 29:
+              _context28.prev = 29;
               _iterator21.f();
-              return _context30.finish(28);
-            case 31:
+              return _context28.finish(29);
+            case 32:
               if (linkedBookingUidsToRemove.size > 0) {
                 // 删除主预约商品时，同步移除挂在同一 booking_uid 下的加时商品，避免残留孤儿行。
                 tempOrder.products = (tempOrder.products || []).filter(function (line) {
@@ -4809,20 +4931,20 @@ 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]);
                 }
               }
-              _context30.next = 35;
+              _context28.next = 36;
               return this.finalizeAfterProductsMutation(tempOrder);
-            case 35:
+            case 36:
               this.logInfo('removeProductsFromOrder success', {
                 identities: identities
               });
-              return _context30.abrupt("return", tempOrder.products);
-            case 37:
+              return _context28.abrupt("return", tempOrder.products);
+            case 38:
             case "end":
-              return _context30.stop();
+              return _context28.stop();
           }
-        }, _callee27, this, [[14, 25, 28, 31]]);
+        }, _callee25, this, [[15, 26, 29, 32]]);
       }));
-      function removeProductsFromOrder(_x36, _x37) {
+      function removeProductsFromOrder(_x31, _x32) {
         return _removeProductsFromOrder.apply(this, arguments);
       }
       return removeProductsFromOrder;
@@ -4830,18 +4952,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeProductFromOrder",
     value: function () {
-      var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(identity, options) {
-        return _regeneratorRuntime().wrap(function _callee28$(_context31) {
-          while (1) switch (_context31.prev = _context31.next) {
+      var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(identity, options) {
+        return _regeneratorRuntime().wrap(function _callee26$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
-              return _context31.abrupt("return", this.removeProductsFromOrder([identity], options));
+              return _context29.abrupt("return", this.removeProductsFromOrder([identity], options));
             case 1:
             case "end":
-              return _context31.stop();
+              return _context29.stop();
           }
-        }, _callee28, this);
+        }, _callee26, this);
       }));
-      function removeProductFromOrder(_x38, _x39) {
+      function removeProductFromOrder(_x33, _x34) {
         return _removeProductFromOrder.apply(this, arguments);
       }
       return removeProductFromOrder;
@@ -4853,10 +4975,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clearOrderCartLines",
     value: (function () {
-      var _clearOrderCartLines = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
+      var _clearOrderCartLines = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27() {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee29$(_context32) {
-          while (1) switch (_context32.prev = _context32.next) {
+        return _regeneratorRuntime().wrap(function _callee27$(_context30) {
+          while (1) switch (_context30.prev = _context30.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               tempOrder.products = [];
@@ -4867,24 +4989,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   productsByUid: {}
                 });
               }
-              _context32.next = 7;
+              _context30.next = 7;
               return this.applyPromotion();
             case 7:
               this.applyDiscount();
               this.sanitizeTempOrderProducts(tempOrder);
-              _context32.next = 11;
+              _context30.next = 11;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 11:
               this.persistTempOrder();
               this.logInfo('clearOrderCartLines success', {});
-              return _context32.abrupt("return", tempOrder);
+              return _context30.abrupt("return", tempOrder);
             case 14:
             case "end":
-              return _context32.stop();
+              return _context30.stop();
           }
-        }, _callee29, this);
+        }, _callee27, this);
       }));
       function clearOrderCartLines() {
         return _clearOrderCartLines.apply(this, arguments);
@@ -4922,17 +5044,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyLocalPrintOrderNumbers",
     value: function () {
-      var _applyLocalPrintOrderNumbers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(order) {
+      var _applyLocalPrintOrderNumbers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(order) {
         var tempOrder, shopOrderNumber, shopFullOrderNumber;
-        return _regeneratorRuntime().wrap(function _callee30$(_context33) {
-          while (1) switch (_context33.prev = _context33.next) {
+        return _regeneratorRuntime().wrap(function _callee28$(_context31) {
+          while (1) switch (_context31.prev = _context31.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (!(!order || _typeof(order) !== 'object')) {
-                _context33.next = 3;
+                _context31.next = 3;
                 break;
               }
-              return _context33.abrupt("return", tempOrder);
+              return _context31.abrupt("return", tempOrder);
             case 3:
               shopOrderNumber = order.shop_order_number;
               shopFullOrderNumber = order.shop_full_order_number;
@@ -4943,17 +5065,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.shop_full_order_number = String(shopFullOrderNumber);
               }
               this.persistTempOrder();
-              _context33.next = 10;
+              _context31.next = 10;
               return this.saveDraft();
             case 10:
-              return _context33.abrupt("return", tempOrder);
+              return _context31.abrupt("return", tempOrder);
             case 11:
             case "end":
-              return _context33.stop();
+              return _context31.stop();
           }
-        }, _callee30, this);
+        }, _callee28, this);
       }));
-      function applyLocalPrintOrderNumbers(_x40) {
+      function applyLocalPrintOrderNumbers(_x35) {
         return _applyLocalPrintOrderNumbers.apply(this, arguments);
       }
       return applyLocalPrintOrderNumbers;
@@ -4961,35 +5083,35 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "saveTempOrderAsDraft",
     value: function () {
-      var _saveTempOrderAsDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(params) {
+      var _saveTempOrderAsDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(params) {
         var _params$cacheId2, _this$otherParams6, _this$otherParams7, _this$otherParams8, _params$type, _this$otherParams9, _payload$products;
         var tempOrder, latestSummary, payload;
-        return _regeneratorRuntime().wrap(function _callee31$(_context34) {
-          while (1) switch (_context34.prev = _context34.next) {
+        return _regeneratorRuntime().wrap(function _callee29$(_context32) {
+          while (1) switch (_context32.prev = _context32.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               this.ensureExternalSaleNumber(tempOrder);
               this.persistTempOrder();
-              _context34.next = 5;
+              _context32.next = 5;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 5:
-              _context34.t1 = _context34.sent;
-              if (_context34.t1) {
-                _context34.next = 8;
+              _context32.t1 = _context32.sent;
+              if (_context32.t1) {
+                _context32.next = 8;
                 break;
               }
-              _context34.t1 = this.store.summary;
+              _context32.t1 = this.store.summary;
             case 8:
-              _context34.t0 = _context34.t1;
-              if (_context34.t0) {
-                _context34.next = 11;
+              _context32.t0 = _context32.t1;
+              if (_context32.t0) {
+                _context32.next = 11;
                 break;
               }
-              _context34.t0 = createEmptySummary();
+              _context32.t0 = createEmptySummary();
             case 11:
-              latestSummary = _context34.t0;
+              latestSummary = _context32.t0;
               payload = buildSubmitPayload({
                 tempOrder: tempOrder,
                 cacheId: (_params$cacheId2 = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId2 !== void 0 ? _params$cacheId2 : this.cacheId,
@@ -5010,17 +5132,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 externalSaleNumber: payload.external_sale_number,
                 productsCount: ((_payload$products = payload.products) === null || _payload$products === void 0 ? void 0 : _payload$products.length) || 0
               });
-              return _context34.abrupt("return", this.request.post('/order/sales/draft', payload, {
+              return _context32.abrupt("return", this.request.post('/order/sales/draft', payload, {
                 osServer: true,
                 customToast: function customToast() {}
               }));
             case 18:
             case "end":
-              return _context34.stop();
+              return _context32.stop();
           }
-        }, _callee31, this);
+        }, _callee29, this);
       }));
-      function saveTempOrderAsDraft(_x41) {
+      function saveTempOrderAsDraft(_x36) {
         return _saveTempOrderAsDraft.apply(this, arguments);
       }
       return saveTempOrderAsDraft;
@@ -5034,18 +5156,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitTempOrder",
     value: (function () {
-      var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(params) {
-        return _regeneratorRuntime().wrap(function _callee32$(_context35) {
-          while (1) switch (_context35.prev = _context35.next) {
+      var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(params) {
+        return _regeneratorRuntime().wrap(function _callee30$(_context33) {
+          while (1) switch (_context33.prev = _context33.next) {
             case 0:
-              return _context35.abrupt("return", this.runSubmitTempOrder(params));
+              return _context33.abrupt("return", this.runSubmitTempOrder(params));
             case 1:
             case "end":
-              return _context35.stop();
+              return _context33.stop();
           }
-        }, _callee32, this);
+        }, _callee30, this);
       }));
-      function submitTempOrder(_x42) {
+      function submitTempOrder(_x37) {
         return _submitTempOrder.apply(this, arguments);
       }
       return submitTempOrder;
@@ -5053,20 +5175,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitTempOrderAsync",
     value: function () {
-      var _submitTempOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(params) {
-        return _regeneratorRuntime().wrap(function _callee33$(_context36) {
-          while (1) switch (_context36.prev = _context36.next) {
+      var _submitTempOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(params) {
+        return _regeneratorRuntime().wrap(function _callee31$(_context34) {
+          while (1) switch (_context34.prev = _context34.next) {
             case 0:
-              return _context36.abrupt("return", this.runSubmitTempOrder(_objectSpread(_objectSpread({}, params), {}, {
+              return _context34.abrupt("return", this.runSubmitTempOrder(_objectSpread(_objectSpread({}, params), {}, {
                 syncMode: true
               })));
             case 1:
             case "end":
-              return _context36.stop();
+              return _context34.stop();
           }
-        }, _callee33, this);
+        }, _callee31, this);
       }));
-      function submitTempOrderAsync(_x43) {
+      function submitTempOrderAsync(_x38) {
         return _submitTempOrderAsync.apply(this, arguments);
       }
       return submitTempOrderAsync;
@@ -5074,11 +5196,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "runSubmitTempOrder",
     value: function () {
-      var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(params) {
+      var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(params) {
         var _params$cacheId3, _this$otherParams10, _ref73, _ref74, _submitSnapshot$busin, _this$otherParams11, _this$otherParams12, _submitSnapshot$type;
         var tempOrder, shouldConfirmPendingVoucherPayments, hasPaymentOverride, preparedPaymentOverride, latestSummary, effectiveCacheId, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, submitSnapshot, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
-        return _regeneratorRuntime().wrap(function _callee34$(_context37) {
-          while (1) switch (_context37.prev = _context37.next) {
+        return _regeneratorRuntime().wrap(function _callee32$(_context35) {
+          while (1) switch (_context35.prev = _context35.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               shouldConfirmPendingVoucherPayments = (params === null || params === void 0 ? void 0 : params.confirmPendingVoucherPayments) !== false;
@@ -5098,26 +5220,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               this.persistTempOrder();
-              _context37.next = 8;
+              _context35.next = 8;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 8:
-              _context37.t1 = _context37.sent;
-              if (_context37.t1) {
-                _context37.next = 11;
+              _context35.t1 = _context35.sent;
+              if (_context35.t1) {
+                _context35.next = 11;
                 break;
               }
-              _context37.t1 = this.store.summary;
+              _context35.t1 = this.store.summary;
             case 11:
-              _context37.t0 = _context37.t1;
-              if (_context37.t0) {
-                _context37.next = 14;
+              _context35.t0 = _context35.t1;
+              if (_context35.t0) {
+                _context35.next = 14;
                 break;
               }
-              _context37.t0 = createEmptySummary();
+              _context35.t0 = createEmptySummary();
             case 14:
-              latestSummary = _context37.t0;
+              latestSummary = _context35.t0;
               effectiveCacheId = (_params$cacheId3 = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId3 !== void 0 ? _params$cacheId3 : this.cacheId;
               hasPaymentStatusOverride = (params === null || params === void 0 ? void 0 : params.paymentStatus) !== undefined;
               hasSmallTicketDataFlagOverride = (params === null || params === void 0 ? void 0 : params.smallTicketDataFlag) !== undefined;
@@ -5152,10 +5274,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!payload.created_at) {
                 payload.created_at = dayjs().format('YYYY-MM-DD HH:mm:ss');
               }
-              _context37.next = 26;
+              _context35.next = 26;
               return this.saveDraft();
             case 26:
-              _context37.prev = 26;
+              _context35.prev = 26;
               this.logInfo('submitTempOrder calling sales checkout', {
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
@@ -5165,43 +5287,43 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 smallTicketDataFlag: payload.small_ticket_data_flag,
                 syncMode: payload.sync_mode
               });
-              _context37.next = 30;
+              _context35.next = 30;
               return this.submitSalesOrder({
                 query: payload
               });
             case 30:
-              result = _context37.sent;
-              _context37.next = 43;
+              result = _context35.sent;
+              _context35.next = 43;
               break;
             case 33:
-              _context37.prev = 33;
-              _context37.t2 = _context37["catch"](26);
-              backendErrorResponse = this.extractSubmitErrorResponse(_context37.t2);
+              _context35.prev = 33;
+              _context35.t2 = _context35["catch"](26);
+              backendErrorResponse = this.extractSubmitErrorResponse(_context35.t2);
               if (!backendErrorResponse) {
-                _context37.next = 40;
+                _context35.next = 40;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
-              return _context37.abrupt("return", backendErrorResponse);
+              return _context35.abrupt("return", backendErrorResponse);
             case 40:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
-                error: _context37.t2 instanceof Error ? _context37.t2.message : String(_context37.t2),
+                error: _context35.t2 instanceof Error ? _context35.t2.message : String(_context35.t2),
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
                 paymentStatus: payload.payment_status,
                 paymentsCount: ((_payload$payments2 = payload.payments) === null || _payload$payments2 === void 0 ? void 0 : _payload$payments2.length) || 0
               });
-              throw _context37.t2;
+              throw _context35.t2;
             case 43:
               if (!this.isSubmitResponseRejected(result)) {
-                _context37.next = 47;
+                _context35.next = 47;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
-              return _context37.abrupt("return", result);
+              return _context35.abrupt("return", result);
             case 47:
               submittedOrderId = this.extractOrderIdFromSubmitResult(result);
               this.logInfo('runSubmitTempOrder: 提交成功', {
@@ -5212,15 +5334,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 })
               });
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
-                _context37.next = 56;
+                _context35.next = 56;
                 break;
               }
               tempOrder.order_id = submittedOrderId;
               resultRecord = result;
-              _context37.next = 54;
+              _context35.next = 54;
               return this.markLocalOrderSynced(submittedOrderId, (resultRecord === null || resultRecord === void 0 ? void 0 : resultRecord.data) || resultRecord || {});
             case 54:
-              _context37.next = 57;
+              _context35.next = 57;
               break;
             case 56:
               if (this.isLocalPendingSubmitResult(result)) {
@@ -5229,14 +5351,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 this.store.syncState = 'submitted';
               }
             case 57:
-              return _context37.abrupt("return", result);
+              return _context35.abrupt("return", result);
             case 58:
             case "end":
-              return _context37.stop();
+              return _context35.stop();
           }
-        }, _callee34, this, [[26, 33]]);
+        }, _callee32, this, [[26, 33]]);
       }));
-      function runSubmitTempOrder(_x44) {
+      function runSubmitTempOrder(_x39) {
         return _runSubmitTempOrder.apply(this, arguments);
       }
       return runSubmitTempOrder;
@@ -5244,10 +5366,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "markLocalOrderSynced",
     value: function () {
-      var _markLocalOrderSynced = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35(orderId, remoteOrder) {
+      var _markLocalOrderSynced = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(orderId, remoteOrder) {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee35$(_context38) {
-          while (1) switch (_context38.prev = _context38.next) {
+        return _regeneratorRuntime().wrap(function _callee33$(_context36) {
+          while (1) switch (_context36.prev = _context36.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               tempOrder.order_id = orderId;
@@ -5255,15 +5377,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.store.lastOrderInfo = remoteOrder;
               this.store.syncState = 'submitted';
               this.persistTempOrder();
-              _context38.next = 8;
+              _context36.next = 8;
               return this.saveDraft();
             case 8:
             case "end":
-              return _context38.stop();
+              return _context36.stop();
           }
-        }, _callee35, this);
+        }, _callee33, this);
       }));
-      function markLocalOrderSynced(_x45, _x46) {
+      function markLocalOrderSynced(_x40, _x41) {
         return _markLocalOrderSynced.apply(this, arguments);
       }
       return markLocalOrderSynced;
@@ -5306,10 +5428,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function extractSubmitErrorResponse(error) {
       var _error$response,
         _error$response2,
-        _this30 = this;
+        _this31 = this;
       var candidates = [error === null || error === void 0 || (_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.data, error === null || error === void 0 ? void 0 : error.data, error === null || error === void 0 || (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : _error$response2.body, error === null || error === void 0 ? void 0 : error.body];
       return candidates.find(function (candidate) {
-        return _this30.isSubmitErrorResponse(candidate);
+        return _this31.isSubmitErrorResponse(candidate);
       }) || null;
     }
   }, {
@@ -5336,33 +5458,33 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncPaymentsToOrder",
     value: function () {
-      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
-        var _this31 = this,
+      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(params) {
+        var _this32 = this,
           _params$confirmPendin;
-        var tempOrder, needsPaymentNumber, devicePrefix, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, orderPaidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, submitResult;
-        return _regeneratorRuntime().wrap(function _callee36$(_context39) {
-          while (1) switch (_context39.prev = _context39.next) {
+        var tempOrder, needsPaymentNumber, devicePrefix, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, orderPaidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, submitParams, submitResult;
+        return _regeneratorRuntime().wrap(function _callee34$(_context37) {
+          while (1) switch (_context37.prev = _context37.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               needsPaymentNumber = (params.payments || []).some(function (payment) {
                 return String(payment.payment_number || '').trim() === '';
               });
               if (!needsPaymentNumber) {
-                _context39.next = 8;
+                _context37.next = 8;
                 break;
               }
-              _context39.next = 5;
+              _context37.next = 5;
               return this.getPaymentNumberDevicePrefixAsync();
             case 5:
-              _context39.t0 = _context39.sent;
-              _context39.next = 9;
+              _context37.t0 = _context37.sent;
+              _context37.next = 9;
               break;
             case 8:
-              _context39.t0 = 'LOCAL';
+              _context37.t0 = 'LOCAL';
             case 9:
-              devicePrefix = _context39.t0;
+              devicePrefix = _context37.t0;
               mappedPayments = mapPaymentItemsToOrderPayments((params.payments || []).map(function (payment) {
-                return _this31.normalizePaymentSource(payment, {
+                return _this32.normalizePaymentSource(payment, {
                   defaultPaid: false,
                   devicePrefix: devicePrefix
                 });
@@ -5375,25 +5497,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               tempOrder.payments = effectivePayments;
               tempOrder.payment_status = paymentStatus;
               this.persistTempOrder();
-              _context39.next = 21;
+              _context37.next = 21;
               return this.saveDraft();
             case 21:
               if (params.submitWhenPaid) {
-                _context39.next = 23;
+                _context37.next = 23;
                 break;
               }
-              return _context39.abrupt("return", completion);
+              return _context37.abrupt("return", completion);
             case 23:
               if (!(this.store.syncState === 'submitting')) {
-                _context39.next = 25;
+                _context37.next = 25;
                 break;
               }
-              return _context39.abrupt("return", completion);
+              return _context37.abrupt("return", completion);
             case 25:
               this.store.syncState = 'submitting';
               paymentSyncIdempotencyToken = this.buildPaymentSyncIdempotencyToken(tempOrder, effectivePayments);
-              _context39.next = 29;
-              return this.submitTempOrder({
+              submitParams = {
                 payments: effectivePayments,
                 paymentStatus: paymentStatus,
                 smallTicketDataFlag: params.smallTicketDataFlag,
@@ -5406,19 +5527,34 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   });
                   return nextPayload;
                 }
-              });
-            case 29:
-              submitResult = _context39.sent;
-              return _context39.abrupt("return", _objectSpread(_objectSpread({}, completion), {}, {
+              };
+              if (!(params.checkoutSyncTaskEnabled === false)) {
+                _context37.next = 34;
+                break;
+              }
+              _context37.next = 31;
+              return this.submitTempOrderAsync(submitParams);
+            case 31:
+              _context37.t1 = _context37.sent;
+              _context37.next = 37;
+              break;
+            case 34:
+              _context37.next = 36;
+              return this.submitTempOrder(submitParams);
+            case 36:
+              _context37.t1 = _context37.sent;
+            case 37:
+              submitResult = _context37.t1;
+              return _context37.abrupt("return", _objectSpread(_objectSpread({}, completion), {}, {
                 submitResult: submitResult
               }));
-            case 31:
+            case 39:
             case "end":
-              return _context39.stop();
+              return _context37.stop();
           }
-        }, _callee36, this);
+        }, _callee34, this);
       }));
-      function syncPaymentsToOrder(_x47) {
+      function syncPaymentsToOrder(_x42) {
         return _syncPaymentsToOrder.apply(this, arguments);
       }
       return syncPaymentsToOrder;
@@ -5426,6 +5562,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createOrder",
     value: function createOrder(params) {
+      var _this33 = this;
       var order = _objectSpread({
         type: (params === null || params === void 0 ? void 0 : params.type) || 'appointment_booking',
         // 要从外面拿，virtual
@@ -5437,11 +5574,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         schedule_date: '',
         is_deposit: 0,
         relation_products: [],
-        relation_forms: []
+        relation_forms: [],
+        business_code: params === null || params === void 0 ? void 0 : params.business_code
       }, (params === null || params === void 0 ? void 0 : params.extraData) || {});
       var is_deposit = 0; // 是否存在定金，0 不存在，1 存在
       if (params.cartItems.length > 0) {
         params.cartItems.forEach(function (item) {
+          var _params$extraData;
           if (!item._origin.duration) {
             var _generateDuration = generateDuration(item),
               duration = _generateDuration.duration,
@@ -5453,6 +5592,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           var discountList = getAllDiscountList(item);
           item._origin.product.discount_list = discountList;
 
+          // 为预约补齐 holder 信息
+          if (params !== null && params !== void 0 && (_params$extraData = params.extraData) !== null && _params$extraData !== void 0 && _params$extraData.is_add_holder_info) {
+            ensureCartItemOriginHolder(item, _this33.window);
+          }
+
           // 购物车是否为普通商品
           if (isNormalProduct(item._origin)) {
             var _order$relation_forms;
@@ -5507,11 +5651,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitOrder",
     value: function () {
-      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(order) {
+      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35(order) {
         var _order$query$cartItem, _params$bookings, _params$relation_prod;
         var url, query, fetchUrl, params;
-        return _regeneratorRuntime().wrap(function _callee37$(_context40) {
-          while (1) switch (_context40.prev = _context40.next) {
+        return _regeneratorRuntime().wrap(function _callee35$(_context38) {
+          while (1) switch (_context38.prev = _context38.next) {
             case 0:
               this.logInfo('submitOrder called', {
                 url: order.url,
@@ -5531,14 +5675,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 relationProductsCount: ((_params$relation_prod = params.relation_products) === null || _params$relation_prod === void 0 ? void 0 : _params$relation_prod.length) || 0,
                 scheduleDate: params.schedule_date
               });
-              return _context40.abrupt("return", this.request.post(fetchUrl, params));
+              return _context38.abrupt("return", this.request.post(fetchUrl, params));
             case 6:
             case "end":
-              return _context40.stop();
+              return _context38.stop();
           }
-        }, _callee37, this);
+        }, _callee35, this);
       }));
-      function submitOrder(_x48) {
+      function submitOrder(_x43) {
         return _submitOrder.apply(this, arguments);
       }
       return submitOrder;
@@ -5546,13 +5690,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "cancelOrder",
     value: function () {
-      var _cancelOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(params) {
+      var _cancelOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
         var payload;
-        return _regeneratorRuntime().wrap(function _callee38$(_context41) {
-          while (1) switch (_context41.prev = _context41.next) {
+        return _regeneratorRuntime().wrap(function _callee36$(_context39) {
+          while (1) switch (_context39.prev = _context39.next) {
             case 0:
               if (!(!Array.isArray(params.order_ids) || params.order_ids.length === 0)) {
-                _context41.next = 2;
+                _context39.next = 2;
                 break;
               }
               throw new Error('取消订单失败：order_ids 不能为空');
@@ -5568,16 +5712,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 method: 'PUT',
                 orderIdsCount: params.order_ids.length
               });
-              return _context41.abrupt("return", this.request.put('/order/update-status', payload, {
+              return _context39.abrupt("return", this.request.put('/order/update-status', payload, {
                 isShopApi: true
               }));
             case 5:
             case "end":
-              return _context41.stop();
+              return _context39.stop();
           }
-        }, _callee38, this);
+        }, _callee36, this);
       }));
-      function cancelOrder(_x49) {
+      function cancelOrder(_x44) {
         return _cancelOrder.apply(this, arguments);
       }
       return cancelOrder;
@@ -5585,19 +5729,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "changeBookingStatus",
     value: function () {
-      var _changeBookingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(params) {
+      var _changeBookingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(params) {
         var url, payload;
-        return _regeneratorRuntime().wrap(function _callee39$(_context42) {
-          while (1) switch (_context42.prev = _context42.next) {
+        return _regeneratorRuntime().wrap(function _callee37$(_context40) {
+          while (1) switch (_context40.prev = _context40.next) {
             case 0:
               if (params.booking_id) {
-                _context42.next = 2;
+                _context40.next = 2;
                 break;
               }
               throw new Error('变更预约状态失败：booking_id 不能为空');
             case 2:
               if (params.appointment_status) {
-                _context42.next = 4;
+                _context40.next = 4;
                 break;
               }
               throw new Error('变更预约状态失败：appointment_status 不能为空');
@@ -5612,16 +5756,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 bookingId: params.booking_id,
                 appointmentStatus: params.appointment_status
               });
-              return _context42.abrupt("return", this.request.put(url, payload, {
+              return _context40.abrupt("return", this.request.put(url, payload, {
                 isShopApi: true
               }));
             case 8:
             case "end":
-              return _context42.stop();
+              return _context40.stop();
           }
-        }, _callee39, this);
+        }, _callee37, this);
       }));
-      function changeBookingStatus(_x50) {
+      function changeBookingStatus(_x45) {
         return _changeBookingStatus.apply(this, arguments);
       }
       return changeBookingStatus;
@@ -5639,11 +5783,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createOrderByCheckout",
     value: (function () {
-      var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(params) {
+      var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(params) {
         var _params$payments, _params$bookings2, _params$relation_prod2, _params$payments2, _params$payments3, _params$bookings3, _params$relation_prod3, _params$payments4;
         var onlineStorePaymentCodeList, _orderData$payments, _orderData$bookings, _orderData$relation_p, _orderData$payments2, _orderData$payments3, _orderData$bookings2, _orderData$relation_p2, _orderData$payments4, _orderData$payments5, _response$data, orderData, response;
-        return _regeneratorRuntime().wrap(function _callee40$(_context43) {
-          while (1) switch (_context43.prev = _context43.next) {
+        return _regeneratorRuntime().wrap(function _callee38$(_context41) {
+          while (1) switch (_context41.prev = _context41.next) {
             case 0:
               // 过滤掉由在线店铺下单的 payment 支付数据
               onlineStorePaymentCodeList = ['WXPAY', 'WECHAT', 'ALIPAY', 'APPLE_PAY', 'CREDIT_CARD_3DS', 'CREDIT_CARD_TOKEN', 'GOOGLE_PAY', 'GOOGLE_PAY_3DS', 'CREDIT_CARD'];
@@ -5677,7 +5821,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 relationProductsCount: ((_params$relation_prod3 = params.relation_products) === null || _params$relation_prod3 === void 0 ? void 0 : _params$relation_prod3.length) || 0,
                 paymentsCount: ((_params$payments4 = params.payments) === null || _params$payments4 === void 0 ? void 0 : _params$payments4.length) || 0
               });
-              _context43.prev = 4;
+              _context41.prev = 4;
               // 构建订单数据，设置默认值并允许 params 覆盖
               orderData = _objectSpread({
                 sales_channel: 'my_pisel',
@@ -5739,13 +5883,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 hasOrderId: !!orderData.order_id,
                 smallTicketDataFlag: orderData.small_ticket_data_flag
               });
-              _context43.next = 12;
+              _context41.next = 12;
               return this.request.post('/order/checkout', orderData, {
                 osServer: true,
                 customToast: function customToast() {}
               });
             case 12:
-              response = _context43.sent;
+              response = _context41.sent;
               this.logInfo('Order API called successfully', {
                 response: response
               });
@@ -5753,22 +5897,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 success: !!response,
                 hasOrderId: !!(response !== null && response !== void 0 && (_response$data = response.data) !== null && _response$data !== void 0 && _response$data.order_id || response !== null && response !== void 0 && response.order_id)
               });
-              return _context43.abrupt("return", response);
+              return _context41.abrupt("return", response);
             case 18:
-              _context43.prev = 18;
-              _context43.t0 = _context43["catch"](4);
-              console.error('[Order] createOrderByCheckout 创建订单失败:', _context43.t0);
+              _context41.prev = 18;
+              _context41.t0 = _context41["catch"](4);
+              console.error('[Order] createOrderByCheckout 创建订单失败:', _context41.t0);
               this.logInfo('Order API called failed', {
-                error: _context43.t0 instanceof Error ? _context43.t0.message : String(_context43.t0)
+                error: _context41.t0 instanceof Error ? _context41.t0.message : String(_context41.t0)
               });
-              throw _context43.t0;
+              throw _context41.t0;
             case 23:
             case "end":
-              return _context43.stop();
+              return _context41.stop();
           }
-        }, _callee40, this, [[4, 18]]);
+        }, _callee38, this, [[4, 18]]);
       }));
-      function createOrderByCheckout(_x51) {
+      function createOrderByCheckout(_x46) {
         return _createOrderByCheckout.apply(this, arguments);
       }
       return createOrderByCheckout;
@@ -5776,24 +5920,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitSalesOrder",
     value: function () {
-      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41(params) {
+      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(params) {
         var url, query, fetchUrl;
-        return _regeneratorRuntime().wrap(function _callee41$(_context44) {
-          while (1) switch (_context44.prev = _context44.next) {
+        return _regeneratorRuntime().wrap(function _callee39$(_context42) {
+          while (1) switch (_context42.prev = _context42.next) {
             case 0:
               url = params.url, query = params.query;
               fetchUrl = url || '/order/sales/checkout';
-              return _context44.abrupt("return", this.request.post(fetchUrl, query, {
+              return _context42.abrupt("return", this.request.post(fetchUrl, query, {
                 osServer: true,
                 customToast: function customToast() {}
               }));
             case 3:
             case "end":
-              return _context44.stop();
+              return _context42.stop();
           }
-        }, _callee41, this);
+        }, _callee39, this);
       }));
-      function submitSalesOrder(_x52) {
+      function submitSalesOrder(_x47) {
         return _submitSalesOrder.apply(this, arguments);
       }
       return submitSalesOrder;
@@ -5807,37 +5951,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sendCustomerPayLink",
     value: (function () {
-      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee42(params) {
+      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(params) {
         var _params$emails;
         var orderIds;
-        return _regeneratorRuntime().wrap(function _callee42$(_context45) {
-          while (1) switch (_context45.prev = _context45.next) {
+        return _regeneratorRuntime().wrap(function _callee40$(_context43) {
+          while (1) switch (_context43.prev = _context43.next) {
             case 0:
               orderIds = params.order_ids || params.orderIds || [];
               if (orderIds.length) {
-                _context45.next = 3;
+                _context43.next = 3;
                 break;
               }
               throw new Error('发送支付链接前必须先提交本地订单并取得订单 ID');
             case 3:
               if ((_params$emails = params.emails) !== null && _params$emails !== void 0 && _params$emails.length) {
-                _context45.next = 5;
+                _context43.next = 5;
                 break;
               }
               throw new Error('发送支付链接需要至少一个邮箱');
             case 5:
-              return _context45.abrupt("return", this.request.post('/order/batch-email', {
+              return _context43.abrupt("return", this.request.post('/order/batch-email', {
                 order_ids: orderIds,
                 notify_action: params.notify_action || 'order_payment_reminder',
                 emails: params.emails
               }));
             case 6:
             case "end":
-              return _context45.stop();
+              return _context43.stop();
           }
-        }, _callee42, this);
+        }, _callee40, this);
       }));
-      function sendCustomerPayLink(_x53) {
+      function sendCustomerPayLink(_x48) {
         return _sendCustomerPayLink.apply(this, arguments);
       }
       return sendCustomerPayLink;
@@ -5845,14 +5989,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getSalesOrderByLookup",
     value: function () {
-      var _getSalesOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43(params) {
+      var _getSalesOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41(params) {
         var lookup, res;
-        return _regeneratorRuntime().wrap(function _callee43$(_context46) {
-          while (1) switch (_context46.prev = _context46.next) {
+        return _regeneratorRuntime().wrap(function _callee41$(_context44) {
+          while (1) switch (_context44.prev = _context44.next) {
             case 0:
               lookup = params.lookup === undefined || params.lookup === null ? '' : String(params.lookup).trim();
               if (lookup) {
-                _context46.next = 3;
+                _context44.next = 3;
                 break;
               }
               throw new Error('加载销售详情需要 lookup');
@@ -5861,7 +6005,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (lookup.startsWith('LOCAL_')) {
                 params.forceRemote = false;
               }
-              _context46.next = 6;
+              _context44.next = 6;
               return this.request.get("/order/sales/".concat(encodeURIComponent(lookup)), _objectSpread({
                 with: ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info', 'refunds']
               }, params.forceRemote ? {
@@ -5870,18 +6014,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 osServer: true
               });
             case 6:
-              res = _context46.sent;
+              res = _context44.sent;
               if (res.code === 200) {
                 this.store.lastOrderInfo = res.data;
               }
-              return _context46.abrupt("return", res);
+              return _context44.abrupt("return", res);
             case 9:
             case "end":
-              return _context46.stop();
+              return _context44.stop();
           }
-        }, _callee43, this);
+        }, _callee41, this);
       }));
-      function getSalesOrderByLookup(_x54) {
+      function getSalesOrderByLookup(_x49) {
         return _getSalesOrderByLookup.apply(this, arguments);
       }
       return getSalesOrderByLookup;
@@ -5895,37 +6039,84 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hydrateTempOrderFromRecord",
     value: (function () {
-      var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee44(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;
-        return _regeneratorRuntime().wrap(function _callee44$(_context47) {
-          while (1) switch (_context47.prev = _context47.next) {
+      var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee42(record, options) {
+        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,
@@ -5935,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
               });
@@ -5956,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;
               });
@@ -5969,34 +6159,34 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               nextDiscounts = [].concat(_toConsumableArray(hydratedEditDiscounts), _toConsumableArray(retainedScanDiscounts));
               shouldSkipEmptyDiscountSync = nextDiscounts.length === 0 && currentDiscounts.length === 0;
               if (shouldSkipEmptyDiscountSync) {
-                _context47.next = 31;
+                _context45.next = 52;
                 break;
               }
               OrderModule.populateSavedAmounts(nextTempOrder.products, nextDiscounts);
-              _context47.next = 29;
-              return (_this$store$discount21 = this.store.discount) === null || _this$store$discount21 === void 0 ? void 0 : _this$store$discount21.setOriginalDiscountList(nextDiscounts);
-            case 29:
-              _context47.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)) {
-                _context47.next = 34;
+                _context45.next = 55;
                 break;
               }
-              _context47.next = 34;
+              _context45.next = 55;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 34:
+            case 55:
               this.persistTempOrder();
-              return _context47.abrupt("return", nextTempOrder);
-            case 36:
+              return _context45.abrupt("return", nextTempOrder);
+            case 57:
             case "end":
-              return _context47.stop();
+              return _context45.stop();
           }
-        }, _callee44, this);
+        }, _callee42, this);
       }));
-      function hydrateTempOrderFromRecord(_x55, _x56) {
+      function hydrateTempOrderFromRecord(_x50, _x51) {
         return _hydrateTempOrderFromRecord.apply(this, arguments);
       }
       return hydrateTempOrderFromRecord;
@@ -6049,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;
           }
@@ -6110,7 +6300,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeTempOrderForRuntime",
     value: function normalizeTempOrderForRuntime(raw, options) {
-      var _this32 = this;
+      var _this34 = this;
       var runtimeRaw = this.withoutSyntheticDraftOrderIdForRuntime(raw);
       var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), runtimeRaw || {});
       // ES 列表详情使用 id 表示订单主键；OS 详情态统一依赖 order_id 驱动操作按钮。
@@ -6134,12 +6324,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       nextTempOrder.holder = raw.holder && _typeof(raw.holder) === 'object' ? _objectSpread({}, raw.holder) : null;
       var rawProducts = Array.isArray(raw.products) ? raw.products : [];
       nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map(function (p) {
-        return _this32.normalizeHydratedOrderProduct(p, {
+        return _this34.normalizeHydratedOrderProduct(p, {
           makeEditMark: options === null || options === void 0 ? void 0 : options.makeEditMark
         });
       }) : [];
       nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map(function (b) {
-        var booking = _this32.normalizeHydratedBookingHolder(b || {});
+        var booking = _this34.normalizeHydratedBookingHolder(b || {});
         return _objectSpread(_objectSpread({}, booking), {}, {
           is_all: normalizeBookingIsAll(booking),
           sub_type: normalizeBookingSubType(booking)
@@ -6169,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;
@@ -6228,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);
         }
@@ -6250,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;
@@ -6326,7 +6516,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedOrderProduct",
     value: function normalizeHydratedOrderProduct(product, options) {
-      var _this33 = this;
+      var _this35 = this;
       var row = _objectSpread({}, product || {});
       if (row.num === undefined && row.product_quantity !== undefined) {
         row.num = row.product_quantity;
@@ -6334,12 +6524,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var productSku = ensureProductSku(row);
       row.product_sku = _objectSpread(_objectSpread({}, productSku), {}, {
         option: normalizeProductSkuOptions(productSku.option.map(function (optionItem) {
-          return _this33.normalizeHydratedProductOptionItem(optionItem || {});
+          return _this35.normalizeHydratedProductOptionItem(optionItem || {});
         }))
       });
       delete row["product_".concat('option', "_item")];
       if (!Array.isArray(row.product_bundle)) row.product_bundle = [];
-      if (!row.metadata || _typeof(row.metadata) !== 'object') row.metadata = {};
+      row.metadata = row.metadata && _typeof(row.metadata) === 'object' ? _objectSpread({}, row.metadata) : {};
+      // bundle_edit 只描述当前编辑会话中的套餐修改状态，不能从本地缓存或详情响应带入新会话。
+      delete row.bundle_edit;
+      delete row.metadata.bundle_edit;
       if (row.booking_uid && !row.metadata.booking_uid) {
         row.metadata.booking_uid = row.booking_uid;
       }
@@ -6371,27 +6564,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderInfo",
     value: function () {
-      var _getOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee45(order_id) {
+      var _getOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43(order_id) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee45$(_context48) {
-          while (1) switch (_context48.prev = _context48.next) {
+        return _regeneratorRuntime().wrap(function _callee43$(_context46) {
+          while (1) switch (_context46.prev = _context46.next) {
             case 0:
-              _context48.next = 2;
+              _context46.next = 2;
               return this.request.get("/order/sales/".concat(order_id), {
                 with: ['products', 'bookings']
               }, {
                 osServer: true
               });
             case 2:
-              res = _context48.sent;
-              return _context48.abrupt("return", res);
+              res = _context46.sent;
+              return _context46.abrupt("return", res);
             case 4:
             case "end":
-              return _context48.stop();
+              return _context46.stop();
           }
-        }, _callee45, this);
+        }, _callee43, this);
       }));
-      function getOrderInfo(_x57) {
+      function getOrderInfo(_x52) {
         return _getOrderInfo.apply(this, arguments);
       }
       return getOrderInfo;