@pisell/pisellos 2.2.171 → 2.2.173

package/dist/modules/Order/index.js

@@ -26,10 +26,11 @@ 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 { generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments } from "./utils";
+import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, sumOptionUnitPrice, clearTempOrderHolderAssignments } from "./utils";
 import { isNormalProduct } from "../Product/utils";
 import dayjs from 'dayjs';
 import { buildProductLineFingerprint, getProductIdentityIndex, getSafeProductNum, isIdentityMatch, normalizeOrderProduct } from "../../solution/ScanOrder/utils";
+import { syncManualProductDiscountProductNum } from "./utils/manualProductDiscount";
 import { DiscountModule } from "../Discount";
 import { RulesModule } from "../Rules";
 import { UnavailableReason } from "../Rules/types";
@@ -59,6 +60,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     return _this;
   }
   _createClass(OrderModule, [{
+    key: "applyProductDiscountPrices",
+    value: function applyProductDiscountPrices(products) {
+      return (products || []).map(function (product) {
+        var _product$metadata, _product$metadata$sou, _product$metadata2, _product$metadata3, _product$original_pri;
+        if ((_product$metadata = product.metadata) !== null && _product$metadata !== void 0 && _product$metadata.is_manual_discount) return product;
+        var totalPerUnitDiscount = (product.discount_list || []).reduce(function (sum, discount) {
+          return sum + Number(discount.amount || 0);
+        }, 0);
+        var optionSum = sumOptionUnitPrice(product.product_option_item);
+        var sourcePrice = (_product$metadata$sou = (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.source_product_price) !== null && _product$metadata$sou !== void 0 ? _product$metadata$sou : ((_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.main_product_original_price) != null ? new Decimal(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : '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) {
+          product.metadata.main_product_selling_price = newMainSellingPrice;
+          product.metadata.price_schema_version = 2;
+        }
+        product.selling_price = composeLinePrice({
+          mainPrice: newMainSellingPrice,
+          bundle: product.product_bundle
+        });
+        return product;
+      });
+    }
+  }, {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
@@ -94,9 +119,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.orderHooks = options.hooks || ((_otherParams$order = otherParams.order) === null || _otherParams$order === void 0 ? void 0 : _otherParams$order.hooks) || ((_otherParams$hooks = otherParams.hooks) === null || _otherParams$hooks === void 0 ? void 0 : _otherParams$hooks.order);
               this.otherParams = otherParams;
               this.registerDiscountModules(options);
-              this.restoreTempOrderFromStorage();
               this.logInfo('OrderModule initialized successfully');
-            case 21:
+            case 20:
             case "end":
               return _context.stop();
           }
@@ -196,29 +220,40 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "loadDiscountConfig",
     value: function () {
       var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
-        var _this$store$discount, _this$store$tempOrder;
-        var discountList, _this$store$discount2;
+        var _this$store$tempOrder, _this$store$discount, _this$store$tempOrder2;
+        var orderId, discountList, _this$store$discount2, _this$store$discount3;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.next = 2;
-              return (_this$store$discount = this.store.discount) === null || _this$store$discount === void 0 ? void 0 : _this$store$discount.loadPrepareConfig({
+              orderId = params.orderId || ((_this$store$tempOrder = this.store.tempOrder) === null || _this$store$tempOrder === void 0 ? void 0 : _this$store$tempOrder.order_id) || undefined;
+              _context2.next = 3;
+              return (_this$store$discount = this.store.discount) === null || _this$store$discount === void 0 ? void 0 : _this$store$discount.loadPrepareConfig(_objectSpread({
                 customer_id: params.customerId,
-                action: params.action || 'create',
+                action: params.action || (orderId ? 'edit' : 'create'),
                 with_good_pass: 1,
                 with_discount_card: 1,
                 with_wallet_pass_holder: 1,
                 request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
-              });
-            case 2:
+              }, orderId ? {
+                order_id: orderId
+              } : {}));
+            case 3:
               discountList = _context2.sent;
-              if (discountList) {
-                (_this$store$discount2 = this.store.discount) === null || _this$store$discount2 === void 0 || _this$store$discount2.setDiscountList(discountList);
+              if (!discountList) {
+                _context2.next = 9;
+                break;
               }
-              if ((_this$store$tempOrder = this.store.tempOrder) !== null && _this$store$tempOrder !== void 0 && (_this$store$tempOrder = _this$store$tempOrder.products) !== null && _this$store$tempOrder !== void 0 && _this$store$tempOrder.length) {
+              _context2.next = 7;
+              return (_this$store$discount2 = this.store.discount) === null || _this$store$discount2 === void 0 ? void 0 : _this$store$discount2.setOriginalDiscountList(discountList);
+            case 7:
+              _context2.next = 9;
+              return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.setDiscountList(discountList);
+            case 9:
+              if (params.apply !== false && (_this$store$tempOrder2 = this.store.tempOrder) !== null && _this$store$tempOrder2 !== void 0 && (_this$store$tempOrder2 = _this$store$tempOrder2.products) !== null && _this$store$tempOrder2 !== void 0 && _this$store$tempOrder2.length) {
                 this.applyDiscount();
               }
-            case 5:
+              return _context2.abrupt("return", this.getDiscountList());
+            case 11:
             case "end":
               return _context2.stop();
           }
@@ -232,20 +267,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getDiscountList",
     value: function getDiscountList() {
-      var _this$store$discount3;
-      return ((_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.getDiscountList()) || [];
+      var _this$store$discount4;
+      return ((_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.getDiscountList()) || [];
     }
   }, {
     key: "scanCode",
     value: function () {
       var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(code, customerId) {
-        var _this$store$discount4, _tempOrder$holder, _this$store$summary, _tempOrder$holder2;
-        var resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelected, tempOrder, holders, _ref, isAvailable, newDiscountList, unavailableReason, _this$store$discount5;
+        var _this$store$discount5, _tempOrder$holder, _this$store$summary, _tempOrder$holder2;
+        var resultDiscountList, rulesModule, withScanList, currentSelected, tempOrder, holders, _ref, isAvailable, newDiscountList, unavailableReason, _this$store$discount6;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               _context3.next = 2;
-              return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.batchSearch(code, {
+              return (_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 ? void 0 : _this$store$discount5.batchSearch(code, {
                 customerId: customerId
               });
             case 2:
@@ -254,36 +289,33 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 _context3.next = 5;
                 break;
               }
-              _context3.t0 = {
-                discountList: [],
-                unavailableReasonKey: null
-              };
+              _context3.t0 = [];
             case 5:
-              resultDiscountWithReason = _context3.t0;
-              resultDiscountList = resultDiscountWithReason.discountList, unavailableReasonKey = resultDiscountWithReason.unavailableReasonKey;
+              resultDiscountList = _context3.t0;
               rulesModule = this.store.rules;
               if (rulesModule) {
-                _context3.next = 10;
+                _context3.next = 9;
                 break;
               }
               return _context3.abrupt("return", {
                 type: 'clientCalc',
                 isAvailable: false,
                 discountList: this.getDiscountList(),
+                scannedDiscountList: resultDiscountList,
                 unavailableReason: UnavailableReason.Unknown
               });
-            case 10:
+            case 9:
               if (resultDiscountList.length) {
-                _context3.next = 12;
+                _context3.next = 11;
                 break;
               }
               return _context3.abrupt("return", {
                 type: 'server',
                 isAvailable: false,
                 discountList: this.getDiscountList(),
-                unavailableReasonKey: unavailableReasonKey
+                scannedDiscountList: resultDiscountList
               });
-            case 12:
+            case 11:
               withScanList = resultDiscountList.map(function (item) {
                 return _objectSpread(_objectSpread({}, item), {}, {
                   isScan: true
@@ -297,15 +329,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   return m.id === n.id;
                 });
               }))) {
-                _context3.next = 16;
+                _context3.next = 15;
                 break;
               }
               return _context3.abrupt("return", {
                 type: 'clientCalc',
                 isAvailable: true,
-                discountList: this.getDiscountList()
+                discountList: this.getDiscountList(),
+                scannedDiscountList: resultDiscountList
               });
-            case 16:
+            case 15:
               tempOrder = this.store.tempOrder;
               holders = tempOrder !== null && tempOrder !== void 0 && (_tempOrder$holder = tempOrder.holder) !== null && _tempOrder$holder !== void 0 && _tempOrder$holder.form_record_id ? [{
                 form_record_id: tempOrder.holder.form_record_id
@@ -322,16 +355,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList()
               }, isAvailable = _ref.isAvailable, newDiscountList = _ref.discountList, unavailableReason = _ref.unavailableReason;
               if (isAvailable && newDiscountList) {
-                (_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 || _this$store$discount5.setDiscountList(newDiscountList);
+                (_this$store$discount6 = this.store.discount) === null || _this$store$discount6 === void 0 || _this$store$discount6.setDiscountList(newDiscountList);
                 this.applyDiscount();
               }
               return _context3.abrupt("return", {
                 type: 'clientCalc',
                 isAvailable: isAvailable || false,
                 discountList: newDiscountList || this.getDiscountList(),
+                scannedDiscountList: resultDiscountList,
                 unavailableReason: unavailableReason
               });
-            case 21:
+            case 20:
             case "end":
               return _context3.stop();
           }
@@ -345,15 +379,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyDiscount",
     value: function applyDiscount() {
-      var _this$store$discount6, _tempOrder$holder3, _tempOrder$holder4, _this$store$summary2;
+      var _this$store$discount7, _tempOrder$holder3, _tempOrder$holder4, _this$store$summary2;
       var tempOrder = this.store.tempOrder;
       // 任意 products CRUD 后都应当重算 discount 状态；即使 products 为空，
       // 也需要让 Rules.calcDiscount 把 DiscountModule 的 isSelected / isAvailable /
-      // appliedProductDetails / savedAmount 以及 tempOrder.discount_list 复位。
+      // appliedProductDetails / savedAmount 复位。
       if (!tempOrder) return;
+      delete tempOrder.discount_list;
       var rulesModule = this.store.rules;
       if (!rulesModule) return;
-      var discountList = ((_this$store$discount6 = this.store.discount) === null || _this$store$discount6 === void 0 ? void 0 : _this$store$discount6.getDiscountList()) || [];
+      var discountList = ((_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.getDiscountList()) || [];
       var holders = (_tempOrder$holder3 = tempOrder.holder) !== null && _tempOrder$holder3 !== void 0 && _tempOrder$holder3.form_record_id ? [{
         form_record_id: tempOrder.holder.form_record_id
       }] : [];
@@ -365,15 +400,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         orderTotalAmount: Number(((_this$store$summary2 = this.store.summary) === null || _this$store$summary2 === void 0 ? void 0 : _this$store$summary2.total_amount) || 0)
       });
       if (result !== null && result !== void 0 && result.productList) {
-        tempOrder.products = result.productList;
+        tempOrder.products = this.applyProductDiscountPrices((result.productList || []).map(function (product) {
+          return _objectSpread(_objectSpread({}, product), {}, {
+            discount_list: normalizeOrderProductDiscountList(syncManualProductDiscountProductNum(product.discount_list, product.num))
+          });
+        }));
       }
       if (result !== null && result !== void 0 && result.discountList) {
-        var _this$store$discount7;
+        var _this$store$discount8;
         OrderModule.populateSavedAmounts(result.productList || tempOrder.products, result.discountList);
-        (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 || _this$store$discount7.setDiscountList(result.discountList);
-        tempOrder.discount_list = result.discountList.filter(function (d) {
-          return d.isSelected;
-        });
+        (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 || _this$store$discount8.setDiscountList(result.discountList);
       }
     }
 
@@ -383,76 +419,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function initTempOrder(params) {
       if (params.cacheId !== undefined) this.cacheId = params.cacheId;
       if (params.salesSummaryModuleName !== undefined) this.salesSummaryModuleName = params.salesSummaryModuleName;
-      this.restoreTempOrderFromStorage();
     }
 
-    // ─── TempOrder: localStorage 持久化 ───
+    /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
   }, {
-    key: "getTempOrderStorageKey",
-    value: function getTempOrderStorageKey() {
-      if (!this.cacheId) return null;
-      return "scanOrder:tempOrder:".concat(this.cacheId);
-    }
+    key: "setEnableTempOrderPersist",
+    value: function setEnableTempOrderPersist(_enabled) {}
+
+    /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
   }, {
-    key: "restoreTempOrderFromStorage",
-    value: function restoreTempOrderFromStorage() {
-      var key = this.getTempOrderStorageKey();
-      if (!key) return;
-      if (!this.window) return;
-      var cachedData = this.window.localStorage.getItem(key);
-      if (!cachedData) return;
-      try {
-        var parsedData = JSON.parse(cachedData);
-        if (!isTempOrder(parsedData)) {
-          this.window.localStorage.removeItem(key);
-          return;
-        }
-        if (Array.isArray(parsedData.products)) {
-          for (var i = 0; i < parsedData.products.length; i++) {
-            var p = parsedData.products[i];
-            if (!p || _typeof(p) !== 'object') continue;
-            if (!Array.isArray(p.product_option_item)) {
-              p.product_option_item = [];
-            }
-            if (!Array.isArray(p.product_bundle)) {
-              p.product_bundle = [];
-            }
-            var row = p;
-            // 价格 schema 迁移：重跑 normalizeOrderProduct。
-            // `metadata.price_schema_version === 2` → 已是新语义，保留现有 main_product_* 折扣；
-            // 否则（v1 或无 metadata）→ 走 legacyDiscount 反推分支，基于新的 source + options
-            // 重算出含 option 的 main_product_*，并打上 price_schema_version: 2。
-            // 幂等：多次 restore 不会重复叠加 option/bundle。
-            parsedData.products[i] = normalizeOrderProduct(row);
-          }
-        }
-        var parsedRecord = parsedData;
-        this.store.summary = parsedRecord.summary || createEmptySummary();
-        delete parsedData.summary;
-        if (parsedRecord.lastOrderInfo) {
-          this.store.lastOrderInfo = parsedRecord.lastOrderInfo;
-          delete parsedData.lastOrderInfo;
-        }
-        if (!parsedData._extend || _typeof(parsedData._extend) !== 'object') {
-          parsedData._extend = {
-            productsByUid: {}
-          };
-        } else if (!parsedData._extend.productsByUid) {
-          parsedData._extend.productsByUid = {};
-        }
-        this.store.tempOrder = parsedData;
-      } catch (_unused2) {
-        var _this$window;
-        (_this$window = this.window) === null || _this$window === void 0 || (_this$window = _this$window.localStorage) === null || _this$window === void 0 || _this$window.removeItem(key);
-      }
+    key: "isTempOrderPersistEnabled",
+    value: function isTempOrderPersistEnabled() {
+      return false;
     }
+
+    /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化；草稿保存请使用 IndexedDB saveDraft。 */
   }, {
     key: "persistTempOrder",
     value: function persistTempOrder() {
-      var key = this.getTempOrderStorageKey();
-      if (!key || !this.store.tempOrder) return;
-      if (!this.window) return;
-      this.window.localStorage.setItem(key, JSON.stringify(this.store.tempOrder));
+      // no-op: OrderModule 的刷新恢复不再依赖 localStorage。
     }
 
     // ─── TempOrder: 创建 & 获取 ───
@@ -721,6 +706,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return saveDraft;
     }()
+  }, {
+    key: "saveDraftInBackground",
+    value: function saveDraftInBackground() {
+      void this.saveDraft();
+    }
   }, {
     key: "hydrateTempOrderFromLocalRecord",
     value: function () {
@@ -812,11 +802,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "restoreOrder",
     value: function restoreOrder() {
+      var _this$store$discount9, _this$store$discount10;
       var freshTempOrder = this.createDefaultTempOrderInstance();
       this.ensureExternalSaleNumber(freshTempOrder);
       this.store.tempOrder = freshTempOrder;
       this.store.summary = createEmptySummary();
       this.store.lastOrderInfo = undefined;
+      this.store.syncState = undefined;
+      void ((_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.setOriginalDiscountList([]));
+      void ((_this$store$discount10 = this.store.discount) === null || _this$store$discount10 === void 0 ? void 0 : _this$store$discount10.setDiscountList([]));
       this.persistTempOrder();
       return freshTempOrder;
     }
@@ -825,6 +819,60 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function getTempOrder() {
       return this.store.tempOrder;
     }
+  }, {
+    key: "replaceTempOrder",
+    value: function () {
+      var _replaceTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(tempOrder, options) {
+        var nextTempOrder;
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
+            case 0:
+              if (isTempOrder(tempOrder)) {
+                _context9.next = 2;
+                break;
+              }
+              throw new Error('无效的 tempOrder 数据');
+            case 2:
+              nextTempOrder = this.normalizeTempOrderForRuntime(cloneDeep(tempOrder), {
+                ensureIdentity: false
+              });
+              this.store.tempOrder = nextTempOrder;
+              if (!((options === null || options === void 0 ? void 0 : options.recalculateSummary) !== false)) {
+                _context9.next = 9;
+                break;
+              }
+              _context9.next = 7;
+              return this.recalculateSummary({
+                createIfMissing: false
+              });
+            case 7:
+              _context9.next = 10;
+              break;
+            case 9:
+              this.store.summary = createEmptySummary();
+            case 10:
+              if ((options === null || options === void 0 ? void 0 : options.persist) !== false) {
+                this.persistTempOrder();
+              }
+              if (!(options !== null && options !== void 0 && options.saveDraft)) {
+                _context9.next = 14;
+                break;
+              }
+              _context9.next = 14;
+              return this.saveDraft();
+            case 14:
+              return _context9.abrupt("return", nextTempOrder);
+            case 15:
+            case "end":
+              return _context9.stop();
+          }
+        }, _callee9, this);
+      }));
+      function replaceTempOrder(_x10, _x11) {
+        return _replaceTempOrder.apply(this, arguments);
+      }
+      return replaceTempOrder;
+    }()
   }, {
     key: "getOrderIdentity",
     value: function getOrderIdentity() {
@@ -903,28 +951,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addNewOrder",
     value: function () {
-      var _addNewOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+      var _addNewOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               this.ensureExternalSaleNumber(tempOrder);
-              _context9.next = 4;
+              _context10.next = 4;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 4:
               this.persistTempOrder();
-              _context9.next = 7;
+              _context10.next = 7;
               return this.saveDraft();
             case 7:
-              return _context9.abrupt("return", tempOrder);
+              return _context10.abrupt("return", tempOrder);
             case 8:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
-        }, _callee9, this);
+        }, _callee10, this);
       }));
       function addNewOrder() {
         return _addNewOrder.apply(this, arguments);
@@ -1000,6 +1048,38 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         })
       };
     }
+  }, {
+    key: "getBookingUniqueIdentificationNumber",
+    value: function getBookingUniqueIdentificationNumber(booking) {
+      var _booking$metadata;
+      var uid = booking === null || booking === void 0 || (_booking$metadata = booking.metadata) === null || _booking$metadata === void 0 ? void 0 : _booking$metadata.unique_identification_number;
+      if (uid === undefined || uid === null || uid === '') return null;
+      return String(uid);
+    }
+  }, {
+    key: "findBookingIndexByUniqueIdentificationNumber",
+    value: function findBookingIndexByUniqueIdentificationNumber(tempOrder, uniqueIdentificationNumber) {
+      var _this3 = this;
+      return (tempOrder.bookings || []).findIndex(function (booking) {
+        return _this3.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
+      });
+    }
+  }, {
+    key: "removeLinkedBookingsForProduct",
+    value: function removeLinkedBookingsForProduct(tempOrder, product) {
+      var _product$metadata4,
+        _product$metadata5,
+        _this4 = this;
+      var productUid = (product === null || product === void 0 || (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.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$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.booking_uid);
+      if (!productUid && !bookingUid) return;
+      tempOrder.bookings = (tempOrder.bookings || []).filter(function (booking) {
+        var currentBookingUid = _this4.getBookingUniqueIdentificationNumber(booking);
+        if (bookingUid && currentBookingUid === String(bookingUid)) return false;
+        if (productUid && String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === String(productUid)) return false;
+        return true;
+      });
+    }
 
     // ─── TempOrder: 金额汇总 ───
   }, {
@@ -1011,23 +1091,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "recalculateSummary",
     value: function () {
-      var _recalculateSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(options) {
+      var _recalculateSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(options) {
         var tempOrder, salesSummary, existedSummary, paidPaymentSummary, emptySummary, salesSummaryResult, summary;
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               tempOrder = options !== null && options !== void 0 && options.createIfMissing ? this.ensureTempOrder() : this.store.tempOrder;
               if (tempOrder) {
-                _context10.next = 3;
+                _context11.next = 3;
                 break;
               }
-              return _context10.abrupt("return", null);
+              return _context11.abrupt("return", null);
             case 3:
               salesSummary = this.getSalesSummary();
               existedSummary = this.store.summary || createEmptySummary();
               paidPaymentSummary = this.calculatePaidPaymentSummary(tempOrder.payments || []);
               if (salesSummary) {
-                _context10.next = 11;
+                _context11.next = 11;
                 break;
               }
               emptySummary = _objectSpread(_objectSpread({}, createEmptySummary()), {}, {
@@ -1038,16 +1118,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               this.store.summary = emptySummary;
               tempOrder.surcharge_fee = emptySummary.surcharge_fee;
-              return _context10.abrupt("return", this.store.summary);
+              return _context11.abrupt("return", this.store.summary);
             case 11:
-              _context10.next = 13;
+              _context11.next = 13;
               return salesSummary.getSummary({
                 products: tempOrder.products,
                 isPriceIncludeTax: tempOrder.is_price_include_tax,
                 shopDiscount: tempOrder.shop_discount
               });
             case 13:
-              salesSummaryResult = _context10.sent;
+              salesSummaryResult = _context11.sent;
               summary = _objectSpread(_objectSpread({}, salesSummaryResult), {}, {
                 total_refund_amount: existedSummary.total_refund_amount || '0.00',
                 customer_paid_amount: paidPaymentSummary.customerPaidAmount.toFixed(2),
@@ -1065,14 +1145,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               tempOrder.surcharges = summary.surcharges || [];
               tempOrder.deposit_amount = summary.deposit_amount || '0.00';
               tempOrder.is_deposit = summary.deposit_amount !== '0.00' ? 1 : 0;
-              return _context10.abrupt("return", this.store.summary);
+              return _context11.abrupt("return", this.store.summary);
             case 23:
             case "end":
-              return _context10.stop();
+              return _context11.stop();
           }
-        }, _callee10, this);
+        }, _callee11, this);
       }));
-      function recalculateSummary(_x10) {
+      function recalculateSummary(_x12) {
         return _recalculateSummary.apply(this, arguments);
       }
       return recalculateSummary;
@@ -1080,30 +1160,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderSummary",
     value: function () {
-      var _getOrderSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+      var _getOrderSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
         var summary;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              _context11.next = 2;
+              _context12.next = 2;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 2:
-              summary = _context11.sent;
+              summary = _context12.sent;
               if (summary) {
-                _context11.next = 5;
+                _context12.next = 5;
                 break;
               }
-              return _context11.abrupt("return", createEmptySummary());
+              return _context12.abrupt("return", createEmptySummary());
             case 5:
               this.persistTempOrder();
-              return _context11.abrupt("return", summary);
+              return _context12.abrupt("return", summary);
             case 7:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
-        }, _callee11, this);
+        }, _callee12, this);
       }));
       function getOrderSummary() {
         return _getOrderSummary.apply(this, arguments);
@@ -1113,16 +1193,46 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateTempOrderNote",
     value: function updateTempOrderNote(note) {
+      var sync = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var tempOrder = this.ensureTempOrder();
       tempOrder.note = String(note || '');
       this.persistTempOrder();
+      if (sync) {
+        var orderId = tempOrder.order_id;
+        if (!orderId) return tempOrder.note;
+        return this.syncTempOrderNoteToRemote(orderId, tempOrder.note);
+      }
       return tempOrder.note;
     }
+  }, {
+    key: "syncTempOrderNoteToRemote",
+    value: function () {
+      var _syncTempOrderNoteToRemote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(orderId, note) {
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
+            case 0:
+              _context13.next = 2;
+              return this.request.put("/order/order/".concat(orderId, "/note"), {
+                note: note
+              });
+            case 2:
+              return _context13.abrupt("return", note);
+            case 3:
+            case "end":
+              return _context13.stop();
+          }
+        }, _callee13, this);
+      }));
+      function syncTempOrderNoteToRemote(_x13, _x14) {
+        return _syncTempOrderNoteToRemote.apply(this, arguments);
+      }
+      return syncTempOrderNoteToRemote;
+    }()
   }, {
     key: "getTempOrderNote",
     value: function getTempOrderNote() {
-      var _this$store$tempOrder2;
-      return ((_this$store$tempOrder2 = this.store.tempOrder) === null || _this$store$tempOrder2 === void 0 ? void 0 : _this$store$tempOrder2.note) || '';
+      var _this$store$tempOrder3;
+      return ((_this$store$tempOrder3 = this.store.tempOrder) === null || _this$store$tempOrder3 === void 0 ? void 0 : _this$store$tempOrder3.note) || '';
     }
   }, {
     key: "updateTempOrderShopDiscount",
@@ -1149,25 +1259,51 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       this.persistTempOrder();
       return tempOrder.contacts_info;
     }
