@pisell/pisellos 2.2.272 → 2.2.274

package/dist/modules/Order/index.js

@@ -35,8 +35,6 @@ import { OrderHooks } from "./types";
 import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, mergeOrderProductDisplayFields, resolveIsFormSubject } from "./utils";
 import { isNormalProduct } from "../Product/utils";
 import dayjs from 'dayjs';
-import { ensureOrderPaymentNumber, mergeOrderPaymentRecord, resolveOrderPaymentIdentity } from "./payment-utils";
-import { resolvePaymentNumberDevicePrefix, resolvePaymentNumberDevicePrefixFromDeviceId } from "../../utils/payment-number";
 import { processCartPromotion, appendPromotionTags as _appendPromotionTags, getOrderProductUid as getPromotionUid } from "../../solution/BaseSales/utils/cartPromotion";
 import { buildProductLineFingerprint, getProductIdentityIndex, getSafeProductNum, isIdentityMatch, normalizeOrderProduct } from "../../solution/ScanOrder/utils";
 import { syncManualProductDiscountProductNum } from "./utils/manualProductDiscount";
@@ -85,10 +83,6 @@ function isPaidPaymentRecord(payment) {
 function isCommittedVoucherPaymentRecord(payment) {
   return isVoucherPaymentRecord(payment) && (payment === null || payment === void 0 ? void 0 : payment.status) !== 'voided' && (hasSyncedOrderPaymentRecord(payment) || isPaidPaymentRecord(payment));
 }
-function getVoucherPaymentLifecycleKey(payment) {
-  if (!isVoucherPaymentRecord(payment)) return null;
-  return "".concat(String(payment.voucher_id), "::").concat(String(payment.status || ''));
-}
 export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(OrderModule, _BaseModule);
   var _super = _createSuper(OrderModule);
@@ -103,7 +97,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "logger", void 0);
     // LoggerManager 实例
     _defineProperty(_assertThisInitialized(_this), "window", void 0);
-    _defineProperty(_assertThisInitialized(_this), "appPlugin", void 0);
     _defineProperty(_assertThisInitialized(_this), "cacheId", void 0);
     _defineProperty(_assertThisInitialized(_this), "salesSummaryModuleName", void 0);
     _defineProperty(_assertThisInitialized(_this), "rulesHooksOverride", void 0);
@@ -291,7 +284,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
         var _otherParams$rules, _otherParams$order, _otherParams$hooks;
-        var app, otherParams;
+        var appPlugin, app, otherParams;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -307,14 +300,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 this.store.availableWalletIds = [];
               }
               this.request = this.core.getPlugin('request');
-              this.appPlugin = this.core.getPlugin('app');
-              if (this.appPlugin) {
+              appPlugin = this.core.getPlugin('app');
+              if (appPlugin) {
                 _context.next = 9;
                 break;
               }
               throw new Error('Order 模块需要 app 插件支持');
             case 9:
-              app = this.appPlugin.getApp();
+              app = appPlugin.getApp();
               this.logger = app.logger;
               this.window = this.core.getPlugin('window');
               otherParams = options.otherParams || {};
@@ -1517,44 +1510,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var depositPaidAmount = this.calculateDepositPaidAmount(tempOrder.payments || []);
       return depositPaidAmount.lt(depositAmount) ? 'deposit' : 'normal';
     }
