@pisell/pisellos 2.2.192 → 2.2.194

package/dist/modules/Order/index.js

@@ -41,7 +41,21 @@ import { RulesModule } from "../Rules";
 import { UnavailableReason } from "../Rules/types";
 import Decimal from 'decimal.js';
 import { cloneDeep } from 'lodash-es';
-var LOCAL_ORDER_STORE_NAME = 'orders';
+function normalizeDiscountListSignature(discountList) {
+  return (discountList || []).map(function (item) {
+    var _item$type, _item$discount_id, _item$order_discount_;
+    return {
+      type: (_item$type = item === null || item === void 0 ? void 0 : item.type) !== null && _item$type !== void 0 ? _item$type : '',
+      discount_id: (_item$discount_id = item === null || item === void 0 ? void 0 : item.discount_id) !== null && _item$discount_id !== void 0 ? _item$discount_id : null,
+      order_discount_id: (_item$order_discount_ = item === null || item === void 0 ? void 0 : item.order_discount_id) !== null && _item$order_discount_ !== void 0 ? _item$order_discount_ : null,
+      amount: new Decimal(Number(item === null || item === void 0 ? void 0 : item.amount) || 0).toFixed(2)
+    };
+  });
+}
+function isSameDiscountList(left, right) {
+  if (!Array.isArray(left) || !Array.isArray(right)) return false;
+  return JSON.stringify(normalizeDiscountListSignature(left)) === JSON.stringify(normalizeDiscountListSignature(right));
+}
 export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(OrderModule, _BaseModule);
   var _super = _createSuper(OrderModule);
@@ -55,7 +69,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
     _defineProperty(_assertThisInitialized(_this), "logger", void 0);
     // LoggerManager 实例
-    _defineProperty(_assertThisInitialized(_this), "dbManager", void 0);
     _defineProperty(_assertThisInitialized(_this), "window", void 0);
     _defineProperty(_assertThisInitialized(_this), "cacheId", void 0);
     _defineProperty(_assertThisInitialized(_this), "salesSummaryModuleName", void 0);
@@ -86,6 +99,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return (products || []).map(function (product) {
         var _product$metadata, _product$metadata$sou, _product$metadata2, _product$metadata3, _product$original_pri;
         if ((_product$metadata = product.metadata) !== null && _product$metadata !== void 0 && _product$metadata.is_manual_discount) return product;
+        var discountItems = Array.isArray(product.discount_list) ? product.discount_list : [];
+        var hasOnlyPersistedDiscountSnapshots = product.order_detail_id !== undefined && product.order_detail_id !== null && discountItems.length > 0 && discountItems.every(function (discount) {
+          return (discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== undefined && (discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null;
+        });
+        if (hasOnlyPersistedDiscountSnapshots) {
+          return product;
+        }
         var totalPerUnitDiscount = resolveEffectivePerUnitDiscount(product);
         var optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
         var sourcePrice = (_product$metadata$sou = (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.source_product_price) !== null && _product$metadata$sou !== void 0 ? _product$metadata$sou : ((_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.main_product_original_price) != null ? new Decimal(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : '0';
@@ -129,7 +149,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 8:
               app = appPlugin.getApp();
               this.logger = app.logger;
-              this.dbManager = app.sqlite;
               this.window = this.core.getPlugin('window');
               otherParams = options.otherParams || {};
               this.cacheId = otherParams.cacheId;
@@ -139,7 +158,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.otherParams = otherParams;
               this.registerDiscountModules(options);
               this.logInfo('OrderModule initialized successfully');
-            case 20:
+            case 19:
             case "end":
               return _context.stop();
           }
@@ -880,211 +899,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return "".concat(baseToken, "_payment_").concat(paidCount);
     }
   }, {
-    key: "hasLocalDatabase",
-    value: function hasLocalDatabase() {
-      return !!this.dbManager;
-    }
-  }, {
-    key: "buildLocalOrderRecord",
-    value: function buildLocalOrderRecord(tempOrder) {
-      var _tempOrder$order_id;
-      var externalSaleNumber = this.ensureExternalSaleNumber(tempOrder);
-      return _objectSpread(_objectSpread({}, tempOrder), {}, {
-        id: (_tempOrder$order_id = tempOrder.order_id) !== null && _tempOrder$order_id !== void 0 ? _tempOrder$order_id : externalSaleNumber,
-        external_sale_number: externalSaleNumber,
-        summary: this.store.summary || createEmptySummary(),
-        lastOrderInfo: this.store.lastOrderInfo
-      });
-    }
-  }, {
-    key: "getLocalOrderByOrderId",
+    key: "saveDraft",
     value: function () {
-      var _getLocalOrderByOrderId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(orderId) {
-        var _this$dbManager$get, _this$dbManager, _this$dbManager$getAl, _this$dbManager2, direct, orders;
+      var _saveDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
         return _regeneratorRuntime().wrap(function _callee5$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              if (!(!this.dbManager || orderId === undefined || orderId === null)) {
-                _context7.next = 2;
-                break;
-              }
-              return _context7.abrupt("return", null);
-            case 2:
-              _context7.prev = 2;
-              _context7.next = 5;
-              return (_this$dbManager$get = (_this$dbManager = this.dbManager).get) === null || _this$dbManager$get === void 0 ? void 0 : _this$dbManager$get.call(_this$dbManager, LOCAL_ORDER_STORE_NAME, orderId);
-            case 5:
-              direct = _context7.sent;
-              if (!direct) {
-                _context7.next = 8;
-                break;
-              }
-              return _context7.abrupt("return", direct);
-            case 8:
-              _context7.next = 10;
-              return (_this$dbManager$getAl = (_this$dbManager2 = this.dbManager).getAll) === null || _this$dbManager$getAl === void 0 ? void 0 : _this$dbManager$getAl.call(_this$dbManager2, LOCAL_ORDER_STORE_NAME);
-            case 10:
-              orders = _context7.sent;
-              return _context7.abrupt("return", (orders || []).find(function (order) {
-                return String(order === null || order === void 0 ? void 0 : order.order_id) === String(orderId);
-              }) || null);
-            case 14:
-              _context7.prev = 14;
-              _context7.t0 = _context7["catch"](2);
-              this.logWarning('getLocalOrderByOrderId failed', {
-                orderId: orderId,
-                error: _context7.t0 instanceof Error ? _context7.t0.message : String(_context7.t0)
-              });
-              return _context7.abrupt("return", null);
-            case 18:
             case "end":
               return _context7.stop();
           }
-        }, _callee5, this, [[2, 14]]);
-      }));
-      function getLocalOrderByOrderId(_x6) {
-        return _getLocalOrderByOrderId.apply(this, arguments);
-      }
-      return getLocalOrderByOrderId;
-    }()
-  }, {
-    key: "getLocalOrderByOrderNumber",
-    value: function () {
-      var _getLocalOrderByOrderNumber = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(orderNumber) {
-        var _this$dbManager$get2, _this$dbManager3, _this$dbManager$getAl2, _this$dbManager4, direct, orders;
-        return _regeneratorRuntime().wrap(function _callee6$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
-            case 0:
-              if (!(!this.dbManager || !orderNumber)) {
-                _context8.next = 2;
-                break;
-              }
-              return _context8.abrupt("return", null);
-            case 2:
-              _context8.prev = 2;
-              _context8.next = 5;
-              return (_this$dbManager$get2 = (_this$dbManager3 = this.dbManager).get) === null || _this$dbManager$get2 === void 0 ? void 0 : _this$dbManager$get2.call(_this$dbManager3, LOCAL_ORDER_STORE_NAME, orderNumber);
-            case 5:
-              direct = _context8.sent;
-              if (!direct) {
-                _context8.next = 8;
-                break;
-              }
-              return _context8.abrupt("return", direct);
-            case 8:
-              _context8.next = 10;
-              return (_this$dbManager$getAl2 = (_this$dbManager4 = this.dbManager).getAll) === null || _this$dbManager$getAl2 === void 0 ? void 0 : _this$dbManager$getAl2.call(_this$dbManager4, LOCAL_ORDER_STORE_NAME);
-            case 10:
-              orders = _context8.sent;
-              return _context8.abrupt("return", (orders || []).find(function (order) {
-                return String(order === null || order === void 0 ? void 0 : order.order_number) === String(orderNumber);
-              }) || null);
-            case 14:
-              _context8.prev = 14;
-              _context8.t0 = _context8["catch"](2);
-              this.logWarning('getLocalOrderByOrderNumber failed', {
-                orderNumber: orderNumber,
-                error: _context8.t0 instanceof Error ? _context8.t0.message : String(_context8.t0)
-              });
-              return _context8.abrupt("return", null);
-            case 18:
-            case "end":
-              return _context8.stop();
-          }
-        }, _callee6, this, [[2, 14]]);
-      }));
-      function getLocalOrderByOrderNumber(_x7) {
-        return _getLocalOrderByOrderNumber.apply(this, arguments);
-      }
-      return getLocalOrderByOrderNumber;
-    }()
-  }, {
-    key: "getLocalOrderByExternalSaleNumber",
-    value: function () {
-      var _getLocalOrderByExternalSaleNumber = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(externalSaleNumber) {
-        var _this$dbManager$get3, _this$dbManager5, _this$dbManager$getAl3, _this$dbManager6, direct, orders;
-        return _regeneratorRuntime().wrap(function _callee7$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
-            case 0:
-              if (!(!this.dbManager || !externalSaleNumber)) {
-                _context9.next = 2;
-                break;
-              }
-              return _context9.abrupt("return", null);
-            case 2:
-              _context9.prev = 2;
-              _context9.next = 5;
-              return (_this$dbManager$get3 = (_this$dbManager5 = this.dbManager).get) === null || _this$dbManager$get3 === void 0 ? void 0 : _this$dbManager$get3.call(_this$dbManager5, LOCAL_ORDER_STORE_NAME, externalSaleNumber);
-            case 5:
-              direct = _context9.sent;
-              if (!direct) {
-                _context9.next = 8;
-                break;
-              }
-              return _context9.abrupt("return", direct);
-            case 8:
-              _context9.next = 10;
-              return (_this$dbManager$getAl3 = (_this$dbManager6 = this.dbManager).getAll) === null || _this$dbManager$getAl3 === void 0 ? void 0 : _this$dbManager$getAl3.call(_this$dbManager6, LOCAL_ORDER_STORE_NAME);
-            case 10:
-              orders = _context9.sent;
-              return _context9.abrupt("return", (orders || []).find(function (order) {
-                return String(order === null || order === void 0 ? void 0 : order.external_sale_number) === String(externalSaleNumber);
-              }) || null);
-            case 14:
-              _context9.prev = 14;
-              _context9.t0 = _context9["catch"](2);
-              this.logWarning('getLocalOrderByExternalSaleNumber failed', {
-                externalSaleNumber: externalSaleNumber,
-                error: _context9.t0 instanceof Error ? _context9.t0.message : String(_context9.t0)
-              });
-              return _context9.abrupt("return", null);
-            case 18:
-            case "end":
-              return _context9.stop();
-          }
-        }, _callee7, this, [[2, 14]]);
-      }));
-      function getLocalOrderByExternalSaleNumber(_x8) {
-        return _getLocalOrderByExternalSaleNumber.apply(this, arguments);
-      }
-      return getLocalOrderByExternalSaleNumber;
-    }()
-  }, {
-    key: "saveDraft",
-    value: function () {
-      var _saveDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-        var tempOrder, record, _this$dbManager$updat, _this$dbManager7;
-        return _regeneratorRuntime().wrap(function _callee8$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
-            case 0:
-              if (!(!this.draftPersistEnabled || !this.dbManager)) {
-                _context10.next = 2;
-                break;
-              }
-              return _context10.abrupt("return");
-            case 2:
-              tempOrder = this.ensureTempOrder();
-              record = this.buildLocalOrderRecord(tempOrder);
-              _context10.prev = 4;
-              _context10.next = 7;
-              return (_this$dbManager$updat = (_this$dbManager7 = this.dbManager).update) === null || _this$dbManager$updat === void 0 ? void 0 : _this$dbManager$updat.call(_this$dbManager7, LOCAL_ORDER_STORE_NAME, record);
-            case 7:
-              _context10.next = 12;
-              break;
-            case 9:
-              _context10.prev = 9;
-              _context10.t0 = _context10["catch"](4);
-              this.logWarning('saveDraft failed', {
-                externalSaleNumber: tempOrder.external_sale_number,
-                orderNumber: tempOrder.order_number,
-                orderId: tempOrder.order_id,
-                error: _context10.t0 instanceof Error ? _context10.t0.message : String(_context10.t0)
-              });
-            case 12:
-            case "end":
-              return _context10.stop();
-          }
-        }, _callee8, this, [[4, 9]]);
+        }, _callee5);
       }));
       function saveDraft() {
         return _saveDraft.apply(this, arguments);
@@ -1099,18 +923,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hydrateTempOrderFromLocalRecord",
     value: function () {
-      var _hydrateTempOrderFromLocalRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(record) {
-        return _regeneratorRuntime().wrap(function _callee9$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+      var _hydrateTempOrderFromLocalRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(record) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              return _context11.abrupt("return", this.hydrateTempOrderFromRecord(record));
+              return _context8.abrupt("return", this.hydrateTempOrderFromRecord(record));
             case 1:
             case "end":
-              return _context11.stop();
+              return _context8.stop();
           }
-        }, _callee9, this);
+        }, _callee6, this);
       }));