+  }, {
+    key: "buildTempOrderCustomer",
+    value: function buildTempOrderCustomer(params) {
+      var _ref8, _ref9, _ref10, _source$name, _ref11, _ref12, _ref13, _source$customer_name, _source$id, _source$customer_id, _ref14, _source$country_calli, _source$phone, _source$email;
+      if (!params.customerId) return null;
+      var source = params.source ? cloneDeep(params.source) : {};
+      var name = (_ref8 = (_ref9 = (_ref10 = (_source$name = source.name) !== null && _source$name !== void 0 ? _source$name : source.display_name) !== null && _ref10 !== void 0 ? _ref10 : source.customerName) !== null && _ref9 !== void 0 ? _ref9 : source.customer_name) !== null && _ref8 !== void 0 ? _ref8 : params.customerName;
+      var customerName = (_ref11 = (_ref12 = (_ref13 = (_source$customer_name = source.customer_name) !== null && _source$customer_name !== void 0 ? _source$customer_name : source.customerName) !== null && _ref13 !== void 0 ? _ref13 : source.display_name) !== null && _ref12 !== void 0 ? _ref12 : source.name) !== null && _ref11 !== void 0 ? _ref11 : params.customerName;
+      return _objectSpread(_objectSpread({}, source), {}, {
+        id: (_source$id = source.id) !== null && _source$id !== void 0 ? _source$id : params.customerId,
+        customer_id: (_source$customer_id = source.customer_id) !== null && _source$customer_id !== void 0 ? _source$customer_id : params.customerId,
+        name: String(name || ''),
+        customer_name: String(customerName || ''),
+        country_calling_code: String((_ref14 = (_source$country_calli = source.country_calling_code) !== null && _source$country_calli !== void 0 ? _source$country_calli : source.countryCallingCode) !== null && _ref14 !== void 0 ? _ref14 : params.countryCallingCode),
+        phone: String((_source$phone = source.phone) !== null && _source$phone !== void 0 ? _source$phone : params.phone),
+        email: String((_source$email = source.email) !== null && _source$email !== void 0 ? _source$email : params.email)
+      });
+    }
 
     /**
      * 更新当前 tempOrder 的客户协议字段。
      *
-     * PaymentModal 只需要修改订单里的客户字段；如果外部还有客户模块需要同步，
+     * PaymentModal 只需要修改订单里的客户事实；如果外部还有客户模块需要同步，
      * 应由调用方通过回调处理，不能把外部 UI 状态写进 tempOrder。
      */
   }, {
     key: "updateTempOrderCustomer",
     value: function updateTempOrderCustomer(customer) {
-      var _ref8, _ref9, _customer$customer_id, _ref10, _ref11, _ref12, _customer$customer_na, _ref13, _customer$country_cal;
+      var _ref15, _ref16, _customer$customer_id, _ref17, _ref18, _ref19, _customer$customer_na, _ref20, _customer$country_cal;
       var tempOrder = this.ensureTempOrder();
-      var customerId = (_ref8 = (_ref9 = (_customer$customer_id = customer.customer_id) !== null && _customer$customer_id !== void 0 ? _customer$customer_id : customer.customerId) !== null && _ref9 !== void 0 ? _ref9 : customer.id) !== null && _ref8 !== void 0 ? _ref8 : null;
-      var customerName = (_ref10 = (_ref11 = (_ref12 = (_customer$customer_na = customer.customer_name) !== null && _customer$customer_na !== void 0 ? _customer$customer_na : customer.customerName) !== null && _ref12 !== void 0 ? _ref12 : customer.display_name) !== null && _ref11 !== void 0 ? _ref11 : customer.name) !== null && _ref10 !== void 0 ? _ref10 : '';
+      var customerId = (_ref15 = (_ref16 = (_customer$customer_id = customer.customer_id) !== null && _customer$customer_id !== void 0 ? _customer$customer_id : customer.customerId) !== null && _ref16 !== void 0 ? _ref16 : customer.id) !== null && _ref15 !== void 0 ? _ref15 : null;
+      var customerName = (_ref17 = (_ref18 = (_ref19 = (_customer$customer_na = customer.customer_name) !== null && _customer$customer_na !== void 0 ? _customer$customer_na : customer.customerName) !== null && _ref19 !== void 0 ? _ref19 : customer.display_name) !== null && _ref18 !== void 0 ? _ref18 : customer.name) !== null && _ref17 !== void 0 ? _ref17 : '';
       tempOrder.customer_id = customerId === null || customerId === undefined || customerId === '' ? null : Number(customerId);
       tempOrder.customer_name = String(customerName || '');
-      tempOrder.country_calling_code = String((_ref13 = (_customer$country_cal = customer.country_calling_code) !== null && _customer$country_cal !== void 0 ? _customer$country_cal : customer.countryCallingCode) !== null && _ref13 !== void 0 ? _ref13 : '');
+      tempOrder.country_calling_code = String((_ref20 = (_customer$country_cal = customer.country_calling_code) !== null && _customer$country_cal !== void 0 ? _customer$country_cal : customer.countryCallingCode) !== null && _ref20 !== void 0 ? _ref20 : '');
       tempOrder.phone = String(customer.phone || '');
       tempOrder.email = String(customer.email || '');
+      tempOrder.customer = this.buildTempOrderCustomer({
+        source: customer,
+        customerId: tempOrder.customer_id,
+        customerName: tempOrder.customer_name,
+        countryCallingCode: tempOrder.country_calling_code,
+        phone: tempOrder.phone,
+        email: tempOrder.email
+      });
       this.persistTempOrder();
       return {
         customerId: tempOrder.customer_id,
@@ -1179,28 +1315,43 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setOrderCustomer",
     value: function setOrderCustomer(patch, snapshot) {
+      var _tempOrder$customer_i2, _tempOrder$customer_i3;
       if (!patch) {
         this.clearOrderCustomer();
         return;
       }
       var tempOrder = this.ensureTempOrder();
+      var previousCustomerId = (_tempOrder$customer_i2 = tempOrder.customer_id) !== null && _tempOrder$customer_i2 !== void 0 ? _tempOrder$customer_i2 : null;
       tempOrder.customer_id = patch.customer_id || patch.id || null;
       tempOrder.customer_name = String(patch.customer_name || '');
       tempOrder.country_calling_code = String(patch.country_calling_code || '');
       tempOrder.phone = String(patch.phone || '');
       tempOrder.email = String(patch.email || '');
+      tempOrder.customer = this.buildTempOrderCustomer({
+        source: snapshot || null,
+        customerId: tempOrder.customer_id,
+        customerName: tempOrder.customer_name,
+        countryCallingCode: tempOrder.country_calling_code,
+        phone: tempOrder.phone,
+        email: tempOrder.email
+      });
       if (snapshot !== undefined) {
         var extend = this.ensureExtend(tempOrder);
         if (snapshot === null) delete extend.customerSnapshot;else extend.customerSnapshot = cloneDeep(snapshot);
       }
+      var nextCustomerId = (_tempOrder$customer_i3 = tempOrder.customer_id) !== null && _tempOrder$customer_i3 !== void 0 ? _tempOrder$customer_i3 : null;
+      if (String(previousCustomerId !== null && previousCustomerId !== void 0 ? previousCustomerId : '') !== String(nextCustomerId !== null && nextCustomerId !== void 0 ? nextCustomerId : '')) {
+        clearTempOrderHolderAssignments(tempOrder);
+      }
       this.persistTempOrder();
+      this.saveDraftInBackground();
       this.emitOrderCustomerChange();
     }
   }, {
     key: "getOrderCustomer",
     value: function getOrderCustomer() {
       var tempOrder = this.store.tempOrder;
-      if (!tempOrder || tempOrder.customer_id === null || tempOrder.customer_id === undefined) {
+      if (!tempOrder || !tempOrder.customer_id) {
         return null;
       }
       return {
@@ -1214,21 +1365,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderCustomerSnapshot",
     value: function getOrderCustomerSnapshot() {
-      var _this$store$tempOrder3;
-      var snapshot = (_this$store$tempOrder3 = this.store.tempOrder) === null || _this$store$tempOrder3 === void 0 || (_this$store$tempOrder3 = _this$store$tempOrder3._extend) === null || _this$store$tempOrder3 === void 0 ? void 0 : _this$store$tempOrder3.customerSnapshot;
+      var _this$store$tempOrder4;
+      var snapshot = (_this$store$tempOrder4 = this.store.tempOrder) === null || _this$store$tempOrder4 === void 0 || (_this$store$tempOrder4 = _this$store$tempOrder4._extend) === null || _this$store$tempOrder4 === void 0 ? void 0 : _this$store$tempOrder4.customerSnapshot;
       return snapshot ? cloneDeep(snapshot) : null;
     }
   }, {
     key: "clearOrderCustomer",
     value: function clearOrderCustomer() {
       var tempOrder = this.ensureTempOrder();
+      clearTempOrderHolderAssignments(tempOrder);
       tempOrder.customer_id = null;
       tempOrder.customer_name = '';
       tempOrder.country_calling_code = '';
       tempOrder.phone = '';
       tempOrder.email = '';
+      tempOrder.customer = null;
       if (tempOrder._extend) delete tempOrder._extend.customerSnapshot;
       this.persistTempOrder();
+      this.saveDraftInBackground();
       this.core.effects.emit(OrderHooks.OnOrderCustomerChange, null);
     }
   }, {
@@ -1279,6 +1433,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addOrderPayment",
     value: function addOrderPayment(payment) {
+      this.logInfo('addOrderPayment', {
+        payment: payment
+      });
       var tempOrder = this.ensureTempOrder();
       var mapped = mapPaymentItemsToOrderPayments([payment]);
       tempOrder.payments = [].concat(_toConsumableArray(tempOrder.payments || []), _toConsumableArray(mapped));
@@ -1358,45 +1515,45 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "shouldMergeProductToOrder",
     value: function () {
-      var _shouldMergeProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(params) {
+      var _shouldMergeProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(params) {
         var _this$orderHooks;
         var onBeforeMergeProductToOrder, result;
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               onBeforeMergeProductToOrder = (_this$orderHooks = this.orderHooks) === null || _this$orderHooks === void 0 ? void 0 : _this$orderHooks.onBeforeMergeProductToOrder;
               if (onBeforeMergeProductToOrder) {
-                _context12.next = 3;
+                _context14.next = 3;
                 break;
               }
-              return _context12.abrupt("return", true);
+              return _context14.abrupt("return", true);
             case 3:
-              _context12.next = 5;
+              _context14.next = 5;
               return onBeforeMergeProductToOrder(_objectSpread(_objectSpread({}, params), {}, {
                 defaultShouldMerge: true
               }));
             case 5:
-              result = _context12.sent;
+              result = _context14.sent;
               if (!(typeof result === 'boolean')) {
-                _context12.next = 8;
+                _context14.next = 8;
                 break;
               }
-              return _context12.abrupt("return", result);
+              return _context14.abrupt("return", result);
             case 8:
               if (!(result && _typeof(result) === 'object' && typeof result.shouldMerge === 'boolean')) {
-                _context12.next = 10;
+                _context14.next = 10;
                 break;
               }
-              return _context12.abrupt("return", result.shouldMerge);
+              return _context14.abrupt("return", result.shouldMerge);
             case 10:
-              return _context12.abrupt("return", true);
+              return _context14.abrupt("return", true);
             case 11:
             case "end":
-              return _context12.stop();
+              return _context14.stop();
           }
-        }, _callee12, this);
+        }, _callee14, this);
       }));
-      function shouldMergeProductToOrder(_x11) {
+      function shouldMergeProductToOrder(_x15) {
         return _shouldMergeProductToOrder.apply(this, arguments);
       }
       return shouldMergeProductToOrder;
@@ -1404,11 +1561,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProductToOrder",
     value: function () {
-      var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(product, booking) {
-        var _this3 = this;
+      var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(product, booking) {
+        var _this5 = this;
         var tempOrder, linked, productToAdd, incomingFingerprint, normalizedIncoming, hasIncomingGoodPass, shouldForceNewLine, matchedIndex, matchedProduct, existedFingerprint, shouldMerge, _targetProduct$metada, targetProduct, targetUid, normalizedProduct;
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               linked = booking ? this.createLinkedProductAndBooking({
@@ -1418,10 +1575,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               productToAdd = (linked === null || linked === void 0 ? void 0 : linked.product) || product;
               incomingFingerprint = buildProductLineFingerprint(productToAdd.product_option_item, productToAdd.product_bundle);
               normalizedIncoming = normalizeOrderProduct(productToAdd);
+              normalizedIncoming.discount_list = normalizeOrderProductDiscountList(normalizedIncoming.discount_list);
               hasIncomingGoodPass = this.hasGoodPassDiscount(normalizedIncoming);
               shouldForceNewLine = !!booking;
               matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
-                if (_this3.hasGoodPassDiscount(item)) return false;
+                if (_this5.hasGoodPassDiscount(item)) return false;
                 if (item.product_id !== productToAdd.product_id) return false;
                 if (item.product_variant_id !== productToAdd.product_variant_id) return false;
                 var existedFingerprint = buildProductLineFingerprint(item.product_option_item, item.product_bundle);
@@ -1430,10 +1588,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               matchedProduct = matchedIndex === -1 ? null : tempOrder.products[matchedIndex];
               existedFingerprint = matchedProduct ? buildProductLineFingerprint(matchedProduct.product_option_item, matchedProduct.product_bundle) : '';
               if (!matchedProduct) {
-                _context13.next = 16;
+                _context15.next = 17;
                 break;
               }
-              _context13.next = 13;
+              _context15.next = 14;
               return this.shouldMergeProductToOrder({
                 incomingProduct: productToAdd,
                 normalizedIncoming: normalizedIncoming,
@@ -1444,14 +1602,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder,
                 booking: booking
               });
-            case 13:
-              _context13.t0 = _context13.sent;
-              _context13.next = 17;
+            case 14:
+              _context15.t0 = _context15.sent;
+              _context15.next = 18;
               break;
-            case 16:
-              _context13.t0 = false;
             case 17:
-              shouldMerge = _context13.t0;
+              _context15.t0 = false;
+            case 18:
+              shouldMerge = _context15.t0;
               if (matchedIndex === -1 || !matchedProduct || !shouldMerge) {
                 this.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
                 if (linked) {
@@ -1469,6 +1627,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     unique_identification_number: targetUid
                   })
                 }));
+                normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
                 tempOrder.products[matchedIndex] = _objectSpread(_objectSpread(_objectSpread({}, targetProduct), normalizedProduct), {}, {
                   metadata: _objectSpread(_objectSpread(_objectSpread({}, targetProduct.metadata || {}), normalizedProduct.metadata || {}), {}, {
                     unique_identification_number: targetUid
@@ -1483,20 +1642,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.bookings = [].concat(_toConsumableArray(tempOrder.bookings || []), [linked.booking]);
               }
               this.applyDiscount();
-              _context13.next = 23;
+              _context15.next = 24;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 23:
+            case 24:
               this.persistTempOrder();
-              return _context13.abrupt("return", tempOrder.products);
-            case 25:
+              return _context15.abrupt("return", tempOrder.products);
+            case 26:
             case "end":
-              return _context13.stop();
+              return _context15.stop();
           }
-        }, _callee13, this);
+        }, _callee15, this);
       }));