-  }, {
-    key: "getPaymentNumberAppData",
-    value: function getPaymentNumberAppData(key) {
-      var _appPlugin$getData, _app$models, _app$models$getStore, _app$models$getStore$, _app$models$getStore$2;
-      var appPlugin = this.appPlugin;
-      if (!appPlugin) return undefined;
-      var getData = (_appPlugin$getData = appPlugin.getData) === null || _appPlugin$getData === void 0 ? void 0 : _appPlugin$getData.call(appPlugin);
-      if (typeof getData === 'function') return getData(key);
-      var app = appPlugin.getApp();
-      var coreData = app === null || app === void 0 || (_app$models = app.models) === null || _app$models === void 0 || (_app$models$getStore = _app$models.getStore) === null || _app$models$getStore === void 0 || (_app$models$getStore$ = (_app$models$getStore$2 = _app$models$getStore.call(_app$models)).getDataByModel) === null || _app$models$getStore$ === void 0 ? void 0 : _app$models$getStore$.call(_app$models$getStore$2, 'core', 'core');
-      return coreData === null || coreData === void 0 ? void 0 : coreData[key];
-    }
-  }, {
-    key: "getPaymentNumberDevicePrefixSync",
-    value: function getPaymentNumberDevicePrefixSync() {
-      var _this7 = this;
-      return resolvePaymentNumberDevicePrefixFromDeviceId(function (key) {
-        return _this7.getPaymentNumberAppData(key);
-      });
-    }
-  }, {
-    key: "getPaymentNumberDevicePrefixAsync",
-    value: function getPaymentNumberDevicePrefixAsync() {
-      var _this8 = this;
-      return resolvePaymentNumberDevicePrefix(function (key) {
-        return _this8.getPaymentNumberAppData(key);
-      });
-    }
   }, {
     key: "normalizePaymentSource",
     value: function normalizePaymentSource(payment, options) {
       var _ref19, _paymentRecord$origin;
       var paymentRecord = payment;
       var metadata = paymentRecord.metadata && _typeof(paymentRecord.metadata) === 'object' ? _objectSpread({}, paymentRecord.metadata) : {};
-      var normalized = ensureOrderPaymentNumber(_objectSpread(_objectSpread({}, paymentRecord), {}, {
+      if (!metadata.unique_payment_number) {
+        metadata.unique_payment_number = createUuidV4();
+      }
+      var normalized = _objectSpread(_objectSpread({}, paymentRecord), {}, {
         metadata: metadata,
         origin_amount: (_ref19 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref19 !== void 0 ? _ref19 : '0.00'
-      }), (options === null || options === void 0 ? void 0 : options.devicePrefix) || this.getPaymentNumberDevicePrefixSync(), createUuidV4);
+      });
       if (paymentRecord.status !== undefined) {
         normalized.status = paymentRecord.status;
       } else if ((options === null || options === void 0 ? void 0 : options.defaultPaid) !== false) {
@@ -1672,16 +1640,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculatePaidPaymentSummary",
     value: function calculatePaidPaymentSummary(payments) {
-      var _this9 = this;
+      var _this7 = this;
       return (payments || []).reduce(function (summary, payment) {
         var paymentRecord = payment;
         if (!isPaidPaymentRecord(paymentRecord)) return summary;
         return {
           customerPaidAmount: summary.customerPaidAmount.plus(paymentRecord.amount || 0),
-          orderPaidAmount: summary.orderPaidAmount.plus(_this9.calculatePaymentOrderAmount(paymentRecord)),
-          gapPaidAmount: summary.gapPaidAmount.plus(_this9.calculatePaymentGapAmount(paymentRecord)),
-          payServiceChargeAmount: summary.payServiceChargeAmount.plus(_this9.calculatePaymentServiceFee(paymentRecord)),
-          roundingAmount: summary.roundingAmount.plus(_this9.calculatePaymentRoundingAmount(paymentRecord))
+          orderPaidAmount: summary.orderPaidAmount.plus(_this7.calculatePaymentOrderAmount(paymentRecord)),
+          gapPaidAmount: summary.gapPaidAmount.plus(_this7.calculatePaymentGapAmount(paymentRecord)),
+          payServiceChargeAmount: summary.payServiceChargeAmount.plus(_this7.calculatePaymentServiceFee(paymentRecord)),
+          roundingAmount: summary.roundingAmount.plus(_this7.calculatePaymentRoundingAmount(paymentRecord))
         };
       }, {
         customerPaidAmount: new Decimal(0),
@@ -1883,15 +1851,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeFingerprintValue",
     value: function normalizeFingerprintValue(value) {
-      var _this10 = this;
+      var _this8 = this;
       if (Array.isArray(value)) {
         return value.map(function (item) {
-          return _this10.normalizeFingerprintValue(item);
+          return _this8.normalizeFingerprintValue(item);
         });
       }
       if (!value || _typeof(value) !== 'object') return value !== null && value !== void 0 ? value : '';
       return Object.keys(value).sort().reduce(function (result, key) {
-        result[key] = _this10.normalizeFingerprintValue(value[key]);
+        result[key] = _this8.normalizeFingerprintValue(value[key]);
         return result;
       }, {});
     }
@@ -1906,7 +1874,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _sku$barcode,
         _ref20,
         _sku$variant_id,
-        _this11 = this;
+        _this9 = this;
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
       var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
       var discountTypes = ((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
@@ -1940,7 +1908,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               option_group_id: (_option$option_group_ = option === null || option === void 0 ? void 0 : option.option_group_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : null,
               option_group_item_id: (_ref22 = (_option$option_group_2 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_2 !== void 0 ? _option$option_group_2 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref22 !== void 0 ? _ref22 : null,
               num: Number((_option$num = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num !== void 0 ? _option$num : 1) || 1,
-              add_price: _this11.normalizeFingerprintMoney((_option$add_price = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price !== void 0 ? _option$add_price : option === null || option === void 0 ? void 0 : option.price)
+              add_price: _this9.normalizeFingerprintMoney((_option$add_price = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price !== void 0 ? _option$add_price : option === null || option === void 0 ? void 0 : option.price)
             };
           })
         }),
@@ -1950,8 +1918,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             bundle_product_id: (_ref23 = (_ref24 = (_bundle$bundle_produc = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref24 !== void 0 ? _ref24 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref23 !== void 0 ? _ref23 : null,
             bundle_variant_id: (_ref25 = (_bundle$bundle_varian = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle === null || bundle === void 0 ? void 0 : bundle.product_variant_id) !== null && _ref25 !== void 0 ? _ref25 : 0,
             num: getSafeProductNum((_bundle$num = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle === null || bundle === void 0 ? void 0 : bundle.quantity),
-            price: _this11.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.price),
-            bundle_selling_price: _this11.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price),
+            price: _this9.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.price),
+            bundle_selling_price: _this9.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price),
             price_type: (_bundle$price_type = bundle === null || bundle === void 0 ? void 0 : bundle.price_type) !== null && _bundle$price_type !== void 0 ? _bundle$price_type : '',
             price_type_ext: (_bundle$price_type_ex = bundle === null || bundle === void 0 ? void 0 : bundle.price_type_ext) !== null && _bundle$price_type_ex !== void 0 ? _bundle$price_type_ex : ''
           };
@@ -1961,7 +1929,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           return {
             type: (_ref26 = (_discount$type2 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type2 !== void 0 ? _discount$type2 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref26 !== void 0 ? _ref26 : '',
             discount_id: (_ref27 = (_ref28 = (_discount$discount_id = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id !== void 0 ? _discount$discount_id : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref28 !== void 0 ? _ref28 : discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) !== null && _ref27 !== void 0 ? _ref27 : null,
-            amount: _this11.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
+            amount: _this9.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
           };
         }))
       };
@@ -1969,9 +1937,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildOrderProductsFingerprint",
     value: function buildOrderProductsFingerprint(products) {
-      var _this12 = this;
+      var _this10 = this;
       var items = (products || []).map(function (product) {
-        return _this12.buildProductFingerprintItem(product);
+        return _this10.buildProductFingerprintItem(product);
       });
       items.sort(function (left, right) {
         return JSON.stringify(left).localeCompare(JSON.stringify(right));
@@ -1993,7 +1961,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _sku$barcode2,
         _ref30,
         _sku$variant_id2,
-        _this13 = this;
+        _this11 = this;
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
       var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
       var discountTypes = ((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
@@ -2024,7 +1992,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               option_group_id: (_option$option_group_3 = option === null || option === void 0 ? void 0 : option.option_group_id) !== null && _option$option_group_3 !== void 0 ? _option$option_group_3 : null,
               option_group_item_id: (_ref32 = (_option$option_group_4 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_4 !== void 0 ? _option$option_group_4 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref32 !== void 0 ? _ref32 : null,
               num: Number((_option$num2 = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num2 !== void 0 ? _option$num2 : 1) || 1,
-              add_price: _this13.normalizeFingerprintMoney((_option$add_price2 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price2 !== void 0 ? _option$add_price2 : option === null || option === void 0 ? void 0 : option.price)
+              add_price: _this11.normalizeFingerprintMoney((_option$add_price2 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price2 !== void 0 ? _option$add_price2 : option === null || option === void 0 ? void 0 : option.price)
             };
           })
         }),
@@ -2038,14 +2006,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             num: getSafeProductNum((_bundle$num2 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num2 !== void 0 ? _bundle$num2 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity),
             price_type: (_bundle$price_type2 = bundle === null || bundle === void 0 ? void 0 : bundle.price_type) !== null && _bundle$price_type2 !== void 0 ? _bundle$price_type2 : '',
             price_type_ext: (_bundle$price_type_ex2 = bundle === null || bundle === void 0 ? void 0 : bundle.price_type_ext) !== null && _bundle$price_type_ex2 !== void 0 ? _bundle$price_type_ex2 : '',
-            option: _this13.normalizeFingerprintValue(((bundle === null || bundle === void 0 ? void 0 : bundle.option) || []).map(function (option) {
+            option: _this11.normalizeFingerprintValue(((bundle === null || bundle === void 0 ? void 0 : bundle.option) || []).map(function (option) {
               var _ref38, _option$id3, _option$option_group_5, _ref39, _option$option_group_6, _option$num3, _option$add_price3;
               return {
                 id: (_ref38 = (_option$id3 = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id3 !== void 0 ? _option$id3 : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref38 !== void 0 ? _ref38 : null,
                 option_group_id: (_option$option_group_5 = option === null || option === void 0 ? void 0 : option.option_group_id) !== null && _option$option_group_5 !== void 0 ? _option$option_group_5 : null,
                 option_group_item_id: (_ref39 = (_option$option_group_6 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_6 !== void 0 ? _option$option_group_6 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref39 !== void 0 ? _ref39 : null,
                 num: Number((_option$num3 = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num3 !== void 0 ? _option$num3 : 1) || 1,
-                add_price: _this13.normalizeFingerprintMoney((_option$add_price3 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price3 !== void 0 ? _option$add_price3 : option === null || option === void 0 ? void 0 : option.price)
+                add_price: _this11.normalizeFingerprintMoney((_option$add_price3 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price3 !== void 0 ? _option$add_price3 : option === null || option === void 0 ? void 0 : option.price)
               };
             }))
           };
@@ -2055,7 +2023,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           return {
             type: (_ref40 = (_discount$type4 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type4 !== void 0 ? _discount$type4 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref40 !== void 0 ? _ref40 : '',
             discount_id: (_ref41 = (_ref42 = (_discount$discount_id2 = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id2 !== void 0 ? _discount$discount_id2 : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref42 !== void 0 ? _ref42 : discount === null || discount === void 0 || (_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) !== null && _ref41 !== void 0 ? _ref41 : null,
-            amount: _this13.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
+            amount: _this11.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
           };
         }))
       };
@@ -2063,9 +2031,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildOrderProductsStructuralFingerprint",
     value: function buildOrderProductsStructuralFingerprint(products) {
-      var _this14 = this;
+      var _this12 = this;
       var items = (products || []).map(function (product) {
-        return _this14.buildProductStructuralFingerprintItem(product);
+        return _this12.buildProductStructuralFingerprintItem(product);
       });
       items.sort(function (left, right) {
         return JSON.stringify(left).localeCompare(JSON.stringify(right));
@@ -2493,9 +2461,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sanitizeTempOrderProducts",
     value: function sanitizeTempOrderProducts(tempOrder) {
-      var _this15 = this;
+      var _this13 = this;
       tempOrder.products = (tempOrder.products || []).map(function (product) {
-        return _this15.sanitizeOrderProductForTempOrder(product);
+        return _this13.sanitizeOrderProductForTempOrder(product);
       });
     }
   }, {
@@ -2598,7 +2566,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncLinkedBookingHoldersToProducts",
     value: function syncLinkedBookingHoldersToProducts(tempOrder) {
-      var _this16 = this;
+      var _this14 = this;
       var bookings = tempOrder.bookings || [];
       var products = tempOrder.products || [];
       if (!bookings.length || !products.length) return;
@@ -2623,7 +2591,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         var bookingUid = product.booking_uid || ((_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.booking_uid);
         var linkedBooking = (productUid !== undefined && productUid !== null && String(productUid) !== '' ? bookingByProductUid.get(String(productUid)) : undefined) || (bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '' ? bookingByBookingUid.get(String(bookingUid)) : undefined);
         if (linkedBooking) {
-          _this16.setProductHolderFromBooking(product, linkedBooking);
+          _this14.setProductHolderFromBooking(product, linkedBooking);
         }
       });
     }
@@ -2751,9 +2719,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "findBookingIndexByUniqueIdentificationNumber",
     value: function findBookingIndexByUniqueIdentificationNumber(tempOrder, uniqueIdentificationNumber) {
-      var _this17 = this;
+      var _this15 = this;
       return (tempOrder.bookings || []).findIndex(function (booking) {
-        return _this17.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
+        return _this15.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
       });
     }
   }, {
@@ -2761,12 +2729,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function removeLinkedBookingsForProduct(tempOrder, product) {
       var _product$metadata7,
         _product$metadata8,
-        _this18 = this;
+        _this16 = this;
       var productUid = (product === null || product === void 0 || (_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
       var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.booking_uid);
       if (!productUid && !bookingUid) return;
       tempOrder.bookings = (tempOrder.bookings || []).filter(function (booking) {
-        var currentBookingUid = _this18.getBookingUniqueIdentificationNumber(booking);
+        var currentBookingUid = _this16.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;
@@ -3099,15 +3067,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "productHasCustomerBoundDiscount",
     value: function productHasCustomerBoundDiscount(product) {
-      var _this19 = this;
+      var _this17 = this;
       if (((product === null || product === void 0 ? void 0 : product.discount_list) || []).some(function (discount) {
-        return _this19.isCustomerBoundDiscount(discount);
+        return _this17.isCustomerBoundDiscount(discount);
       })) {
         return true;
       }
       return ((product === null || product === void 0 ? void 0 : product.product_bundle) || []).some(function (bundle) {
         return ((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []).some(function (discount) {
-          return _this19.isCustomerBoundDiscount(discount);
+          return _this17.isCustomerBoundDiscount(discount);
         });
       });
     }
@@ -3116,18 +3084,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function shouldSkipDiscountCalculation(tempOrder) {
       var _this$store$discount17,
         _this$store$discount18,
-        _this20 = this;
+        _this18 = this;
       if (this.hasActiveCustomerBoundDiscount) return false;
       var discountList = ((_this$store$discount17 = this.store.discount) === null || _this$store$discount17 === void 0 || (_this$store$discount18 = _this$store$discount17.getDiscountList) === null || _this$store$discount18 === void 0 ? void 0 : _this$store$discount18.call(_this$store$discount17)) || [];
       if (discountList.length > 0) return false;
       return !(tempOrder.products || []).some(function (product) {
-        return _this20.productHasCustomerBoundDiscount(product);
+        return _this18.productHasCustomerBoundDiscount(product);
       });
     }
   }, {
     key: "clearCustomerBoundDiscounts",
     value: function clearCustomerBoundDiscounts(tempOrder) {
-      var _this21 = this,
+      var _this19 = this,
         _discountModule$getDi,
         _discountModule$getOr,
         _discountModule$setDi,
@@ -3136,7 +3104,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var filterDiscountList = function filterDiscountList(discountList) {
         if (!Array.isArray(discountList)) return [];
         return discountList.filter(function (discount) {
-          var shouldRemove = _this21.isCustomerBoundDiscount(discount);
+          var shouldRemove = _this19.isCustomerBoundDiscount(discount);
           if (shouldRemove) didRemoveCustomerBoundDiscount = true;
           return !shouldRemove;
         });
@@ -3163,12 +3131,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var currentDiscounts = ((_discountModule$getDi = discountModule.getDiscountList) === null || _discountModule$getDi === void 0 ? void 0 : _discountModule$getDi.call(discountModule)) || [];
       var currentOriginalDiscounts = ((_discountModule$getOr = discountModule.getOriginalDiscountList) === null || _discountModule$getOr === void 0 ? void 0 : _discountModule$getOr.call(discountModule)) || [];
       var nextDiscounts = currentDiscounts.filter(function (discount) {
-        if (_this21.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
-        return !_this21.isCustomerBoundDiscount(discount);
+        if (_this19.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
+        return !_this19.isCustomerBoundDiscount(discount);
       });
       var nextOriginalDiscounts = currentOriginalDiscounts.filter(function (discount) {
-        if (_this21.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
-        return !_this21.isCustomerBoundDiscount(discount);
+        if (_this19.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
+        return !_this19.isCustomerBoundDiscount(discount);
       });
       void ((_discountModule$setDi = discountModule.setDiscountList) === null || _discountModule$setDi === void 0 ? void 0 : _discountModule$setDi.call(discountModule, nextDiscounts));
       void ((_discountModule$setOr = discountModule.setOriginalDiscountList) === null || _discountModule$setOr === void 0 ? void 0 : _discountModule$setOr.call(discountModule, nextOriginalDiscounts));
@@ -3322,71 +3290,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
      * 用一组支付来源覆盖当前订单支付项。
      *
      * 入参允许来自 PaymentModule 的 PaymentItem，内部统一映射为 Sales 协议：
-     * 新支付来源的 uuid 会作为 payment_number 的唯一号段，id -> custom_payment_id，
+     * uuid -> metadata.unique_payment_number，id -> custom_payment_id，
      * isSynced 等运行态字段不会进入 tempOrder.payments。
      */
   }, {
     key: "setOrderPayments",
     value: function setOrderPayments(payments) {
-      var _this22 = this;
       var tempOrder = this.ensureTempOrder();
-      tempOrder.payments = mapPaymentItemsToOrderPayments((payments || []).map(function (payment) {
-        return _this22.normalizePaymentSource(payment, {
-          defaultPaid: false
-        });
-      }));
+      tempOrder.payments = mapPaymentItemsToOrderPayments(payments);
       this.persistTempOrder();
       return tempOrder.payments;
     }
 
-    /** 同步兼容入口：按调用当下的 device_id 或 LOCAL 生成支付编号。 */
+    /** 追加单个支付项，并立即持久化当前 tempOrder。 */
   }, {
     key: "addOrderPayment",
     value: function addOrderPayment(payment) {
-      var hasPaymentNumber = String(payment.payment_number || '').trim() !== '';
-      return this.addOrderPaymentWithDevicePrefix(payment, hasPaymentNumber ? 'LOCAL' : this.getPaymentNumberDevicePrefixSync());
-    }
-
-    /** 异步入口：创建支付项时读取最新 IoT 设备短号。 */
-  }, {
-    key: "addOrderPaymentAsync",
-    value: (function () {
-      var _addOrderPaymentAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(payment) {
-        var hasPaymentNumber, devicePrefix;
-        return _regeneratorRuntime().wrap(function _callee15$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
-            case 0:
-              hasPaymentNumber = String(payment.payment_number || '').trim() !== '';
-              if (!hasPaymentNumber) {
-                _context17.next = 5;
-                break;
-              }
-              _context17.t0 = 'LOCAL';
-              _context17.next = 8;
-              break;
-            case 5:
-              _context17.next = 7;
-              return this.getPaymentNumberDevicePrefixAsync();
-            case 7:
-              _context17.t0 = _context17.sent;
-            case 8:
-              devicePrefix = _context17.t0;
-              return _context17.abrupt("return", this.addOrderPaymentWithDevicePrefix(payment, devicePrefix));
-            case 10:
-            case "end":
-              return _context17.stop();
-          }
-        }, _callee15, this);
-      }));
-      function addOrderPaymentAsync(_x14) {
-        return _addOrderPaymentAsync.apply(this, arguments);
-      }
-      return addOrderPaymentAsync;
-    }())
-  }, {
-    key: "addOrderPaymentWithDevicePrefix",
-    value: function addOrderPaymentWithDevicePrefix(payment, devicePrefix) {
-      var _this23 = this;
+      var _this20 = this;
       this.logInfo('addOrderPayment', {
         payment: payment
       });
@@ -3396,15 +3316,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         type: orderPaymentType,
         order_payment_type: orderPaymentType
       }), {
-        defaultPaid: true,
-        devicePrefix: devicePrefix
+        defaultPaid: true
       })]);
       tempOrder.payments = [].concat(_toConsumableArray(tempOrder.payments || []), _toConsumableArray(mapped));
       this.persistTempOrder();
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this23.logError('recalculate summary after addOrderPayment failed', {
+        _this20.logError('recalculate summary after addOrderPayment failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -3412,80 +3331,49 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     }
 
     /**
-     * 默认按支付唯一号精确更新；仅显式指定 legacy 时兼容历史支付标识。
-     * metadata 与 transactions 会分别合并，避免覆盖支付会话号和已有交易记录。
+     * 按支付唯一号、后端支付 ID、自定义支付方式 ID 或旧 uuid 更新支付项。
+     *
+     * 该方法服务 PaymentModal 的 void / 编辑场景；更新 metadata 时会做浅合并，
+     * 避免覆盖 unique_payment_number、现金实付/找零等已有元数据。
      */
   }, {
     key: "updateOrderPayment",
-    value: (function () {
-      var _updateOrderPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(paymentIdentity, updates) {
-        var options,
-          tempOrder,
-          identity,
-          matchMode,
-          matchedPayment,
-          updatedPayment,
-          summary,
-          payments,
-          _args18 = arguments;
-        return _regeneratorRuntime().wrap(function _callee16$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
-            case 0:
-              options = _args18.length > 2 && _args18[2] !== undefined ? _args18[2] : {};
-              tempOrder = this.ensureTempOrder();
-              identity = String(paymentIdentity);
-              matchMode = options.matchBy === 'compat' || options.matchBy === 'legacy' ? 'compat' : 'payment_number';
-              matchedPayment = resolveOrderPaymentIdentity(tempOrder.payments || [], identity, matchMode);
-              if (matchedPayment) {
-                _context18.next = 7;
-                break;
-              }
-              throw new Error("\u672A\u627E\u5230\u652F\u4ED8\u9879: ".concat(identity));
-            case 7:
-              updatedPayment = null;
-              tempOrder.payments = (tempOrder.payments || []).map(function (payment, index) {
-                if (index !== matchedPayment.index) return payment;
-                var nextPayment = mergeOrderPaymentRecord(payment, _objectSpread(_objectSpread({}, updates), {}, {
-                  updated_at: updates.updated_at || dayjs().format('YYYY-MM-DD HH:mm:ss')
-                }));
-                updatedPayment = nextPayment;
-                return nextPayment;
-              });
-              this.persistTempOrder();
-              _context18.next = 12;
-              return this.recalculateSummary({
-                createIfMissing: true
-              });
-            case 12:
-              summary = _context18.sent;
-              this.persistTempOrder();
-              payments = tempOrder.payments;
-              return _context18.abrupt("return", {
-                updated: true,
-                payment: payments[matchedPayment.index] || updatedPayment,
-                payments: payments,
-                summary: summary
-              });
-            case 16:
-            case "end":
-              return _context18.stop();
-          }
-        }, _callee16, this);
-      }));
-      function updateOrderPayment(_x15, _x16) {
-        return _updateOrderPayment.apply(this, arguments);
-      }
-      return updateOrderPayment;
-    }() /** 从当前订单支付项中移除指定支付项。 */)
+    value: function updateOrderPayment(paymentIdentity, updates) {
+      var tempOrder = this.ensureTempOrder();
+      var identity = String(paymentIdentity);
+      tempOrder.payments = (tempOrder.payments || []).map(function (payment) {
+        var _payment$metadata;
+        var uniquePaymentNumber = payment === null || payment === void 0 || (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.unique_payment_number;
+        var orderPaymentId = payment === null || payment === void 0 ? void 0 : payment.order_payment_id;
+        var customPaymentId = payment === null || payment === void 0 ? void 0 : payment.custom_payment_id;
+        var uuid = payment === null || payment === void 0 ? void 0 : payment.uuid;
+        var matched = [uniquePaymentNumber, orderPaymentId, customPaymentId, uuid].some(function (value) {
+          return value !== undefined && String(value) === identity;
+        });
+        if (!matched) return payment;
+        return _objectSpread(_objectSpread(_objectSpread({}, payment), updates), {}, {
+          metadata: _objectSpread(_objectSpread({}, payment.metadata || {}), updates.metadata || {})
+        });
+      });
+      this.persistTempOrder();
+      return tempOrder.payments;
+    }
+
+    /** 从当前订单支付项中移除指定支付项。 */
   }, {
     key: "deleteOrderPayment",
     value: function deleteOrderPayment(paymentIdentity) {
       var tempOrder = this.ensureTempOrder();
       var identity = String(paymentIdentity);
-      var matchedPayment = resolveOrderPaymentIdentity(tempOrder.payments || [], identity, 'compat');
-      if (!matchedPayment) return tempOrder.payments;
-      tempOrder.payments = (tempOrder.payments || []).filter(function (_, index) {
-        return index !== matchedPayment.index;
+      tempOrder.payments = (tempOrder.payments || []).filter(function (payment) {
+        var _payment$metadata2;
+        var uniquePaymentNumber = payment === null || payment === void 0 || (_payment$metadata2 = payment.metadata) === null || _payment$metadata2 === void 0 ? void 0 : _payment$metadata2.unique_payment_number;
+        var orderPaymentId = payment === null || payment === void 0 ? void 0 : payment.order_payment_id;
+        var customPaymentId = payment === null || payment === void 0 ? void 0 : payment.custom_payment_id;
+        var uuid = payment === null || payment === void 0 ? void 0 : payment.uuid;
+        return ![uniquePaymentNumber, orderPaymentId, customPaymentId, uuid].some(function (value) {
+          return value !== undefined && String(value) === identity;
+        });
       });
       this.persistTempOrder();
       return tempOrder.payments;
@@ -3517,7 +3405,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyPaymentLifecycleChange",
     value: function applyPaymentLifecycleChange(tempOrder, options) {
-      var _this24 = this;
+      var _this21 = this;
       this.updateTempOrderPaymentStatus(tempOrder);
       if ((options === null || options === void 0 ? void 0 : options.persist) !== false) {
         this.persistTempOrder();
@@ -3527,7 +3415,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this24.logError("recalculate summary after ".concat(logContext, " failed"), {
+        _this21.logError("recalculate summary after ".concat(logContext, " failed"), {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -3571,7 +3459,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateVoucherOrderPayments",
     value: function updateVoucherOrderPayments(payments, options) {
-      var _this25 = this;
+      var _this22 = this;
       var tempOrder = this.ensureTempOrder();
       var isOrderPaymentType = function isOrderPaymentType(value) {
         return value === 'normal' || value === 'deposit';
@@ -3606,9 +3494,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         });
       };
       var mappedVouchers = mapPaymentItemsToOrderPayments(payments.map(function (payment) {
-        return _this25.normalizePaymentSource(normalizeVoucherPaymentStatus(withVoucherPaymentType(payment)), {
-          defaultPaid: false,
-          devicePrefix: options === null || options === void 0 ? void 0 : options.devicePrefix
+        return _this22.normalizePaymentSource(normalizeVoucherPaymentStatus(withVoucherPaymentType(payment)), {
+          defaultPaid: false
         });
       })).filter(function (payment) {
         return isVoucherPaymentRecord(payment);
@@ -3634,17 +3521,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }).map(function (payment) {
         return String(payment.order_payment_id);
       }));
-      var committedVoucherLifecycleKeys = new Set(committedVoucherPayments.map(function (payment) {
-        return getVoucherPaymentLifecycleKey(payment);
-      }).filter(function (key) {
-        return key !== null;
+      var committedVoucherIds = new Set(committedVoucherPayments.map(function (payment) {
+        return String(payment.voucher_id);
       }));
       var replaceableVouchers = mappedVouchers.filter(function (payment) {
         if (hasSyncedOrderPaymentRecord(payment) && committedVoucherPaymentIds.has(String(payment.order_payment_id))) {
           return false;
         }
-        var lifecycleKey = getVoucherPaymentLifecycleKey(payment);
-        if (lifecycleKey && committedVoucherLifecycleKeys.has(lifecycleKey)) {
+        if (payment.voucher_id !== undefined && committedVoucherIds.has(String(payment.voucher_id))) {
           return false;
         }
         return true;
@@ -3659,93 +3543,54 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this25.logError('recalculate summary after updateVoucherOrderPayments failed', {
+        _this22.logError('recalculate summary after updateVoucherOrderPayments failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
       return tempOrder.payments;
     }
-  }, {
-    key: "updateVoucherOrderPaymentsAsync",
-    value: function () {
-      var _updateVoucherOrderPaymentsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(payments, options) {
-        var needsPaymentNumber, devicePrefix;
-        return _regeneratorRuntime().wrap(function _callee17$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
-            case 0:
-              needsPaymentNumber = (payments || []).some(function (payment) {
-                return String(payment.payment_number || '').trim() === '';
-              });
-              if (!needsPaymentNumber) {
-                _context19.next = 7;
-                break;
-              }
-              _context19.next = 4;
-              return this.getPaymentNumberDevicePrefixAsync();
-            case 4:
-              _context19.t0 = _context19.sent;
-              _context19.next = 8;
-              break;
-            case 7:
-              _context19.t0 = 'LOCAL';
-            case 8:
-              devicePrefix = _context19.t0;
-              return _context19.abrupt("return", this.updateVoucherOrderPayments(payments, _objectSpread(_objectSpread({}, options), {}, {
-                devicePrefix: devicePrefix
-              })));
-            case 10:
-            case "end":
-              return _context19.stop();
-          }
-        }, _callee17, this);
-      }));
-      function updateVoucherOrderPaymentsAsync(_x17, _x18) {
-        return _updateVoucherOrderPaymentsAsync.apply(this, arguments);
-      }
-      return updateVoucherOrderPaymentsAsync;
-    }()
   }, {
     key: "shouldMergeProductToOrder",
     value: function () {
-      var _shouldMergeProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(params) {
+      var _shouldMergeProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(params) {
         var _this$orderHooks;
         var onBeforeMergeProductToOrder, result;
-        return _regeneratorRuntime().wrap(function _callee18$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+        return _regeneratorRuntime().wrap(function _callee15$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               onBeforeMergeProductToOrder = (_this$orderHooks = this.orderHooks) === null || _this$orderHooks === void 0 ? void 0 : _this$orderHooks.onBeforeMergeProductToOrder;
               if (onBeforeMergeProductToOrder) {
-                _context20.next = 3;
+                _context17.next = 3;
                 break;
               }
-              return _context20.abrupt("return", true);
+              return _context17.abrupt("return", true);
             case 3:
-              _context20.next = 5;
+              _context17.next = 5;
               return onBeforeMergeProductToOrder(_objectSpread(_objectSpread({}, params), {}, {
                 defaultShouldMerge: true
               }));
             case 5:
-              result = _context20.sent;
+              result = _context17.sent;
               if (!(typeof result === 'boolean')) {
-                _context20.next = 8;
+                _context17.next = 8;
                 break;
               }
-              return _context20.abrupt("return", result);
+              return _context17.abrupt("return", result);
             case 8:
               if (!(result && _typeof(result) === 'object' && typeof result.shouldMerge === 'boolean')) {
-                _context20.next = 10;
+                _context17.next = 10;
                 break;
               }
-              return _context20.abrupt("return", result.shouldMerge);
+              return _context17.abrupt("return", result.shouldMerge);
             case 10:
-              return _context20.abrupt("return", true);
+              return _context17.abrupt("return", true);
             case 11:
             case "end":
-              return _context20.stop();
+              return _context17.stop();
           }
-        }, _callee18, this);
+        }, _callee15, this);
       }));
-      function shouldMergeProductToOrder(_x19) {
+      function shouldMergeProductToOrder(_x14) {
         return _shouldMergeProductToOrder.apply(this, arguments);
       }
       return shouldMergeProductToOrder;
@@ -3781,30 +3626,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "finalizeProductOrderMutation",
     value: function () {
-      var _finalizeProductOrderMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(tempOrder, options) {
-        return _regeneratorRuntime().wrap(function _callee19$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+      var _finalizeProductOrderMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(tempOrder, options) {
+        return _regeneratorRuntime().wrap(function _callee16$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
               this.syncTempOrderHolderFromBookings(tempOrder);
               if (options !== null && options !== void 0 && options.skipEditDiscountConfigRefresh) {
-                _context21.next = 4;
+                _context18.next = 4;
                 break;
               }
-              _context21.next = 4;
+              _context18.next = 4;
               return this.ensureEditDiscountConfigForProductChange(tempOrder);
             case 4:
               if (options !== null && options !== void 0 && options.skipDiscountRecalculation) {
-                _context21.next = 7;
+                _context18.next = 7;
                 break;
               }
-              _context21.next = 7;
+              _context18.next = 7;
               return this.applyPromotion();
             case 7:
               if (!(options !== null && options !== void 0 && options.skipDiscountRecalculation)) {
                 this.applyDiscount();
               }
               this.sanitizeTempOrderProducts(tempOrder);
-              _context21.next = 11;
+              _context18.next = 11;
               return this.recalculateSummary({
                 createIfMissing: true
               });
@@ -3812,11 +3657,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.persistTempOrder();
             case 12:
             case "end":
-              return _context21.stop();
+              return _context18.stop();
           }
-        }, _callee19, this);
+        }, _callee16, this);
       }));
-      function finalizeProductOrderMutation(_x20, _x21) {
+      function finalizeProductOrderMutation(_x15, _x16) {
         return _finalizeProductOrderMutation.apply(this, arguments);
       }
       return finalizeProductOrderMutation;
@@ -3831,13 +3676,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "appendProductLineToTempOrder",
     value: (function () {
-      var _appendProductLineToTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(tempOrder, product, booking) {
-        var _booking_uid,
+      var _appendProductLineToTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(tempOrder, product, booking, options) {
+        var _normalizedIncoming$p,
+          _normalizedIncoming$p2,
+          _booking_uid,
           _metadata,
-          _this26 = this;
-        var linked, productToAdd, incomingFingerprint, normalizedIncoming, incomingBookingUid, hasIncomingGoodPass, hasIncomingProductNote, hasIncomingBookingUid, shouldForceNewLine, matchedIndex, matchedProduct, existedFingerprint, shouldMerge, _targetProduct$metada, targetProduct, targetUid, normalizedProduct, nextNum, targetIsManualProductDiscount, nextDiscountList;
-        return _regeneratorRuntime().wrap(function _callee20$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+          _this23 = this;
+        var linked, productToAdd, incomingFingerprint, normalizedIncoming, isWeighingProduct, netWeight, incomingBookingUid, hasIncomingGoodPass, hasIncomingProductNote, hasIncomingBookingUid, shouldForceNewLine, matchedIndex, matchedProduct, existedFingerprint, shouldMerge, insertAtIndex, _targetProduct$metada, targetProduct, targetUid, normalizedProduct, nextNum, targetIsManualProductDiscount, nextDiscountList, mergedProduct;
+        return _regeneratorRuntime().wrap(function _callee17$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
               linked = booking ? this.createLinkedProductAndBooking({
                 product: product,
@@ -3846,6 +3693,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               productToAdd = (linked === null || linked === void 0 ? void 0 : linked.product) || product;
               incomingFingerprint = buildProductLineFingerprint(getProductSkuOptions(productToAdd), productToAdd.product_bundle);
               normalizedIncoming = mergeOrderProductDisplayFields(productToAdd, normalizeOrderProduct(productToAdd));
+              isWeighingProduct = Number(((_normalizedIncoming$p = normalizedIncoming.product_sku) === null || _normalizedIncoming$p === void 0 ? void 0 : _normalizedIncoming$p.open_sold_weight) || 0) === 1;
+              netWeight = Number((_normalizedIncoming$p2 = normalizedIncoming.product_sku) === null || _normalizedIncoming$p2 === void 0 ? void 0 : _normalizedIncoming$p2.net_weight);
+              if (!(isWeighingProduct && (!Number.isFinite(netWeight) || netWeight <= 0))) {
+                _context19.next = 8;
+                break;
+              }
+              throw new Error('[Order] 称重商品净重必须大于 0');
+            case 8:
               incomingBookingUid = (_booking_uid = productToAdd.booking_uid) !== null && _booking_uid !== void 0 ? _booking_uid : (_metadata = productToAdd.metadata) === null || _metadata === void 0 ? void 0 : _metadata.booking_uid;
               if (incomingBookingUid !== undefined && incomingBookingUid !== null && String(incomingBookingUid) !== '') {
                 normalizedIncoming.booking_uid = String(incomingBookingUid);
@@ -3857,11 +3712,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               hasIncomingGoodPass = this.hasGoodPassDiscount(normalizedIncoming);
               hasIncomingProductNote = this.hasOrderProductLineNote(normalizedIncoming);
               hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
-              shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid;
+              shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid || isWeighingProduct;
               matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
                 var _item$metadata3;
-                if (_this26.hasGoodPassDiscount(item)) return false;
-                if (_this26.hasOrderProductLineNote(item)) return false;
+                if (_this23.hasGoodPassDiscount(item)) return false;
+                if (_this23.hasOrderProductLineNote(item)) return false;
                 if (item.order_detail_id !== undefined && item.order_detail_id !== null) return false;
                 if ((_item$metadata3 = item.metadata) !== null && _item$metadata3 !== void 0 && _item$metadata3.is_edit_for_runtime) return false;
                 if (item.product_id !== productToAdd.product_id) return false;
@@ -3872,10 +3727,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               matchedProduct = matchedIndex === -1 ? null : tempOrder.products[matchedIndex];
               existedFingerprint = matchedProduct ? buildProductLineFingerprint(getProductSkuOptions(matchedProduct), matchedProduct.product_bundle) : '';
               if (!matchedProduct) {
-                _context22.next = 20;
+                _context19.next = 24;
                 break;
               }
-              _context22.next = 17;
+              _context19.next = 21;
               return this.shouldMergeProductToOrder({
                 incomingProduct: productToAdd,
                 normalizedIncoming: normalizedIncoming,
@@ -3886,14 +3741,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder,
                 booking: booking
               });
-            case 17:
-              _context22.t0 = _context22.sent;
-              _context22.next = 21;
-              break;
-            case 20:
-              _context22.t0 = false;
             case 21:
-              shouldMerge = _context22.t0;
+              _context19.t0 = _context19.sent;
+              _context19.next = 25;
+              break;
+            case 24:
+              _context19.t0 = false;
+            case 25:
+              shouldMerge = _context19.t0;
               if (matchedIndex === -1 || !matchedProduct || !shouldMerge) {
                 this.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
                 if (linked) {
@@ -3902,8 +3757,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     booking_uid: linked.bookingUid
                   });
                 }
-                // tempOrder.products.push(normalizedIncoming);
-                tempOrder.products = [].concat(_toConsumableArray(tempOrder.products), [normalizedIncoming]);
+                insertAtIndex = options === null || options === void 0 ? void 0 : options.insertAtIndex;
+                if (Number.isInteger(insertAtIndex) && Number(insertAtIndex) >= 0 && Number(insertAtIndex) < tempOrder.products.length) {
+                  tempOrder.products = [].concat(_toConsumableArray(tempOrder.products.slice(0, insertAtIndex)), [normalizedIncoming], _toConsumableArray(tempOrder.products.slice(insertAtIndex)));
+                } else {
+                  tempOrder.products = [].concat(_toConsumableArray(tempOrder.products), [normalizedIncoming]);
+                }
               } else {
                 targetProduct = matchedProduct;
                 targetUid = (_targetProduct$metada = targetProduct.metadata) === null || _targetProduct$metada === void 0 ? void 0 : _targetProduct$metada.unique_identification_number;
@@ -3941,17 +3800,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   num: nextNum
                 });
                 this.captureProductRuntime(tempOrder, productToAdd, tempOrder.products[matchedIndex], targetUid);
+                if (matchedIndex !== tempOrder.products.length - 1) {
+                  mergedProduct = tempOrder.products[matchedIndex];
+                  tempOrder.products = [].concat(_toConsumableArray(tempOrder.products.slice(0, matchedIndex)), _toConsumableArray(tempOrder.products.slice(matchedIndex + 1)), [mergedProduct]);
+                }
               }
               if (linked) {
                 tempOrder.bookings = [].concat(_toConsumableArray(tempOrder.bookings || []), [linked.booking]);
               }
-            case 24:
+            case 28:
             case "end":
-              return _context22.stop();
+              return _context19.stop();
           }
-        }, _callee20, this);
+        }, _callee17, this);
       }));
-      function appendProductLineToTempOrder(_x22, _x23, _x24) {
+      function appendProductLineToTempOrder(_x17, _x18, _x19, _x20) {
         return _appendProductLineToTempOrder.apply(this, arguments);
       }
       return appendProductLineToTempOrder;
@@ -3967,61 +3830,74 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProductToOrder",
     value: (function () {
-      var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(product, booking) {
-        var tempOrder, _ref61, _productRecord$num, productRecord, splitCount, i, singleLine;
-        return _regeneratorRuntime().wrap(function _callee21$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+      var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(product, booking, options) {
+        var tempOrder, insertAfterProductUid, anchorIndex, insertAtIndex, _ref61, _productRecord$num, productRecord, splitCount, i, singleLine;
+        return _regeneratorRuntime().wrap(function _callee18$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
+              insertAfterProductUid = options === null || options === void 0 ? void 0 : options.insertAfterProductUid;
+              anchorIndex = booking && insertAfterProductUid ? tempOrder.products.findIndex(function (line) {
+                var _line$metadata;
+                var uid = ((_line$metadata = line.metadata) === null || _line$metadata === void 0 ? void 0 : _line$metadata.unique_identification_number) || line.unique_identification_number;
+                return uid !== undefined && uid !== null && String(uid) === String(insertAfterProductUid);
+              }) : -1;
+              insertAtIndex = anchorIndex >= 0 ? anchorIndex + 1 : undefined;
               if (!booking) {
-                _context23.next = 18;
+                _context20.next = 22;
                 break;
               }
               productRecord = product;
               splitCount = getSafeProductNum((_ref61 = (_productRecord$num = productRecord.num) !== null && _productRecord$num !== void 0 ? _productRecord$num : productRecord.product_quantity) !== null && _ref61 !== void 0 ? _ref61 : 1);
               if (!(splitCount > 1)) {
-                _context23.next = 18;
+                _context20.next = 22;
                 break;
               }
               i = 0;
-            case 6:
+            case 9:
               if (!(i < splitCount)) {
-                _context23.next = 15;
+                _context20.next = 19;
                 break;
               }
               singleLine = cloneDeep(productRecord);
               singleLine.num = 1;
               delete singleLine.product_quantity;
-              _context23.next = 12;
-              return this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking));
-            case 12:
+              _context20.next = 15;
+              return this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking), {
+                insertAtIndex: insertAtIndex
+              });
+            case 15:
+              if (insertAtIndex !== undefined) insertAtIndex += 1;
+            case 16:
               i += 1;
-              _context23.next = 6;
+              _context20.next = 9;
               break;
-            case 15:
-              _context23.next = 17;
-              return this.finalizeProductOrderMutation(tempOrder);
-            case 17:
-              return _context23.abrupt("return", tempOrder.products);
-            case 18:
-              _context23.next = 20;
-              return this.appendProductLineToTempOrder(tempOrder, product, booking);
-            case 20:
-              _context23.next = 22;
+            case 19:
+              _context20.next = 21;
               return this.finalizeProductOrderMutation(tempOrder);
+            case 21:
+              return _context20.abrupt("return", tempOrder.products);
             case 22:
+              _context20.next = 24;
+              return this.appendProductLineToTempOrder(tempOrder, product, booking, {
+                insertAtIndex: insertAtIndex
+              });
+            case 24:
+              _context20.next = 26;
+              return this.finalizeProductOrderMutation(tempOrder);
+            case 26:
               this.logInfo('addProductToOrder success', {
                 product_id: product.product_id,
                 with_booking: !!booking
               });
-              return _context23.abrupt("return", tempOrder.products);
-            case 24:
+              return _context20.abrupt("return", tempOrder.products);
+            case 28:
             case "end":
-              return _context23.stop();
+              return _context20.stop();
           }
-        }, _callee21, this);
+        }, _callee18, this);
       }));
-      function addProductToOrder(_x25, _x26) {
+      function addProductToOrder(_x21, _x22, _x23) {
         return _addProductToOrder.apply(this, arguments);
       }
       return addProductToOrder;
@@ -4039,93 +3915,93 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProductsToOrder",
     value: (function () {
-      var _addProductsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(items, options) {
+      var _addProductsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(items, options) {
         var tempOrder, _iterator20, _step20, item, product, booking, _ref62, _productRecord$num2, productRecord, splitCount, i, singleLine;
-        return _regeneratorRuntime().wrap(function _callee22$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+        return _regeneratorRuntime().wrap(function _callee19$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (!(!Array.isArray(items) || items.length === 0)) {
-                _context24.next = 3;
+                _context21.next = 3;
                 break;
               }
-              return _context24.abrupt("return", tempOrder.products);
+              return _context21.abrupt("return", tempOrder.products);
             case 3:
               _iterator20 = _createForOfIteratorHelper(items || []);
-              _context24.prev = 4;
+              _context21.prev = 4;
               _iterator20.s();
             case 6:
               if ((_step20 = _iterator20.n()).done) {
-                _context24.next = 30;
+                _context21.next = 30;
                 break;
               }
               item = _step20.value;
               product = item.product, booking = item.booking;
               if (product) {
-                _context24.next = 11;
+                _context21.next = 11;
                 break;
               }
-              return _context24.abrupt("continue", 28);
+              return _context21.abrupt("continue", 28);
             case 11:
               if (!booking) {
-                _context24.next = 26;
+                _context21.next = 26;
                 break;
               }
               productRecord = product;
               splitCount = getSafeProductNum((_ref62 = (_productRecord$num2 = productRecord.num) !== null && _productRecord$num2 !== void 0 ? _productRecord$num2 : productRecord.product_quantity) !== null && _ref62 !== void 0 ? _ref62 : 1);
               if (!(splitCount > 1)) {
-                _context24.next = 26;
+                _context21.next = 26;
                 break;
               }
               i = 0;
             case 16:
               if (!(i < splitCount)) {
-                _context24.next = 25;
+                _context21.next = 25;
                 break;
               }
               singleLine = cloneDeep(productRecord);
               singleLine.num = 1;
               delete singleLine.product_quantity;
-              _context24.next = 22;
+              _context21.next = 22;
               return this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking));
             case 22:
               i += 1;
-              _context24.next = 16;
+              _context21.next = 16;
               break;
             case 25:
-              return _context24.abrupt("continue", 28);
+              return _context21.abrupt("continue", 28);
             case 26:
-              _context24.next = 28;
+              _context21.next = 28;
               return this.appendProductLineToTempOrder(tempOrder, product, booking);
             case 28:
-              _context24.next = 6;
+              _context21.next = 6;
               break;
             case 30:
-              _context24.next = 35;
+              _context21.next = 35;
               break;
             case 32:
-              _context24.prev = 32;
-              _context24.t0 = _context24["catch"](4);
-              _iterator20.e(_context24.t0);
+              _context21.prev = 32;
+              _context21.t0 = _context21["catch"](4);
+              _iterator20.e(_context21.t0);
             case 35:
-              _context24.prev = 35;
+              _context21.prev = 35;
               _iterator20.f();
-              return _context24.finish(35);
+              return _context21.finish(35);
             case 38:
-              _context24.next = 40;
+              _context21.next = 40;
               return this.finalizeProductOrderMutation(tempOrder, options);
             case 40:
               this.logInfo('addProductsToOrder success', {
                 itemsCount: items.length
               });
-              return _context24.abrupt("return", tempOrder.products);
+              return _context21.abrupt("return", tempOrder.products);
             case 42:
             case "end":
-              return _context24.stop();
+              return _context21.stop();
           }
-        }, _callee22, this, [[4, 32, 35, 38]]);
+        }, _callee19, this, [[4, 32, 35, 38]]);
       }));
-      function addProductsToOrder(_x27, _x28) {
+      function addProductsToOrder(_x24, _x25) {
         return _addProductsToOrder.apply(this, arguments);
       }
       return addProductsToOrder;
@@ -4159,17 +4035,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "preservePersistedBundlePriceFields",
     value: function preservePersistedBundlePriceFields(previousBundles, nextBundles) {
-      var _this27 = this;
+      var _this24 = this;
       if (!Array.isArray(nextBundles)) return nextBundles;
       if (!Array.isArray(previousBundles) || previousBundles.length === 0) return nextBundles;
       var previousByIdentity = new Map();
       previousBundles.forEach(function (bundle) {
-        var identity = _this27.getBundleRuntimeIdentity(bundle);
+        var identity = _this24.getBundleRuntimeIdentity(bundle);
         if (identity) previousByIdentity.set(identity, bundle);
       });
       return nextBundles.map(function (bundle, index) {
         if (!bundle || _typeof(bundle) !== 'object') return bundle;
-        var previous = previousByIdentity.get(_this27.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
+        var previous = previousByIdentity.get(_this24.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
         if (!previous || _typeof(previous) !== 'object') return bundle;
         return _objectSpread(_objectSpread(_objectSpread({}, bundle), (bundle.cover === undefined || bundle.cover === null || bundle.cover === '') && previous.cover !== undefined && previous.cover !== null && previous.cover !== '' ? {
           cover: previous.cover
@@ -4370,21 +4246,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProduct",
     value: function () {
-      var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(params) {
+      var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(params) {
         var tempOrder, updatedProductUid;
-        return _regeneratorRuntime().wrap(function _callee23$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+        return _regeneratorRuntime().wrap(function _callee20$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params);
-              _context25.next = 4;
+              _context22.next = 4;
               return this.applyPromotion();
             case 4:
               this.applyDiscount({
                 reapplyBookingDiscountProductUids: params.allow_booking_discount_reapply && updatedProductUid ? [String(updatedProductUid)] : undefined
               });
               this.sanitizeTempOrderProducts(tempOrder);
-              _context25.next = 8;
+              _context22.next = 8;
               return this.recalculateSummary({
                 createIfMissing: true
               });
@@ -4393,14 +4269,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('updateOrderProduct success', {
                 params: params
               });
-              return _context25.abrupt("return", tempOrder.products);
+              return _context22.abrupt("return", tempOrder.products);
             case 11:
             case "end":
-              return _context25.stop();
+              return _context22.stop();
           }
-        }, _callee23, this);
+        }, _callee20, this);
       }));
-      function updateOrderProduct(_x29) {
+      function updateOrderProduct(_x26) {
         return _updateOrderProduct.apply(this, arguments);
       }
       return updateOrderProduct;
@@ -4408,28 +4284,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProducts",
     value: function () {
-      var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(paramsList) {
-        var _this28 = this;
+      var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(paramsList) {
+        var _this25 = this;
         var tempOrder, reapplyBookingDiscountProductUids;
-        return _regeneratorRuntime().wrap(function _callee24$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+        return _regeneratorRuntime().wrap(function _callee21$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (paramsList.length) {
-                _context26.next = 3;
+                _context23.next = 3;
                 break;
               }
-              return _context26.abrupt("return", tempOrder.products);
+              return _context23.abrupt("return", tempOrder.products);
             case 3:
               reapplyBookingDiscountProductUids = paramsList.reduce(function (acc, params) {
-                var updatedProductUid = _this28.applyOrderProductUpdateToTempOrder(tempOrder, params);
+                var updatedProductUid = _this25.applyOrderProductUpdateToTempOrder(tempOrder, params);
                 // 批量改预约时间时，延迟到最后一次折扣计算里统一恢复已选预约折扣卡。
                 if (params.allow_booking_discount_reapply && updatedProductUid) {
                   acc.push(String(updatedProductUid));
                 }
                 return acc;
               }, []);
-              _context26.next = 6;
+              _context23.next = 6;
               return this.finalizeAfterProductsMutation(tempOrder, {
                 reapplyBookingDiscountProductUids: reapplyBookingDiscountProductUids.length ? reapplyBookingDiscountProductUids : undefined
               });
@@ -4437,14 +4313,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('updateOrderProduct success', {
                 paramsList: paramsList
               });
-              return _context26.abrupt("return", tempOrder.products);
+              return _context23.abrupt("return", tempOrder.products);
             case 8:
             case "end":
-              return _context26.stop();
+              return _context23.stop();
           }
-        }, _callee24, this);
+        }, _callee21, this);
       }));
-      function updateOrderProducts(_x30) {
+      function updateOrderProducts(_x27) {
         return _updateOrderProducts.apply(this, arguments);
       }
       return updateOrderProducts;
@@ -4452,11 +4328,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProductQuantity",
     value: function () {
-      var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(params) {
+      var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(params) {
         var _targetProduct$metada17;
         var product_id, product_variant_id, num, unique_identification_number, identity_key, product_sku, product_bundle, tempOrder, identityLookup, productIndex, targetUid, targetProduct, normalizedProduct;
-        return _regeneratorRuntime().wrap(function _callee25$(_context27) {
-          while (1) switch (_context27.prev = _context27.next) {
+        return _regeneratorRuntime().wrap(function _callee22$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
               product_id = params.product_id, product_variant_id = params.product_variant_id, num = params.num, unique_identification_number = params.unique_identification_number, identity_key = params.identity_key, product_sku = params.product_sku, product_bundle = params.product_bundle;
               tempOrder = this.ensureTempOrder();
@@ -4485,7 +4361,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 productIndex = getProductIdentityIndex(tempOrder.products, identityLookup);
               }
               if (!(productIndex === -1)) {
-                _context27.next = 12;
+                _context24.next = 12;
                 break;
               }
               throw new Error('[Order] 目标商品不存在，无法更新数量');
@@ -4499,12 +4375,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }));
               normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
               tempOrder.products[productIndex] = normalizedProduct;
-              _context27.next = 18;
+              _context24.next = 18;
               return this.applyPromotion();
             case 18:
               this.applyDiscount();
               this.sanitizeTempOrderProducts(tempOrder);
-              _context27.next = 22;
+              _context24.next = 22;
               return this.recalculateSummary({
                 createIfMissing: true
               });
@@ -4513,14 +4389,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('updateOrderProductQuantity success', {
                 params: params
               });
-              return _context27.abrupt("return", tempOrder.products);
+              return _context24.abrupt("return", tempOrder.products);
             case 25:
             case "end":
-              return _context27.stop();
+              return _context24.stop();
           }
-        }, _callee25, this);
+        }, _callee22, this);
       }));
-      function updateOrderProductQuantity(_x31) {
+      function updateOrderProductQuantity(_x28) {
         return _updateOrderProductQuantity.apply(this, arguments);
       }
       return updateOrderProductQuantity;
@@ -4561,19 +4437,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "finalizeAfterProductsMutation",
     value: (function () {
-      var _finalizeAfterProductsMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(tempOrder, options) {
-        return _regeneratorRuntime().wrap(function _callee26$(_context28) {
-          while (1) switch (_context28.prev = _context28.next) {
+      var _finalizeAfterProductsMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(tempOrder, options) {
+        return _regeneratorRuntime().wrap(function _callee23$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
               this.syncTempOrderHolderFromBookings(tempOrder);
-              _context28.next = 3;
+              _context25.next = 3;
               return this.applyPromotion();
             case 3:
               this.applyDiscount({
                 reapplyBookingDiscountProductUids: options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids
               });
               this.sanitizeTempOrderProducts(tempOrder);
-              _context28.next = 7;
+              _context25.next = 7;
               return this.recalculateSummary({
                 createIfMissing: true
               });
@@ -4581,11 +4457,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.persistTempOrder();
             case 8:
             case "end":
-              return _context28.stop();
+              return _context25.stop();
           }
-        }, _callee26, this);
+        }, _callee23, this);
       }));
-      function finalizeAfterProductsMutation(_x32, _x33) {
+      function finalizeAfterProductsMutation(_x29, _x30) {
         return _finalizeAfterProductsMutation.apply(this, arguments);
       }
       return finalizeAfterProductsMutation;
@@ -4600,21 +4476,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeProductsFromOrder",
     value: (function () {
-      var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(identities) {
-        var _this29 = this;
-        var tempOrder, productsBeforeRemove, bookingsBeforeRemove, matchedProducts, removedProducts, _i2, _removedProducts, product, linkedBookingUidsToRemove, _iterator21, _step21, _loop3;
-        return _regeneratorRuntime().wrap(function _callee27$(_context30) {
-          while (1) switch (_context30.prev = _context30.next) {
+      var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(identities, options) {
+        var _this26 = this;
+        var tempOrder, productsBeforeRemove, bookingsBeforeRemove, preserveDisplayPosition, anchorIndex, productsAfterAnchor, matchedProducts, removedProducts, _i2, _removedProducts, product, linkedBookingUidsToRemove, _iterator21, _step21, _loop3, remainingProductIndex, remainingProduct, nextProduct, productsWithoutRemaining, nextProductIndex;
+        return _regeneratorRuntime().wrap(function _callee24$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (identities.length) {
-                _context30.next = 3;
+                _context27.next = 3;
                 break;
               }
-              return _context30.abrupt("return", tempOrder.products);
+              return _context27.abrupt("return", tempOrder.products);
             case 3:
               productsBeforeRemove = tempOrder.products || [];
               bookingsBeforeRemove = tempOrder.bookings || [];
+              preserveDisplayPosition = options === null || options === void 0 ? void 0 : options.preserveDisplayPosition;
+              anchorIndex = preserveDisplayPosition ? productsBeforeRemove.findIndex(function (item) {
+                var _item$metadata6;
+                var uid = ((_item$metadata6 = item.metadata) === null || _item$metadata6 === void 0 ? void 0 : _item$metadata6.unique_identification_number) || item.unique_identification_number;
+                return uid !== undefined && uid !== null && String(uid) === String(preserveDisplayPosition.anchorProductUid);
+              }) : -1;
+              productsAfterAnchor = anchorIndex >= 0 ? productsBeforeRemove.slice(anchorIndex + 1) : [];
               matchedProducts = productsBeforeRemove.filter(function (item) {
                 return identities.some(function (identity) {
                   return isIdentityMatch(item, identity);
@@ -4634,29 +4517,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               linkedBookingUidsToRemove = new Set();
               _iterator21 = _createForOfIteratorHelper(matchedProducts);
-              _context30.prev = 11;
+              _context27.prev = 14;
               _loop3 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop3() {
                 var _metadata11, _metadata12, _metadata13, _metadata14;
                 var product, productUid, productBookingUid, isAddTimeProduct;
-                return _regeneratorRuntime().wrap(function _loop3$(_context29) {
-                  while (1) switch (_context29.prev = _context29.next) {
+                return _regeneratorRuntime().wrap(function _loop3$(_context26) {
+                  while (1) switch (_context26.prev = _context26.next) {
                     case 0:
                       product = _step21.value;
                       productUid = (product === null || product === void 0 || (_metadata11 = product.metadata) === null || _metadata11 === void 0 ? void 0 : _metadata11.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
                       productBookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_metadata12 = product.metadata) === null || _metadata12 === void 0 ? void 0 : _metadata12.booking_uid);
                       isAddTimeProduct = (product === null || product === void 0 || (_metadata13 = product.metadata) === null || _metadata13 === void 0 ? void 0 : _metadata13.product_add_schedule_time) !== undefined && (product === null || product === void 0 || (_metadata14 = product.metadata) === null || _metadata14 === void 0 ? void 0 : _metadata14.product_add_schedule_time) !== null;
                       if (!isAddTimeProduct) {
-                        _context29.next = 6;
+                        _context26.next = 6;
                         break;
                       }
-                      return _context29.abrupt("return", 1);
+                      return _context26.abrupt("return", 1);
                     case 6:
                       if (productBookingUid !== undefined && productBookingUid !== null && productBookingUid !== '') {
                         linkedBookingUidsToRemove.add(String(productBookingUid));
                       }
                       if (productUid !== undefined && productUid !== null && productUid !== '') {
                         bookingsBeforeRemove.forEach(function (booking) {
-                          var bookingUid = _this29.getBookingUniqueIdentificationNumber(booking);
+                          var bookingUid = _this26.getBookingUniqueIdentificationNumber(booking);
                           if (bookingUid && String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === String(productUid)) {
                             linkedBookingUidsToRemove.add(bookingUid);
                           }
@@ -4664,61 +4547,77 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }
                     case 8:
                     case "end":
-                      return _context29.stop();
+                      return _context26.stop();
                   }
                 }, _loop3);
               });
               _iterator21.s();
-            case 14:
+            case 17:
               if ((_step21 = _iterator21.n()).done) {
-                _context30.next = 20;
+                _context27.next = 23;
                 break;
               }
-              return _context30.delegateYield(_loop3(), "t0", 16);
-            case 16:
-              if (!_context30.t0) {
-                _context30.next = 18;
+              return _context27.delegateYield(_loop3(), "t0", 19);
+            case 19:
+              if (!_context27.t0) {
+                _context27.next = 21;
                 break;
               }
-              return _context30.abrupt("continue", 18);
-            case 18:
-              _context30.next = 14;
+              return _context27.abrupt("continue", 21);
+            case 21:
+              _context27.next = 17;
               break;
-            case 20:
-              _context30.next = 25;
+            case 23:
+              _context27.next = 28;
               break;
-            case 22:
-              _context30.prev = 22;
-              _context30.t1 = _context30["catch"](11);
-              _iterator21.e(_context30.t1);
             case 25:
-              _context30.prev = 25;
-              _iterator21.f();
-              return _context30.finish(25);
+              _context27.prev = 25;
+              _context27.t1 = _context27["catch"](14);
+              _iterator21.e(_context27.t1);
             case 28:
+              _context27.prev = 28;
+              _iterator21.f();
+              return _context27.finish(28);
+            case 31:
               if (linkedBookingUidsToRemove.size > 0) {
                 // 删除主预约商品时，同步移除挂在同一 booking_uid 下的加时商品，避免残留孤儿行。
                 tempOrder.products = (tempOrder.products || []).filter(function (line) {
-                  var _line$metadata, _line$metadata2, _line$metadata3;
-                  var lineBookingUid = (line === null || line === void 0 || (_line$metadata = line.metadata) === null || _line$metadata === void 0 ? void 0 : _line$metadata.booking_uid) || (line === null || line === void 0 ? void 0 : line.booking_uid);
-                  var isAddTimeProduct = (line === null || line === void 0 || (_line$metadata2 = line.metadata) === null || _line$metadata2 === void 0 ? void 0 : _line$metadata2.product_add_schedule_time) !== undefined && (line === null || line === void 0 || (_line$metadata3 = line.metadata) === null || _line$metadata3 === void 0 ? void 0 : _line$metadata3.product_add_schedule_time) !== null;
+                  var _line$metadata2, _line$metadata3, _line$metadata4;
+                  var lineBookingUid = (line === null || line === void 0 || (_line$metadata2 = line.metadata) === null || _line$metadata2 === void 0 ? void 0 : _line$metadata2.booking_uid) || (line === null || line === void 0 ? void 0 : line.booking_uid);
+                  var isAddTimeProduct = (line === null || line === void 0 || (_line$metadata3 = line.metadata) === null || _line$metadata3 === void 0 ? void 0 : _line$metadata3.product_add_schedule_time) !== undefined && (line === null || line === void 0 || (_line$metadata4 = line.metadata) === null || _line$metadata4 === void 0 ? void 0 : _line$metadata4.product_add_schedule_time) !== null;
                   return !(isAddTimeProduct && lineBookingUid !== undefined && lineBookingUid !== null && linkedBookingUidsToRemove.has(String(lineBookingUid)));
                 });
               }
-              _context30.next = 31;
+              if (preserveDisplayPosition && anchorIndex >= 0) {
+                remainingProductIndex = tempOrder.products.findIndex(function (item) {
+                  var _item$metadata7;
+                  var uid = ((_item$metadata7 = item.metadata) === null || _item$metadata7 === void 0 ? void 0 : _item$metadata7.unique_identification_number) || item.unique_identification_number;
+                  return uid !== undefined && uid !== null && String(uid) === String(preserveDisplayPosition.remainingProductUid);
+                });
+                if (remainingProductIndex >= 0) {
+                  remainingProduct = tempOrder.products[remainingProductIndex];
+                  nextProduct = productsAfterAnchor.find(function (item) {
+                    return tempOrder.products.includes(item);
+                  });
+                  productsWithoutRemaining = [].concat(_toConsumableArray(tempOrder.products.slice(0, remainingProductIndex)), _toConsumableArray(tempOrder.products.slice(remainingProductIndex + 1)));
+                  nextProductIndex = nextProduct ? productsWithoutRemaining.indexOf(nextProduct) : -1;
+                  tempOrder.products = nextProductIndex >= 0 ? [].concat(_toConsumableArray(productsWithoutRemaining.slice(0, nextProductIndex)), [remainingProduct], _toConsumableArray(productsWithoutRemaining.slice(nextProductIndex))) : [].concat(_toConsumableArray(productsWithoutRemaining), [remainingProduct]);
+                }
+              }
+              _context27.next = 35;
               return this.finalizeAfterProductsMutation(tempOrder);
-            case 31:
+            case 35:
               this.logInfo('removeProductsFromOrder success', {
                 identities: identities
               });
-              return _context30.abrupt("return", tempOrder.products);
-            case 33:
+              return _context27.abrupt("return", tempOrder.products);
+            case 37:
             case "end":
-              return _context30.stop();
+              return _context27.stop();
           }
-        }, _callee27, this, [[11, 22, 25, 28]]);
+        }, _callee24, this, [[14, 25, 28, 31]]);
       }));
-      function removeProductsFromOrder(_x34) {
+      function removeProductsFromOrder(_x31, _x32) {
         return _removeProductsFromOrder.apply(this, arguments);
       }
       return removeProductsFromOrder;
@@ -4726,18 +4625,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeProductFromOrder",
     value: function () {
-      var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(identity) {
-        return _regeneratorRuntime().wrap(function _callee28$(_context31) {
-          while (1) switch (_context31.prev = _context31.next) {
+      var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(identity, options) {
+        return _regeneratorRuntime().wrap(function _callee25$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
-              return _context31.abrupt("return", this.removeProductsFromOrder([identity]));
+              return _context28.abrupt("return", this.removeProductsFromOrder([identity], options));
             case 1:
             case "end":
-              return _context31.stop();
+              return _context28.stop();
           }
-        }, _callee28, this);
+        }, _callee25, this);
       }));
-      function removeProductFromOrder(_x35) {
+      function removeProductFromOrder(_x33, _x34) {
         return _removeProductFromOrder.apply(this, arguments);
       }
       return removeProductFromOrder;
@@ -4749,10 +4648,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clearOrderCartLines",
     value: (function () {
-      var _clearOrderCartLines = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
+      var _clearOrderCartLines = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee29$(_context32) {
-          while (1) switch (_context32.prev = _context32.next) {
+        return _regeneratorRuntime().wrap(function _callee26$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               tempOrder.products = [];
@@ -4763,24 +4662,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   productsByUid: {}
                 });
               }
-              _context32.next = 7;
+              _context29.next = 7;
               return this.applyPromotion();
             case 7:
               this.applyDiscount();
               this.sanitizeTempOrderProducts(tempOrder);
-              _context32.next = 11;
+              _context29.next = 11;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 11:
               this.persistTempOrder();
               this.logInfo('clearOrderCartLines success', {});
-              return _context32.abrupt("return", tempOrder);
+              return _context29.abrupt("return", tempOrder);
             case 14:
             case "end":
-              return _context32.stop();
+              return _context29.stop();
           }
-        }, _callee29, this);
+        }, _callee26, this);
       }));
       function clearOrderCartLines() {
         return _clearOrderCartLines.apply(this, arguments);
@@ -4818,17 +4717,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyLocalPrintOrderNumbers",
     value: function () {
-      var _applyLocalPrintOrderNumbers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(order) {
+      var _applyLocalPrintOrderNumbers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(order) {
         var tempOrder, shopOrderNumber, shopFullOrderNumber;
-        return _regeneratorRuntime().wrap(function _callee30$(_context33) {
-          while (1) switch (_context33.prev = _context33.next) {
+        return _regeneratorRuntime().wrap(function _callee27$(_context30) {
+          while (1) switch (_context30.prev = _context30.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (!(!order || _typeof(order) !== 'object')) {
-                _context33.next = 3;
+                _context30.next = 3;
                 break;
               }
-              return _context33.abrupt("return", tempOrder);
+              return _context30.abrupt("return", tempOrder);
             case 3:
               shopOrderNumber = order.shop_order_number;
               shopFullOrderNumber = order.shop_full_order_number;
@@ -4839,88 +4738,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.shop_full_order_number = String(shopFullOrderNumber);
               }
               this.persistTempOrder();
-              _context33.next = 10;
+              _context30.next = 10;
               return this.saveDraft();
             case 10:
-              return _context33.abrupt("return", tempOrder);
+              return _context30.abrupt("return", tempOrder);
             case 11:
             case "end":
-              return _context33.stop();
+              return _context30.stop();
           }
-        }, _callee30, this);
+        }, _callee27, this);
       }));
-      function applyLocalPrintOrderNumbers(_x36) {
+      function applyLocalPrintOrderNumbers(_x35) {
         return _applyLocalPrintOrderNumbers.apply(this, arguments);
       }
       return applyLocalPrintOrderNumbers;
     }()
-  }, {
-    key: "saveTempOrderAsDraft",
-    value: function () {
-      var _saveTempOrderAsDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(params) {
-        var _params$cacheId2, _this$otherParams6, _ref74, _params$businessCode2, _this$otherParams7, _this$otherParams8, _params$type, _this$otherParams9, _payload$products;
-        var tempOrder, latestSummary, payload;
-        return _regeneratorRuntime().wrap(function _callee31$(_context34) {
-          while (1) switch (_context34.prev = _context34.next) {
-            case 0:
-              tempOrder = this.ensureTempOrder();
-              this.ensureExternalSaleNumber(tempOrder);
-              this.persistTempOrder();
-              _context34.next = 5;
-              return this.recalculateSummary({
-                createIfMissing: true
-              });
-            case 5:
-              _context34.t1 = _context34.sent;
-              if (_context34.t1) {
-                _context34.next = 8;
-                break;
-              }
-              _context34.t1 = this.store.summary;
-            case 8:
-              _context34.t0 = _context34.t1;
-              if (_context34.t0) {
-                _context34.next = 11;
-                break;
-              }
-              _context34.t0 = createEmptySummary();
-            case 11:
-              latestSummary = _context34.t0;
-              payload = buildSubmitPayload({
-                tempOrder: tempOrder,
-                cacheId: (_params$cacheId2 = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId2 !== void 0 ? _params$cacheId2 : this.cacheId,
-                platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.platform),
-                businessCode: (_ref74 = (_params$businessCode2 = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode2 !== void 0 ? _params$businessCode2 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.businessCode) !== null && _ref74 !== void 0 ? _ref74 : (_this$otherParams8 = this.otherParams) === null || _this$otherParams8 === void 0 ? void 0 : _this$otherParams8.business_code,
-                channel: params === null || params === void 0 ? void 0 : params.channel,
-                type: (_params$type = params === null || params === void 0 ? void 0 : params.type) !== null && _params$type !== void 0 ? _params$type : (_this$otherParams9 = this.otherParams) === null || _this$otherParams9 === void 0 ? void 0 : _this$otherParams9.type,
-                summary: latestSummary,
-                enhance: params === null || params === void 0 ? void 0 : params.enhancePayload
-              });
-              if (!payload.created_at) {
-                payload.created_at = dayjs().format('YYYY-MM-DD HH:mm:ss');
-              }
-              payload.need_sync = 0;
-              payload.is_draft_order = 1;
-              this.logInfo('saveTempOrderAsDraft calling sales draft', {
-                orderId: payload.order_id,
-                externalSaleNumber: payload.external_sale_number,
-                productsCount: ((_payload$products = payload.products) === null || _payload$products === void 0 ? void 0 : _payload$products.length) || 0
-              });
-              return _context34.abrupt("return", this.request.post('/order/sales/draft', payload, {
-                osServer: true,
-                customToast: function customToast() {}
-              }));
-            case 18:
-            case "end":
-              return _context34.stop();
-          }
-        }, _callee31, this);
-      }));
-      function saveTempOrderAsDraft(_x37) {
-        return _saveTempOrderAsDraft.apply(this, arguments);
-      }
-      return saveTempOrderAsDraft;
-    }()
     /**
      * 提交当前 Sales tempOrder。
      *
@@ -4930,18 +4762,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitTempOrder",
     value: (function () {
-      var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(params) {
-        return _regeneratorRuntime().wrap(function _callee32$(_context35) {
-          while (1) switch (_context35.prev = _context35.next) {
+      var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(params) {
+        return _regeneratorRuntime().wrap(function _callee28$(_context31) {
+          while (1) switch (_context31.prev = _context31.next) {
             case 0:
-              return _context35.abrupt("return", this.runSubmitTempOrder(params));
+              return _context31.abrupt("return", this.runSubmitTempOrder(params));
             case 1:
             case "end":
-              return _context35.stop();
+              return _context31.stop();
           }
-        }, _callee32, this);
+        }, _callee28, this);
       }));
-      function submitTempOrder(_x38) {
+      function submitTempOrder(_x36) {
         return _submitTempOrder.apply(this, arguments);
       }
       return submitTempOrder;
@@ -4949,20 +4781,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitTempOrderAsync",
     value: function () {
-      var _submitTempOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(params) {
-        return _regeneratorRuntime().wrap(function _callee33$(_context36) {
-          while (1) switch (_context36.prev = _context36.next) {
+      var _submitTempOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(params) {
+        return _regeneratorRuntime().wrap(function _callee29$(_context32) {
+          while (1) switch (_context32.prev = _context32.next) {
             case 0:
-              return _context36.abrupt("return", this.runSubmitTempOrder(_objectSpread(_objectSpread({}, params), {}, {
+              return _context32.abrupt("return", this.runSubmitTempOrder(_objectSpread(_objectSpread({}, params), {}, {
                 syncMode: true
               })));
             case 1:
             case "end":
-              return _context36.stop();
+              return _context32.stop();
           }
-        }, _callee33, this);
+        }, _callee29, this);
       }));
-      function submitTempOrderAsync(_x39) {
+      function submitTempOrderAsync(_x37) {
         return _submitTempOrderAsync.apply(this, arguments);
       }
       return submitTempOrderAsync;
@@ -4970,11 +4802,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "runSubmitTempOrder",
     value: function () {
-      var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(params) {
-        var _params$cacheId3, _this$otherParams10, _ref75, _ref76, _submitSnapshot$busin, _this$otherParams11, _this$otherParams12, _submitSnapshot$type;
+      var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(params) {
+        var _params$cacheId2, _this$otherParams6, _ref74, _ref75, _submitSnapshot$busin, _this$otherParams7, _this$otherParams8, _submitSnapshot$type;
         var tempOrder, shouldConfirmPendingVoucherPayments, hasPaymentOverride, preparedPaymentOverride, latestSummary, effectiveCacheId, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, submitSnapshot, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
-        return _regeneratorRuntime().wrap(function _callee34$(_context37) {
-          while (1) switch (_context37.prev = _context37.next) {
+        return _regeneratorRuntime().wrap(function _callee30$(_context33) {
+          while (1) switch (_context33.prev = _context33.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               shouldConfirmPendingVoucherPayments = (params === null || params === void 0 ? void 0 : params.confirmPendingVoucherPayments) !== false;
@@ -4994,27 +4826,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               this.persistTempOrder();
-              _context37.next = 8;
+              _context33.next = 8;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 8:
-              _context37.t1 = _context37.sent;
-              if (_context37.t1) {
-                _context37.next = 11;
+              _context33.t1 = _context33.sent;
+              if (_context33.t1) {
+                _context33.next = 11;
                 break;
               }
-              _context37.t1 = this.store.summary;
+              _context33.t1 = this.store.summary;
             case 11:
-              _context37.t0 = _context37.t1;
-              if (_context37.t0) {
-                _context37.next = 14;
+              _context33.t0 = _context33.t1;
+              if (_context33.t0) {
+                _context33.next = 14;
                 break;
               }
-              _context37.t0 = createEmptySummary();
+              _context33.t0 = createEmptySummary();
             case 14:
-              latestSummary = _context37.t0;
-              effectiveCacheId = (_params$cacheId3 = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId3 !== void 0 ? _params$cacheId3 : this.cacheId;
+              latestSummary = _context33.t0;
+              effectiveCacheId = (_params$cacheId2 = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId2 !== void 0 ? _params$cacheId2 : this.cacheId;
               hasPaymentStatusOverride = (params === null || params === void 0 ? void 0 : params.paymentStatus) !== undefined;
               hasSmallTicketDataFlagOverride = (params === null || params === void 0 ? void 0 : params.smallTicketDataFlag) !== undefined;
               enhancePayload = hasPaymentOverride || hasPaymentStatusOverride || hasSmallTicketDataFlagOverride || params !== null && params !== void 0 && params.enhancePayload ? function (payload, ctx) {
@@ -5032,8 +4864,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               payload = buildSubmitPayload({
                 tempOrder: tempOrder,
                 cacheId: effectiveCacheId,
-                platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 ? void 0 : _this$otherParams10.platform),
-                businessCode: (_ref75 = (_ref76 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref76 !== void 0 ? _ref76 : (_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.businessCode) !== null && _ref75 !== void 0 ? _ref75 : (_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.business_code,
+                platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.platform),
+                businessCode: (_ref74 = (_ref75 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref75 !== void 0 ? _ref75 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.businessCode) !== null && _ref74 !== void 0 ? _ref74 : (_this$otherParams8 = this.otherParams) === null || _this$otherParams8 === void 0 ? void 0 : _this$otherParams8.business_code,
                 channel: params === null || params === void 0 ? void 0 : params.channel,
                 type: (_submitSnapshot$type = submitSnapshot.type) !== null && _submitSnapshot$type !== void 0 ? _submitSnapshot$type : params === null || params === void 0 ? void 0 : params.type,
                 summary: latestSummary,
@@ -5048,10 +4880,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!payload.created_at) {
                 payload.created_at = dayjs().format('YYYY-MM-DD HH:mm:ss');
               }
-              _context37.next = 26;
+              _context33.next = 26;
               return this.saveDraft();
             case 26:
-              _context37.prev = 26;
+              _context33.prev = 26;
               this.logInfo('submitTempOrder calling sales checkout', {
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
@@ -5061,43 +4893,43 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 smallTicketDataFlag: payload.small_ticket_data_flag,
                 syncMode: payload.sync_mode
               });
-              _context37.next = 30;
+              _context33.next = 30;
               return this.submitSalesOrder({
                 query: payload
               });
             case 30:
-              result = _context37.sent;
-              _context37.next = 43;
+              result = _context33.sent;
+              _context33.next = 43;
               break;
             case 33:
-              _context37.prev = 33;
-              _context37.t2 = _context37["catch"](26);
-              backendErrorResponse = this.extractSubmitErrorResponse(_context37.t2);
+              _context33.prev = 33;
+              _context33.t2 = _context33["catch"](26);
+              backendErrorResponse = this.extractSubmitErrorResponse(_context33.t2);
               if (!backendErrorResponse) {
-                _context37.next = 40;
+                _context33.next = 40;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
-              return _context37.abrupt("return", backendErrorResponse);
+              return _context33.abrupt("return", backendErrorResponse);
             case 40:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
-                error: _context37.t2 instanceof Error ? _context37.t2.message : String(_context37.t2),
+                error: _context33.t2 instanceof Error ? _context33.t2.message : String(_context33.t2),
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
                 paymentStatus: payload.payment_status,
                 paymentsCount: ((_payload$payments2 = payload.payments) === null || _payload$payments2 === void 0 ? void 0 : _payload$payments2.length) || 0
               });
-              throw _context37.t2;
+              throw _context33.t2;
             case 43:
               if (!this.isSubmitResponseRejected(result)) {
-                _context37.next = 47;
+                _context33.next = 47;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
-              return _context37.abrupt("return", result);
+              return _context33.abrupt("return", result);
             case 47:
               submittedOrderId = this.extractOrderIdFromSubmitResult(result);
               this.logInfo('runSubmitTempOrder: 提交成功', {
@@ -5108,15 +4940,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 })
               });
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
-                _context37.next = 56;
+                _context33.next = 56;
                 break;
               }
               tempOrder.order_id = submittedOrderId;
               resultRecord = result;
-              _context37.next = 54;
+              _context33.next = 54;
               return this.markLocalOrderSynced(submittedOrderId, (resultRecord === null || resultRecord === void 0 ? void 0 : resultRecord.data) || resultRecord || {});
             case 54:
-              _context37.next = 57;
+              _context33.next = 57;
               break;
             case 56:
               if (this.isLocalPendingSubmitResult(result)) {
@@ -5125,14 +4957,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 this.store.syncState = 'submitted';
               }
             case 57:
-              return _context37.abrupt("return", result);
+              return _context33.abrupt("return", result);
             case 58:
             case "end":
-              return _context37.stop();
+              return _context33.stop();
           }
-        }, _callee34, this, [[26, 33]]);
+        }, _callee30, this, [[26, 33]]);
       }));
-      function runSubmitTempOrder(_x40) {
+      function runSubmitTempOrder(_x38) {
         return _runSubmitTempOrder.apply(this, arguments);
       }
       return runSubmitTempOrder;
@@ -5140,10 +4972,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "markLocalOrderSynced",
     value: function () {
-      var _markLocalOrderSynced = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35(orderId, remoteOrder) {
+      var _markLocalOrderSynced = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(orderId, remoteOrder) {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee35$(_context38) {
-          while (1) switch (_context38.prev = _context38.next) {
+        return _regeneratorRuntime().wrap(function _callee31$(_context34) {
+          while (1) switch (_context34.prev = _context34.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               tempOrder.order_id = orderId;
@@ -5151,15 +4983,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.store.lastOrderInfo = remoteOrder;
               this.store.syncState = 'submitted';
               this.persistTempOrder();
-              _context38.next = 8;
+              _context34.next = 8;
               return this.saveDraft();
             case 8:
             case "end":
-              return _context38.stop();
+              return _context34.stop();
           }
-        }, _callee35, this);
+        }, _callee31, this);
       }));
-      function markLocalOrderSynced(_x41, _x42) {
+      function markLocalOrderSynced(_x39, _x40) {
         return _markLocalOrderSynced.apply(this, arguments);
       }
       return markLocalOrderSynced;
@@ -5202,10 +5034,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function extractSubmitErrorResponse(error) {
       var _error$response,
         _error$response2,
-        _this30 = this;
+        _this27 = this;
       var candidates = [error === null || error === void 0 || (_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.data, error === null || error === void 0 ? void 0 : error.data, error === null || error === void 0 || (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : _error$response2.body, error === null || error === void 0 ? void 0 : error.body];
       return candidates.find(function (candidate) {
-        return _this30.isSubmitErrorResponse(candidate);
+        return _this27.isSubmitErrorResponse(candidate);
       }) || null;
     }
   }, {
@@ -5232,37 +5064,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncPaymentsToOrder",
     value: function () {
-      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
-        var _this31 = this,
-          _params$confirmPendin;
-        var tempOrder, needsPaymentNumber, devicePrefix, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, orderPaidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, submitResult;
-        return _regeneratorRuntime().wrap(function _callee36$(_context39) {
-          while (1) switch (_context39.prev = _context39.next) {
+      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(params) {
+        var _params$confirmPendin;
+        var tempOrder, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, orderPaidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, submitResult;
+        return _regeneratorRuntime().wrap(function _callee32$(_context35) {
+          while (1) switch (_context35.prev = _context35.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
-              needsPaymentNumber = (params.payments || []).some(function (payment) {
-                return String(payment.payment_number || '').trim() === '';
-              });
-              if (!needsPaymentNumber) {
-                _context39.next = 8;
-                break;
-              }
-              _context39.next = 5;
-              return this.getPaymentNumberDevicePrefixAsync();
-            case 5:
-              _context39.t0 = _context39.sent;
-              _context39.next = 9;
-              break;
-            case 8:
-              _context39.t0 = 'LOCAL';
-            case 9:
-              devicePrefix = _context39.t0;
-              mappedPayments = mapPaymentItemsToOrderPayments((params.payments || []).map(function (payment) {
-                return _this31.normalizePaymentSource(payment, {
-                  defaultPaid: false,
-                  devicePrefix: devicePrefix
-                });
-              }));
+              mappedPayments = mapPaymentItemsToOrderPayments(params.payments || []);
               shouldConfirmPendingVoucherPayments = (_params$confirmPendin = params.confirmPendingVoucherPayments) !== null && _params$confirmPendin !== void 0 ? _params$confirmPendin : params.submitWhenPaid === true;
               effectivePayments = shouldConfirmPendingVoucherPayments ? this.confirmPendingVoucherPaymentsInList(mappedPayments) : params.confirmPendingVoucherPayments === false ? this.discardPendingVoucherPaymentsFromList(mappedPayments) : mappedPayments;
               completion = this.getPaymentCompletion(effectivePayments);
@@ -5271,24 +5080,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               tempOrder.payments = effectivePayments;
               tempOrder.payment_status = paymentStatus;
               this.persistTempOrder();
-              _context39.next = 21;
+              _context35.next = 12;
               return this.saveDraft();
-            case 21:
+            case 12:
               if (params.submitWhenPaid) {
-                _context39.next = 23;
+                _context35.next = 14;
                 break;
               }
-              return _context39.abrupt("return", completion);
-            case 23:
+              return _context35.abrupt("return", completion);
+            case 14:
               if (!(this.store.syncState === 'submitting')) {
-                _context39.next = 25;
+                _context35.next = 16;
                 break;
               }
-              return _context39.abrupt("return", completion);
-            case 25:
+              return _context35.abrupt("return", completion);
+            case 16:
               this.store.syncState = 'submitting';
               paymentSyncIdempotencyToken = this.buildPaymentSyncIdempotencyToken(tempOrder, effectivePayments);
-              _context39.next = 29;
+              _context35.next = 20;
               return this.submitTempOrder({
                 payments: effectivePayments,
                 paymentStatus: paymentStatus,
@@ -5303,18 +5112,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   return nextPayload;
                 }
               });
-            case 29:
-              submitResult = _context39.sent;
-              return _context39.abrupt("return", _objectSpread(_objectSpread({}, completion), {}, {
+            case 20:
+              submitResult = _context35.sent;
+              return _context35.abrupt("return", _objectSpread(_objectSpread({}, completion), {}, {
                 submitResult: submitResult
               }));
-            case 31:
+            case 22:
             case "end":
-              return _context39.stop();
+              return _context35.stop();
           }
-        }, _callee36, this);
+        }, _callee32, this);
       }));
-      function syncPaymentsToOrder(_x43) {
+      function syncPaymentsToOrder(_x41) {
         return _syncPaymentsToOrder.apply(this, arguments);
       }
       return syncPaymentsToOrder;
@@ -5403,11 +5212,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitOrder",
     value: function () {
-      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(order) {
+      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(order) {
         var _order$query$cartItem, _params$bookings, _params$relation_prod;
         var url, query, fetchUrl, params;
-        return _regeneratorRuntime().wrap(function _callee37$(_context40) {
-          while (1) switch (_context40.prev = _context40.next) {
+        return _regeneratorRuntime().wrap(function _callee33$(_context36) {
+          while (1) switch (_context36.prev = _context36.next) {
             case 0:
               this.logInfo('submitOrder called', {
                 url: order.url,
@@ -5427,14 +5236,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 relationProductsCount: ((_params$relation_prod = params.relation_products) === null || _params$relation_prod === void 0 ? void 0 : _params$relation_prod.length) || 0,
                 scheduleDate: params.schedule_date
               });
-              return _context40.abrupt("return", this.request.post(fetchUrl, params));
+              return _context36.abrupt("return", this.request.post(fetchUrl, params));
             case 6:
             case "end":
-              return _context40.stop();
+              return _context36.stop();
           }
-        }, _callee37, this);
+        }, _callee33, this);
       }));
-      function submitOrder(_x44) {
+      function submitOrder(_x42) {
         return _submitOrder.apply(this, arguments);
       }
       return submitOrder;
@@ -5442,13 +5251,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "cancelOrder",
     value: function () {
-      var _cancelOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(params) {
+      var _cancelOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(params) {
         var payload;
-        return _regeneratorRuntime().wrap(function _callee38$(_context41) {
-          while (1) switch (_context41.prev = _context41.next) {
+        return _regeneratorRuntime().wrap(function _callee34$(_context37) {
+          while (1) switch (_context37.prev = _context37.next) {
             case 0:
               if (!(!Array.isArray(params.order_ids) || params.order_ids.length === 0)) {
-                _context41.next = 2;
+                _context37.next = 2;
                 break;
               }
               throw new Error('取消订单失败：order_ids 不能为空');
@@ -5464,16 +5273,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 method: 'PUT',
                 orderIdsCount: params.order_ids.length
               });
-              return _context41.abrupt("return", this.request.put('/order/update-status', payload, {
+              return _context37.abrupt("return", this.request.put('/order/update-status', payload, {
                 isShopApi: true
               }));
             case 5:
             case "end":
-              return _context41.stop();
+              return _context37.stop();
           }
-        }, _callee38, this);
+        }, _callee34, this);
       }));
-      function cancelOrder(_x45) {
+      function cancelOrder(_x43) {
         return _cancelOrder.apply(this, arguments);
       }
       return cancelOrder;
@@ -5481,19 +5290,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "changeBookingStatus",
     value: function () {
-      var _changeBookingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(params) {
+      var _changeBookingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35(params) {
         var url, payload;
-        return _regeneratorRuntime().wrap(function _callee39$(_context42) {
-          while (1) switch (_context42.prev = _context42.next) {
+        return _regeneratorRuntime().wrap(function _callee35$(_context38) {
+          while (1) switch (_context38.prev = _context38.next) {
             case 0:
               if (params.booking_id) {
-                _context42.next = 2;
+                _context38.next = 2;
                 break;
               }
               throw new Error('变更预约状态失败：booking_id 不能为空');
             case 2:
               if (params.appointment_status) {
-                _context42.next = 4;
+                _context38.next = 4;
                 break;
               }
               throw new Error('变更预约状态失败：appointment_status 不能为空');
@@ -5508,16 +5317,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 bookingId: params.booking_id,
                 appointmentStatus: params.appointment_status
               });
-              return _context42.abrupt("return", this.request.put(url, payload, {
+              return _context38.abrupt("return", this.request.put(url, payload, {
                 isShopApi: true
               }));
             case 8:
             case "end":
-              return _context42.stop();
+              return _context38.stop();
           }
-        }, _callee39, this);
+        }, _callee35, this);
       }));
-      function changeBookingStatus(_x46) {
+      function changeBookingStatus(_x44) {
         return _changeBookingStatus.apply(this, arguments);
       }
       return changeBookingStatus;
@@ -5535,11 +5344,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createOrderByCheckout",
     value: (function () {
-      var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(params) {
+      var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
         var _params$payments, _params$bookings2, _params$relation_prod2, _params$payments2, _params$payments3, _params$bookings3, _params$relation_prod3, _params$payments4;
         var onlineStorePaymentCodeList, _orderData$payments, _orderData$bookings, _orderData$relation_p, _orderData$payments2, _orderData$payments3, _orderData$bookings2, _orderData$relation_p2, _orderData$payments4, _orderData$payments5, _response$data, orderData, response;
-        return _regeneratorRuntime().wrap(function _callee40$(_context43) {
-          while (1) switch (_context43.prev = _context43.next) {
+        return _regeneratorRuntime().wrap(function _callee36$(_context39) {
+          while (1) switch (_context39.prev = _context39.next) {
             case 0:
               // 过滤掉由在线店铺下单的 payment 支付数据
               onlineStorePaymentCodeList = ['WXPAY', 'WECHAT', 'ALIPAY', 'APPLE_PAY', 'CREDIT_CARD_3DS', 'CREDIT_CARD_TOKEN', 'GOOGLE_PAY', 'GOOGLE_PAY_3DS', 'CREDIT_CARD'];
@@ -5573,7 +5382,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 relationProductsCount: ((_params$relation_prod3 = params.relation_products) === null || _params$relation_prod3 === void 0 ? void 0 : _params$relation_prod3.length) || 0,
                 paymentsCount: ((_params$payments4 = params.payments) === null || _params$payments4 === void 0 ? void 0 : _params$payments4.length) || 0
               });
-              _context43.prev = 4;
+              _context39.prev = 4;
               // 构建订单数据，设置默认值并允许 params 覆盖
               orderData = _objectSpread({
                 sales_channel: 'my_pisel',
@@ -5635,13 +5444,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 hasOrderId: !!orderData.order_id,
                 smallTicketDataFlag: orderData.small_ticket_data_flag
               });
-              _context43.next = 12;
+              _context39.next = 12;
               return this.request.post('/order/checkout', orderData, {
                 osServer: true,
                 customToast: function customToast() {}
               });
             case 12:
-              response = _context43.sent;
+              response = _context39.sent;
               this.logInfo('Order API called successfully', {
                 response: response
               });
@@ -5649,22 +5458,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 success: !!response,
                 hasOrderId: !!(response !== null && response !== void 0 && (_response$data = response.data) !== null && _response$data !== void 0 && _response$data.order_id || response !== null && response !== void 0 && response.order_id)
               });
-              return _context43.abrupt("return", response);
+              return _context39.abrupt("return", response);
             case 18:
-              _context43.prev = 18;
-              _context43.t0 = _context43["catch"](4);
-              console.error('[Order] createOrderByCheckout 创建订单失败:', _context43.t0);
+              _context39.prev = 18;
+              _context39.t0 = _context39["catch"](4);
+              console.error('[Order] createOrderByCheckout 创建订单失败:', _context39.t0);
               this.logInfo('Order API called failed', {
-                error: _context43.t0 instanceof Error ? _context43.t0.message : String(_context43.t0)
+                error: _context39.t0 instanceof Error ? _context39.t0.message : String(_context39.t0)
               });
-              throw _context43.t0;
+              throw _context39.t0;
             case 23:
             case "end":
-              return _context43.stop();
+              return _context39.stop();
           }
-        }, _callee40, this, [[4, 18]]);
+        }, _callee36, this, [[4, 18]]);
       }));
-      function createOrderByCheckout(_x47) {
+      function createOrderByCheckout(_x45) {
         return _createOrderByCheckout.apply(this, arguments);
       }
       return createOrderByCheckout;
@@ -5672,24 +5481,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitSalesOrder",
     value: function () {
-      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41(params) {
+      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(params) {
         var url, query, fetchUrl;
-        return _regeneratorRuntime().wrap(function _callee41$(_context44) {
-          while (1) switch (_context44.prev = _context44.next) {
+        return _regeneratorRuntime().wrap(function _callee37$(_context40) {
+          while (1) switch (_context40.prev = _context40.next) {
             case 0:
               url = params.url, query = params.query;
               fetchUrl = url || '/order/sales/checkout';
-              return _context44.abrupt("return", this.request.post(fetchUrl, query, {
+              return _context40.abrupt("return", this.request.post(fetchUrl, query, {
                 osServer: true,
                 customToast: function customToast() {}
               }));
             case 3:
             case "end":
-              return _context44.stop();
+              return _context40.stop();
           }
-        }, _callee41, this);
+        }, _callee37, this);
       }));
-      function submitSalesOrder(_x48) {
+      function submitSalesOrder(_x46) {
         return _submitSalesOrder.apply(this, arguments);
       }
       return submitSalesOrder;
@@ -5703,37 +5512,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sendCustomerPayLink",
     value: (function () {
-      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee42(params) {
+      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(params) {
         var _params$emails;
         var orderIds;
-        return _regeneratorRuntime().wrap(function _callee42$(_context45) {
-          while (1) switch (_context45.prev = _context45.next) {
+        return _regeneratorRuntime().wrap(function _callee38$(_context41) {
+          while (1) switch (_context41.prev = _context41.next) {
             case 0:
               orderIds = params.order_ids || params.orderIds || [];
               if (orderIds.length) {
-                _context45.next = 3;
+                _context41.next = 3;
                 break;
               }
               throw new Error('发送支付链接前必须先提交本地订单并取得订单 ID');
             case 3:
               if ((_params$emails = params.emails) !== null && _params$emails !== void 0 && _params$emails.length) {
-                _context45.next = 5;
+                _context41.next = 5;
                 break;
               }
               throw new Error('发送支付链接需要至少一个邮箱');
             case 5:
-              return _context45.abrupt("return", this.request.post('/order/batch-email', {
+              return _context41.abrupt("return", this.request.post('/order/batch-email', {
                 order_ids: orderIds,
                 notify_action: params.notify_action || 'order_payment_reminder',
                 emails: params.emails
               }));
             case 6:
             case "end":
-              return _context45.stop();
+              return _context41.stop();
           }
-        }, _callee42, this);
+        }, _callee38, this);
       }));
-      function sendCustomerPayLink(_x49) {
+      function sendCustomerPayLink(_x47) {
         return _sendCustomerPayLink.apply(this, arguments);
       }
       return sendCustomerPayLink;
@@ -5741,14 +5550,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getSalesOrderByLookup",
     value: function () {
-      var _getSalesOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43(params) {
+      var _getSalesOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(params) {
         var lookup, res;
-        return _regeneratorRuntime().wrap(function _callee43$(_context46) {
-          while (1) switch (_context46.prev = _context46.next) {
+        return _regeneratorRuntime().wrap(function _callee39$(_context42) {
+          while (1) switch (_context42.prev = _context42.next) {
             case 0:
               lookup = params.lookup === undefined || params.lookup === null ? '' : String(params.lookup).trim();
               if (lookup) {
-                _context46.next = 3;
+                _context42.next = 3;
                 break;
               }
               throw new Error('加载销售详情需要 lookup');
@@ -5757,7 +5566,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (lookup.startsWith('LOCAL_')) {
                 params.forceRemote = false;
               }
-              _context46.next = 6;
+              _context42.next = 6;
               return this.request.get("/order/sales/".concat(encodeURIComponent(lookup)), _objectSpread({
                 with: ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info']
               }, params.forceRemote ? {
@@ -5766,18 +5575,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 osServer: true
               });
             case 6:
-              res = _context46.sent;
+              res = _context42.sent;
               if (res.code === 200) {
                 this.store.lastOrderInfo = res.data;
               }
-              return _context46.abrupt("return", res);
+              return _context42.abrupt("return", res);
             case 9:
             case "end":
-              return _context46.stop();
+              return _context42.stop();
           }
-        }, _callee43, this);
+        }, _callee39, this);
       }));
-      function getSalesOrderByLookup(_x50) {
+      function getSalesOrderByLookup(_x48) {
         return _getSalesOrderByLookup.apply(this, arguments);
       }
       return getSalesOrderByLookup;
@@ -5791,11 +5600,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hydrateTempOrderFromRecord",
     value: (function () {
-      var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee44(record, options) {
+      var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(record, options) {
         var _this$store$discount19;
-        var sourceRaw, identityReadySource, normalizedCollections, raw, hasIdentityChanges, identityLogMetadata, hasIdentityWarnings, nextTempOrder, sourceLastOrderInfo, isDraftOrder, syntheticIdentityOptions, rawSummary, summarySurcharges, hadSyntheticDraftOrderId, hydratedEditDiscounts, currentDiscounts, currentScanDiscounts, hydratedDiscountIds, retainedScanDiscounts, nextDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount20, _this$store$discount21;
-        return _regeneratorRuntime().wrap(function _callee44$(_context47) {
-          while (1) switch (_context47.prev = _context47.next) {
+        var sourceRaw, identityReadySource, normalizedCollections, raw, hasIdentityChanges, identityLogMetadata, hasIdentityWarnings, nextTempOrder, rawSummary, summarySurcharges, hydratedEditDiscounts, currentDiscounts, currentScanDiscounts, hydratedDiscountIds, retainedScanDiscounts, nextDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount20, _this$store$discount21;
+        return _regeneratorRuntime().wrap(function _callee40$(_context43) {
+          while (1) switch (_context43.prev = _context43.next) {
             case 0:
               sourceRaw = record && _typeof(record) === 'object' && record.data && record.order_id == null ? record.data : record || {};
               identityReadySource = this.seedAnonymousBookingUidsFromProducts(sourceRaw);
@@ -5820,13 +5629,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               nextTempOrder = this.normalizeTempOrderForRuntime(raw, {
                 makeEditMark: true
-              }); // Server list compatibility may synthesize order_id from external_sale_number; tempOrder must not.
-              sourceLastOrderInfo = raw.lastOrderInfo || raw;
-              isDraftOrder = Number(nextTempOrder.is_draft_order || 0) === 1;
-              syntheticIdentityOptions = {
-                isDraftOrder: isDraftOrder,
-                externalSaleNumber: nextTempOrder.external_sale_number
-              };
+              });
               rawSummary = raw.summary && _typeof(raw.summary) === 'object' ? raw.summary : {};
               summarySurcharges = Array.isArray(rawSummary.surcharges) ? rawSummary.surcharges.map(function (s) {
                 return _objectSpread({}, s || {});
@@ -5846,11 +5649,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   productFingerprint: this.buildOrderProductsFingerprint(nextTempOrder.products || [])
                 }
               });
-              this.store.lastOrderInfo = this.withoutSyntheticDraftOrderIdForRuntime(sourceLastOrderInfo, syntheticIdentityOptions);
-              hadSyntheticDraftOrderId = this.isSyntheticDraftOrderIdForRuntime(raw, syntheticIdentityOptions) || this.isSyntheticDraftOrderIdForRuntime(sourceLastOrderInfo, syntheticIdentityOptions);
-              if (hadSyntheticDraftOrderId && this.store.syncState !== 'submitting') {
-                this.store.syncState = 'local';
-              }
+              // lastOrderInfo carries the exact backend snapshot used by deposit/type recovery.
+              // Runtime collection repair lives in tempOrder/originalSalesSnapshot and must not
+              // rewrite this protocol snapshot as a side effect of hydration.
+              this.store.lastOrderInfo = sourceRaw.lastOrderInfo || sourceRaw;
               hydratedEditDiscounts = this.collectHydratedEditDiscounts(nextTempOrder.products);
               currentDiscounts = typeof ((_this$store$discount19 = this.store.discount) === null || _this$store$discount19 === void 0 ? void 0 : _this$store$discount19.getDiscountList) === 'function' ? this.store.discount.getDiscountList() || [] : [];
               currentScanDiscounts = currentDiscounts.filter(function (discount) {
@@ -5865,34 +5667,34 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               nextDiscounts = [].concat(_toConsumableArray(hydratedEditDiscounts), _toConsumableArray(retainedScanDiscounts));
               shouldSkipEmptyDiscountSync = nextDiscounts.length === 0 && currentDiscounts.length === 0;
               if (shouldSkipEmptyDiscountSync) {
-                _context47.next = 31;
+                _context43.next = 26;
                 break;
               }
               OrderModule.populateSavedAmounts(nextTempOrder.products, nextDiscounts);
-              _context47.next = 29;
+              _context43.next = 24;
               return (_this$store$discount20 = this.store.discount) === null || _this$store$discount20 === void 0 ? void 0 : _this$store$discount20.setOriginalDiscountList(nextDiscounts);
-            case 29:
-              _context47.next = 31;
+            case 24:
+              _context43.next = 26;
               return (_this$store$discount21 = this.store.discount) === null || _this$store$discount21 === void 0 ? void 0 : _this$store$discount21.setDiscountList(nextDiscounts);
-            case 31:
+            case 26:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context47.next = 34;
+                _context43.next = 29;
                 break;
               }
-              _context47.next = 34;
+              _context43.next = 29;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 34:
+            case 29:
               this.persistTempOrder();
-              return _context47.abrupt("return", nextTempOrder);
-            case 36:
+              return _context43.abrupt("return", nextTempOrder);
+            case 31:
             case "end":
-              return _context47.stop();
+              return _context43.stop();
           }
-        }, _callee44, this);
+        }, _callee40, this);
       }));
-      function hydrateTempOrderFromRecord(_x51, _x52) {
+      function hydrateTempOrderFromRecord(_x49, _x50) {
         return _hydrateTempOrderFromRecord.apply(this, arguments);
       }
       return hydrateTempOrderFromRecord;
@@ -6006,12 +5808,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeTempOrderForRuntime",
     value: function normalizeTempOrderForRuntime(raw, options) {
-      var _this32 = this;
-      var runtimeRaw = this.withoutSyntheticDraftOrderIdForRuntime(raw);
-      var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), runtimeRaw || {});
+      var _this28 = this;
+      var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), raw || {});
       // ES 列表详情使用 id 表示订单主键；OS 详情态统一依赖 order_id 驱动操作按钮。
-      if ((nextTempOrder.order_id === undefined || nextTempOrder.order_id === null) && (runtimeRaw === null || runtimeRaw === void 0 ? void 0 : runtimeRaw.id) !== undefined && (runtimeRaw === null || runtimeRaw === void 0 ? void 0 : runtimeRaw.id) !== null) {
-        nextTempOrder.order_id = runtimeRaw.id;
+      if ((nextTempOrder.order_id === undefined || nextTempOrder.order_id === null) && (raw === null || raw === void 0 ? void 0 : raw.id) !== undefined && (raw === null || raw === void 0 ? void 0 : raw.id) !== null) {
+        nextTempOrder.order_id = raw.id;
       }
       delete nextTempOrder.summary;
       delete nextTempOrder.lastOrderInfo;
@@ -6030,12 +5831,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       nextTempOrder.holder = raw.holder && _typeof(raw.holder) === 'object' ? _objectSpread({}, raw.holder) : null;
       var rawProducts = Array.isArray(raw.products) ? raw.products : [];
       nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map(function (p) {
-        return _this32.normalizeHydratedOrderProduct(p, {
+        return _this28.normalizeHydratedOrderProduct(p, {
           makeEditMark: options === null || options === void 0 ? void 0 : options.makeEditMark
         });
       }) : [];
       nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map(function (b) {
-        var booking = _this32.normalizeHydratedBookingHolder(b || {});
+        var booking = _this28.normalizeHydratedBookingHolder(b || {});
         return _objectSpread(_objectSpread({}, booking), {}, {
           is_all: normalizeBookingIsAll(booking),
           sub_type: normalizeBookingSubType(booking)
@@ -6065,7 +5866,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _step24;
       try {
         for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
-          var _product$metadata11, _ref77, _ref78, _existed$origin, _rawProduct$metadata;
+          var _product$metadata11, _ref76, _ref77, _existed$origin, _rawProduct$metadata;
           var _step24$value = _slicedToArray(_step24.value, 2),
             index = _step24$value[0],
             product = _step24$value[1];
@@ -6073,7 +5874,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           if (!uid) continue;
           var existed = productsByUid[uid] && _typeof(productsByUid[uid]) === 'object' ? productsByUid[uid] : {};
           var rawProduct = rawProducts[index] && _typeof(rawProducts[index]) === 'object' ? rawProducts[index] : product;
-          var origin = (_ref77 = (_ref78 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref78 !== void 0 ? _ref78 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref77 !== void 0 ? _ref77 : rawProduct;
+          var origin = (_ref76 = (_ref77 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref77 !== void 0 ? _ref77 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref76 !== void 0 ? _ref76 : rawProduct;
           var originSnapshot = cloneDeep(origin);
           var productOptionString = this.buildHydratedProductOptionString(rawProduct) || this.buildHydratedProductOptionString(product);
           if (productOptionString && originSnapshot && _typeof(originSnapshot) === 'object') {
@@ -6101,23 +5902,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       nextTempOrder.vouchers = raw.vouchers || [];
       return nextTempOrder;
     }
-  }, {
-    key: "isSyntheticDraftOrderIdForRuntime",
-    value: function isSyntheticDraftOrderIdForRuntime(record, options) {
-      var _options$isDraftOrder, _record$external_sale;
-      var isDraftOrder = (_options$isDraftOrder = options === null || options === void 0 ? void 0 : options.isDraftOrder) !== null && _options$isDraftOrder !== void 0 ? _options$isDraftOrder : Number((record === null || record === void 0 ? void 0 : record.is_draft_order) || 0) === 1;
-      var externalSaleNumber = (_record$external_sale = record === null || record === void 0 ? void 0 : record.external_sale_number) !== null && _record$external_sale !== void 0 ? _record$external_sale : options === null || options === void 0 ? void 0 : options.externalSaleNumber;
-      var orderId = record === null || record === void 0 ? void 0 : record.order_id;
-      return Boolean(isDraftOrder && orderId !== undefined && orderId !== null && orderId !== '' && externalSaleNumber !== undefined && externalSaleNumber !== null && externalSaleNumber !== '' && String(orderId) === String(externalSaleNumber));
-    }
-  }, {
-    key: "withoutSyntheticDraftOrderIdForRuntime",
-    value: function withoutSyntheticDraftOrderIdForRuntime(record, options) {
-      if (!this.isSyntheticDraftOrderIdForRuntime(record, options)) return record;
-      return _objectSpread(_objectSpread({}, record), {}, {
-        order_id: null
-      });
-    }
   }, {
     key: "hydrateLinkedBookingIdentity",
     value: function hydrateLinkedBookingIdentity(tempOrder) {
@@ -6202,10 +5986,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedProductOptionItem",
     value: function normalizeHydratedProductOptionItem(optionItem) {
-      var _ref79, _optionItem$num, _ref80, _optionItem$add_price;
-      var rawNum = (_ref79 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref79 !== void 0 ? _ref79 : 1;
+      var _ref78, _optionItem$num, _ref79, _optionItem$add_price;
+      var rawNum = (_ref78 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref78 !== void 0 ? _ref78 : 1;
       var parsedNum = Number(rawNum);
-      var rawPrice = (_ref80 = (_optionItem$add_price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _optionItem$add_price !== void 0 ? _optionItem$add_price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _ref80 !== void 0 ? _ref80 : 0;
+      var rawPrice = (_ref79 = (_optionItem$add_price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _optionItem$add_price !== void 0 ? _optionItem$add_price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _ref79 !== void 0 ? _ref79 : 0;
       var parsedPrice = Number(rawPrice);
       var normalized = _objectSpread(_objectSpread({}, optionItem), {}, {
         option_group_item_id: optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id,
@@ -6222,7 +6006,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedOrderProduct",
     value: function normalizeHydratedOrderProduct(product, options) {
-      var _this33 = this;
+      var _this29 = this;
       var row = _objectSpread({}, product || {});
       if (row.num === undefined && row.product_quantity !== undefined) {
         row.num = row.product_quantity;
@@ -6230,7 +6014,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var productSku = ensureProductSku(row);
       row.product_sku = _objectSpread(_objectSpread({}, productSku), {}, {
         option: normalizeProductSkuOptions(productSku.option.map(function (optionItem) {
-          return _this33.normalizeHydratedProductOptionItem(optionItem || {});
+          return _this29.normalizeHydratedProductOptionItem(optionItem || {});
         }))
       });
       delete row["product_".concat('option', "_item")];
@@ -6267,27 +6051,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderInfo",
     value: function () {
-      var _getOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee45(order_id) {
+      var _getOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41(order_id) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee45$(_context48) {
-          while (1) switch (_context48.prev = _context48.next) {
+        return _regeneratorRuntime().wrap(function _callee41$(_context44) {
+          while (1) switch (_context44.prev = _context44.next) {
             case 0:
-              _context48.next = 2;
+              _context44.next = 2;
               return this.request.get("/order/sales/".concat(order_id), {
                 with: ['products', 'bookings']
               }, {
                 osServer: true
               });
             case 2:
-              res = _context48.sent;
-              return _context48.abrupt("return", res);
+              res = _context44.sent;
+              return _context44.abrupt("return", res);
             case 4:
             case "end":
-              return _context48.stop();
+              return _context44.stop();
           }
-        }, _callee45, this);
+        }, _callee41, this);
       }));
-      function getOrderInfo(_x53) {
+      function getOrderInfo(_x51) {
         return _getOrderInfo.apply(this, arguments);
       }
       return getOrderInfo;
@@ -6346,10 +6130,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             _step29;
           try {
             for (_iterator29.s(); !(_step29 = _iterator29.n()).done;) {
-              var _ref81, _bundle$num3;
+              var _ref80, _bundle$num3;
               var bundle = _step29.value;
               var isPersistedBundleProduct = isPersistedProduct || Boolean((bundle === null || bundle === void 0 ? void 0 : bundle.order_detail_id) || (bundle === null || bundle === void 0 ? void 0 : bundle.orderDetailId) || (bundle === null || bundle === void 0 ? void 0 : bundle.booking_id));
-              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref81 = (_bundle$num3 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num3 !== void 0 ? _bundle$num3 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref81 !== void 0 ? _ref81 : 1) || 1).toNumber();
+              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref80 = (_bundle$num3 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num3 !== void 0 ? _bundle$num3 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref80 !== void 0 ? _ref80 : 1) || 1).toNumber();
               var _iterator30 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
                 _step30;
               try {