-      function hydrateTempOrderFromLocalRecord(_x9) {
+      function hydrateTempOrderFromLocalRecord(_x6) {
         return _hydrateTempOrderFromLocalRecord.apply(this, arguments);
       }
       return hydrateTempOrderFromLocalRecord;
@@ -1161,6 +985,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateTempOrderPaymentStatus",
     value: function updateTempOrderPaymentStatus(tempOrder) {
+      if (this.shouldKeepPaymentStatusAfterAmountRecalc(tempOrder.payment_status)) {
+        return;
+      }
       var paymentTotal = this.calculatePaymentTotal(tempOrder.payments || []);
       var targetAmount = this.getPaymentTargetAmount();
       if (targetAmount.lte(0)) {
@@ -1168,11 +995,59 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         return;
       }
       if (paymentTotal.lte(0)) {
-        tempOrder.payment_status = tempOrder.payment_status || 'payment_processing';
+        tempOrder.payment_status = 'payment_processing';
         return;
       }
       tempOrder.payment_status = paymentTotal.gte(targetAmount) ? 'paid' : 'partially_paid';
     }
+  }, {
+    key: "shouldKeepPaymentStatusAfterAmountRecalc",
+    value: function shouldKeepPaymentStatusAfterAmountRecalc(paymentStatus) {
+      var normalizedStatus = String(paymentStatus || '').trim().toLowerCase();
+      return normalizedStatus === 'refunded' || normalizedStatus === 'partially_refunded';
+    }
+  }, {
+    key: "resolveWalletPassUseValue",
+    value: function resolveWalletPassUseValue(payment, amount) {
+      var usageUnit = payment.wallet_pass_usage_unit && _typeof(payment.wallet_pass_usage_unit) === 'object' ? payment.wallet_pass_usage_unit : null;
+      if (!usageUnit) return payment.wallet_pass_use_value;
+      var price = new Decimal(usageUnit.price || 0);
+      var points = new Decimal(usageUnit.points || 0);
+      if (price.lte(0) || points.lte(0)) return payment.wallet_pass_use_value;
+      return amount.div(price).times(points).toDecimalPlaces(2).toFixed(2);
+    }
+  }, {
+    key: "capVoucherPaymentsByRemainingAmount",
+    value: function capVoucherPaymentsByRemainingAmount(params) {
+      var targetAmount = this.getPaymentTargetAmount();
+      var nonVoucherTotal = this.calculatePaymentTotal(params.nonVoucherPayments);
+      if (targetAmount.lte(0)) return [];
+      var remainingAmount = Decimal.max(targetAmount.minus(nonVoucherTotal), 0);
+      var cappedVouchers = [];
+      var _iterator5 = _createForOfIteratorHelper(params.vouchers),
+        _step5;
+      try {
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var voucher = _step5.value;
+          if (remainingAmount.lte(0)) break;
+          var voucherAmount = Decimal.max(new Decimal(voucher.amount || 0), 0);
+          if (voucherAmount.lte(0)) continue;
+          var cappedAmount = Decimal.min(voucherAmount, remainingAmount);
+          var amountText = cappedAmount.toDecimalPlaces(2).toFixed(2);
+          cappedVouchers.push(_objectSpread(_objectSpread({}, voucher), {}, {
+            amount: amountText,
+            origin_amount: amountText,
+            wallet_pass_use_value: this.resolveWalletPassUseValue(voucher, cappedAmount)
+          }));
+          remainingAmount = remainingAmount.minus(cappedAmount);
+        }
+      } catch (err) {
+        _iterator5.e(err);
+      } finally {
+        _iterator5.f();
+      }
+      return cappedVouchers;
+    }
   }, {
     key: "calculatePaidPaymentSummary",
     value: function calculatePaidPaymentSummary(payments) {
@@ -1183,7 +1058,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         return {
           customerPaidAmount: summary.customerPaidAmount.plus(paymentRecord.amount || 0),
           orderPaidAmount: summary.orderPaidAmount.plus(paymentRecord.origin_amount || 0),
-          gapPaidAmount: summary.gapPaidAmount.plus(_this4.calculatePaymentEffectiveAmount(paymentRecord)),
+          gapPaidAmount: summary.gapPaidAmount.plus(_this4.calculatePaymentGapAmount(paymentRecord)),
           payServiceChargeAmount: summary.payServiceChargeAmount.plus(_this4.calculatePaymentServiceFee(paymentRecord))
         };
       }, {
@@ -1204,6 +1079,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var fixedAmount = new Decimal(serviceCharge.amount || 0);
       return new Decimal(payment.amount || 0).times(percentage).plus(fixedAmount);
     }
+  }, {
+    key: "calculatePaymentGapAmount",
+    value: function calculatePaymentGapAmount(payment) {
+      if (payment.origin_amount === undefined || payment.origin_amount === null || payment.origin_amount === '') {
+        return new Decimal(0);
+      }
+      var rounding = new Decimal(payment.rounding_amount || 0);
+      return new Decimal(payment.origin_amount || 0).minus(rounding);
+    }
   }, {
     key: "formatSummaryMetadataMoney",
     value: function formatSummaryMetadataMoney(value) {
@@ -1215,28 +1099,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "syncSummaryProductMetadata",
     value: function syncSummaryProductMetadata(products) {
       var moneyKeys = ['main_product_attached_bundle_surcharge_fee', 'main_product_attached_bundle_tax_fee', 'surcharge_rounding_remainder', 'tax_fee_rounding_remainder'];
-      var _iterator5 = _createForOfIteratorHelper(products || []),
-        _step5;
+      var _iterator6 = _createForOfIteratorHelper(products || []),
+        _step6;
       try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var product = _step5.value;
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var product = _step6.value;
           var productRecord = product;
           var metadata = productRecord.metadata && _typeof(productRecord.metadata) === 'object' ? _objectSpread({}, productRecord.metadata) : {};
           var hasMetadataPatch = false;
-          var _iterator6 = _createForOfIteratorHelper(moneyKeys),
-            _step6;
+          var _iterator7 = _createForOfIteratorHelper(moneyKeys),
+            _step7;
           try {
-            for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-              var key = _step6.value;
+            for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+              var key = _step7.value;
               var value = this.formatSummaryMetadataMoney(productRecord[key]);
               if (value === undefined) continue;
               metadata[key] = value;
               hasMetadataPatch = true;
             }
           } catch (err) {
-            _iterator6.e(err);
+            _iterator7.e(err);
           } finally {
-            _iterator6.f();
+            _iterator7.f();
           }
           if (Array.isArray(productRecord.relation_surcharge_ids)) {
             metadata.relation_surcharge_ids = productRecord.relation_surcharge_ids;
@@ -1244,11 +1128,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
           if (hasMetadataPatch) productRecord.metadata = metadata;
           if (!Array.isArray(productRecord.product_bundle)) continue;
-          var _iterator7 = _createForOfIteratorHelper(productRecord.product_bundle),
-            _step7;
+          var _iterator8 = _createForOfIteratorHelper(productRecord.product_bundle),
+            _step8;
           try {
-            for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-              var bundle = _step7.value;
+            for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+              var bundle = _step8.value;
               var bundleRecord = bundle;
               var bundleMetadata = bundleRecord.metadata && _typeof(bundleRecord.metadata) === 'object' ? _objectSpread({}, bundleRecord.metadata) : {};
               var hasBundleMetadataPatch = false;
@@ -1264,15 +1148,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (hasBundleMetadataPatch) bundleRecord.metadata = bundleMetadata;
             }
           } catch (err) {
-            _iterator7.e(err);
+            _iterator8.e(err);
           } finally {
-            _iterator7.f();
+            _iterator8.f();
           }
         }
       } catch (err) {
-        _iterator5.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator5.f();
+        _iterator6.f();
       }
     }
   }, {
@@ -1332,13 +1216,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "replaceTempOrder",
     value: function () {
-      var _replaceTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(tempOrder, options) {
+      var _replaceTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(tempOrder, options) {
         var nextTempOrder;
-        return _regeneratorRuntime().wrap(function _callee10$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               if (isTempOrder(tempOrder)) {
-                _context12.next = 2;
+                _context9.next = 2;
                 break;
               }
               throw new Error('无效的 tempOrder 数据');
@@ -1348,15 +1232,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               this.store.tempOrder = nextTempOrder;
               if (!((options === null || options === void 0 ? void 0 : options.recalculateSummary) !== false)) {
-                _context12.next = 9;
+                _context9.next = 9;
                 break;
               }
-              _context12.next = 7;
+              _context9.next = 7;
               return this.recalculateSummary({
                 createIfMissing: false
               });
             case 7:
-              _context12.next = 10;
+              _context9.next = 10;
               break;
             case 9:
               this.store.summary = createEmptySummary();
@@ -1365,20 +1249,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 this.persistTempOrder();
               }
               if (!(options !== null && options !== void 0 && options.saveDraft)) {
-                _context12.next = 14;
+                _context9.next = 14;
                 break;
               }
-              _context12.next = 14;
+              _context9.next = 14;
               return this.saveDraft();
             case 14:
-              return _context12.abrupt("return", nextTempOrder);
+              return _context9.abrupt("return", nextTempOrder);
             case 15:
             case "end":
-              return _context12.stop();
+              return _context9.stop();
           }
-        }, _callee10, this);
+        }, _callee7, this);
       }));