-      function addProductToOrder(_x12, _x13) {
+      function addProductToOrder(_x16, _x17) {
         return _addProductToOrder.apply(this, arguments);
       }
       return addProductToOrder;
@@ -1521,15 +1680,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       });
     }
   }, {
-    key: "updateProductInOrder",
+    key: "updateOrderProduct",
     value: function () {
-      var _updateProductInOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(params) {
+      var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(params) {
         var _targetProduct$metada2, _metadata, _metadata2, _metadata3, _tempOrder$products$p;
-        var product_id, product_variant_id, updates, unique_identification_number, product_option_item, product_bundle, tempOrder, identityLookup, productIndex, targetProduct, nextProduct, callerUpdatesTopPrice, callerUpdatesMainMeta, existedMeta;
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        var product_id, product_variant_id, updates, unique_identification_number, identity_key, product_option_item, product_bundle, booking, tempOrder, identityLookup, productIndex, targetUid, targetProduct, nextProduct, callerUpdatesTopPrice, callerUpdatesMainMeta, existedMeta, normalizedProduct, _normalizedProduct$me, _targetProduct$metada3, productUid, linked;
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              product_id = params.product_id, product_variant_id = params.product_variant_id, updates = params.updates, unique_identification_number = params.unique_identification_number, product_option_item = params.product_option_item, product_bundle = params.product_bundle;
+              product_id = params.product_id, product_variant_id = params.product_variant_id, updates = params.updates, unique_identification_number = params.unique_identification_number, identity_key = params.identity_key, product_option_item = params.product_option_item, product_bundle = params.product_bundle, booking = params.booking;
               tempOrder = this.ensureTempOrder();
               identityLookup = {
                 product_id: product_id,
@@ -1537,16 +1696,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               };
               if (unique_identification_number !== undefined) {
                 identityLookup.unique_identification_number = unique_identification_number;
+                if (identity_key === undefined) {
+                  identityLookup.identity_key = unique_identification_number;
+                }
+              }
+              if (identity_key !== undefined) {
+                identityLookup.identity_key = identity_key;
               }
               if (product_option_item !== undefined) identityLookup.product_option_item = product_option_item;
               if (product_bundle !== undefined) identityLookup.product_bundle = product_bundle;
-              productIndex = getProductIdentityIndex(tempOrder.products, identityLookup);
+              productIndex = -1;
+              if (unique_identification_number !== undefined) {
+                targetUid = String(unique_identification_number);
+                productIndex = tempOrder.products.findIndex(function (item) {
+                  var _item$metadata;
+                  return String(((_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.unique_identification_number) || item.unique_identification_number || '') === targetUid;
+                });
+              }
+              if (productIndex === -1) {
+                productIndex = getProductIdentityIndex(tempOrder.products, identityLookup);
+              }
               if (!(productIndex === -1)) {
-                _context14.next = 9;
+                _context16.next = 12;
                 break;
               }
               throw new Error('[Order] 目标商品不存在，无法更新');
-            case 9:
+            case 12:
               targetProduct = tempOrder.products[productIndex];
               nextProduct = _objectSpread(_objectSpread(_objectSpread({}, targetProduct), updates), {}, {
                 product_id: product_id,
@@ -1574,57 +1749,218 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               // normalizeOrderProduct 幂等：v2 metadata 存在 → 保留 main_product_* 折扣重算 composite；
               // 否则 → 把顶层 selling_price 视作 source，派生 main_product_* 并写 price_schema_version: 2。
-              tempOrder.products[productIndex] = normalizeOrderProduct(nextProduct);
+              normalizedProduct = normalizeOrderProduct(nextProduct);
+              normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
+              if (booking) {
+                productUid = String(((_normalizedProduct$me = normalizedProduct.metadata) === null || _normalizedProduct$me === void 0 ? void 0 : _normalizedProduct$me.unique_identification_number) || ((_targetProduct$metada3 = targetProduct.metadata) === null || _targetProduct$metada3 === void 0 ? void 0 : _targetProduct$metada3.unique_identification_number) || unique_identification_number || createUuidV4());
+                normalizedProduct.metadata = _objectSpread(_objectSpread({}, normalizedProduct.metadata || {}), {}, {
+                  unique_identification_number: productUid
+                });
+                linked = this.createLinkedProductAndBooking({
+                  product: _objectSpread(_objectSpread({}, normalizedProduct), {}, {
+                    unique_identification_number: productUid
+                  }),
+                  booking: booking
+                });
+                this.removeLinkedBookingsForProduct(tempOrder, targetProduct);
+                normalizedProduct = _objectSpread(_objectSpread({}, normalizedProduct), {}, {
+                  booking_uid: linked.bookingUid,
+                  metadata: _objectSpread(_objectSpread({}, normalizedProduct.metadata || {}), {}, {
+                    booking_uid: linked.bookingUid,
+                    unique_identification_number: productUid
+                  })
+                });
+                tempOrder.bookings = [].concat(_toConsumableArray(tempOrder.bookings || []), [linked.booking]);
+              }
+              tempOrder.products[productIndex] = normalizedProduct;
               this.captureProductRuntime(tempOrder, updates, tempOrder.products[productIndex], (_tempOrder$products$p = tempOrder.products[productIndex].metadata) === null || _tempOrder$products$p === void 0 ? void 0 : _tempOrder$products$p.unique_identification_number);
               this.applyDiscount();
-              _context14.next = 20;
+              _context16.next = 26;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 20:
+            case 26:
               this.persistTempOrder();
-              return _context14.abrupt("return", tempOrder.products);
-            case 22:
+              return _context16.abrupt("return", tempOrder.products);
+            case 28:
             case "end":
-              return _context14.stop();
+              return _context16.stop();
           }
-        }, _callee14, this);
+        }, _callee16, this);
+      }));
+      function updateOrderProduct(_x18) {
+        return _updateOrderProduct.apply(this, arguments);
+      }
+      return updateOrderProduct;
+    }()
+  }, {
+    key: "updateOrderProductQuantity",
+    value: function () {
+      var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(params) {
+        var _targetProduct$metada4;
+        var product_id, product_variant_id, num, unique_identification_number, identity_key, product_option_item, product_bundle, tempOrder, identityLookup, productIndex, targetUid, targetProduct, normalizedProduct;
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.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_option_item = params.product_option_item, product_bundle = params.product_bundle;
+              tempOrder = this.ensureTempOrder();
+              identityLookup = {
+                product_id: product_id,
+                product_variant_id: product_variant_id
+              };
+              if (unique_identification_number !== undefined) {
+                identityLookup.unique_identification_number = unique_identification_number;
+                if (identity_key === undefined) {
+                  identityLookup.identity_key = unique_identification_number;
+                }
+              }
+              if (identity_key !== undefined) identityLookup.identity_key = identity_key;
+              if (product_option_item !== undefined) identityLookup.product_option_item = product_option_item;
+              if (product_bundle !== undefined) identityLookup.product_bundle = product_bundle;
+              productIndex = -1;
+              if (unique_identification_number !== undefined) {
+                targetUid = String(unique_identification_number);
+                productIndex = tempOrder.products.findIndex(function (item) {
+                  var _item$metadata2;
+                  return String(((_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.unique_identification_number) || item.unique_identification_number || '') === targetUid;
+                });
+              }
+              if (productIndex === -1) {
+                productIndex = getProductIdentityIndex(tempOrder.products, identityLookup);
+              }
+              if (!(productIndex === -1)) {
+                _context17.next = 12;
+                break;
+              }
+              throw new Error('[Order] 目标商品不存在，无法更新数量');
+            case 12:
+              targetProduct = tempOrder.products[productIndex];
+              normalizedProduct = normalizeOrderProduct(_objectSpread(_objectSpread({}, targetProduct), {}, {
+                num: getSafeProductNum(num),
+                metadata: _objectSpread(_objectSpread({}, targetProduct.metadata || {}), {}, {
+                  unique_identification_number: ((_targetProduct$metada4 = targetProduct.metadata) === null || _targetProduct$metada4 === void 0 ? void 0 : _targetProduct$metada4.unique_identification_number) || unique_identification_number
+                })
+              }));
+              normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
+              tempOrder.products[productIndex] = normalizedProduct;
+              this.applyDiscount();
+              _context17.next = 19;
+              return this.recalculateSummary({
+                createIfMissing: true
+              });
+            case 19:
+              this.persistTempOrder();
+              return _context17.abrupt("return", tempOrder.products);
+            case 21:
+            case "end":
+              return _context17.stop();
+          }
+        }, _callee17, this);
       }));
-      function updateProductInOrder(_x14) {
-        return _updateProductInOrder.apply(this, arguments);
+      function updateOrderProductQuantity(_x19) {
+        return _updateOrderProductQuantity.apply(this, arguments);
       }
-      return updateProductInOrder;
+      return updateOrderProductQuantity;
     }()
+  }, {
+    key: "updateOrderBooking",
+    value: function updateOrderBooking(params) {
+      var unique_identification_number = params.unique_identification_number,
+        updates = params.updates;
+      var tempOrder = this.ensureTempOrder();
+      var bookingUid = String(unique_identification_number || '');
+      var bookingIndex = this.findBookingIndexByUniqueIdentificationNumber(tempOrder, bookingUid);
+      if (!bookingUid || bookingIndex === -1) {
+        throw new Error('[Order] 目标 booking 不存在，无法更新');
+      }
+      var targetBooking = tempOrder.bookings[bookingIndex] || {};
+      var nextBooking = _objectSpread(_objectSpread(_objectSpread({}, targetBooking), updates), {}, {
+        metadata: _objectSpread(_objectSpread(_objectSpread({}, targetBooking.metadata || {}), updates.metadata || {}), {}, {
+          unique_identification_number: bookingUid
+        })
+      });
+      nextBooking.is_all = normalizeBookingIsAll(nextBooking);
+      nextBooking.sub_type = normalizeBookingSubType(nextBooking);
+      tempOrder.bookings[bookingIndex] = nextBooking;
+      this.persistTempOrder();
+      return tempOrder.bookings;
+    }
   }, {
     key: "removeProductFromOrder",
     value: function () {
-      var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(identity) {
-        var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+      var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(identity) {
+        var tempOrder, removedProducts, _i, _removedProducts, product;
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
+              removedProducts = [];
               tempOrder.products = tempOrder.products.filter(function (item) {
-                return !isIdentityMatch(item, identity);
+                var shouldRemove = isIdentityMatch(item, identity);
+                if (shouldRemove) removedProducts.push(item);
+                return !shouldRemove;
               });
+              for (_i = 0, _removedProducts = removedProducts; _i < _removedProducts.length; _i++) {
+                product = _removedProducts[_i];
+                this.removeLinkedBookingsForProduct(tempOrder, product);
+              }
               this.applyDiscount();
-              _context15.next = 5;
+              _context18.next = 7;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 5:
-              this.persistTempOrder();
-              return _context15.abrupt("return", tempOrder.products);
             case 7:
+              this.persistTempOrder();
+              return _context18.abrupt("return", tempOrder.products);
+            case 9:
             case "end":
-              return _context15.stop();
+              return _context18.stop();
           }
-        }, _callee15, this);
+        }, _callee18, this);
       }));