-      function replaceTempOrder(_x10, _x11) {
+      function replaceTempOrder(_x7, _x8) {
         return _replaceTempOrder.apply(this, arguments);
       }
       return replaceTempOrder;
@@ -1386,11 +1270,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderIdentity",
     value: function getOrderIdentity() {
-      var _ref7, _ref8, _tempOrder$order_id2, _tempOrder$_extend;
+      var _ref7, _ref8, _tempOrder$order_id, _tempOrder$_extend;
       var tempOrder = this.store.tempOrder;
       if (!tempOrder) return null;
       var lastOrderInfo = this.store.lastOrderInfo || {};
-      var orderId = (_ref7 = (_ref8 = (_tempOrder$order_id2 = tempOrder.order_id) !== null && _tempOrder$order_id2 !== void 0 ? _tempOrder$order_id2 : lastOrderInfo.order_id) !== null && _ref8 !== void 0 ? _ref8 : lastOrderInfo.id) !== null && _ref7 !== void 0 ? _ref7 : null;
+      var orderId = (_ref7 = (_ref8 = (_tempOrder$order_id = tempOrder.order_id) !== null && _tempOrder$order_id !== void 0 ? _tempOrder$order_id : lastOrderInfo.order_id) !== null && _ref8 !== void 0 ? _ref8 : lastOrderInfo.id) !== null && _ref7 !== void 0 ? _ref7 : null;
       return {
         localId: this.cacheId || ((_tempOrder$_extend = tempOrder._extend) === null || _tempOrder$_extend === void 0 ? void 0 : _tempOrder$_extend.localId),
         orderId: orderId,
@@ -1461,32 +1345,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addNewOrder",
     value: function () {
-      var _addNewOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+      var _addNewOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee11$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               this.ensureExternalSaleNumber(tempOrder);
-              _context13.next = 4;
+              _context10.next = 4;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 4:
               this.persistTempOrder();
               if (!this.draftPersistEnabled) {
-                _context13.next = 8;
+                _context10.next = 8;
                 break;
               }
-              _context13.next = 8;
+              _context10.next = 8;
               return this.saveDraft();
             case 8:
-              return _context13.abrupt("return", tempOrder);
+              return _context10.abrupt("return", tempOrder);
             case 9:
             case "end":
-              return _context13.stop();
+              return _context10.stop();
           }
-        }, _callee11, this);
+        }, _callee8, this);
       }));
       function addNewOrder() {
         return _addNewOrder.apply(this, arguments);
@@ -1508,6 +1392,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       product.metadata = metadata;
       return String(uid);
     }
+  }, {
+    key: "sanitizeOrderProductForTempOrder",
+    value: function sanitizeOrderProductForTempOrder(product) {
+      if (product.metadata && _typeof(product.metadata) === 'object') {
+        delete product.metadata.origin;
+      }
+      return product;
+    }
+  }, {
+    key: "sanitizeTempOrderProducts",
+    value: function sanitizeTempOrderProducts(tempOrder) {
+      var _this5 = this;
+      tempOrder.products = (tempOrder.products || []).map(function (product) {
+        return _this5.sanitizeOrderProductForTempOrder(product);
+      });
+    }
   }, {
     key: "ensureExtend",
     value: function ensureExtend(tempOrder) {
@@ -1573,9 +1473,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "findBookingIndexByUniqueIdentificationNumber",
     value: function findBookingIndexByUniqueIdentificationNumber(tempOrder, uniqueIdentificationNumber) {
-      var _this5 = this;
+      var _this6 = this;
       return (tempOrder.bookings || []).findIndex(function (booking) {
-        return _this5.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
+        return _this6.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
       });
     }
   }, {
@@ -1583,12 +1483,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function removeLinkedBookingsForProduct(tempOrder, product) {
       var _product$metadata4,
         _product$metadata5,
-        _this6 = this;
+        _this7 = this;
       var productUid = (product === null || product === void 0 || (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
       var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.booking_uid);
       if (!productUid && !bookingUid) return;
       tempOrder.bookings = (tempOrder.bookings || []).filter(function (booking) {
-        var currentBookingUid = _this6.getBookingUniqueIdentificationNumber(booking);
+        var currentBookingUid = _this7.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;
@@ -1605,23 +1505,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "recalculateSummary",
     value: function () {
-      var _recalculateSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(options) {
+      var _recalculateSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(options) {
         var tempOrder, salesSummary, existedSummary, paidPaymentSummary, emptySummary, salesSummaryResult, summary;
-        return _regeneratorRuntime().wrap(function _callee12$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               tempOrder = options !== null && options !== void 0 && options.createIfMissing ? this.ensureTempOrder() : this.store.tempOrder;
               if (tempOrder) {
-                _context14.next = 3;
+                _context11.next = 3;
                 break;
               }
-              return _context14.abrupt("return", null);
+              return _context11.abrupt("return", null);
             case 3:
+              this.sanitizeTempOrderProducts(tempOrder);
               salesSummary = this.getSalesSummary();
               existedSummary = this.store.summary || createEmptySummary();
               paidPaymentSummary = this.calculatePaidPaymentSummary(tempOrder.payments || []);
               if (salesSummary) {
-                _context14.next = 11;
+                _context11.next = 13;
                 break;
               }
               emptySummary = _objectSpread(_objectSpread({}, createEmptySummary()), {}, {
@@ -1635,18 +1536,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }),
                 pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
               });
-              this.store.summary = emptySummary;
               tempOrder.surcharge_fee = emptySummary.surcharge_fee;
-              return _context14.abrupt("return", this.store.summary);
-            case 11:
-              _context14.next = 13;
+              this.updateTempOrderPaymentStatus(tempOrder);
+              this.store.summary = emptySummary;
+              return _context11.abrupt("return", this.store.summary);
+            case 13:
+              _context11.next = 15;
               return salesSummary.getSummary({
                 products: tempOrder.products,
                 isPriceIncludeTax: tempOrder.is_price_include_tax,
                 shopDiscount: tempOrder.shop_discount
               });
-            case 13:
-              salesSummaryResult = _context14.sent;
+            case 15:
+              salesSummaryResult = _context11.sent;
               this.syncSummaryProductMetadata(tempOrder.products || []);
               summary = _objectSpread(_objectSpread({}, salesSummaryResult), {}, {
                 total_refund_amount: existedSummary.total_refund_amount || '0.00',
@@ -1670,14 +1572,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               tempOrder.surcharges = summary.surcharges || [];
               tempOrder.deposit_amount = summary.deposit_amount || '0.00';
               tempOrder.is_deposit = summary.deposit_amount !== '0.00' ? 1 : 0;
-              return _context14.abrupt("return", this.store.summary);
-            case 24:
+              this.updateTempOrderPaymentStatus(tempOrder);
+              return _context11.abrupt("return", this.store.summary);
+            case 27:
             case "end":
-              return _context14.stop();
+              return _context11.stop();
           }
-        }, _callee12, this);
+        }, _callee9, this);
       }));
-      function recalculateSummary(_x12) {
+      function recalculateSummary(_x9) {
         return _recalculateSummary.apply(this, arguments);
       }
       return recalculateSummary;
@@ -1685,30 +1588,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderSummary",
     value: function () {
-      var _getOrderSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+      var _getOrderSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
         var summary;
-        return _regeneratorRuntime().wrap(function _callee13$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        return _regeneratorRuntime().wrap(function _callee10$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              _context15.next = 2;
+              _context12.next = 2;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 2:
-              summary = _context15.sent;
+              summary = _context12.sent;
               if (summary) {
-                _context15.next = 5;
+                _context12.next = 5;
                 break;
               }
-              return _context15.abrupt("return", createEmptySummary());
+              return _context12.abrupt("return", createEmptySummary());
             case 5:
               this.persistTempOrder();
-              return _context15.abrupt("return", summary);
+              return _context12.abrupt("return", summary);
             case 7:
             case "end":
-              return _context15.stop();
+              return _context12.stop();
           }
-        }, _callee13, this);
+        }, _callee10, this);
       }));
       function getOrderSummary() {
         return _getOrderSummary.apply(this, arguments);
@@ -1732,23 +1635,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncTempOrderNoteToRemote",
     value: function () {
-      var _syncTempOrderNoteToRemote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(orderId, note) {
-        return _regeneratorRuntime().wrap(function _callee14$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+      var _syncTempOrderNoteToRemote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(orderId, note) {
+        return _regeneratorRuntime().wrap(function _callee11$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              _context16.next = 2;
+              _context13.next = 2;
               return this.request.put("/order/order/".concat(orderId, "/note"), {
                 note: note
               });
             case 2:
-              return _context16.abrupt("return", note);
+              return _context13.abrupt("return", note);
             case 3:
             case "end":
-              return _context16.stop();
+              return _context13.stop();
           }
-        }, _callee14, this);
+        }, _callee11, this);
       }));