-      function removeProductFromOrder(_x15) {
+      function removeProductFromOrder(_x20) {
         return _removeProductFromOrder.apply(this, arguments);
       }
       return removeProductFromOrder;
+    }()
+    /**
+     * 仅清空购物车行（products / bookings），不重置整单。
+     * 用于「仅清空商品」；客户、备注、支付等协议字段保持不变。
+     */
+  }, {
+    key: "clearOrderCartLines",
+    value: (function () {
+      var _clearOrderCartLines = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
+        var tempOrder;
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
+            case 0:
+              tempOrder = this.ensureTempOrder();
+              tempOrder.products = [];
+              tempOrder.bookings = [];
+              if (tempOrder._extend && _typeof(tempOrder._extend) === 'object') {
+                tempOrder._extend = _objectSpread(_objectSpread({}, tempOrder._extend), {}, {
+                  productsByUid: {}
+                });
+              }
+              this.applyDiscount();
+              _context19.next = 7;
+              return this.recalculateSummary({
+                createIfMissing: true
+              });
+            case 7:
+              this.persistTempOrder();
+              return _context19.abrupt("return", tempOrder);
+            case 9:
+            case "end":
+              return _context19.stop();
+          }
+        }, _callee19, this);
+      }));
+      function clearOrderCartLines() {
+        return _clearOrderCartLines.apply(this, arguments);
+      }
+      return clearOrderCartLines;
     }() // ─── TempOrder: 提交 ───
     /**
      * 提交当前 Sales tempOrder。
@@ -1632,14 +1968,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
      * smallTicketDataFlag 用于 B 端 checkout 小票数据返回。PaymentModal 在支付提交时
      * 应传 1，确保 /order/sales/checkout 返回打印所需数据。
      */