-      function syncTempOrderNoteToRemote(_x13, _x14) {
+      function syncTempOrderNoteToRemote(_x10, _x11) {
         return _syncTempOrderNoteToRemote.apply(this, arguments);
       }
       return syncTempOrderNoteToRemote;
@@ -1960,7 +1863,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addOrderPayment",
     value: function addOrderPayment(payment) {
-      var _this7 = this;
+      var _this8 = this;
       this.logInfo('addOrderPayment', {
         payment: payment
       });
@@ -1973,7 +1876,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this7.logError('recalculate summary after addOrderPayment failed', {
+        _this8.logError('recalculate summary after addOrderPayment failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -2038,10 +1941,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateVoucherOrderPayments",
     value: function updateVoucherOrderPayments(payments) {
-      var _this8 = this;
+      var _this9 = this;
       var tempOrder = this.ensureTempOrder();
       var mappedVouchers = mapPaymentItemsToOrderPayments(payments.map(function (payment) {
-        return _this8.normalizePaymentSource(payment, {
+        return _this9.normalizePaymentSource(payment, {
           defaultPaid: false
         });
       })).filter(function (payment) {
@@ -2050,13 +1953,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var nonVoucherPayments = (tempOrder.payments || []).filter(function (payment) {
         return payment.voucher_id === undefined || Number(payment.voucher_id) === 0;
       });
-      tempOrder.payments = [].concat(_toConsumableArray(nonVoucherPayments), _toConsumableArray(mappedVouchers));
+      var cappedVouchers = this.capVoucherPaymentsByRemainingAmount({
+        vouchers: mappedVouchers,
+        nonVoucherPayments: nonVoucherPayments
+      });
+      tempOrder.payments = [].concat(_toConsumableArray(nonVoucherPayments), _toConsumableArray(cappedVouchers));
       this.updateTempOrderPaymentStatus(tempOrder);
       this.persistTempOrder();
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this8.logError('recalculate summary after updateVoucherOrderPayments failed', {
+        _this9.logError('recalculate summary after updateVoucherOrderPayments failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -2065,45 +1972,45 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "shouldMergeProductToOrder",
     value: function () {
-      var _shouldMergeProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(params) {
+      var _shouldMergeProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(params) {
         var _this$orderHooks;
         var onBeforeMergeProductToOrder, result;
-        return _regeneratorRuntime().wrap(function _callee15$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        return _regeneratorRuntime().wrap(function _callee12$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               onBeforeMergeProductToOrder = (_this$orderHooks = this.orderHooks) === null || _this$orderHooks === void 0 ? void 0 : _this$orderHooks.onBeforeMergeProductToOrder;
               if (onBeforeMergeProductToOrder) {
-                _context17.next = 3;
+                _context14.next = 3;
                 break;
               }
-              return _context17.abrupt("return", true);
+              return _context14.abrupt("return", true);
             case 3:
-              _context17.next = 5;
+              _context14.next = 5;
               return onBeforeMergeProductToOrder(_objectSpread(_objectSpread({}, params), {}, {
                 defaultShouldMerge: true
               }));
             case 5:
-              result = _context17.sent;
+              result = _context14.sent;
               if (!(typeof result === 'boolean')) {
-                _context17.next = 8;
+                _context14.next = 8;
                 break;
               }
-              return _context17.abrupt("return", result);
+              return _context14.abrupt("return", result);
             case 8:
               if (!(result && _typeof(result) === 'object' && typeof result.shouldMerge === 'boolean')) {
-                _context17.next = 10;
+                _context14.next = 10;
                 break;
               }
-              return _context17.abrupt("return", result.shouldMerge);
+              return _context14.abrupt("return", result.shouldMerge);
             case 10:
-              return _context17.abrupt("return", true);
+              return _context14.abrupt("return", true);
             case 11:
             case "end":
-              return _context17.stop();
+              return _context14.stop();
           }
-        }, _callee15, this);
+        }, _callee12, this);
       }));
-      function shouldMergeProductToOrder(_x15) {
+      function shouldMergeProductToOrder(_x12) {
         return _shouldMergeProductToOrder.apply(this, arguments);
       }
       return shouldMergeProductToOrder;
@@ -2111,11 +2018,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProductToOrder",
     value: function () {
-      var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(product, booking) {
-        var _this9 = this;
+      var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(product, booking) {
+        var _this10 = this;
         var tempOrder, linked, productToAdd, incomingFingerprint, normalizedIncoming, hasIncomingGoodPass, shouldForceNewLine, matchedIndex, matchedProduct, existedFingerprint, shouldMerge, _targetProduct$metada, targetProduct, targetUid, normalizedProduct;
-        return _regeneratorRuntime().wrap(function _callee16$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        return _regeneratorRuntime().wrap(function _callee13$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               linked = booking ? this.createLinkedProductAndBooking({
@@ -2129,7 +2036,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               hasIncomingGoodPass = this.hasGoodPassDiscount(normalizedIncoming);
               shouldForceNewLine = !!booking;
               matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
-                if (_this9.hasGoodPassDiscount(item)) return false;
+                if (_this10.hasGoodPassDiscount(item)) return false;
                 if (item.product_id !== productToAdd.product_id) return false;
                 if (item.product_variant_id !== productToAdd.product_variant_id) return false;
                 var existedFingerprint = buildProductLineFingerprint(getProductSkuOptions(item), item.product_bundle);
@@ -2138,10 +2045,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               matchedProduct = matchedIndex === -1 ? null : tempOrder.products[matchedIndex];
               existedFingerprint = matchedProduct ? buildProductLineFingerprint(getProductSkuOptions(matchedProduct), matchedProduct.product_bundle) : '';
               if (!matchedProduct) {
-                _context18.next = 17;
+                _context15.next = 17;
                 break;
               }
-              _context18.next = 14;
+              _context15.next = 14;
               return this.shouldMergeProductToOrder({
                 incomingProduct: productToAdd,
                 normalizedIncoming: normalizedIncoming,
@@ -2153,13 +2060,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 booking: booking
               });
             case 14:
-              _context18.t0 = _context18.sent;
-              _context18.next = 18;
+              _context15.t0 = _context15.sent;
+              _context15.next = 18;
               break;
             case 17:
-              _context18.t0 = false;
+              _context15.t0 = false;
             case 18:
-              shouldMerge = _context18.t0;
+              shouldMerge = _context15.t0;
               if (matchedIndex === -1 || !matchedProduct || !shouldMerge) {
                 this.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
                 if (linked) {
@@ -2198,24 +2105,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (linked) {
                 tempOrder.bookings = [].concat(_toConsumableArray(tempOrder.bookings || []), [linked.booking]);
               }
-              _context18.next = 23;
+              _context15.next = 23;
               return this.applyPromotion();
             case 23:
               this.applyDiscount();
-              _context18.next = 26;
+              this.sanitizeTempOrderProducts(tempOrder);
+              _context15.next = 27;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 26:
+            case 27:
               this.persistTempOrder();
-              return _context18.abrupt("return", tempOrder.products);
-            case 28:
+              return _context15.abrupt("return", tempOrder.products);
+            case 29:
             case "end":
-              return _context18.stop();
+              return _context15.stop();
           }
-        }, _callee16, this);
+        }, _callee13, this);
       }));
-      function addProductToOrder(_x16, _x17) {
+      function addProductToOrder(_x13, _x14) {
         return _addProductToOrder.apply(this, arguments);
       }
       return addProductToOrder;
@@ -2242,11 +2150,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProduct",
     value: function () {
-      var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(params) {
-        var _targetProduct$metada2, _product_sku, _metadata, _metadata2, _metadata3, _metadata4, _metadata5, _metadata6, _nextProduct$metadata, _targetProduct$metada7, _tempOrder$products$p;
-        var product_id, product_variant_id, updates, unique_identification_number, identity_key, product_sku, product_bundle, booking, tempOrder, identityLookup, productIndex, targetUid, targetProduct, nextProduct, callerUpdatesTopPrice, callerUpdatesMainMeta, isPersistedOrderLine, callerUpdatesManualPrice, _targetProduct$metada3, _targetProduct$metada4, _targetProduct$metada5, _targetProduct$metada6, existedMeta, normalizedProduct, preservedBookingUid, _normalizedProduct$me, _targetProduct$metada8, productUid, linked;
-        return _regeneratorRuntime().wrap(function _callee17$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+      var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(params) {
+        var _targetProduct$metada2, _product_sku, _metadata, _metadata2, _metadata3, _metadata4, _metadata5, _metadata6, _nextProduct$metadata, _targetProduct$metada8, _tempOrder$products$p;
+        var product_id, product_variant_id, updates, unique_identification_number, identity_key, product_sku, product_bundle, booking, tempOrder, identityLookup, productIndex, targetUid, targetProduct, nextProduct, callerUpdatesTopPrice, callerUpdatesMainMeta, isPersistedOrderLine, callerChangesDiscountList, callerUpdatesManualPrice, _targetProduct$metada3, _targetProduct$metada4, _targetProduct$metada5, _targetProduct$metada6, _targetProduct$metada7, existedMeta, normalizedProduct, preservedBookingUid, _normalizedProduct$me, _targetProduct$metada9, productUid, linked;
+        return _regeneratorRuntime().wrap(function _callee14$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               product_id = params.product_id, product_variant_id = params.product_variant_id, updates = params.updates, unique_identification_number = params.unique_identification_number, identity_key = params.identity_key, product_sku = params.product_sku, product_bundle = params.product_bundle, booking = params.booking;
               tempOrder = this.ensureTempOrder();
@@ -2277,7 +2185,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 productIndex = getProductIdentityIndex(tempOrder.products, identityLookup);
               }
               if (!(productIndex === -1)) {
-                _context19.next = 12;
+                _context16.next = 12;
                 break;
               }
               throw new Error('[Order] 目标商品不存在，无法更新');
@@ -2305,7 +2213,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               callerUpdatesTopPrice = Object.prototype.hasOwnProperty.call(updates || {}, 'selling_price') || Object.prototype.hasOwnProperty.call(updates || {}, 'original_price');
               callerUpdatesMainMeta = (updates === null || updates === void 0 || (_metadata = updates.metadata) === null || _metadata === void 0 ? void 0 : _metadata.main_product_selling_price) !== undefined || (updates === null || updates === void 0 || (_metadata2 = updates.metadata) === null || _metadata2 === void 0 ? void 0 : _metadata2.main_product_original_price) !== undefined || (updates === null || updates === void 0 || (_metadata3 = updates.metadata) === null || _metadata3 === void 0 ? void 0 : _metadata3.source_product_price) !== undefined;
               isPersistedOrderLine = targetProduct.order_detail_id !== undefined && targetProduct.order_detail_id !== null;
-              callerUpdatesManualPrice = (updates === null || updates === void 0 || (_metadata4 = updates.metadata) === null || _metadata4 === void 0 ? void 0 : _metadata4.price_override) !== undefined || (updates === null || updates === void 0 || (_metadata5 = updates.metadata) === null || _metadata5 === void 0 ? void 0 : _metadata5.is_manual_discount) !== undefined || (updates === null || updates === void 0 || (_metadata6 = updates.metadata) === null || _metadata6 === void 0 ? void 0 : _metadata6.product_discount_reason) !== undefined || Array.isArray(updates === null || updates === void 0 ? void 0 : updates.discount_list) && updates.discount_list.length > 0;
+              callerChangesDiscountList = Array.isArray(updates === null || updates === void 0 ? void 0 : updates.discount_list) && updates.discount_list.length > 0 && !isSameDiscountList(updates.discount_list, targetProduct.discount_list);
+              callerUpdatesManualPrice = (updates === null || updates === void 0 || (_metadata4 = updates.metadata) === null || _metadata4 === void 0 ? void 0 : _metadata4.price_override) !== undefined || (updates === null || updates === void 0 || (_metadata5 = updates.metadata) === null || _metadata5 === void 0 ? void 0 : _metadata5.is_manual_discount) !== undefined || (updates === null || updates === void 0 || (_metadata6 = updates.metadata) === null || _metadata6 === void 0 ? void 0 : _metadata6.product_discount_reason) !== undefined || callerChangesDiscountList;
               if (isPersistedOrderLine && !callerUpdatesManualPrice) {
                 nextProduct.selling_price = targetProduct.selling_price;
                 nextProduct.original_price = targetProduct.original_price;
@@ -2314,7 +2223,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   source_product_price: (_targetProduct$metada3 = targetProduct.metadata) === null || _targetProduct$metada3 === void 0 ? void 0 : _targetProduct$metada3.source_product_price,
                   main_product_selling_price: (_targetProduct$metada4 = targetProduct.metadata) === null || _targetProduct$metada4 === void 0 ? void 0 : _targetProduct$metada4.main_product_selling_price,
                   main_product_original_price: (_targetProduct$metada5 = targetProduct.metadata) === null || _targetProduct$metada5 === void 0 ? void 0 : _targetProduct$metada5.main_product_original_price,
-                  price_schema_version: (_targetProduct$metada6 = targetProduct.metadata) === null || _targetProduct$metada6 === void 0 ? void 0 : _targetProduct$metada6.price_schema_version
+                  price_schema_version: (_targetProduct$metada6 = (_targetProduct$metada7 = targetProduct.metadata) === null || _targetProduct$metada7 === void 0 ? void 0 : _targetProduct$metada7.price_schema_version) !== null && _targetProduct$metada6 !== void 0 ? _targetProduct$metada6 : 2
                 });
               } else if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
                 existedMeta = nextProduct.metadata || {};
@@ -2328,7 +2237,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               // 否则 → 把顶层 selling_price 视作 source，派生 main_product_* 并写 price_schema_version: 2。
               normalizedProduct = mergeOrderProductDisplayFields(nextProduct, normalizeOrderProduct(nextProduct));
               normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
-              preservedBookingUid = nextProduct.booking_uid || ((_nextProduct$metadata = nextProduct.metadata) === null || _nextProduct$metadata === void 0 ? void 0 : _nextProduct$metadata.booking_uid) || targetProduct.booking_uid || ((_targetProduct$metada7 = targetProduct.metadata) === null || _targetProduct$metada7 === void 0 ? void 0 : _targetProduct$metada7.booking_uid);
+              preservedBookingUid = nextProduct.booking_uid || ((_nextProduct$metadata = nextProduct.metadata) === null || _nextProduct$metadata === void 0 ? void 0 : _nextProduct$metadata.booking_uid) || targetProduct.booking_uid || ((_targetProduct$metada8 = targetProduct.metadata) === null || _targetProduct$metada8 === void 0 ? void 0 : _targetProduct$metada8.booking_uid);
               if (!booking && preservedBookingUid) {
                 normalizedProduct.booking_uid = preservedBookingUid;
                 normalizedProduct.metadata = _objectSpread(_objectSpread({}, normalizedProduct.metadata || {}), {}, {
@@ -2336,7 +2245,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 });
               }
               if (booking) {
-                productUid = String(((_normalizedProduct$me = normalizedProduct.metadata) === null || _normalizedProduct$me === void 0 ? void 0 : _normalizedProduct$me.unique_identification_number) || ((_targetProduct$metada8 = targetProduct.metadata) === null || _targetProduct$metada8 === void 0 ? void 0 : _targetProduct$metada8.unique_identification_number) || unique_identification_number || createUuidV4());
+                productUid = String(((_normalizedProduct$me = normalizedProduct.metadata) === null || _normalizedProduct$me === void 0 ? void 0 : _normalizedProduct$me.unique_identification_number) || ((_targetProduct$metada9 = targetProduct.metadata) === null || _targetProduct$metada9 === void 0 ? void 0 : _targetProduct$metada9.unique_identification_number) || unique_identification_number || createUuidV4());
                 normalizedProduct.metadata = _objectSpread(_objectSpread({}, normalizedProduct.metadata || {}), {}, {
                   unique_identification_number: productUid
                 });
@@ -2358,24 +2267,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               tempOrder.products[productIndex] = normalizedProduct;
               this.captureProductRuntime(tempOrder, updates, tempOrder.products[productIndex], (_tempOrder$products$p = tempOrder.products[productIndex].metadata) === null || _tempOrder$products$p === void 0 ? void 0 : _tempOrder$products$p.unique_identification_number);
-              _context19.next = 29;
+              _context16.next = 30;
               return this.applyPromotion();
-            case 29:
+            case 30:
               this.applyDiscount();
-              _context19.next = 32;
+              this.sanitizeTempOrderProducts(tempOrder);
+              _context16.next = 34;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 32:
-              this.persistTempOrder();
-              return _context19.abrupt("return", tempOrder.products);
             case 34:
+              this.persistTempOrder();
+              return _context16.abrupt("return", tempOrder.products);
+            case 36:
             case "end":
-              return _context19.stop();
+              return _context16.stop();
           }
-        }, _callee17, this);
+        }, _callee14, this);
       }));
-      function updateOrderProduct(_x18) {
+      function updateOrderProduct(_x15) {
         return _updateOrderProduct.apply(this, arguments);
       }
       return updateOrderProduct;
@@ -2383,11 +2293,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProductQuantity",
     value: function () {
-      var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(params) {
-        var _targetProduct$metada9;
+      var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(params) {
+        var _targetProduct$metada10;
         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 _callee18$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+        return _regeneratorRuntime().wrap(function _callee15$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               product_id = params.product_id, product_variant_id = params.product_variant_id, num = params.num, unique_identification_number = params.unique_identification_number, identity_key = params.identity_key, product_sku = params.product_sku, product_bundle = params.product_bundle;
               tempOrder = this.ensureTempOrder();
@@ -2416,7 +2326,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 productIndex = getProductIdentityIndex(tempOrder.products, identityLookup);
               }
               if (!(productIndex === -1)) {
-                _context20.next = 12;
+                _context17.next = 12;
                 break;
               }
               throw new Error('[Order] 目标商品不存在，无法更新数量');
@@ -2425,29 +2335,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               normalizedProduct = normalizeOrderProduct(_objectSpread(_objectSpread({}, targetProduct), {}, {
                 num: getSafeProductNum(num),
                 metadata: _objectSpread(_objectSpread({}, targetProduct.metadata || {}), {}, {
-                  unique_identification_number: ((_targetProduct$metada9 = targetProduct.metadata) === null || _targetProduct$metada9 === void 0 ? void 0 : _targetProduct$metada9.unique_identification_number) || unique_identification_number
+                  unique_identification_number: ((_targetProduct$metada10 = targetProduct.metadata) === null || _targetProduct$metada10 === void 0 ? void 0 : _targetProduct$metada10.unique_identification_number) || unique_identification_number
                 })
               }));
               normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
               tempOrder.products[productIndex] = normalizedProduct;
-              _context20.next = 18;
+              _context17.next = 18;
               return this.applyPromotion();
             case 18:
               this.applyDiscount();
-              _context20.next = 21;
+              this.sanitizeTempOrderProducts(tempOrder);
+              _context17.next = 22;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 21:
+            case 22:
               this.persistTempOrder();
-              return _context20.abrupt("return", tempOrder.products);
-            case 23:
+              return _context17.abrupt("return", tempOrder.products);
+            case 24:
             case "end":
-              return _context20.stop();
+              return _context17.stop();
           }
-        }, _callee18, this);
+        }, _callee15, this);
       }));
-      function updateOrderProductQuantity(_x19) {
+      function updateOrderProductQuantity(_x16) {
         return _updateOrderProductQuantity.apply(this, arguments);
       }
       return updateOrderProductQuantity;
@@ -2478,10 +2389,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeProductFromOrder",
     value: function () {
-      var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(identity) {
+      var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(identity) {
         var tempOrder, removedProducts, _i, _removedProducts, product;
-        return _regeneratorRuntime().wrap(function _callee19$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+        return _regeneratorRuntime().wrap(function _callee16$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               removedProducts = [];
@@ -2494,24 +2405,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 product = _removedProducts[_i];
                 this.removeLinkedBookingsForProduct(tempOrder, product);
               }
-              _context21.next = 6;
+              _context18.next = 6;
               return this.applyPromotion();
             case 6:
               this.applyDiscount();
-              _context21.next = 9;
+              this.sanitizeTempOrderProducts(tempOrder);
+              _context18.next = 10;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 9:
+            case 10:
               this.persistTempOrder();
-              return _context21.abrupt("return", tempOrder.products);
-            case 11:
+              return _context18.abrupt("return", tempOrder.products);
+            case 12:
             case "end":
-              return _context21.stop();
+              return _context18.stop();
           }
-        }, _callee19, this);
+        }, _callee16, this);
       }));
-      function removeProductFromOrder(_x20) {
+      function removeProductFromOrder(_x17) {
         return _removeProductFromOrder.apply(this, arguments);
       }
       return removeProductFromOrder;
@@ -2523,10 +2435,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clearOrderCartLines",
     value: (function () {
-      var _clearOrderCartLines = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
+      var _clearOrderCartLines = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee20$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+        return _regeneratorRuntime().wrap(function _callee17$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               tempOrder.products = [];
@@ -2536,22 +2448,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   productsByUid: {}
                 });
               }
-              _context22.next = 6;
+              _context19.next = 6;
               return this.applyPromotion();
             case 6:
               this.applyDiscount();
-              _context22.next = 9;
+              this.sanitizeTempOrderProducts(tempOrder);
+              _context19.next = 10;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 9:
+            case 10:
               this.persistTempOrder();
-              return _context22.abrupt("return", tempOrder);
-            case 11:
+              return _context19.abrupt("return", tempOrder);
+            case 12:
             case "end":
-              return _context22.stop();
+              return _context19.stop();
           }
-        }, _callee20, this);
+        }, _callee17, this);
       }));
       function clearOrderCartLines() {
         return _clearOrderCartLines.apply(this, arguments);
@@ -2562,17 +2475,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
      * 提交当前 Sales tempOrder。
      *
      * smallTicketDataFlag 用于 B 端 checkout 小票数据返回。PaymentModal 在支付提交时
-     * 应传 1，确保 /order/sales/checkout 返回打印所需数据。
+     * 应传 1，确保 /shop/order/sales/checkout 返回打印所需数据。
      */
     )
   }, {
     key: "submitTempOrder",
     value: function () {
-      var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(params) {
+      var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(params) {
         var _params$cacheId, _this$otherParams, _ref23, _params$businessCode, _this$otherParams2, _this$otherParams3;
         var tempOrder, effectiveCacheId, hasPaymentOverride, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
-        return _regeneratorRuntime().wrap(function _callee21$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+        return _regeneratorRuntime().wrap(function _callee18$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               this.persistTempOrder();
@@ -2601,10 +2514,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 enhance: enhancePayload
               }); // TODO: 前端生成的时间现在是有问题的，后面要统一优化
               payload.created_at = undefined;
-              _context23.next = 11;
+              _context20.next = 11;
               return this.saveDraft();
             case 11:
-              _context23.prev = 11;
+              _context20.prev = 11;
               this.logInfo('submitTempOrder calling sales checkout', {
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
@@ -2613,62 +2526,62 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 paymentsCount: ((_payload$payments = payload.payments) === null || _payload$payments === void 0 ? void 0 : _payload$payments.length) || 0,
                 smallTicketDataFlag: payload.small_ticket_data_flag
               });
-              _context23.next = 15;
+              _context20.next = 15;
               return this.submitSalesOrder({
                 query: payload
               });
             case 15:
-              result = _context23.sent;
-              _context23.next = 28;
+              result = _context20.sent;
+              _context20.next = 28;
               break;
             case 18:
-              _context23.prev = 18;
-              _context23.t0 = _context23["catch"](11);
-              backendErrorResponse = this.extractSubmitErrorResponse(_context23.t0);
+              _context20.prev = 18;
+              _context20.t0 = _context20["catch"](11);
+              backendErrorResponse = this.extractSubmitErrorResponse(_context20.t0);
               if (!backendErrorResponse) {
-                _context23.next = 25;
+                _context20.next = 25;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
-              return _context23.abrupt("return", backendErrorResponse);
+              return _context20.abrupt("return", backendErrorResponse);
             case 25:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
-                error: _context23.t0 instanceof Error ? _context23.t0.message : String(_context23.t0),
+                error: _context20.t0 instanceof Error ? _context20.t0.message : String(_context20.t0),
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
                 paymentStatus: payload.payment_status,
                 paymentsCount: ((_payload$payments2 = payload.payments) === null || _payload$payments2 === void 0 ? void 0 : _payload$payments2.length) || 0
               });
-              throw _context23.t0;
+              throw _context20.t0;
             case 28:
               if (!this.isSubmitResponseRejected(result)) {
-                _context23.next = 32;
+                _context20.next = 32;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
-              return _context23.abrupt("return", result);
+              return _context20.abrupt("return", result);
             case 32:
               submittedOrderId = this.extractOrderIdFromSubmitResult(result);
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
-                _context23.next = 38;
+                _context20.next = 38;
                 break;
               }
               tempOrder.order_id = submittedOrderId;
               resultRecord = result;
-              _context23.next = 38;
+              _context20.next = 38;
               return this.markLocalOrderSynced(submittedOrderId, (resultRecord === null || resultRecord === void 0 ? void 0 : resultRecord.data) || resultRecord || {});
             case 38:
-              return _context23.abrupt("return", result);
+              return _context20.abrupt("return", result);
             case 39:
             case "end":
-              return _context23.stop();
+              return _context20.stop();
           }
-        }, _callee21, this, [[11, 18]]);
+        }, _callee18, this, [[11, 18]]);
       }));