+    )
   }, {
     key: "submitTempOrder",
     value: function () {
-      var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(params) {
+      var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(params) {
         var _params$cacheId, _this$otherParams;
         var tempOrder, effectiveCacheId, hasPaymentOverride, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               this.persistTempOrder();
@@ -1666,10 +2003,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 type: params === null || params === void 0 ? void 0 : params.type,
                 enhance: enhancePayload
               });
-              _context16.next = 10;
+              _context20.next = 10;
               return this.saveDraft();
             case 10:
-              _context16.prev = 10;
+              _context20.prev = 10;
               this.logInfo('submitTempOrder calling sales checkout', {
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
@@ -1677,62 +2014,62 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 paymentsCount: ((_payload$payments = payload.payments) === null || _payload$payments === void 0 ? void 0 : _payload$payments.length) || 0,
                 smallTicketDataFlag: payload.small_ticket_data_flag
               });
-              _context16.next = 14;
+              _context20.next = 14;
               return this.submitSalesOrder({
                 query: payload
               });
             case 14:
-              result = _context16.sent;
-              _context16.next = 27;
+              result = _context20.sent;
+              _context20.next = 27;
               break;
             case 17:
-              _context16.prev = 17;
-              _context16.t0 = _context16["catch"](10);
-              backendErrorResponse = this.extractSubmitErrorResponse(_context16.t0);
+              _context20.prev = 17;
+              _context20.t0 = _context20["catch"](10);
+              backendErrorResponse = this.extractSubmitErrorResponse(_context20.t0);
               if (!backendErrorResponse) {
-                _context16.next = 24;
+                _context20.next = 24;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
-              return _context16.abrupt("return", backendErrorResponse);
+              return _context20.abrupt("return", backendErrorResponse);
             case 24:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
-                error: _context16.t0 instanceof Error ? _context16.t0.message : String(_context16.t0),
+                error: _context20.t0 instanceof Error ? _context20.t0.message : String(_context20.t0),
                 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 _context16.t0;
+              throw _context20.t0;
             case 27:
               if (!this.isSubmitResponseRejected(result)) {
-                _context16.next = 31;
+                _context20.next = 31;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
-              return _context16.abrupt("return", result);
+              return _context20.abrupt("return", result);
             case 31:
               submittedOrderId = this.extractOrderIdFromSubmitResult(result);
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
-                _context16.next = 37;
+                _context20.next = 37;
                 break;
               }
               tempOrder.order_id = submittedOrderId;
               resultRecord = result;
-              _context16.next = 37;
+              _context20.next = 37;
               return this.markLocalOrderSynced(submittedOrderId, (resultRecord === null || resultRecord === void 0 ? void 0 : resultRecord.data) || resultRecord || {});
             case 37:
-              return _context16.abrupt("return", result);
+              return _context20.abrupt("return", result);
             case 38:
             case "end":
-              return _context16.stop();
+              return _context20.stop();
           }
-        }, _callee16, this, [[10, 17]]);
+        }, _callee20, this, [[10, 17]]);
       }));
-      function submitTempOrder(_x16) {
+      function submitTempOrder(_x21) {
         return _submitTempOrder.apply(this, arguments);
       }
       return submitTempOrder;
@@ -1740,25 +2077,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "markLocalOrderSynced",
     value: function () {
-      var _markLocalOrderSynced = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(orderId, remoteOrder) {
+      var _markLocalOrderSynced = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(orderId, remoteOrder) {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               tempOrder.order_id = orderId;
               this.store.lastOrderInfo = remoteOrder;
               this.store.syncState = 'submitted';
               this.persistTempOrder();
-              _context17.next = 7;
+              _context21.next = 7;
               return this.saveDraft();
             case 7:
             case "end":
-              return _context17.stop();
+              return _context21.stop();
           }
-        }, _callee17, this);
+        }, _callee21, this);
       }));
-      function markLocalOrderSynced(_x17, _x18) {
+      function markLocalOrderSynced(_x22, _x23) {
         return _markLocalOrderSynced.apply(this, arguments);
       }
       return markLocalOrderSynced;
@@ -1782,10 +2119,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function extractSubmitErrorResponse(error) {
       var _error$response,
         _error$response2,
-        _this4 = this;
+        _this6 = 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 _this4.isSubmitErrorResponse(candidate);
+        return _this6.isSubmitErrorResponse(candidate);
       }) || null;
     }
   }, {
@@ -1805,49 +2142,60 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncPaymentsToOrder",
     value: function () {
-      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(params) {
-        var tempOrder, mappedPayments, paymentTotal, targetAmount, isFullyPaid, submitResult;
-        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(params) {
+        var tempOrder, mappedPayments, paymentTotal, targetAmount, isFullyPaid, paymentStatus, submitResult;
+        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               mappedPayments = mapPaymentItemsToOrderPayments(params.payments || []);
-              tempOrder.payments = mappedPayments;
-              if (params.paymentStatus) tempOrder.payment_status = params.paymentStatus;
-              this.persistTempOrder();
-              _context18.next = 7;
-              return this.saveDraft();
-            case 7:
               paymentTotal = this.calculatePaymentTotal(mappedPayments);
               targetAmount = this.getPaymentTargetAmount();
               isFullyPaid = targetAmount.lte(0) ? false : paymentTotal.gte(targetAmount);
-              if (!(!isFullyPaid || !params.submitWhenPaid)) {
-                _context18.next = 12;
+              paymentStatus = isFullyPaid ? params.paymentStatus || 'paid' : 'partially_paid';
+              tempOrder.payments = mappedPayments;
+              tempOrder.payment_status = paymentStatus;
+              this.persistTempOrder();
+              _context22.next = 11;
+              return this.saveDraft();
+            case 11:
+              if (params.submitWhenPaid) {
+                _context22.next = 13;
                 break;
               }
-              return _context18.abrupt("return", {
+              return _context22.abrupt("return", {
                 isFullyPaid: isFullyPaid
               });
-            case 12:
-              _context18.next = 14;
+            case 13:
+              if (!(this.store.syncState === 'submitting')) {
+                _context22.next = 15;
+                break;
+              }
+              return _context22.abrupt("return", {
+                isFullyPaid: isFullyPaid
+              });
+            case 15:
+              this.store.syncState = 'submitting';
+              _context22.next = 18;
               return this.submitTempOrder({
                 payments: mappedPayments,
-                paymentStatus: params.paymentStatus || 'paid',
-                smallTicketDataFlag: params.smallTicketDataFlag
+                paymentStatus: paymentStatus,
+                smallTicketDataFlag: params.smallTicketDataFlag,
+                channel: params.channel
               });
-            case 14:
-              submitResult = _context18.sent;
-              return _context18.abrupt("return", {
+            case 18:
+              submitResult = _context22.sent;
+              return _context22.abrupt("return", {
                 isFullyPaid: isFullyPaid,
                 submitResult: submitResult
               });
-            case 16:
+            case 20:
             case "end":
-              return _context18.stop();
+              return _context22.stop();
           }
-        }, _callee18, this);
+        }, _callee22, this);
       }));
-      function syncPaymentsToOrder(_x19) {
+      function syncPaymentsToOrder(_x24) {
         return _syncPaymentsToOrder.apply(this, arguments);
       }
       return syncPaymentsToOrder;
@@ -1936,11 +2284,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitOrder",
     value: function () {
-      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(order) {
+      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(order) {
         var _order$query$cartItem, _params$bookings, _params$relation_prod;
         var url, query, fetchUrl, params;
-        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
               this.logInfo('submitOrder called', {
                 url: order.url,
@@ -1960,14 +2308,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 _context19.abrupt("return", this.request.post(fetchUrl, params));
+              return _context23.abrupt("return", this.request.post(fetchUrl, params));
             case 6:
             case "end":
-              return _context19.stop();
+              return _context23.stop();
           }
-        }, _callee19, this);
+        }, _callee23, this);
       }));
-      function submitOrder(_x20) {
+      function submitOrder(_x25) {
         return _submitOrder.apply(this, arguments);
       }
       return submitOrder;
@@ -1975,13 +2323,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "cancelOrder",
     value: function () {
-      var _cancelOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(params) {
+      var _cancelOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(params) {
         var payload;
-        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
               if (!(!Array.isArray(params.order_ids) || params.order_ids.length === 0)) {
-                _context20.next = 2;
+                _context24.next = 2;
                 break;
               }
               throw new Error('取消订单失败：order_ids 不能为空');
@@ -1997,16 +2345,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 method: 'PUT',
                 orderIdsCount: params.order_ids.length
               });
-              return _context20.abrupt("return", this.request.put('/order/update-status', payload, {
+              return _context24.abrupt("return", this.request.put('/order/update-status', payload, {
                 isShopApi: true
               }));
             case 5:
             case "end":
-              return _context20.stop();
+              return _context24.stop();
           }
-        }, _callee20, this);
+        }, _callee24, this);
       }));
-      function cancelOrder(_x21) {
+      function cancelOrder(_x26) {
         return _cancelOrder.apply(this, arguments);
       }
       return cancelOrder;
@@ -2014,19 +2362,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "changeBookingStatus",
     value: function () {
-      var _changeBookingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(params) {
+      var _changeBookingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(params) {
         var url, payload;
-        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
               if (params.booking_id) {
-                _context21.next = 2;
+                _context25.next = 2;
                 break;
               }
               throw new Error('变更预约状态失败：booking_id 不能为空');
             case 2:
               if (params.appointment_status) {
-                _context21.next = 4;
+                _context25.next = 4;
                 break;
               }
               throw new Error('变更预约状态失败：appointment_status 不能为空');
@@ -2041,16 +2389,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 bookingId: params.booking_id,
                 appointmentStatus: params.appointment_status
               });
-              return _context21.abrupt("return", this.request.put(url, payload, {
+              return _context25.abrupt("return", this.request.put(url, payload, {
                 isShopApi: true
               }));
             case 8:
             case "end":
-              return _context21.stop();
+              return _context25.stop();
           }
-        }, _callee21, this);
+        }, _callee25, this);
       }));
-      function changeBookingStatus(_x22) {
+      function changeBookingStatus(_x27) {
         return _changeBookingStatus.apply(this, arguments);
       }
       return changeBookingStatus;
@@ -2068,11 +2416,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createOrderByCheckout",
     value: (function () {
-      var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(params) {
+      var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(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 _callee22$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
               // 过滤掉由在线店铺下单的 payment 支付数据
               onlineStorePaymentCodeList = ['WXPAY', 'WECHAT', 'ALIPAY', 'APPLE_PAY', 'CREDIT_CARD_3DS', 'CREDIT_CARD_TOKEN', 'GOOGLE_PAY', 'GOOGLE_PAY_3DS', 'CREDIT_CARD'];
@@ -2106,7 +2454,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
               });
-              _context22.prev = 4;
+              _context26.prev = 4;
               // 构建订单数据，设置默认值并允许 params 覆盖
               orderData = _objectSpread({
                 sales_channel: 'my_pisel',
@@ -2170,10 +2518,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 调用后端接口
-              _context22.next = 12;
+              _context26.next = 12;
               return this.request.post('/order/checkout', orderData);
             case 12:
-              response = _context22.sent;
+              response = _context26.sent;
               this.logInfo('Order API called successfully', {
                 response: response
               });
@@ -2181,22 +2529,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 _context22.abrupt("return", response);
+              return _context26.abrupt("return", response);
             case 18:
-              _context22.prev = 18;
-              _context22.t0 = _context22["catch"](4);
-              console.error('[Order] createOrderByCheckout 创建订单失败:', _context22.t0);
+              _context26.prev = 18;
+              _context26.t0 = _context26["catch"](4);
+              console.error('[Order] createOrderByCheckout 创建订单失败:', _context26.t0);
               this.logInfo('Order API called failed', {
-                error: _context22.t0 instanceof Error ? _context22.t0.message : String(_context22.t0)
+                error: _context26.t0 instanceof Error ? _context26.t0.message : String(_context26.t0)
               });
-              throw _context22.t0;
+              throw _context26.t0;
             case 23:
             case "end":
-              return _context22.stop();
+              return _context26.stop();
           }
-        }, _callee22, this, [[4, 18]]);
+        }, _callee26, this, [[4, 18]]);
       }));
-      function createOrderByCheckout(_x23) {
+      function createOrderByCheckout(_x28) {
         return _createOrderByCheckout.apply(this, arguments);
       }
       return createOrderByCheckout;
@@ -2204,23 +2552,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitSalesOrder",
     value: function () {
-      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(params) {
+      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(params) {
         var url, query, fetchUrl;
-        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+        return _regeneratorRuntime().wrap(function _callee27$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
               url = params.url, query = params.query;
               fetchUrl = url || '/order/sales/checkout';
-              return _context23.abrupt("return", this.request.post(fetchUrl, query, {
+              return _context27.abrupt("return", this.request.post(fetchUrl, query, {
                 customToast: function customToast() {}
               }));
             case 3:
             case "end":
-              return _context23.stop();
+              return _context27.stop();
           }
-        }, _callee23, this);
+        }, _callee27, this);
       }));
-      function submitSalesOrder(_x24) {
+      function submitSalesOrder(_x29) {
         return _submitSalesOrder.apply(this, arguments);
       }
       return submitSalesOrder;
@@ -2234,37 +2582,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sendCustomerPayLink",
     value: (function () {
-      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(params) {
+      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(params) {
         var _params$emails;
         var orderIds;
-        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+        return _regeneratorRuntime().wrap(function _callee28$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
               orderIds = params.order_ids || params.orderIds || [];
               if (orderIds.length) {
-                _context24.next = 3;
+                _context28.next = 3;
                 break;
               }
               throw new Error('发送支付链接前必须先提交本地订单并取得订单 ID');
             case 3:
               if ((_params$emails = params.emails) !== null && _params$emails !== void 0 && _params$emails.length) {
-                _context24.next = 5;
+                _context28.next = 5;
                 break;
               }
               throw new Error('发送支付链接需要至少一个邮箱');
             case 5:
-              return _context24.abrupt("return", this.request.post('/order/batch-email', {
+              return _context28.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 _context24.stop();
+              return _context28.stop();
           }
-        }, _callee24, this);
+        }, _callee28, this);
       }));
-      function sendCustomerPayLink(_x25) {
+      function sendCustomerPayLink(_x30) {
         return _sendCustomerPayLink.apply(this, arguments);
       }
       return sendCustomerPayLink;
@@ -2273,28 +2621,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderInfoByRemote",
     value: function () {
-      var _getOrderInfoByRemote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(order_id) {
+      var _getOrderInfoByRemote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(order_id) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+        return _regeneratorRuntime().wrap(function _callee29$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
-              _context25.next = 2;
+              _context29.next = 2;
               return this.request.get("/order/sales/".concat(order_id), {
                 with: ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info']
               });
             case 2:
-              res = _context25.sent;
+              res = _context29.sent;
               if (res.code === 200) {
                 this.store.lastOrderInfo = res.data;
               }
-              return _context25.abrupt("return", res);
+              return _context29.abrupt("return", res);
             case 5:
             case "end":
-              return _context25.stop();
+              return _context29.stop();
           }
-        }, _callee25, this);
+        }, _callee29, this);
       }));