-      function submitTempOrder(_x21) {
+      function submitTempOrder(_x18) {
         return _submitTempOrder.apply(this, arguments);
       }
       return submitTempOrder;
@@ -2676,25 +2589,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "markLocalOrderSynced",
     value: function () {
-      var _markLocalOrderSynced = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(orderId, remoteOrder) {
+      var _markLocalOrderSynced = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(orderId, remoteOrder) {
         var tempOrder;
-        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();
               tempOrder.order_id = orderId;
               this.store.lastOrderInfo = remoteOrder;
               this.store.syncState = 'submitted';
               this.persistTempOrder();
-              _context24.next = 7;
+              _context21.next = 7;
               return this.saveDraft();
             case 7:
             case "end":
-              return _context24.stop();
+              return _context21.stop();
           }
-        }, _callee22, this);
+        }, _callee19, this);
       }));
-      function markLocalOrderSynced(_x22, _x23) {
+      function markLocalOrderSynced(_x19, _x20) {
         return _markLocalOrderSynced.apply(this, arguments);
       }
       return markLocalOrderSynced;
@@ -2718,10 +2631,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function extractSubmitErrorResponse(error) {
       var _error$response,
         _error$response2,
-        _this10 = this;
+        _this11 = 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 _this10.isSubmitErrorResponse(candidate);
+        return _this11.isSubmitErrorResponse(candidate);
       }) || null;
     }
   }, {
@@ -2741,10 +2654,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncPaymentsToOrder",
     value: function () {
-      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(params) {
+      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(params) {
         var tempOrder, mappedPayments, paymentTotal, targetAmount, isFullyPaid, paymentStatus, paymentSyncIdempotencyToken, submitResult;
-        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();
               mappedPayments = mapPaymentItemsToOrderPayments(params.payments || []);
@@ -2755,28 +2668,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               tempOrder.payments = mappedPayments;
               tempOrder.payment_status = paymentStatus;
               this.persistTempOrder();
-              _context25.next = 11;
+              _context22.next = 11;
               return this.saveDraft();
             case 11:
               if (params.submitWhenPaid) {
-                _context25.next = 13;
+                _context22.next = 13;
                 break;
               }
-              return _context25.abrupt("return", {
+              return _context22.abrupt("return", {
                 isFullyPaid: isFullyPaid
               });
             case 13:
               if (!(this.store.syncState === 'submitting')) {
-                _context25.next = 15;
+                _context22.next = 15;
                 break;
               }
-              return _context25.abrupt("return", {
+              return _context22.abrupt("return", {
                 isFullyPaid: isFullyPaid
               });
             case 15:
               this.store.syncState = 'submitting';
               paymentSyncIdempotencyToken = this.buildPaymentSyncIdempotencyToken(tempOrder, mappedPayments);
-              _context25.next = 19;
+              _context22.next = 19;
               return this.submitTempOrder({
                 payments: mappedPayments,
                 paymentStatus: paymentStatus,
@@ -2791,18 +2704,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               });
             case 19:
-              submitResult = _context25.sent;
-              return _context25.abrupt("return", {
+              submitResult = _context22.sent;
+              return _context22.abrupt("return", {
                 isFullyPaid: isFullyPaid,
                 submitResult: submitResult
               });
             case 21:
             case "end":
-              return _context25.stop();
+              return _context22.stop();
           }
-        }, _callee23, this);
+        }, _callee20, this);
       }));
-      function syncPaymentsToOrder(_x24) {
+      function syncPaymentsToOrder(_x21) {
         return _syncPaymentsToOrder.apply(this, arguments);
       }
       return syncPaymentsToOrder;
@@ -2891,11 +2804,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitOrder",
     value: function () {
-      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(order) {
+      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(order) {
         var _order$query$cartItem, _params$bookings, _params$relation_prod;
         var url, query, fetchUrl, params;
-        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:
               this.logInfo('submitOrder called', {
                 url: order.url,
@@ -2915,14 +2828,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 _context26.abrupt("return", this.request.post(fetchUrl, params));
+              return _context23.abrupt("return", this.request.post(fetchUrl, params));
             case 6:
             case "end":
-              return _context26.stop();
+              return _context23.stop();
           }
-        }, _callee24, this);
+        }, _callee21, this);
       }));