-      function getOrderInfoByRemote(_x26) {
+      function getOrderInfoByRemote(_x31) {
         return _getOrderInfoByRemote.apply(this, arguments);
       }
       return getOrderInfoByRemote;
@@ -2308,79 +2656,92 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hydrateTempOrderFromRecord",
     value: (function () {
-      var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(record, options) {
-        var _this5 = this;
-        var raw, defaults, nextTempOrder, TEMP_ORDER_KEYS;
-        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+      var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(record, options) {
+        var raw, nextTempOrder;
+        return _regeneratorRuntime().wrap(function _callee30$(_context30) {
+          while (1) switch (_context30.prev = _context30.next) {
             case 0:
               raw = record && _typeof(record) === 'object' && record.data && record.order_id == null ? record.data : record || {};
-              defaults = this.createDefaultTempOrderInstance();
-              nextTempOrder = _objectSpread({}, defaults);
-              TEMP_ORDER_KEYS = ['order_id', 'external_sale_number', 'order_number', 'shop_order_number', 'shop_full_order_number', 'type', 'business_code', 'platform', 'sales_channel', 'order_sales_channel', 'status', 'payment_status', 'shipping_status', 'customer_id', 'customer_name', 'country_calling_code', 'phone', 'email', 'customer', 'is_price_include_tax', 'tax_title', 'tax_country_code', 'currency_code', 'currency_symbol', 'currency_format', 'is_deposit', 'deposit_amount', 'shop_discount', 'surcharge_fee', 'note', 'buzzer', 'delivery_type', 'table_number', 'schedule_date', 'created_at', 'request_unique_idempotency_token'];
-              TEMP_ORDER_KEYS.forEach(function (key) {
-                if (raw[key] !== undefined) {
-                  nextTempOrder[key] = raw[key];
-                }
+              nextTempOrder = this.normalizeTempOrderForRuntime(raw, {
+                ensureIdentity: true
               });
-              nextTempOrder.metadata = raw.metadata && _typeof(raw.metadata) === 'object' ? _objectSpread({}, raw.metadata) : {};
-              nextTempOrder.holder = raw.holder && _typeof(raw.holder) === 'object' ? _objectSpread({}, raw.holder) : null;
-              nextTempOrder.products = Array.isArray(raw.products) ? raw.products.map(function (p) {
-                return _this5.normalizeHydratedOrderProduct(p);
-              }) : [];
-              nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map(function (b) {
-                return _objectSpread(_objectSpread({}, b || {}), {}, {
-                  is_all: normalizeBookingIsAll(b || {}),
-                  sub_type: normalizeBookingSubType(b || {})
-                });
-              }) : [];
-              nextTempOrder.payments = Array.isArray(raw.payments) ? raw.payments.map(function (p) {
-                return _objectSpread({}, p || {});
-              }) : [];
-              nextTempOrder.surcharges = Array.isArray(raw.surcharges) ? raw.surcharges.map(function (s) {
-                return _objectSpread({}, s || {});
-              }) : [];
-              nextTempOrder.discount_list = Array.isArray(raw.discount_list) ? raw.discount_list.map(function (d) {
-                return _objectSpread({}, d || {});
-              }) : [];
-              nextTempOrder.relation_forms = Array.isArray(raw.relation_forms) ? raw.relation_forms.map(function (f) {
-                return _objectSpread({}, f || {});
-              }) : [];
-              nextTempOrder.contacts = Array.isArray(raw.contacts) ? raw.contacts.map(function (c) {
-                return _objectSpread({}, c || {});
-              }) : [];
-              nextTempOrder.contacts_info = raw.contacts_info && _typeof(raw.contacts_info) === 'object' && !Array.isArray(raw.contacts_info) ? _objectSpread({}, raw.contacts_info) : null;
-              nextTempOrder._extend = raw._extend && _typeof(raw._extend) === 'object' ? _objectSpread(_objectSpread({}, raw._extend), {}, {
-                productsByUid: raw._extend.productsByUid || {}
-              }) : {
-                productsByUid: {}
-              };
-              this.ensureExternalSaleNumber(nextTempOrder);
               this.store.tempOrder = nextTempOrder;
               this.store.summary = raw.summary && _typeof(raw.summary) === 'object' ? _objectSpread(_objectSpread({}, createEmptySummary()), raw.summary) : createEmptySummary();
               this.store.lastOrderInfo = raw.lastOrderInfo || raw;
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context26.next = 23;
+                _context30.next = 8;
                 break;
               }
-              _context26.next = 23;
+              _context30.next = 8;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 23:
+            case 8:
               this.persistTempOrder();
-              return _context26.abrupt("return", nextTempOrder);
-            case 25:
+              return _context30.abrupt("return", nextTempOrder);
+            case 10:
             case "end":
-              return _context26.stop();
+              return _context30.stop();
           }
-        }, _callee26, this);
+        }, _callee30, this);
       }));
-      function hydrateTempOrderFromRecord(_x27, _x28) {
+      function hydrateTempOrderFromRecord(_x32, _x33) {
         return _hydrateTempOrderFromRecord.apply(this, arguments);
       }
       return hydrateTempOrderFromRecord;
     }())
+  }, {
+    key: "normalizeTempOrderForRuntime",
+    value: function normalizeTempOrderForRuntime(raw, options) {
+      var _this7 = this;
+      var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), raw || {});
+      delete nextTempOrder.summary;
+      delete nextTempOrder.lastOrderInfo;
+      delete nextTempOrder.discount_list;
+      delete nextTempOrder.shop_id;
+      delete nextTempOrder.create_date;
+      delete nextTempOrder.total_amount;
+      delete nextTempOrder.expect_amount;
+      delete nextTempOrder.paid_amount;
+      delete nextTempOrder.shop_note;
+      delete nextTempOrder.start_time;
+      delete nextTempOrder.tax_fee;
+      delete nextTempOrder.total_refund_amount;
+      delete nextTempOrder.holder_id;
+      nextTempOrder.metadata = raw.metadata && _typeof(raw.metadata) === 'object' ? _objectSpread({}, raw.metadata) : {};
+      nextTempOrder.holder = raw.holder && _typeof(raw.holder) === 'object' ? _objectSpread({}, raw.holder) : null;
+      nextTempOrder.products = Array.isArray(raw.products) ? raw.products.map(function (p) {
+        return _this7.normalizeHydratedOrderProduct(p);
+      }) : [];
+      nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map(function (b) {
+        return _objectSpread(_objectSpread({}, b || {}), {}, {
+          is_all: normalizeBookingIsAll(b || {}),
+          sub_type: normalizeBookingSubType(b || {})
+        });
+      }) : [];
+      nextTempOrder.payments = Array.isArray(raw.payments) ? raw.payments.map(function (p) {
+        return _objectSpread({}, p || {});
+      }) : [];
+      nextTempOrder.surcharges = Array.isArray(raw.surcharges) ? raw.surcharges.map(function (s) {
+        return _objectSpread({}, s || {});
+      }) : [];
+      nextTempOrder.relation_forms = Array.isArray(raw.relation_forms) ? raw.relation_forms.map(function (f) {
+        return _objectSpread({}, f || {});
+      }) : [];
+      nextTempOrder.contacts = Array.isArray(raw.contacts) ? raw.contacts.map(function (c) {
+        return _objectSpread({}, c || {});
+      }) : [];
+      nextTempOrder.contacts_info = raw.contacts_info && _typeof(raw.contacts_info) === 'object' && !Array.isArray(raw.contacts_info) ? _objectSpread({}, raw.contacts_info) : null;
+      nextTempOrder._extend = raw._extend && _typeof(raw._extend) === 'object' ? _objectSpread(_objectSpread({}, raw._extend), {}, {
+        productsByUid: raw._extend.productsByUid || {}
+      }) : {
+        productsByUid: {}
+      };
+      if ((options === null || options === void 0 ? void 0 : options.ensureIdentity) !== false) {
+        this.ensureExternalSaleNumber(nextTempOrder);
+      }
+      return nextTempOrder;
+    }
   }, {
     key: "normalizeHydratedOrderProduct",
     value: function normalizeHydratedOrderProduct(product) {
@@ -2396,6 +2757,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         row.metadata.unique_identification_number = createUuidV4();
       }
       var normalized = normalizeOrderProduct(row);
+      normalized.discount_list = normalizeOrderProductDiscountList(normalized.discount_list);
       var result = _objectSpread(_objectSpread(_objectSpread({}, row), normalized), {}, {
         metadata: _objectSpread(_objectSpread({}, row.metadata), normalized.metadata)
       });
@@ -2411,25 +2773,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderInfo",
     value: function () {
-      var _getOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(order_id) {
+      var _getOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(order_id) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee27$(_context27) {
-          while (1) switch (_context27.prev = _context27.next) {
+        return _regeneratorRuntime().wrap(function _callee31$(_context31) {
+          while (1) switch (_context31.prev = _context31.next) {
             case 0:
-              _context27.next = 2;
+              _context31.next = 2;
               return this.request.get("/order/sales/".concat(order_id), {
                 with: ['products', 'bookings']
               });
             case 2:
-              res = _context27.sent;
-              return _context27.abrupt("return", res);
+              res = _context31.sent;
+              return _context31.abrupt("return", res);
             case 4:
             case "end":
-              return _context27.stop();
+              return _context31.stop();
           }
-        }, _callee27, this);
+        }, _callee31, this);
       }));
-      function getOrderInfo(_x29) {
+      function getOrderInfo(_x34) {
         return _getOrderInfo.apply(this, arguments);
       }
       return getOrderInfo;