-      function submitOrder(_x25) {
+      function submitOrder(_x22) {
         return _submitOrder.apply(this, arguments);
       }
       return submitOrder;
@@ -2930,13 +2843,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "cancelOrder",
     value: function () {
-      var _cancelOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(params) {
+      var _cancelOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(params) {
         var payload;
-        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:
               if (!(!Array.isArray(params.order_ids) || params.order_ids.length === 0)) {
-                _context27.next = 2;
+                _context24.next = 2;
                 break;
               }
               throw new Error('取消订单失败：order_ids 不能为空');
@@ -2952,16 +2865,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 method: 'PUT',
                 orderIdsCount: params.order_ids.length
               });
-              return _context27.abrupt("return", this.request.put('/order/update-status', payload, {
+              return _context24.abrupt("return", this.request.put('/order/update-status', payload, {
                 isShopApi: true
               }));
             case 5:
             case "end":
-              return _context27.stop();
+              return _context24.stop();
           }
-        }, _callee25, this);
+        }, _callee22, this);
       }));
-      function cancelOrder(_x26) {
+      function cancelOrder(_x23) {
         return _cancelOrder.apply(this, arguments);
       }
       return cancelOrder;
@@ -2969,19 +2882,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "changeBookingStatus",
     value: function () {
-      var _changeBookingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(params) {
+      var _changeBookingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(params) {
         var url, payload;
-        return _regeneratorRuntime().wrap(function _callee26$(_context28) {
-          while (1) switch (_context28.prev = _context28.next) {
+        return _regeneratorRuntime().wrap(function _callee23$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
               if (params.booking_id) {
-                _context28.next = 2;
+                _context25.next = 2;
                 break;
               }
               throw new Error('变更预约状态失败：booking_id 不能为空');
             case 2:
               if (params.appointment_status) {
-                _context28.next = 4;
+                _context25.next = 4;
                 break;
               }
               throw new Error('变更预约状态失败：appointment_status 不能为空');
@@ -2996,16 +2909,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 bookingId: params.booking_id,
                 appointmentStatus: params.appointment_status
               });
-              return _context28.abrupt("return", this.request.put(url, payload, {
+              return _context25.abrupt("return", this.request.put(url, payload, {
                 isShopApi: true
               }));
             case 8:
             case "end":
-              return _context28.stop();
+              return _context25.stop();
           }
-        }, _callee26, this);
+        }, _callee23, this);
       }));
-      function changeBookingStatus(_x27) {
+      function changeBookingStatus(_x24) {
         return _changeBookingStatus.apply(this, arguments);
       }
       return changeBookingStatus;
@@ -3014,7 +2927,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
      * Checkout 专用：创建订单到后端
      *
      * 专门为 Checkout 模块设计的订单创建方法，
-     * 直接调用 /order/checkout 接口创建订单
+     * 通过 OS Server 调用 checkout 接口创建订单
      * 接收已经处理好的订单数据，无需再处理购物车
      *
      * @param params Checkout 订单参数（已处理的订单数据）
@@ -3023,11 +2936,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createOrderByCheckout",
     value: (function () {
-      var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(params) {
+      var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(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 _callee27$(_context29) {
-          while (1) switch (_context29.prev = _context29.next) {
+        return _regeneratorRuntime().wrap(function _callee24$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
               // 过滤掉由在线店铺下单的 payment 支付数据
               onlineStorePaymentCodeList = ['WXPAY', 'WECHAT', 'ALIPAY', 'APPLE_PAY', 'CREDIT_CARD_3DS', 'CREDIT_CARD_TOKEN', 'GOOGLE_PAY', 'GOOGLE_PAY_3DS', 'CREDIT_CARD'];
@@ -3061,7 +2974,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
               });
-              _context29.prev = 4;
+              _context26.prev = 4;
               // 构建订单数据，设置默认值并允许 params 覆盖
               orderData = _objectSpread({
                 sales_channel: 'my_pisel',
@@ -3084,7 +2997,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 orderData.schedule_date = dayjs().format('YYYY-MM-DD HH:mm:ss');
               }
               console.log('[Order] 调用后端接口创建订单:', {
-                url: '/order/checkout',
+                url: '/shop/order/checkout',
                 orderType: orderData.type,
                 platform: orderData.platform,
                 isDeposit: orderData.is_deposit,
@@ -3099,7 +3012,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
 
               // 记录接口调用详情
               this.logInfo('Calling backend checkout API', {
-                url: '/order/checkout',
+                url: '/shop/order/checkout',
                 orderType: orderData.type,
                 platform: orderData.platform,
                 isDeposit: orderData.is_deposit,
@@ -3123,12 +3036,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 hasOrderId: !!orderData.order_id,
                 smallTicketDataFlag: orderData.small_ticket_data_flag
               });
-
-              // 调用后端接口
-              _context29.next = 12;
-              return this.request.post('/order/checkout', orderData);
+              _context26.next = 12;
+              return this.request.post('/shop/order/checkout', orderData, {
+                osServer: true,
+                customToast: function customToast() {}
+              });
             case 12:
-              response = _context29.sent;
+              response = _context26.sent;
               this.logInfo('Order API called successfully', {
                 response: response
               });
@@ -3136,22 +3050,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 _context29.abrupt("return", response);
+              return _context26.abrupt("return", response);
             case 18:
-              _context29.prev = 18;
-              _context29.t0 = _context29["catch"](4);
-              console.error('[Order] createOrderByCheckout 创建订单失败:', _context29.t0);
+              _context26.prev = 18;
+              _context26.t0 = _context26["catch"](4);
+              console.error('[Order] createOrderByCheckout 创建订单失败:', _context26.t0);
               this.logInfo('Order API called failed', {
-                error: _context29.t0 instanceof Error ? _context29.t0.message : String(_context29.t0)
+                error: _context26.t0 instanceof Error ? _context26.t0.message : String(_context26.t0)
               });
-              throw _context29.t0;
+              throw _context26.t0;
             case 23:
             case "end":
-              return _context29.stop();
+              return _context26.stop();
           }
-        }, _callee27, this, [[4, 18]]);
+        }, _callee24, this, [[4, 18]]);
       }));
-      function createOrderByCheckout(_x28) {
+      function createOrderByCheckout(_x25) {
         return _createOrderByCheckout.apply(this, arguments);
       }
       return createOrderByCheckout;
@@ -3159,23 +3073,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitSalesOrder",
     value: function () {
-      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(params) {
+      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(params) {
         var url, query, fetchUrl;
-        return _regeneratorRuntime().wrap(function _callee28$(_context30) {
-          while (1) switch (_context30.prev = _context30.next) {
+        return _regeneratorRuntime().wrap(function _callee25$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
               url = params.url, query = params.query;
               fetchUrl = url || '/order/sales/checkout';
-              return _context30.abrupt("return", this.request.post(fetchUrl, query, {
+              return _context27.abrupt("return", this.request.post(fetchUrl, query, {
+                osServer: true,
                 customToast: function customToast() {}
               }));
             case 3:
             case "end":
-              return _context30.stop();
+              return _context27.stop();
           }
-        }, _callee28, this);
+        }, _callee25, this);
       }));
-      function submitSalesOrder(_x29) {
+      function submitSalesOrder(_x26) {
         return _submitSalesOrder.apply(this, arguments);
       }
       return submitSalesOrder;
@@ -3189,72 +3104,80 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sendCustomerPayLink",
     value: (function () {
-      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(params) {
+      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(params) {
         var _params$emails;
         var orderIds;
-        return _regeneratorRuntime().wrap(function _callee29$(_context31) {
-          while (1) switch (_context31.prev = _context31.next) {
+        return _regeneratorRuntime().wrap(function _callee26$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
               orderIds = params.order_ids || params.orderIds || [];
               if (orderIds.length) {
-                _context31.next = 3;
+                _context28.next = 3;
                 break;
               }
               throw new Error('发送支付链接前必须先提交本地订单并取得订单 ID');
             case 3:
               if ((_params$emails = params.emails) !== null && _params$emails !== void 0 && _params$emails.length) {
-                _context31.next = 5;
+                _context28.next = 5;
                 break;
               }
               throw new Error('发送支付链接需要至少一个邮箱');
             case 5:
-              return _context31.abrupt("return", this.request.post('/order/batch-email', {
+              return _context28.abrupt("return", this.request.post('/order/batch-email', {
                 order_ids: orderIds,
                 notify_action: params.notify_action || 'order_payment_reminder',
                 emails: params.emails
               }));
             case 6:
             case "end":
-              return _context31.stop();
+              return _context28.stop();
           }
-        }, _callee29, this);
+        }, _callee26, this);
       }));
-      function sendCustomerPayLink(_x30) {
+      function sendCustomerPayLink(_x27) {
         return _sendCustomerPayLink.apply(this, arguments);
       }
       return sendCustomerPayLink;
-    }() // TODO 获取详情的接口
-    )
+    }())
   }, {
-    key: "getOrderInfoByRemote",
+    key: "getSalesOrderByLookup",
     value: function () {
-      var _getOrderInfoByRemote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(order_id) {
-        var res;
-        return _regeneratorRuntime().wrap(function _callee30$(_context32) {
-          while (1) switch (_context32.prev = _context32.next) {
+      var _getSalesOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(params) {
+        var lookup, res;
+        return _regeneratorRuntime().wrap(function _callee27$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
-              _context32.next = 2;
-              return this.request.get("/order/sales/".concat(order_id), {
+              lookup = params.lookup === undefined || params.lookup === null ? '' : String(params.lookup).trim();
+              if (lookup) {
+                _context29.next = 3;
+                break;
+              }
+              throw new Error('加载销售详情需要 lookup');
+            case 3:
+              _context29.next = 5;
+              return this.request.get("/order/sales/".concat(encodeURIComponent(lookup)), _objectSpread({
                 with: ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info']
-              }, {
+              }, params.forceRemote ? {
+                forceRemote: true
+              } : {}), {
                 osServer: true
               });
-            case 2:
-              res = _context32.sent;
+            case 5:
+              res = _context29.sent;
               if (res.code === 200) {
                 this.store.lastOrderInfo = res.data;
               }
-              return _context32.abrupt("return", res);
-            case 5:
+              return _context29.abrupt("return", res);
+            case 8:
             case "end":
-              return _context32.stop();
+              return _context29.stop();
           }
-        }, _callee30, this);
+        }, _callee27, this);
       }));
-      function getOrderInfoByRemote(_x31) {
-        return _getOrderInfoByRemote.apply(this, arguments);
+      function getSalesOrderByLookup(_x28) {
+        return _getSalesOrderByLookup.apply(this, arguments);
       }
-      return getOrderInfoByRemote;
+      return getSalesOrderByLookup;
     }()
     /**
      * 把 sqlite / 后端返回的订单记录直接恢复为 tempOrder。
@@ -3265,10 +3188,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hydrateTempOrderFromRecord",
     value: (function () {
-      var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(record, options) {
+      var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(record, options) {
         var raw, nextTempOrder;
-        return _regeneratorRuntime().wrap(function _callee31$(_context33) {
-          while (1) switch (_context33.prev = _context33.next) {
+        return _regeneratorRuntime().wrap(function _callee28$(_context30) {
+          while (1) switch (_context30.prev = _context30.next) {
             case 0:
               raw = record && _typeof(record) === 'object' && record.data && record.order_id == null ? record.data : record || {};
               nextTempOrder = this.normalizeTempOrderForRuntime(raw);
@@ -3276,23 +3199,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.store.summary = raw.summary && _typeof(raw.summary) === 'object' ? _objectSpread(_objectSpread({}, createEmptySummary()), raw.summary) : createEmptySummary();
               this.store.lastOrderInfo = raw.lastOrderInfo || raw;
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context33.next = 8;
+                _context30.next = 8;
                 break;
               }
-              _context33.next = 8;
+              _context30.next = 8;
               return this.recalculateSummary({
                 createIfMissing: false
               });
             case 8:
               this.persistTempOrder();
-              return _context33.abrupt("return", nextTempOrder);
+              return _context30.abrupt("return", nextTempOrder);
             case 10:
             case "end":
-              return _context33.stop();
+              return _context30.stop();
           }
-        }, _callee31, this);
+        }, _callee28, this);
       }));
-      function hydrateTempOrderFromRecord(_x32, _x33) {
+      function hydrateTempOrderFromRecord(_x29, _x30) {
         return _hydrateTempOrderFromRecord.apply(this, arguments);
       }
       return hydrateTempOrderFromRecord;
@@ -3300,7 +3223,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeTempOrderForRuntime",
     value: function normalizeTempOrderForRuntime(raw, options) {
-      var _this11 = this;
+      var _this12 = this;
       var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), raw || {});
       delete nextTempOrder.summary;
       delete nextTempOrder.lastOrderInfo;
@@ -3319,7 +3242,7 @@ 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 _this11.normalizeHydratedOrderProduct(p);
+        return _this12.normalizeHydratedOrderProduct(p);
       }) : [];
       nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map(function (b) {
         return _objectSpread(_objectSpread({}, b || {}), {}, {
@@ -3347,14 +3270,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       };
       var tempOrderExtend = nextTempOrder._extend;
       var productsByUid = tempOrderExtend.productsByUid || {};
-      var _iterator8 = _createForOfIteratorHelper(nextTempOrder.products.entries()),
-        _step8;
+      var _iterator9 = _createForOfIteratorHelper(nextTempOrder.products.entries()),
+        _step9;
       try {
-        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
           var _product$metadata6, _ref24, _ref25, _existed$origin, _rawProduct$metadata;
-          var _step8$value = _slicedToArray(_step8.value, 2),
-            index = _step8$value[0],
-            product = _step8$value[1];
+          var _step9$value = _slicedToArray(_step9.value, 2),
+            index = _step9$value[0],
+            product = _step9$value[1];
           var uid = (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.unique_identification_number;
           if (!uid) continue;
           var existed = productsByUid[uid] && _typeof(productsByUid[uid]) === 'object' ? productsByUid[uid] : {};
@@ -3375,9 +3298,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           });
         }
       } catch (err) {
-        _iterator8.e(err);
+        _iterator9.e(err);
       } finally {
-        _iterator8.f();
+        _iterator9.f();
       }
       tempOrderExtend.productsByUid = productsByUid;
       if ((options === null || options === void 0 ? void 0 : options.ensureIdentity) !== false) {
@@ -3408,18 +3331,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var segments = [];
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
       if (Array.isArray(sku.variant)) {
-        var _iterator9 = _createForOfIteratorHelper(sku.variant),
-          _step9;
+        var _iterator10 = _createForOfIteratorHelper(sku.variant),
+          _step10;
         try {
-          for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-            var variant = _step9.value;
+          for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+            var variant = _step10.value;
             var segment = this.formatHydratedNamePair(variant === null || variant === void 0 ? void 0 : variant.group, variant === null || variant === void 0 ? void 0 : variant.item);
             if (segment) segments.push(segment);
           }
         } catch (err) {
-          _iterator9.e(err);
+          _iterator10.e(err);
         } finally {
-          _iterator9.f();
+          _iterator10.f();
         }
       }
       return segments.join(', ');
@@ -3447,7 +3370,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedOrderProduct",
     value: function normalizeHydratedOrderProduct(product) {
-      var _this12 = this;
+      var _this13 = this;
       var row = _objectSpread({}, product || {});
       if (row.num === undefined && row.product_quantity !== undefined) {
         row.num = row.product_quantity;
@@ -3455,7 +3378,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 _this12.normalizeHydratedProductOptionItem(optionItem || {});
+          return _this13.normalizeHydratedProductOptionItem(optionItem || {});
         }))
       });
       delete row["product_".concat('option', "_item")];
@@ -3475,7 +3398,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         metadata: _objectSpread(_objectSpread({}, row.metadata), normalized.metadata)
       });
       if (result.metadata) delete result.metadata.price_schema_version;
-      return result;
+      return this.sanitizeOrderProductForTempOrder(result);
     }
   }, {
     key: "getLastOrderInfo",
@@ -3486,25 +3409,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderInfo",
     value: function () {
-      var _getOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(order_id) {
+      var _getOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(order_id) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee32$(_context34) {
-          while (1) switch (_context34.prev = _context34.next) {
+        return _regeneratorRuntime().wrap(function _callee29$(_context31) {
+          while (1) switch (_context31.prev = _context31.next) {
             case 0:
-              _context34.next = 2;
+              _context31.next = 2;
               return this.request.get("/order/sales/".concat(order_id), {
                 with: ['products', 'bookings']
               });
             case 2:
-              res = _context34.sent;
-              return _context34.abrupt("return", res);
+              res = _context31.sent;
+              return _context31.abrupt("return", res);
             case 4:
             case "end":
-              return _context34.stop();
+              return _context31.stop();
           }
-        }, _callee32, this);
+        }, _callee29, this);
       }));
-      function getOrderInfo(_x34) {
+      function getOrderInfo(_x31) {
         return _getOrderInfo.apply(this, arguments);
       }
       return getOrderInfo;
@@ -3526,67 +3449,67 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         var amount = new Decimal(discount.amount || 0).times(qty).plus(((_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.product_discount_difference) || 0);
         savedMap.set(discountKey, (savedMap.get(discountKey) || new Decimal(0)).plus(amount));
       };
-      var _iterator10 = _createForOfIteratorHelper(productList),
-        _step10;
+      var _iterator11 = _createForOfIteratorHelper(productList),
+        _step11;
       try {
-        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-          var product = _step10.value;
+        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+          var product = _step11.value;
           var qty = product.num || 1;
-          var _iterator12 = _createForOfIteratorHelper(product.discount_list || []),
-            _step12;
+          var _iterator13 = _createForOfIteratorHelper(product.discount_list || []),
+            _step13;
           try {
-            for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-              var pd = _step12.value;
+            for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+              var pd = _step13.value;
               addDiscountAmount(pd, qty);
             }
           } catch (err) {
-            _iterator12.e(err);
+            _iterator13.e(err);
           } finally {
-            _iterator12.f();
+            _iterator13.f();
           }
-          var _iterator13 = _createForOfIteratorHelper(product.product_bundle || []),
-            _step13;
+          var _iterator14 = _createForOfIteratorHelper(product.product_bundle || []),
+            _step14;
           try {
-            for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+            for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
               var _ref28, _bundle$num;
-              var bundle = _step13.value;
+              var bundle = _step14.value;
               var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref28 = (_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) !== null && _ref28 !== void 0 ? _ref28 : 1) || 1).toNumber();
-              var _iterator14 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
-                _step14;
+              var _iterator15 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
+                _step15;
               try {
-                for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-                  var _pd = _step14.value;
+                for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+                  var _pd = _step15.value;
                   addDiscountAmount(_pd, bundleQty);
                 }
               } catch (err) {
-                _iterator14.e(err);
+                _iterator15.e(err);
               } finally {
-                _iterator14.f();
+                _iterator15.f();
               }
             }
           } catch (err) {
-            _iterator13.e(err);
+            _iterator14.e(err);
           } finally {
-            _iterator13.f();
+            _iterator14.f();
           }
         }
       } catch (err) {
-        _iterator10.e(err);
+        _iterator11.e(err);
       } finally {
-        _iterator10.f();
+        _iterator11.f();
       }
-      var _iterator11 = _createForOfIteratorHelper(discountList),
-        _step11;
+      var _iterator12 = _createForOfIteratorHelper(discountList),
+        _step12;
       try {
-        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-          var d = _step11.value;
+        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+          var d = _step12.value;
           var key = d.id;
           d.savedAmount = d.isSelected && key != null && savedMap.has(key) ? savedMap.get(key).toNumber() : 0;
         }
       } catch (err) {
-        _iterator11.e(err);
+        _iterator12.e(err);
       } finally {
-        _iterator11.f();
+        _iterator12.f();
       }
     }
   }]);