@pisell/pisellos 2.3.54 → 2.3.56

package/dist/modules/Order/index.js

@@ -42,6 +42,7 @@ import { buildProductLineFingerprint, getProductIdentityIndex, getSafeProductNum
 import { syncManualProductDiscountProductNum } from "./utils/manualProductDiscount";
 import { expandHydratedProductsForDiscountCollection, restoreHydratedBundleDiscounts } from "./utils/bundleDiscountHydration";
 import { getOrderCollectionPersistentId, getOrderCollectionUid, normalizeOrderCollections, setOrderCollectionUid } from "./utils/orderCollectionIdentity";
+import { consolidateDiscountFreeProductLines, ensureUniqueProductLineUids } from "./utils/discountProductLineIdentity";
 import { DiscountModule } from "../Discount";
 import { RulesModule } from "../Rules";
 import { UnavailableReason } from "../Rules/types";
@@ -159,7 +160,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             _step2;
           try {
             for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-              var _item$type2, _ref, _ref2, _item$discount$resour, _item$discount, _item$discount$title, _item$discount2, _item$amount, _ref3, _item$discount$origin, _item$discount3, _ref4, _ref5, _item$metadata$num, _item$metadata, _ref6, _ref7, _item$metadata$num2, _item$metadata2, _ref8, _item$discount$discou, _item$discount4, _ref9, _item$discount$origin2, _item$discount5, _item$amount2, _item$amount3, _product$product_id, _product$is_charge_ta, _ref10, _product$original_pri, _ref11, _item$discount$discou2, _item$discount6, _item$discount$discou3, _item$discount7;
+              var _item$type2, _ref, _ref2, _item$discount$resour, _item$discount, _item$discount$title, _item$discount2, _item$discount3, _item$discount$fixed_, _item$discount4, _item$discount5, _item$amount, _ref3, _item$discount$origin, _item$discount6, _ref4, _ref5, _item$metadata$num, _item$metadata, _ref6, _ref7, _item$metadata$num2, _item$metadata2, _ref8, _item$discount$discou, _item$discount7, _item$amount2, _item$amount3, _product$product_id, _product$is_charge_ta, _ref9, _product$original_pri, _ref10, _item$discount$discou2, _item$discount8, _item$discount$discou3, _item$discount9;
               var item = _step2.value;
               var type = (_item$type2 = item === null || item === void 0 ? void 0 : item.type) !== null && _item$type2 !== void 0 ? _item$type2 : item === null || item === void 0 ? void 0 : item.tag;
               if (!type || type === 'product') continue;
@@ -170,12 +171,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               var key = Number.isFinite(id) ? id : String(resourceId);
               var title = (_item$discount$title = item === null || item === void 0 || (_item$discount2 = item.discount) === null || _item$discount2 === void 0 ? void 0 : _item$discount2.title) !== null && _item$discount$title !== void 0 ? _item$discount$title : {};
               var amount = Number((item === null || item === void 0 ? void 0 : item.amount) || 0);
+              var discountCardType = item === null || item === void 0 || (_item$discount3 = item.discount) === null || _item$discount3 === void 0 ? void 0 : _item$discount3.discount_card_type;
+              var parValue = isDiscountCard ? discountCardType === 'fixed_amount' ? (_item$discount$fixed_ = item === null || item === void 0 || (_item$discount4 = item.discount) === null || _item$discount4 === void 0 ? void 0 : _item$discount4.fixed_amount) !== null && _item$discount$fixed_ !== void 0 ? _item$discount$fixed_ : item === null || item === void 0 ? void 0 : item.amount : item === null || item === void 0 || (_item$discount5 = item.discount) === null || _item$discount5 === void 0 ? void 0 : _item$discount5.percent : '0';
               var detail = {
                 amount: String((_item$amount = item === null || item === void 0 ? void 0 : item.amount) !== null && _item$amount !== void 0 ? _item$amount : '0'),
                 type: type,
                 resource_id: key,
                 title: title,
-                original_amount: String((_ref3 = (_item$discount$origin = item === null || item === void 0 || (_item$discount3 = item.discount) === null || _item$discount3 === void 0 ? void 0 : _item$discount3.original_amount) !== null && _item$discount$origin !== void 0 ? _item$discount$origin : item === null || item === void 0 ? void 0 : item.amount) !== null && _ref3 !== void 0 ? _ref3 : '0'),
+                original_amount: String((_ref3 = (_item$discount$origin = item === null || item === void 0 || (_item$discount6 = item.discount) === null || _item$discount6 === void 0 ? void 0 : _item$discount6.original_amount) !== null && _item$discount$origin !== void 0 ? _item$discount$origin : item === null || item === void 0 ? void 0 : item.amount) !== null && _ref3 !== void 0 ? _ref3 : '0'),
                 num: Number((_ref4 = (_ref5 = (_item$metadata$num = item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.num) !== null && _item$metadata$num !== void 0 ? _item$metadata$num : product === null || product === void 0 ? void 0 : product.num) !== null && _ref5 !== void 0 ? _ref5 : product === null || product === void 0 ? void 0 : product.product_quantity) !== null && _ref4 !== void 0 ? _ref4 : 1) || 1,
                 metadata: item === null || item === void 0 ? void 0 : item.metadata,
                 discount: item === null || item === void 0 ? void 0 : item.discount,
@@ -205,9 +208,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 encoded: '',
                 code: '',
                 tag: type,
-                product_id: (_ref8 = (_item$discount$discou = item === null || item === void 0 || (_item$discount4 = item.discount) === null || _item$discount4 === void 0 ? void 0 : _item$discount4.discount_product_id) !== null && _item$discount$discou !== void 0 ? _item$discount$discou : product === null || product === void 0 ? void 0 : product.product_id) !== null && _ref8 !== void 0 ? _ref8 : 0,
+                product_id: (_ref8 = (_item$discount$discou = item === null || item === void 0 || (_item$discount7 = item.discount) === null || _item$discount7 === void 0 ? void 0 : _item$discount7.discount_product_id) !== null && _item$discount$discou !== void 0 ? _item$discount$discou : product === null || product === void 0 ? void 0 : product.product_id) !== null && _ref8 !== void 0 ? _ref8 : 0,
                 relation_type: '',
-                par_value: String((_ref9 = (_item$discount$origin2 = item === null || item === void 0 || (_item$discount5 = item.discount) === null || _item$discount5 === void 0 ? void 0 : _item$discount5.original_amount) !== null && _item$discount$origin2 !== void 0 ? _item$discount$origin2 : item === null || item === void 0 ? void 0 : item.amount) !== null && _ref9 !== void 0 ? _ref9 : '0'),
+                par_value: String(parValue !== null && parValue !== void 0 ? parValue : '0'),
                 used_par_value: String((_item$amount2 = item === null || item === void 0 ? void 0 : item.amount) !== null && _item$amount2 !== void 0 ? _item$amount2 : '0'),
                 limit_status: 'enable',
                 limited_relation_product_data: {
@@ -226,7 +229,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   id: (_product$product_id = product === null || product === void 0 ? void 0 : product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : 0,
                   title: '',
                   is_charge_tax: (_product$is_charge_ta = product === null || product === void 0 ? void 0 : product.is_charge_tax) !== null && _product$is_charge_ta !== void 0 ? _product$is_charge_ta : 0,
-                  base_price: String((_ref10 = (_product$original_pri = product === null || product === void 0 ? void 0 : product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : product === null || product === void 0 ? void 0 : product.selling_price) !== null && _ref10 !== void 0 ? _ref10 : '0')
+                  base_price: String((_ref9 = (_product$original_pri = product === null || product === void 0 ? void 0 : product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : product === null || product === void 0 ? void 0 : product.selling_price) !== null && _ref9 !== void 0 ? _ref9 : '0')
                 },
                 type: type,
                 resource_id: key,
@@ -238,8 +241,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 amount: amount,
                 discount: _objectSpread(_objectSpread({}, (item === null || item === void 0 ? void 0 : item.discount) || {}), {}, {
                   resource_id: key,
-                  discount_product_id: (_ref11 = (_item$discount$discou2 = item === null || item === void 0 || (_item$discount6 = item.discount) === null || _item$discount6 === void 0 ? void 0 : _item$discount6.discount_product_id) !== null && _item$discount$discou2 !== void 0 ? _item$discount$discou2 : product === null || product === void 0 ? void 0 : product.product_id) !== null && _ref11 !== void 0 ? _ref11 : 0,
-                  discount_calculation_mode: (_item$discount$discou3 = item === null || item === void 0 || (_item$discount7 = item.discount) === null || _item$discount7 === void 0 ? void 0 : _item$discount7.discount_calculation_mode) !== null && _item$discount$discou3 !== void 0 ? _item$discount$discou3 : 'item_level'
+                  discount_product_id: (_ref10 = (_item$discount$discou2 = item === null || item === void 0 || (_item$discount8 = item.discount) === null || _item$discount8 === void 0 ? void 0 : _item$discount8.discount_product_id) !== null && _item$discount$discou2 !== void 0 ? _item$discount$discou2 : product === null || product === void 0 ? void 0 : product.product_id) !== null && _ref10 !== void 0 ? _ref10 : 0,
+                  discount_calculation_mode: (_item$discount$discou3 = item === null || item === void 0 || (_item$discount9 = item.discount) === null || _item$discount9 === void 0 ? void 0 : _item$discount9.discount_calculation_mode) !== null && _item$discount$discou3 !== void 0 ? _item$discount$discou3 : 'item_level'
                 }),
                 applicableProductDetails: [detail],
                 appliedProductDetails: [detail]
@@ -287,10 +290,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         }
         if (Array.isArray(product.product_bundle)) {
           product.product_bundle = product.product_bundle.map(function (bundle) {
-            var _ref12, _bundle$original_pric;
+            var _ref11, _bundle$original_pric;
             var hasBundleDiscount = Array.isArray(bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) && bundle.discount_list.length > 0;
             if (hasBundleDiscount) return bundle;
-            var restoredPrice = (_ref12 = (_bundle$original_pric = bundle === null || bundle === void 0 ? void 0 : bundle.original_price) !== null && _bundle$original_pric !== void 0 ? _bundle$original_pric : bundle === null || bundle === void 0 ? void 0 : bundle.product_price) !== null && _ref12 !== void 0 ? _ref12 : bundle === null || bundle === void 0 ? void 0 : bundle.price;
+            var restoredPrice = (_ref11 = (_bundle$original_pric = bundle === null || bundle === void 0 ? void 0 : bundle.original_price) !== null && _bundle$original_pric !== void 0 ? _bundle$original_pric : bundle === null || bundle === void 0 ? void 0 : bundle.product_price) !== null && _ref11 !== void 0 ? _ref11 : bundle === null || bundle === void 0 ? void 0 : bundle.price;
             if (restoredPrice === undefined || restoredPrice === null || restoredPrice === '') return bundle;
             return _objectSpread(_objectSpread({}, bundle), {}, {
               price: restoredPrice,
@@ -683,7 +686,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(code, customerId) {
         var _this$store$discount11, _tempOrder$holder, _this$store$summary;
-        var resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelected, tempOrder, holders, _ref13, isAvailable, newDiscountList, evaluatedDiscountList, unavailableReason, shouldRetainForLater, normalizedNewDiscountList, retainedDiscountList, resolvedDiscountList, _this$store$discount12, _this$store$discount13;
+        var resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelected, tempOrder, holders, _ref12, isAvailable, newDiscountList, evaluatedDiscountList, unavailableReason, shouldRetainForLater, normalizedNewDiscountList, retainedDiscountList, resolvedDiscountList, _this$store$discount12, _this$store$discount13;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -760,7 +763,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 18:
               tempOrder = this.store.tempOrder;
               holders = (tempOrder === null || tempOrder === void 0 || (_tempOrder$holder = tempOrder.holder) === null || _tempOrder$holder === void 0 ? void 0 : _tempOrder$holder.form_record) || [];
-              _ref13 = rulesModule.isDiscountListAvailable({
+              _ref12 = rulesModule.isDiscountListAvailable({
                 productList: (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.products) || [],
                 oldDiscountList: this.getDiscountList(),
                 newDiscountList: withScanList,
@@ -772,7 +775,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }) || {
                 isAvailable: false,
                 discountList: this.getDiscountList()
-              }, isAvailable = _ref13.isAvailable, newDiscountList = _ref13.discountList, evaluatedDiscountList = _ref13.evaluatedDiscountList, unavailableReason = _ref13.unavailableReason;
+              }, isAvailable = _ref12.isAvailable, newDiscountList = _ref12.discountList, evaluatedDiscountList = _ref12.evaluatedDiscountList, unavailableReason = _ref12.unavailableReason;
               shouldRetainForLater = !isAvailable && unavailableReason === UnavailableReason.ProductNotApplicable && withScanList.some(isCustomerPromotionDiscount);
               normalizedNewDiscountList = newDiscountList ? markScannedDiscounts(newDiscountList, withScanList) : undefined;
               retainedDiscountList = evaluatedDiscountList ? markScannedDiscounts(evaluatedDiscountList, withScanList) : normalizedNewDiscountList;
@@ -855,9 +858,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (result !== null && result !== void 0 && result.productList) {
         var previousProductsByUid = indexOrderProductsByUid(tempOrder.products);
         tempOrder.products = this.applyProductDiscountPrices((result.productList || []).map(function (product, index) {
-          var _ref14;
+          var _ref13;
           var uid = getOrderProductLineUid(product);
-          var previous = (_ref14 = uid ? previousProductsByUid.get(uid) : undefined) !== null && _ref14 !== void 0 ? _ref14 : previousProductsByUid.get("__index__:".concat(index));
+          var previous = (_ref13 = uid ? previousProductsByUid.get(uid) : undefined) !== null && _ref13 !== void 0 ? _ref13 : previousProductsByUid.get("__index__:".concat(index));
           if (isManualProductDiscountProduct(previous)) {
             return previous;
           }
@@ -866,6 +869,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             discount_list: normalizeOrderProductDiscountList(syncManualProductDiscountProductNum(mergedProduct.discount_list, mergedProduct.num))
           });
         }));
+        ensureUniqueProductLineUids(tempOrder);
+        consolidateDiscountFreeProductLines(tempOrder);
       }
       if (result !== null && result !== void 0 && result.discountList) {
         var _this$store$discount15;
@@ -1392,15 +1397,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "extractOrderIdFromSubmitResult",
     value: function extractOrderIdFromSubmitResult(result) {
-      var _ref15, _ref16, _ref17, _result$data$order_id, _result$data, _result$data2;
-      return (_ref15 = (_ref16 = (_ref17 = (_result$data$order_id = result === null || result === void 0 || (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.order_id) !== null && _result$data$order_id !== void 0 ? _result$data$order_id : result === null || result === void 0 ? void 0 : result.order_id) !== null && _ref17 !== void 0 ? _ref17 : result === null || result === void 0 || (_result$data2 = result.data) === null || _result$data2 === void 0 ? void 0 : _result$data2.id) !== null && _ref16 !== void 0 ? _ref16 : result === null || result === void 0 ? void 0 : result.id) !== null && _ref15 !== void 0 ? _ref15 : null;
+      var _ref14, _ref15, _ref16, _result$data$order_id, _result$data, _result$data2;
+      return (_ref14 = (_ref15 = (_ref16 = (_result$data$order_id = result === null || result === void 0 || (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.order_id) !== null && _result$data$order_id !== void 0 ? _result$data$order_id : result === null || result === void 0 ? void 0 : result.order_id) !== null && _ref16 !== void 0 ? _ref16 : result === null || result === void 0 || (_result$data2 = result.data) === null || _result$data2 === void 0 ? void 0 : _result$data2.id) !== null && _ref15 !== void 0 ? _ref15 : result === null || result === void 0 ? void 0 : result.id) !== null && _ref14 !== void 0 ? _ref14 : null;
     }
   }, {
     key: "calculatePaymentEffectiveAmount",
     value: function calculatePaymentEffectiveAmount(payment) {
-      var _ref18, _payment$origin_amoun;
+      var _ref17, _payment$origin_amoun;
       var amount = new Decimal(payment.amount || 0);
-      var originAmount = new Decimal((_ref18 = (_payment$origin_amoun = payment.origin_amount) !== null && _payment$origin_amoun !== void 0 ? _payment$origin_amoun : payment.amount) !== null && _ref18 !== void 0 ? _ref18 : 0);
+      var originAmount = new Decimal((_ref17 = (_payment$origin_amoun = payment.origin_amount) !== null && _payment$origin_amoun !== void 0 ? _payment$origin_amoun : payment.amount) !== null && _ref17 !== void 0 ? _ref17 : 0);
       var serviceFee = new Decimal(payment.service_fee || 0);
       // TODO: 后端允许 amount 表示顾客实际支付总额后，移除这个兼容分支。
       var effectiveAmount = serviceFee.gt(0) && amount.eq(originAmount) ? amount.plus(serviceFee) : amount;
@@ -1600,12 +1605,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizePaymentSource",
     value: function normalizePaymentSource(payment, options) {
-      var _ref19, _paymentRecord$origin;
+      var _ref18, _paymentRecord$origin;
       var paymentRecord = payment;
       var metadata = paymentRecord.metadata && _typeof(paymentRecord.metadata) === 'object' ? _objectSpread({}, paymentRecord.metadata) : {};
       var normalized = ensureOrderPaymentNumber(_objectSpread(_objectSpread({}, paymentRecord), {}, {
         metadata: metadata,
-        origin_amount: (_ref19 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref19 !== void 0 ? _ref19 : '0.00'
+        origin_amount: (_ref18 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref18 !== void 0 ? _ref18 : '0.00'
       }), (options === null || options === void 0 ? void 0 : options.devicePrefix) || this.getPaymentNumberDevicePrefixSync(), createUuidV4);
       if (paymentRecord.status !== undefined) {
         normalized.status = paymentRecord.status;
@@ -1956,7 +1961,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _product$payment_pric,
         _sku$code,
         _sku$barcode,
-        _ref20,
+        _ref19,
         _sku$variant_id,
         _this11 = this;
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
@@ -1983,24 +1988,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         product_sku: this.normalizeFingerprintValue({
           code: (_sku$code = sku.code) !== null && _sku$code !== void 0 ? _sku$code : '',
           barcode: (_sku$barcode = sku.barcode) !== null && _sku$barcode !== void 0 ? _sku$barcode : '',
-          variant_id: (_ref20 = (_sku$variant_id = sku.variant_id) !== null && _sku$variant_id !== void 0 ? _sku$variant_id : product === null || product === void 0 ? void 0 : product.product_variant_id) !== null && _ref20 !== void 0 ? _ref20 : 0,
+          variant_id: (_ref19 = (_sku$variant_id = sku.variant_id) !== null && _sku$variant_id !== void 0 ? _sku$variant_id : product === null || product === void 0 ? void 0 : product.product_variant_id) !== null && _ref19 !== void 0 ? _ref19 : 0,
           variant: sku.variant || [],
           option: getProductSkuOptions(product || {}).map(function (option) {
-            var _ref21, _option$id, _option$option_group_, _ref22, _option$option_group_2, _option$num, _option$add_price;
+            var _ref20, _option$id, _option$option_group_, _ref21, _option$option_group_2, _option$num, _option$add_price;
             return {
-              id: (_ref21 = (_option$id = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id !== void 0 ? _option$id : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref21 !== void 0 ? _ref21 : null,
+              id: (_ref20 = (_option$id = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id !== void 0 ? _option$id : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref20 !== void 0 ? _ref20 : null,
               option_group_id: (_option$option_group_ = option === null || option === void 0 ? void 0 : option.option_group_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : null,
-              option_group_item_id: (_ref22 = (_option$option_group_2 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_2 !== void 0 ? _option$option_group_2 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref22 !== void 0 ? _ref22 : null,
+              option_group_item_id: (_ref21 = (_option$option_group_2 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_2 !== void 0 ? _option$option_group_2 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref21 !== void 0 ? _ref21 : null,
               num: Number((_option$num = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num !== void 0 ? _option$num : 1) || 1,
               add_price: _this11.normalizeFingerprintMoney((_option$add_price = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price !== void 0 ? _option$add_price : option === null || option === void 0 ? void 0 : option.price)
             };
           })
         }),
         product_bundle: this.normalizeFingerprintValue(((product === null || product === void 0 ? void 0 : product.product_bundle) || []).map(function (bundle) {
-          var _ref23, _ref24, _bundle$bundle_produc, _ref25, _bundle$bundle_varian, _bundle$num, _bundle$price_type, _bundle$price_type_ex;
+          var _ref22, _ref23, _bundle$bundle_produc, _ref24, _bundle$bundle_varian, _bundle$num, _bundle$price_type, _bundle$price_type_ex;
           return {
-            bundle_product_id: (_ref23 = (_ref24 = (_bundle$bundle_produc = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref24 !== void 0 ? _ref24 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref23 !== void 0 ? _ref23 : null,
-            bundle_variant_id: (_ref25 = (_bundle$bundle_varian = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle === null || bundle === void 0 ? void 0 : bundle.product_variant_id) !== null && _ref25 !== void 0 ? _ref25 : 0,
+            bundle_product_id: (_ref22 = (_ref23 = (_bundle$bundle_produc = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref23 !== void 0 ? _ref23 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref22 !== void 0 ? _ref22 : null,
+            bundle_variant_id: (_ref24 = (_bundle$bundle_varian = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle === null || bundle === void 0 ? void 0 : bundle.product_variant_id) !== null && _ref24 !== void 0 ? _ref24 : 0,
             num: getSafeProductNum((_bundle$num = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle === null || bundle === void 0 ? void 0 : bundle.quantity),
             price: _this11.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.price),
             bundle_selling_price: _this11.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price),
@@ -2009,10 +2014,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           };
         })),
         discount_list: this.normalizeFingerprintValue(((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
-          var _ref26, _discount$type2, _ref27, _ref28, _discount$discount_id, _discount$discount;
+          var _ref25, _discount$type2, _ref26, _ref27, _discount$discount_id, _discount$discount;
           return {
-            type: (_ref26 = (_discount$type2 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type2 !== void 0 ? _discount$type2 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref26 !== void 0 ? _ref26 : '',
-            discount_id: (_ref27 = (_ref28 = (_discount$discount_id = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id !== void 0 ? _discount$discount_id : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref28 !== void 0 ? _ref28 : discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) !== null && _ref27 !== void 0 ? _ref27 : null,
+            type: (_ref25 = (_discount$type2 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type2 !== void 0 ? _discount$type2 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref25 !== void 0 ? _ref25 : '',
+            discount_id: (_ref26 = (_ref27 = (_discount$discount_id = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id !== void 0 ? _discount$discount_id : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref27 !== void 0 ? _ref27 : discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) !== null && _ref26 !== void 0 ? _ref26 : null,
             amount: _this11.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
           };
         }))
@@ -2036,14 +2041,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _product$product_id3,
         _product$product_vari2,
         _product$num2,
-        _ref29,
+        _ref28,
         _metadata$unique_iden,
         _metadata$price_overr,
         _metadata$is_manual_d,
         _metadata$product_dis,
         _sku$code2,
         _sku$barcode2,
-        _ref30,
+        _ref29,
         _sku$variant_id2,
         _this13 = this;
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
@@ -2059,7 +2064,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         extension_type: extensionType,
         num: getSafeProductNum((_product$num2 = product === null || product === void 0 ? void 0 : product.num) !== null && _product$num2 !== void 0 ? _product$num2 : product === null || product === void 0 ? void 0 : product.product_quantity),
         metadata: {
-          unique_identification_number: (_ref29 = (_metadata$unique_iden = metadata.unique_identification_number) !== null && _metadata$unique_iden !== void 0 ? _metadata$unique_iden : product === null || product === void 0 ? void 0 : product.unique_identification_number) !== null && _ref29 !== void 0 ? _ref29 : '',
+          unique_identification_number: (_ref28 = (_metadata$unique_iden = metadata.unique_identification_number) !== null && _metadata$unique_iden !== void 0 ? _metadata$unique_iden : product === null || product === void 0 ? void 0 : product.unique_identification_number) !== null && _ref28 !== void 0 ? _ref28 : '',
           price_override: (_metadata$price_overr = metadata.price_override) !== null && _metadata$price_overr !== void 0 ? _metadata$price_overr : '',
           is_manual_discount: (_metadata$is_manual_d = metadata.is_manual_discount) !== null && _metadata$is_manual_d !== void 0 ? _metadata$is_manual_d : '',
           product_discount_reason: (_metadata$product_dis = metadata.product_discount_reason) !== null && _metadata$product_dis !== void 0 ? _metadata$product_dis : ''
@@ -2067,35 +2072,35 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         product_sku: this.normalizeFingerprintValue({
           code: (_sku$code2 = sku.code) !== null && _sku$code2 !== void 0 ? _sku$code2 : '',
           barcode: (_sku$barcode2 = sku.barcode) !== null && _sku$barcode2 !== void 0 ? _sku$barcode2 : '',
-          variant_id: (_ref30 = (_sku$variant_id2 = sku.variant_id) !== null && _sku$variant_id2 !== void 0 ? _sku$variant_id2 : product === null || product === void 0 ? void 0 : product.product_variant_id) !== null && _ref30 !== void 0 ? _ref30 : 0,
+          variant_id: (_ref29 = (_sku$variant_id2 = sku.variant_id) !== null && _sku$variant_id2 !== void 0 ? _sku$variant_id2 : product === null || product === void 0 ? void 0 : product.product_variant_id) !== null && _ref29 !== void 0 ? _ref29 : 0,
           variant: sku.variant || [],
           option: getProductSkuOptions(product || {}).map(function (option) {
-            var _ref31, _option$id2, _option$option_group_3, _ref32, _option$option_group_4, _option$num2, _option$add_price2;
+            var _ref30, _option$id2, _option$option_group_3, _ref31, _option$option_group_4, _option$num2, _option$add_price2;
             return {
-              id: (_ref31 = (_option$id2 = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id2 !== void 0 ? _option$id2 : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref31 !== void 0 ? _ref31 : null,
+              id: (_ref30 = (_option$id2 = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id2 !== void 0 ? _option$id2 : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref30 !== void 0 ? _ref30 : null,
               option_group_id: (_option$option_group_3 = option === null || option === void 0 ? void 0 : option.option_group_id) !== null && _option$option_group_3 !== void 0 ? _option$option_group_3 : null,
-              option_group_item_id: (_ref32 = (_option$option_group_4 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_4 !== void 0 ? _option$option_group_4 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref32 !== void 0 ? _ref32 : null,
+              option_group_item_id: (_ref31 = (_option$option_group_4 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_4 !== void 0 ? _option$option_group_4 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref31 !== void 0 ? _ref31 : null,
               num: Number((_option$num2 = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num2 !== void 0 ? _option$num2 : 1) || 1,
               add_price: _this13.normalizeFingerprintMoney((_option$add_price2 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price2 !== void 0 ? _option$add_price2 : option === null || option === void 0 ? void 0 : option.price)
             };
           })
         }),
         product_bundle: this.normalizeFingerprintValue(((product === null || product === void 0 ? void 0 : product.product_bundle) || []).map(function (bundle) {
-          var _ref33, _bundle$bundle_id, _ref34, _bundle$bundle_group_, _ref35, _ref36, _bundle$bundle_produc2, _ref37, _bundle$bundle_varian2, _bundle$num2, _bundle$price_type2, _bundle$price_type_ex2;
+          var _ref32, _bundle$bundle_id, _ref33, _bundle$bundle_group_, _ref34, _ref35, _bundle$bundle_produc2, _ref36, _bundle$bundle_varian2, _bundle$num2, _bundle$price_type2, _bundle$price_type_ex2;
           return {
-            bundle_id: (_ref33 = (_bundle$bundle_id = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_id) !== null && _bundle$bundle_id !== void 0 ? _bundle$bundle_id : bundle === null || bundle === void 0 ? void 0 : bundle.id) !== null && _ref33 !== void 0 ? _ref33 : null,
-            bundle_group_id: (_ref34 = (_bundle$bundle_group_ = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle === null || bundle === void 0 ? void 0 : bundle.group_id) !== null && _ref34 !== void 0 ? _ref34 : null,
-            bundle_product_id: (_ref35 = (_ref36 = (_bundle$bundle_produc2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref36 !== void 0 ? _ref36 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref35 !== void 0 ? _ref35 : null,
-            bundle_variant_id: (_ref37 = (_bundle$bundle_varian2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_variant_id) !== null && _bundle$bundle_varian2 !== void 0 ? _bundle$bundle_varian2 : bundle === null || bundle === void 0 ? void 0 : bundle.product_variant_id) !== null && _ref37 !== void 0 ? _ref37 : 0,
+            bundle_id: (_ref32 = (_bundle$bundle_id = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_id) !== null && _bundle$bundle_id !== void 0 ? _bundle$bundle_id : bundle === null || bundle === void 0 ? void 0 : bundle.id) !== null && _ref32 !== void 0 ? _ref32 : null,
+            bundle_group_id: (_ref33 = (_bundle$bundle_group_ = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle === null || bundle === void 0 ? void 0 : bundle.group_id) !== null && _ref33 !== void 0 ? _ref33 : null,
+            bundle_product_id: (_ref34 = (_ref35 = (_bundle$bundle_produc2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref35 !== void 0 ? _ref35 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref34 !== void 0 ? _ref34 : null,
+            bundle_variant_id: (_ref36 = (_bundle$bundle_varian2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_variant_id) !== null && _bundle$bundle_varian2 !== void 0 ? _bundle$bundle_varian2 : bundle === null || bundle === void 0 ? void 0 : bundle.product_variant_id) !== null && _ref36 !== void 0 ? _ref36 : 0,
             num: getSafeProductNum((_bundle$num2 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num2 !== void 0 ? _bundle$num2 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity),
             price_type: (_bundle$price_type2 = bundle === null || bundle === void 0 ? void 0 : bundle.price_type) !== null && _bundle$price_type2 !== void 0 ? _bundle$price_type2 : '',
             price_type_ext: (_bundle$price_type_ex2 = bundle === null || bundle === void 0 ? void 0 : bundle.price_type_ext) !== null && _bundle$price_type_ex2 !== void 0 ? _bundle$price_type_ex2 : '',
             option: _this13.normalizeFingerprintValue(((bundle === null || bundle === void 0 ? void 0 : bundle.option) || []).map(function (option) {
-              var _ref38, _option$id3, _option$option_group_5, _ref39, _option$option_group_6, _option$num3, _option$add_price3;
+              var _ref37, _option$id3, _option$option_group_5, _ref38, _option$option_group_6, _option$num3, _option$add_price3;
               return {
-                id: (_ref38 = (_option$id3 = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id3 !== void 0 ? _option$id3 : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref38 !== void 0 ? _ref38 : null,
+                id: (_ref37 = (_option$id3 = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id3 !== void 0 ? _option$id3 : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref37 !== void 0 ? _ref37 : null,
                 option_group_id: (_option$option_group_5 = option === null || option === void 0 ? void 0 : option.option_group_id) !== null && _option$option_group_5 !== void 0 ? _option$option_group_5 : null,
-                option_group_item_id: (_ref39 = (_option$option_group_6 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_6 !== void 0 ? _option$option_group_6 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref39 !== void 0 ? _ref39 : null,
+                option_group_item_id: (_ref38 = (_option$option_group_6 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_6 !== void 0 ? _option$option_group_6 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref38 !== void 0 ? _ref38 : null,
                 num: Number((_option$num3 = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num3 !== void 0 ? _option$num3 : 1) || 1,
                 add_price: _this13.normalizeFingerprintMoney((_option$add_price3 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price3 !== void 0 ? _option$add_price3 : option === null || option === void 0 ? void 0 : option.price)
               };
@@ -2103,10 +2108,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           };
         })),
         discount_list: this.normalizeFingerprintValue(((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
-          var _ref40, _discount$type4, _ref41, _ref42, _discount$discount_id2, _discount$discount2;
+          var _ref39, _discount$type4, _ref40, _ref41, _discount$discount_id2, _discount$discount2;
           return {
-            type: (_ref40 = (_discount$type4 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type4 !== void 0 ? _discount$type4 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref40 !== void 0 ? _ref40 : '',
-            discount_id: (_ref41 = (_ref42 = (_discount$discount_id2 = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id2 !== void 0 ? _discount$discount_id2 : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref42 !== void 0 ? _ref42 : discount === null || discount === void 0 || (_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) !== null && _ref41 !== void 0 ? _ref41 : null,
+            type: (_ref39 = (_discount$type4 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type4 !== void 0 ? _discount$type4 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref39 !== void 0 ? _ref39 : '',
+            discount_id: (_ref40 = (_ref41 = (_discount$discount_id2 = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id2 !== void 0 ? _discount$discount_id2 : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref41 !== void 0 ? _ref41 : discount === null || discount === void 0 || (_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) !== null && _ref40 !== void 0 ? _ref40 : null,
             amount: _this13.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
           };
         }))
@@ -2409,11 +2414,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderIdentity",
     value: function getOrderIdentity() {
-      var _ref43, _ref44, _tempOrder$order_id, _tempOrder$_extend6;
+      var _ref42, _ref43, _tempOrder$order_id, _tempOrder$_extend6;
       var tempOrder = this.store.tempOrder;
       if (!tempOrder) return null;
       var lastOrderInfo = this.store.lastOrderInfo || {};
-      var orderId = (_ref43 = (_ref44 = (_tempOrder$order_id = tempOrder.order_id) !== null && _tempOrder$order_id !== void 0 ? _tempOrder$order_id : lastOrderInfo.order_id) !== null && _ref44 !== void 0 ? _ref44 : lastOrderInfo.id) !== null && _ref43 !== void 0 ? _ref43 : null;
+      var orderId = (_ref42 = (_ref43 = (_tempOrder$order_id = tempOrder.order_id) !== null && _tempOrder$order_id !== void 0 ? _tempOrder$order_id : lastOrderInfo.order_id) !== null && _ref43 !== void 0 ? _ref43 : lastOrderInfo.id) !== null && _ref42 !== void 0 ? _ref42 : null;
       return {
         localId: this.cacheId || ((_tempOrder$_extend6 = tempOrder._extend) === null || _tempOrder$_extend6 === void 0 ? void 0 : _tempOrder$_extend6.localId),
         orderId: orderId,
@@ -2549,6 +2554,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       tempOrder.products = (tempOrder.products || []).map(function (product) {
         return _this15.sanitizeOrderProductForTempOrder(product);
       });
+      ensureUniqueProductLineUids(tempOrder);
     }
   }, {
     key: "ensureExtend",
@@ -2566,11 +2572,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "captureProductRuntime",
     value: function captureProductRuntime(tempOrder, rawProduct, normalizedProduct, existedUid) {
-      var _extend$productsByUid, _ref45, _rawProduct$_origin;
+      var _extend$productsByUid, _ref44, _rawProduct$_origin;
       var uid = existedUid || this.getProductUid(normalizedProduct);
       var extend = this.ensureExtend(tempOrder);
       var existed = ((_extend$productsByUid = extend.productsByUid) === null || _extend$productsByUid === void 0 ? void 0 : _extend$productsByUid[uid]) || {};
-      var origin = (_ref45 = (_rawProduct$_origin = rawProduct._origin) !== null && _rawProduct$_origin !== void 0 ? _rawProduct$_origin : normalizedProduct._origin) !== null && _ref45 !== void 0 ? _ref45 : existed.origin;
+      var origin = (_ref44 = (_rawProduct$_origin = rawProduct._origin) !== null && _rawProduct$_origin !== void 0 ? _rawProduct$_origin : normalizedProduct._origin) !== null && _ref44 !== void 0 ? _ref44 : existed.origin;
       extend.productsByUid[uid] = _objectSpread(_objectSpread({}, existed), origin !== undefined ? {
         origin: origin
       } : {});
@@ -2713,7 +2719,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildTempOrderHolderFromBookings",
     value: function buildTempOrderHolderFromBookings(tempOrder) {
-      var _baseHolder$customer_, _baseHolder, _ref46, _baseHolder$form_id, _baseHolder2, _tempOrder$holder2, _baseHolder3, _this$otherParams;
+      var _baseHolder$customer_, _baseHolder, _ref45, _baseHolder$form_id, _baseHolder2, _tempOrder$holder2, _baseHolder3, _this$otherParams;
       var holderRecords = [];
       var holderNames = [];
       var baseHolder = null;
@@ -2760,7 +2766,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       var nextHolder = {
         customer_id: (_baseHolder$customer_ = (_baseHolder = baseHolder) === null || _baseHolder === void 0 ? void 0 : _baseHolder.customer_id) !== null && _baseHolder$customer_ !== void 0 ? _baseHolder$customer_ : tempOrder.customer_id,
-        form_id: (_ref46 = (_baseHolder$form_id = (_baseHolder2 = baseHolder) === null || _baseHolder2 === void 0 ? void 0 : _baseHolder2.form_id) !== null && _baseHolder$form_id !== void 0 ? _baseHolder$form_id : (_tempOrder$holder2 = tempOrder.holder) === null || _tempOrder$holder2 === void 0 ? void 0 : _tempOrder$holder2.form_id) !== null && _ref46 !== void 0 ? _ref46 : 0,
+        form_id: (_ref45 = (_baseHolder$form_id = (_baseHolder2 = baseHolder) === null || _baseHolder2 === void 0 ? void 0 : _baseHolder2.form_id) !== null && _baseHolder$form_id !== void 0 ? _baseHolder$form_id : (_tempOrder$holder2 = tempOrder.holder) === null || _tempOrder$holder2 === void 0 ? void 0 : _tempOrder$holder2.form_id) !== null && _ref45 !== void 0 ? _ref45 : 0,
         form_record: holderRecords
       };
       if (holderNames.length) {
@@ -2865,7 +2871,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "recalculateSummary",
     value: function () {
       var _recalculateSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(options) {
-        var _this$otherParams2, _ref47, _salesSummaryResult$e;
+        var _this$otherParams2, _ref46, _salesSummaryResult$e;
         var tempOrder, originalSnapshot, hasShopDiscountChanged, shouldReuseOriginalSnapshot, snapshotSummary, shouldFullRecalculateFromSnapshot, summaryProducts, salesSummary, existedSummary, totalRefundAmount, paidPaymentSummary, emptyBaseSummary, emptySummaryBase, emptySummaryWithDeposit, emptySummary, salesSummaryResult, roundingAmount, payServiceChargeAmount, hasSalesSummaryAmount, expectAmount, amountPaymentPatch, normalizedExpectAmountPatch, summaryForGap, summary;
         return _regeneratorRuntime().wrap(function _callee12$(_context14) {
           while (1) switch (_context14.prev = _context14.next) {
@@ -2943,7 +2949,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               roundingAmount = paidPaymentSummary.roundingAmount;
               payServiceChargeAmount = paidPaymentSummary.payServiceChargeAmount;
               hasSalesSummaryAmount = salesSummaryResult.expect_amount !== undefined || salesSummaryResult.total_amount !== undefined;
-              expectAmount = hasSalesSummaryAmount ? new Decimal((_ref47 = (_salesSummaryResult$e = salesSummaryResult.expect_amount) !== null && _salesSummaryResult$e !== void 0 ? _salesSummaryResult$e : salesSummaryResult.total_amount) !== null && _ref47 !== void 0 ? _ref47 : 0) : null;
+              expectAmount = hasSalesSummaryAmount ? new Decimal((_ref46 = (_salesSummaryResult$e = salesSummaryResult.expect_amount) !== null && _salesSummaryResult$e !== void 0 ? _salesSummaryResult$e : salesSummaryResult.total_amount) !== null && _ref46 !== void 0 ? _ref46 : 0) : null;
               amountPaymentPatch = hasSalesSummaryAmount || !roundingAmount.eq(0) || !payServiceChargeAmount.eq(0) ? _objectSpread({
                 rounding_amount: roundingAmount.toFixed(2)
               }, expectAmount ? {
@@ -3121,17 +3127,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildTempOrderCustomer",
     value: function buildTempOrderCustomer(params) {
-      var _ref48, _ref49, _ref50, _source$name, _ref51, _ref52, _ref53, _source$customer_name, _source$id, _source$customer_id, _ref54, _source$country_calli, _source$phone, _source$email;
+      var _ref47, _ref48, _ref49, _source$name, _ref50, _ref51, _ref52, _source$customer_name, _source$id, _source$customer_id, _ref53, _source$country_calli, _source$phone, _source$email;
       if (!params.customerId) return null;
       var source = params.source ? cloneDeep(params.source) : {};
-      var name = (_ref48 = (_ref49 = (_ref50 = (_source$name = source.name) !== null && _source$name !== void 0 ? _source$name : source.display_name) !== null && _ref50 !== void 0 ? _ref50 : source.customerName) !== null && _ref49 !== void 0 ? _ref49 : source.customer_name) !== null && _ref48 !== void 0 ? _ref48 : params.customerName;
-      var customerName = (_ref51 = (_ref52 = (_ref53 = (_source$customer_name = source.customer_name) !== null && _source$customer_name !== void 0 ? _source$customer_name : source.customerName) !== null && _ref53 !== void 0 ? _ref53 : source.display_name) !== null && _ref52 !== void 0 ? _ref52 : source.name) !== null && _ref51 !== void 0 ? _ref51 : params.customerName;
+      var name = (_ref47 = (_ref48 = (_ref49 = (_source$name = source.name) !== null && _source$name !== void 0 ? _source$name : source.display_name) !== null && _ref49 !== void 0 ? _ref49 : source.customerName) !== null && _ref48 !== void 0 ? _ref48 : source.customer_name) !== null && _ref47 !== void 0 ? _ref47 : params.customerName;
+      var customerName = (_ref50 = (_ref51 = (_ref52 = (_source$customer_name = source.customer_name) !== null && _source$customer_name !== void 0 ? _source$customer_name : source.customerName) !== null && _ref52 !== void 0 ? _ref52 : source.display_name) !== null && _ref51 !== void 0 ? _ref51 : source.name) !== null && _ref50 !== void 0 ? _ref50 : params.customerName;
       return _objectSpread(_objectSpread({}, source), {}, {
         id: (_source$id = source.id) !== null && _source$id !== void 0 ? _source$id : params.customerId,
         customer_id: (_source$customer_id = source.customer_id) !== null && _source$customer_id !== void 0 ? _source$customer_id : params.customerId,
         name: String(name || ''),
         customer_name: String(customerName || ''),
-        country_calling_code: String((_ref54 = (_source$country_calli = source.country_calling_code) !== null && _source$country_calli !== void 0 ? _source$country_calli : source.countryCallingCode) !== null && _ref54 !== void 0 ? _ref54 : params.countryCallingCode),
+        country_calling_code: String((_ref53 = (_source$country_calli = source.country_calling_code) !== null && _source$country_calli !== void 0 ? _source$country_calli : source.countryCallingCode) !== null && _ref53 !== void 0 ? _ref53 : params.countryCallingCode),
         phone: String((_source$phone = source.phone) !== null && _source$phone !== void 0 ? _source$phone : params.phone),
         email: String((_source$email = source.email) !== null && _source$email !== void 0 ? _source$email : params.email)
       });
@@ -3235,14 +3241,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateTempOrderCustomer",
     value: function updateTempOrderCustomer(customer) {
-      var _tempOrder$customer_i2, _ref55, _ref56, _customer$customer_id, _ref57, _ref58, _ref59, _customer$customer_na, _ref60, _customer$country_cal, _tempOrder$customer_i3;
+      var _tempOrder$customer_i2, _ref54, _ref55, _customer$customer_id, _ref56, _ref57, _ref58, _customer$customer_na, _ref59, _customer$country_cal, _tempOrder$customer_i3;
       var tempOrder = this.ensureTempOrder();
       var previousCustomerId = (_tempOrder$customer_i2 = tempOrder.customer_id) !== null && _tempOrder$customer_i2 !== void 0 ? _tempOrder$customer_i2 : null;
-      var customerId = (_ref55 = (_ref56 = (_customer$customer_id = customer.customer_id) !== null && _customer$customer_id !== void 0 ? _customer$customer_id : customer.customerId) !== null && _ref56 !== void 0 ? _ref56 : customer.id) !== null && _ref55 !== void 0 ? _ref55 : null;
-      var customerName = (_ref57 = (_ref58 = (_ref59 = (_customer$customer_na = customer.customer_name) !== null && _customer$customer_na !== void 0 ? _customer$customer_na : customer.customerName) !== null && _ref59 !== void 0 ? _ref59 : customer.display_name) !== null && _ref58 !== void 0 ? _ref58 : customer.name) !== null && _ref57 !== void 0 ? _ref57 : '';
+      var customerId = (_ref54 = (_ref55 = (_customer$customer_id = customer.customer_id) !== null && _customer$customer_id !== void 0 ? _customer$customer_id : customer.customerId) !== null && _ref55 !== void 0 ? _ref55 : customer.id) !== null && _ref54 !== void 0 ? _ref54 : null;
+      var customerName = (_ref56 = (_ref57 = (_ref58 = (_customer$customer_na = customer.customer_name) !== null && _customer$customer_na !== void 0 ? _customer$customer_na : customer.customerName) !== null && _ref58 !== void 0 ? _ref58 : customer.display_name) !== null && _ref57 !== void 0 ? _ref57 : customer.name) !== null && _ref56 !== void 0 ? _ref56 : '';
       tempOrder.customer_id = customerId === null || customerId === undefined || customerId === '' ? null : Number(customerId);
       tempOrder.customer_name = String(customerName || '');
-      tempOrder.country_calling_code = String((_ref60 = (_customer$country_cal = customer.country_calling_code) !== null && _customer$country_cal !== void 0 ? _customer$country_cal : customer.countryCallingCode) !== null && _ref60 !== void 0 ? _ref60 : '');
+      tempOrder.country_calling_code = String((_ref59 = (_customer$country_cal = customer.country_calling_code) !== null && _customer$country_cal !== void 0 ? _customer$country_cal : customer.countryCallingCode) !== null && _ref59 !== void 0 ? _ref59 : '');
       tempOrder.phone = String(customer.phone || '');
       tempOrder.email = String(customer.email || '');
       tempOrder.customer = this.buildTempOrderCustomer({
@@ -3338,6 +3344,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (tempOrder._extend) delete tempOrder._extend.customerSnapshot;
       this.store.availableWalletIds = [];
       this.clearCustomerBoundDiscounts(tempOrder);
+      this.applyDiscount();
       this.persistTempOrder();
       this.saveDraftInBackground();
       this.core.effects.emit(OrderHooks.OnOrderCustomerChange, null);
@@ -3756,52 +3763,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return updateVoucherOrderPaymentsAsync;
     }()
+  }, {
+    key: "normalizeShouldMergeProductResult",
+    value: function normalizeShouldMergeProductResult(result) {
+      if (typeof result === 'boolean') return result;
+      if (result && _typeof(result) === 'object' && typeof result.shouldMerge === 'boolean') {
+        return result.shouldMerge;
+      }
+      return true;
+    }
   }, {
     key: "shouldMergeProductToOrder",
-    value: function () {
-      var _shouldMergeProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(params) {
-        var _this$orderHooks;
-        var onBeforeMergeProductToOrder, result;
-        return _regeneratorRuntime().wrap(function _callee18$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
-            case 0:
-              onBeforeMergeProductToOrder = (_this$orderHooks = this.orderHooks) === null || _this$orderHooks === void 0 ? void 0 : _this$orderHooks.onBeforeMergeProductToOrder;
-              if (onBeforeMergeProductToOrder) {
-                _context20.next = 3;
-                break;
-              }
-              return _context20.abrupt("return", true);
-            case 3:
-              _context20.next = 5;
-              return onBeforeMergeProductToOrder(_objectSpread(_objectSpread({}, params), {}, {
-                defaultShouldMerge: true
-              }));
-            case 5:
-              result = _context20.sent;
-              if (!(typeof result === 'boolean')) {
-                _context20.next = 8;
-                break;
-              }
-              return _context20.abrupt("return", result);
-            case 8:
-              if (!(result && _typeof(result) === 'object' && typeof result.shouldMerge === 'boolean')) {
-                _context20.next = 10;
-                break;
-              }
-              return _context20.abrupt("return", result.shouldMerge);
-            case 10:
-              return _context20.abrupt("return", true);
-            case 11:
-            case "end":
-              return _context20.stop();
-          }
-        }, _callee18, this);
+    value: function shouldMergeProductToOrder(params) {
+      var _this$orderHooks,
+        _this26 = this;
+      var onBeforeMergeProductToOrder = (_this$orderHooks = this.orderHooks) === null || _this$orderHooks === void 0 ? void 0 : _this$orderHooks.onBeforeMergeProductToOrder;
+      if (!onBeforeMergeProductToOrder) return true;
+      var result = onBeforeMergeProductToOrder(_objectSpread(_objectSpread({}, params), {}, {
+        defaultShouldMerge: true
       }));
-      function shouldMergeProductToOrder(_x19) {
-        return _shouldMergeProductToOrder.apply(this, arguments);
+      if (result && _typeof(result) === 'object' && typeof result.then === 'function') {
+        return Promise.resolve(result).then(function (resolved) {
+          return _this26.normalizeShouldMergeProductResult(resolved);
+        });
       }
-      return shouldMergeProductToOrder;
-    }()
+      return this.normalizeShouldMergeProductResult(result);
+    }
   }, {
     key: "hasOrderProductLineNote",
     value: function hasOrderProductLineNote(product) {
@@ -3833,30 +3820,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "finalizeProductOrderMutation",
     value: function () {
-      var _finalizeProductOrderMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(tempOrder, options) {
-        return _regeneratorRuntime().wrap(function _callee19$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+      var _finalizeProductOrderMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(tempOrder, options) {
+        return _regeneratorRuntime().wrap(function _callee18$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
               this.syncTempOrderHolderFromBookings(tempOrder);
               if (options !== null && options !== void 0 && options.skipEditDiscountConfigRefresh) {
-                _context21.next = 4;
+                _context20.next = 4;
                 break;
               }
-              _context21.next = 4;
+              _context20.next = 4;
               return this.ensureEditDiscountConfigForProductChange(tempOrder);
             case 4:
               if (options !== null && options !== void 0 && options.skipDiscountRecalculation) {
-                _context21.next = 7;
+                _context20.next = 7;
                 break;
               }
-              _context21.next = 7;
+              _context20.next = 7;
               return this.applyPromotion();
             case 7:
               if (!(options !== null && options !== void 0 && options.skipDiscountRecalculation)) {
                 this.applyDiscount();
               }
               this.sanitizeTempOrderProducts(tempOrder);
-              _context21.next = 11;
+              _context20.next = 11;
               return this.recalculateSummary({
                 createIfMissing: true
               });
@@ -3864,11 +3851,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.persistTempOrder();
             case 12:
             case "end":
-              return _context21.stop();
+              return _context20.stop();
           }
-        }, _callee19, this);
+        }, _callee18, this);
       }));
-      function finalizeProductOrderMutation(_x20, _x21) {
+      function finalizeProductOrderMutation(_x19, _x20) {
         return _finalizeProductOrderMutation.apply(this, arguments);
       }
       return finalizeProductOrderMutation;
@@ -3878,154 +3865,143 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
      * 带 booking 且 num>1 时由 `addProductToOrder` 拆成多次本方法调用（每次 num=1）。
      *
      * @example
-     * await this.appendProductLineToTempOrder(tempOrder, { product_id: 1, num: 1 }, booking);
+     * const pending = this.appendProductLineToTempOrder(
+     *   tempOrder,
+     *   { product_id: 1, num: 1 },
+     *   booking,
+     * );
+     * if (pending) await pending;
      */
   }, {
     key: "appendProductLineToTempOrder",
-    value: (function () {
-      var _appendProductLineToTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(tempOrder, product, booking, options) {
-        var _normalizedIncoming$p,
-          _normalizedIncoming$p2,
-          _booking_uid,
-          _metadata,
-          _this26 = this;
-        var linked, productToAdd, incomingFingerprint, normalizedIncoming, isWeighingProduct, netWeight, incomingBookingUid, hasIncomingGoodPass, hasIncomingProductNote, hasIncomingBookingUid, shouldForceNewLine, matchedIndex, matchedProduct, existedFingerprint, shouldMerge, insertAtIndex, _targetProduct$metada, targetProduct, targetUid, normalizedProduct, nextNum, targetIsManualProductDiscount, nextDiscountList, mergedProduct;
-        return _regeneratorRuntime().wrap(function _callee20$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
-            case 0:
-              linked = booking ? this.createLinkedProductAndBooking({
-                product: product,
-                booking: booking
-              }) : null;
-              productToAdd = (linked === null || linked === void 0 ? void 0 : linked.product) || product;
-              incomingFingerprint = buildProductLineFingerprint(getProductSkuOptions(productToAdd), productToAdd.product_bundle);
-              normalizedIncoming = mergeOrderProductDisplayFields(productToAdd, normalizeOrderProduct(productToAdd));
-              isWeighingProduct = Number(((_normalizedIncoming$p = normalizedIncoming.product_sku) === null || _normalizedIncoming$p === void 0 ? void 0 : _normalizedIncoming$p.open_sold_weight) || 0) === 1;
-              netWeight = Number((_normalizedIncoming$p2 = normalizedIncoming.product_sku) === null || _normalizedIncoming$p2 === void 0 ? void 0 : _normalizedIncoming$p2.net_weight);
-              if (!(isWeighingProduct && (!Number.isFinite(netWeight) || netWeight <= 0))) {
-                _context22.next = 8;
-                break;
-              }
-              throw new Error('[Order] 称重商品净重必须大于 0');
-            case 8:
-              incomingBookingUid = (_booking_uid = productToAdd.booking_uid) !== null && _booking_uid !== void 0 ? _booking_uid : (_metadata = productToAdd.metadata) === null || _metadata === void 0 ? void 0 : _metadata.booking_uid;
-              if (incomingBookingUid !== undefined && incomingBookingUid !== null && String(incomingBookingUid) !== '') {
-                normalizedIncoming.booking_uid = String(incomingBookingUid);
-                normalizedIncoming.metadata = _objectSpread(_objectSpread({}, normalizedIncoming.metadata || {}), {}, {
-                  booking_uid: String(incomingBookingUid)
-                });
-              }
-              normalizedIncoming.discount_list = normalizeOrderProductDiscountList(normalizedIncoming.discount_list);
-              hasIncomingGoodPass = this.hasGoodPassDiscount(normalizedIncoming);
-              hasIncomingProductNote = this.hasOrderProductLineNote(normalizedIncoming);
-              hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
-              shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid || isWeighingProduct;
-              matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
-                var _item$metadata3;
-                if (_this26.hasGoodPassDiscount(item)) return false;
-                if (_this26.hasOrderProductLineNote(item)) return false;
-                if (item.order_detail_id !== undefined && item.order_detail_id !== null) return false;
-                if ((_item$metadata3 = item.metadata) !== null && _item$metadata3 !== void 0 && _item$metadata3.is_edit_for_runtime) return false;
-                if (item.product_id !== productToAdd.product_id) return false;
-                if (item.product_variant_id !== productToAdd.product_variant_id) return false;
-                var existedFingerprint = buildProductLineFingerprint(getProductSkuOptions(item), item.product_bundle);
-                return existedFingerprint === incomingFingerprint;
-              });
-              matchedProduct = matchedIndex === -1 ? null : tempOrder.products[matchedIndex];
-              existedFingerprint = matchedProduct ? buildProductLineFingerprint(getProductSkuOptions(matchedProduct), matchedProduct.product_bundle) : '';
-              if (!matchedProduct) {
-                _context22.next = 24;
-                break;
-              }
-              _context22.next = 21;
-              return this.shouldMergeProductToOrder({
-                incomingProduct: productToAdd,
-                normalizedIncoming: normalizedIncoming,
-                matchedProduct: matchedProduct,
-                matchedIndex: matchedIndex,
-                incomingFingerprint: incomingFingerprint,
-                existedFingerprint: existedFingerprint,
-                tempOrder: tempOrder,
-                booking: booking
-              });
-            case 21:
-              _context22.t0 = _context22.sent;
-              _context22.next = 25;
-              break;
-            case 24:
-              _context22.t0 = false;
-            case 25:
-              shouldMerge = _context22.t0;
-              if (matchedIndex === -1 || !matchedProduct || !shouldMerge) {
-                this.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
-                if (linked) {
-                  normalizedIncoming.booking_uid = linked.bookingUid;
-                  normalizedIncoming.metadata = _objectSpread(_objectSpread({}, normalizedIncoming.metadata || {}), {}, {
-                    booking_uid: linked.bookingUid
-                  });
-                }
-                insertAtIndex = options === null || options === void 0 ? void 0 : options.insertAtIndex;
-                if (Number.isInteger(insertAtIndex) && Number(insertAtIndex) >= 0 && Number(insertAtIndex) < tempOrder.products.length) {
-                  tempOrder.products = [].concat(_toConsumableArray(tempOrder.products.slice(0, insertAtIndex)), [normalizedIncoming], _toConsumableArray(tempOrder.products.slice(insertAtIndex)));
-                } else {
-                  tempOrder.products = [].concat(_toConsumableArray(tempOrder.products), [normalizedIncoming]);
-                }
-              } else {
-                targetProduct = matchedProduct;
-                targetUid = (_targetProduct$metada = targetProduct.metadata) === null || _targetProduct$metada === void 0 ? void 0 : _targetProduct$metada.unique_identification_number;
-                normalizedProduct = mergeOrderProductDisplayFields(targetProduct, normalizeOrderProduct(_objectSpread(_objectSpread({}, productToAdd), {}, {
-                  metadata: _objectSpread(_objectSpread({}, productToAdd.metadata || {}), {}, {
-                    unique_identification_number: targetUid
-                  })
-                })));
-                normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
-                nextNum = getSafeProductNum(targetProduct.num + normalizedProduct.num);
-                targetIsManualProductDiscount = isManualProductDiscountProduct(targetProduct);
-                nextDiscountList = targetIsManualProductDiscount ? normalizeOrderProductDiscountList(syncManualProductDiscountProductNum(targetProduct.discount_list, nextNum)) : normalizedProduct.discount_list;
-                tempOrder.products[matchedIndex] = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, targetProduct), normalizedProduct), {}, {
-                  discount_list: nextDiscountList,
-                  metadata: _objectSpread(_objectSpread(_objectSpread({}, targetProduct.metadata || {}), normalizedProduct.metadata || {}), {}, {
-                    unique_identification_number: targetUid
-                  }),
-                  product_sku: _objectSpread(_objectSpread(_objectSpread({}, targetProduct.product_sku || {
-                    option: []
-                  }), normalizedProduct.product_sku || {
-                    option: []
-                  }), {}, {
-                    option: getProductSkuOptions(normalizedProduct)
-                  })
-                }, targetIsManualProductDiscount ? {
-                  selling_price: targetProduct.selling_price,
-                  original_price: targetProduct.original_price,
-                  payment_price: targetProduct.payment_price,
-                  metadata: _objectSpread(_objectSpread(_objectSpread({}, normalizedProduct.metadata || {}), targetProduct.metadata || {}), {}, {
-                    unique_identification_number: targetUid
-                  })
-                } : {}), {}, {
-                  note: targetProduct.note,
-                  order_detail_id: targetProduct.order_detail_id,
-                  num: nextNum
-                });
-                this.captureProductRuntime(tempOrder, productToAdd, tempOrder.products[matchedIndex], targetUid);
-                if (matchedIndex !== tempOrder.products.length - 1) {
-                  mergedProduct = tempOrder.products[matchedIndex];
-                  tempOrder.products = [].concat(_toConsumableArray(tempOrder.products.slice(0, matchedIndex)), _toConsumableArray(tempOrder.products.slice(matchedIndex + 1)), [mergedProduct]);
-                }
-              }
-              if (linked) {
-                tempOrder.bookings = [].concat(_toConsumableArray(tempOrder.bookings || []), [linked.booking]);
-              }
-            case 28:
-            case "end":
-              return _context22.stop();
+    value: function appendProductLineToTempOrder(tempOrder, product, booking, options) {
+      var _normalizedIncoming$p,
+        _normalizedIncoming$p2,
+        _booking_uid,
+        _metadata,
+        _productToAdd$metadat,
+        _origin,
+        _this27 = this;
+      var linked = booking ? this.createLinkedProductAndBooking({
+        product: product,
+        booking: booking
+      }) : null;
+      var productToAdd = (linked === null || linked === void 0 ? void 0 : linked.product) || product;
+      var incomingFingerprint = buildProductLineFingerprint(getProductSkuOptions(productToAdd), productToAdd.product_bundle);
+      var normalizedIncoming = mergeOrderProductDisplayFields(productToAdd, normalizeOrderProduct(productToAdd));
+      var isWeighingProduct = Number(((_normalizedIncoming$p = normalizedIncoming.product_sku) === null || _normalizedIncoming$p === void 0 ? void 0 : _normalizedIncoming$p.open_sold_weight) || 0) === 1;
+      var netWeight = Number((_normalizedIncoming$p2 = normalizedIncoming.product_sku) === null || _normalizedIncoming$p2 === void 0 ? void 0 : _normalizedIncoming$p2.net_weight);
+      if (isWeighingProduct && (!Number.isFinite(netWeight) || netWeight <= 0)) {
+        throw new Error('[Order] 称重商品净重必须大于 0');
+      }
+      var incomingBookingUid = (_booking_uid = productToAdd.booking_uid) !== null && _booking_uid !== void 0 ? _booking_uid : (_metadata = productToAdd.metadata) === null || _metadata === void 0 ? void 0 : _metadata.booking_uid;
+      if (incomingBookingUid !== undefined && incomingBookingUid !== null && String(incomingBookingUid) !== '') {
+        normalizedIncoming.booking_uid = String(incomingBookingUid);
+        normalizedIncoming.metadata = _objectSpread(_objectSpread({}, normalizedIncoming.metadata || {}), {}, {
+          booking_uid: String(incomingBookingUid)
+        });
+      }
+      normalizedIncoming.discount_list = normalizeOrderProductDiscountList(normalizedIncoming.discount_list);
+      var hasIncomingGoodPass = this.hasGoodPassDiscount(normalizedIncoming);
+      var hasIncomingProductNote = this.hasOrderProductLineNote(normalizedIncoming);
+      var hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
+      var isIncomingCustomItem = ((_productToAdd$metadat = productToAdd.metadata) === null || _productToAdd$metadat === void 0 || (_productToAdd$metadat = _productToAdd$metadat.origin) === null || _productToAdd$metadat === void 0 ? void 0 : _productToAdd$metadat.isCustomItem) === true || ((_origin = productToAdd._origin) === null || _origin === void 0 ? void 0 : _origin.isCustomItem) === true;
+      var shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
+      var matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
+        var _item$metadata3;
+        if (_this27.hasGoodPassDiscount(item)) return false;
+        if (_this27.hasOrderProductLineNote(item)) return false;
+        if (item.order_detail_id !== undefined && item.order_detail_id !== null) return false;
+        if ((_item$metadata3 = item.metadata) !== null && _item$metadata3 !== void 0 && _item$metadata3.is_edit_for_runtime) return false;
+        if (item.product_id !== productToAdd.product_id) return false;
+        if (item.product_variant_id !== productToAdd.product_variant_id) return false;
+        var existedFingerprint = buildProductLineFingerprint(getProductSkuOptions(item), item.product_bundle);
+        return existedFingerprint === incomingFingerprint;
+      });
+      var matchedProduct = matchedIndex === -1 ? null : tempOrder.products[matchedIndex];
+      var existedFingerprint = matchedProduct ? buildProductLineFingerprint(getProductSkuOptions(matchedProduct), matchedProduct.product_bundle) : '';
+      var commitProductLine = function commitProductLine(shouldMerge) {
+        if (matchedIndex === -1 || !matchedProduct || !shouldMerge) {
+          _this27.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
+          if (linked) {
+            normalizedIncoming.booking_uid = linked.bookingUid;
+            normalizedIncoming.metadata = _objectSpread(_objectSpread({}, normalizedIncoming.metadata || {}), {}, {
+              booking_uid: linked.bookingUid
+            });
           }
-        }, _callee20, this);
-      }));
-      function appendProductLineToTempOrder(_x22, _x23, _x24, _x25) {
-        return _appendProductLineToTempOrder.apply(this, arguments);
+          var insertAtIndex = options === null || options === void 0 ? void 0 : options.insertAtIndex;
+          if (Number.isInteger(insertAtIndex) && Number(insertAtIndex) >= 0 && Number(insertAtIndex) < tempOrder.products.length) {
+            tempOrder.products = [].concat(_toConsumableArray(tempOrder.products.slice(0, insertAtIndex)), [normalizedIncoming], _toConsumableArray(tempOrder.products.slice(insertAtIndex)));
+          } else {
+            tempOrder.products = [].concat(_toConsumableArray(tempOrder.products), [normalizedIncoming]);
+          }
+        } else {
+          var _targetProduct$metada;
+          var targetProduct = matchedProduct;
+          var targetUid = (_targetProduct$metada = targetProduct.metadata) === null || _targetProduct$metada === void 0 ? void 0 : _targetProduct$metada.unique_identification_number;
+          var normalizedProduct = mergeOrderProductDisplayFields(targetProduct, normalizeOrderProduct(_objectSpread(_objectSpread({}, productToAdd), {}, {
+            metadata: _objectSpread(_objectSpread({}, productToAdd.metadata || {}), {}, {
+              unique_identification_number: targetUid
+            })
+          })));
+          normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
+          var nextNum = getSafeProductNum(targetProduct.num + normalizedProduct.num);
+          var targetIsManualProductDiscount = isManualProductDiscountProduct(targetProduct);
+          var nextDiscountList = targetIsManualProductDiscount ? normalizeOrderProductDiscountList(syncManualProductDiscountProductNum(targetProduct.discount_list, nextNum)) : normalizedProduct.discount_list;
+          tempOrder.products[matchedIndex] = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, targetProduct), normalizedProduct), {}, {
+            discount_list: nextDiscountList,
+            metadata: _objectSpread(_objectSpread(_objectSpread({}, targetProduct.metadata || {}), normalizedProduct.metadata || {}), {}, {
+              unique_identification_number: targetUid
+            }),
+            product_sku: _objectSpread(_objectSpread(_objectSpread({}, targetProduct.product_sku || {
+              option: []
+            }), normalizedProduct.product_sku || {
+              option: []
+            }), {}, {
+              option: getProductSkuOptions(normalizedProduct)
+            })
+          }, targetIsManualProductDiscount ? {
+            selling_price: targetProduct.selling_price,
+            original_price: targetProduct.original_price,
+            payment_price: targetProduct.payment_price,
+            metadata: _objectSpread(_objectSpread(_objectSpread({}, normalizedProduct.metadata || {}), targetProduct.metadata || {}), {}, {
+              unique_identification_number: targetUid
+            })
+          } : {}), {}, {
+            note: targetProduct.note,
+            order_detail_id: targetProduct.order_detail_id,
+            num: nextNum
+          });
+          _this27.captureProductRuntime(tempOrder, productToAdd, tempOrder.products[matchedIndex], targetUid);
+          if (matchedIndex !== tempOrder.products.length - 1) {
+            var mergedProduct = tempOrder.products[matchedIndex];
+            tempOrder.products = [].concat(_toConsumableArray(tempOrder.products.slice(0, matchedIndex)), _toConsumableArray(tempOrder.products.slice(matchedIndex + 1)), [mergedProduct]);
+          }
+        }
+        if (linked) {
+          tempOrder.bookings = [].concat(_toConsumableArray(tempOrder.bookings || []), [linked.booking]);
+        }
+      };
+      if (!matchedProduct) {
+        commitProductLine(false);
+        return;
       }
-      return appendProductLineToTempOrder;
-    }()
+      var shouldMerge = this.shouldMergeProductToOrder({
+        incomingProduct: productToAdd,
+        normalizedIncoming: normalizedIncoming,
+        matchedProduct: matchedProduct,
+        matchedIndex: matchedIndex,
+        incomingFingerprint: incomingFingerprint,
+        existedFingerprint: existedFingerprint,
+        tempOrder: tempOrder,
+        booking: booking
+      });
+      if (shouldMerge && _typeof(shouldMerge) === 'object' && typeof shouldMerge.then === 'function') {
+        return Promise.resolve(shouldMerge).then(commitProductLine);
+      }
+      commitProductLine(shouldMerge);
+    }
+
     /**
      * 添加商品行。带 booking 时强制独立行；num>1 时拆成多条 num=1 的 product+booking（对齐 BookingByStep / ticketBooking addService）。
      *
@@ -4033,14 +4009,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
      * await order.addProductToOrder({ product_id: 1, num: 3 }, { start_time: '10:00' });
      * // → tempOrder.products 新增 3 行，每行 num=1，bookings 3 条
      */
-    )
   }, {
     key: "addProductToOrder",
     value: (function () {
-      var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(product, booking, options) {
-        var tempOrder, insertAfterProductUid, anchorIndex, insertAtIndex, _ref61, _productRecord$num, productRecord, splitCount, i, singleLine;
-        return _regeneratorRuntime().wrap(function _callee21$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+      var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(product, booking, options) {
+        var tempOrder, insertAfterProductUid, anchorIndex, insertAtIndex, _ref60, _productRecord$num, productRecord, splitCount, i, singleLine, _appendResult, appendResult;
+        return _regeneratorRuntime().wrap(function _callee19$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               insertAfterProductUid = options === null || options === void 0 ? void 0 : options.insertAfterProductUid;
@@ -4051,60 +4026,70 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }) : -1;
               insertAtIndex = anchorIndex >= 0 ? anchorIndex + 1 : undefined;
               if (!booking) {
-                _context23.next = 22;
+                _context21.next = 24;
                 break;
               }
               productRecord = product;
-              splitCount = getSafeProductNum((_ref61 = (_productRecord$num = productRecord.num) !== null && _productRecord$num !== void 0 ? _productRecord$num : productRecord.product_quantity) !== null && _ref61 !== void 0 ? _ref61 : 1);
+              splitCount = getSafeProductNum((_ref60 = (_productRecord$num = productRecord.num) !== null && _productRecord$num !== void 0 ? _productRecord$num : productRecord.product_quantity) !== null && _ref60 !== void 0 ? _ref60 : 1);
               if (!(splitCount > 1)) {
-                _context23.next = 22;
+                _context21.next = 24;
                 break;
               }
               i = 0;
             case 9:
               if (!(i < splitCount)) {
-                _context23.next = 19;
+                _context21.next = 21;
                 break;
               }
               singleLine = cloneDeep(productRecord);
               singleLine.num = 1;
               delete singleLine.product_quantity;
-              _context23.next = 15;
-              return this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking), {
+              _appendResult = this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking), {
                 insertAtIndex: insertAtIndex
               });
-            case 15:
+              if (!_appendResult) {
+                _context21.next = 17;
+                break;
+              }
+              _context21.next = 17;
+              return _appendResult;
+            case 17:
               if (insertAtIndex !== undefined) insertAtIndex += 1;
-            case 16:
+            case 18:
               i += 1;
-              _context23.next = 9;
+              _context21.next = 9;
               break;
-            case 19:
-              _context23.next = 21;
-              return this.finalizeProductOrderMutation(tempOrder);
             case 21:
-              return _context23.abrupt("return", tempOrder.products);
-            case 22:
-              _context23.next = 24;
-              return this.appendProductLineToTempOrder(tempOrder, product, booking, {
+              _context21.next = 23;
+              return this.finalizeProductOrderMutation(tempOrder);
+            case 23:
+              return _context21.abrupt("return", tempOrder.products);
+            case 24:
+              appendResult = this.appendProductLineToTempOrder(tempOrder, product, booking, {
                 insertAtIndex: insertAtIndex
               });
-            case 24:
-              _context23.next = 26;
+              if (!appendResult) {
+                _context21.next = 28;
+                break;
+              }
+              _context21.next = 28;
+              return appendResult;
+            case 28:
+              _context21.next = 30;
               return this.finalizeProductOrderMutation(tempOrder);
-            case 26:
+            case 30:
               this.logInfo('addProductToOrder success', {
                 product_id: product.product_id,
                 with_booking: !!booking
               });
-              return _context23.abrupt("return", tempOrder.products);
-            case 28:
+              return _context21.abrupt("return", tempOrder.products);
+            case 32:
             case "end":
-              return _context23.stop();
+              return _context21.stop();
           }
-        }, _callee21, this);
+        }, _callee19, this);
       }));
-      function addProductToOrder(_x26, _x27, _x28) {
+      function addProductToOrder(_x21, _x22, _x23) {
         return _addProductToOrder.apply(this, arguments);
       }
       return addProductToOrder;
@@ -4122,93 +4107,103 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProductsToOrder",
     value: (function () {
-      var _addProductsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(items, options) {
-        var tempOrder, _iterator20, _step20, item, product, booking, _ref62, _productRecord$num2, productRecord, splitCount, i, singleLine;
-        return _regeneratorRuntime().wrap(function _callee22$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+      var _addProductsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(items, options) {
+        var tempOrder, _iterator20, _step20, item, product, booking, _ref61, _productRecord$num2, productRecord, splitCount, i, singleLine, _appendResult2, appendResult;
+        return _regeneratorRuntime().wrap(function _callee20$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (!(!Array.isArray(items) || items.length === 0)) {
-                _context24.next = 3;
+                _context22.next = 3;
                 break;
               }
-              return _context24.abrupt("return", tempOrder.products);
+              return _context22.abrupt("return", tempOrder.products);
             case 3:
               _iterator20 = _createForOfIteratorHelper(items || []);
-              _context24.prev = 4;
+              _context22.prev = 4;
               _iterator20.s();
             case 6:
               if ((_step20 = _iterator20.n()).done) {
-                _context24.next = 30;
+                _context22.next = 34;
                 break;
               }
               item = _step20.value;
               product = item.product, booking = item.booking;
               if (product) {
-                _context24.next = 11;
+                _context22.next = 11;
                 break;
               }
-              return _context24.abrupt("continue", 28);
+              return _context22.abrupt("continue", 32);
             case 11:
               if (!booking) {
-                _context24.next = 26;
+                _context22.next = 28;
                 break;
               }
               productRecord = product;
-              splitCount = getSafeProductNum((_ref62 = (_productRecord$num2 = productRecord.num) !== null && _productRecord$num2 !== void 0 ? _productRecord$num2 : productRecord.product_quantity) !== null && _ref62 !== void 0 ? _ref62 : 1);
+              splitCount = getSafeProductNum((_ref61 = (_productRecord$num2 = productRecord.num) !== null && _productRecord$num2 !== void 0 ? _productRecord$num2 : productRecord.product_quantity) !== null && _ref61 !== void 0 ? _ref61 : 1);
               if (!(splitCount > 1)) {
-                _context24.next = 26;
+                _context22.next = 28;
                 break;
               }
               i = 0;
             case 16:
               if (!(i < splitCount)) {
-                _context24.next = 25;
+                _context22.next = 27;
                 break;
               }
               singleLine = cloneDeep(productRecord);
               singleLine.num = 1;
               delete singleLine.product_quantity;
-              _context24.next = 22;
-              return this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking));
-            case 22:
+              _appendResult2 = this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking));
+              if (!_appendResult2) {
+                _context22.next = 24;
+                break;
+              }
+              _context22.next = 24;
+              return _appendResult2;
+            case 24:
               i += 1;
-              _context24.next = 16;
+              _context22.next = 16;
               break;
-            case 25:
-              return _context24.abrupt("continue", 28);
-            case 26:
-              _context24.next = 28;
-              return this.appendProductLineToTempOrder(tempOrder, product, booking);
+            case 27:
+              return _context22.abrupt("continue", 32);
             case 28:
-              _context24.next = 6;
+              appendResult = this.appendProductLineToTempOrder(tempOrder, product, booking);
+              if (!appendResult) {
+                _context22.next = 32;
+                break;
+              }
+              _context22.next = 32;
+              return appendResult;
+            case 32:
+              _context22.next = 6;
               break;
-            case 30:
-              _context24.next = 35;
+            case 34:
+              _context22.next = 39;
               break;
-            case 32:
-              _context24.prev = 32;
-              _context24.t0 = _context24["catch"](4);
-              _iterator20.e(_context24.t0);
-            case 35:
-              _context24.prev = 35;
+            case 36:
+              _context22.prev = 36;
+              _context22.t0 = _context22["catch"](4);
+              _iterator20.e(_context22.t0);
+            case 39:
+              _context22.prev = 39;
               _iterator20.f();
-              return _context24.finish(35);
-            case 38:
-              _context24.next = 40;
+              return _context22.finish(39);
+            case 42:
+              _context22.next = 44;
               return this.finalizeProductOrderMutation(tempOrder, options);
-            case 40:
+            case 44:
               this.logInfo('addProductsToOrder success', {
                 itemsCount: items.length
               });
-              return _context24.abrupt("return", tempOrder.products);
-            case 42:
+              return _context22.abrupt("return", tempOrder.products);
+            case 46:
             case "end":
-              return _context24.stop();
+              return _context22.stop();
           }
-        }, _callee22, this, [[4, 32, 35, 38]]);
+        }, _callee20, this, [[4, 36, 39, 42]]);
       }));
-      function addProductsToOrder(_x29, _x30) {
+      function addProductsToOrder(_x24, _x25) {
         return _addProductsToOrder.apply(this, arguments);
       }
       return addProductsToOrder;
@@ -4235,24 +4230,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getBundleRuntimeIdentity",
     value: function getBundleRuntimeIdentity(bundle) {
-      var _ref63, _bundle$bundle_id2, _ref64, _bundle$bundle_group_2, _ref65, _ref66, _bundle$bundle_produc3, _ref67, _bundle$bundle_varian3;
+      var _ref62, _bundle$bundle_id2, _ref63, _bundle$bundle_group_2, _ref64, _ref65, _bundle$bundle_produc3, _ref66, _bundle$bundle_varian3;
       if (!bundle || _typeof(bundle) !== 'object') return '';
-      return [(_ref63 = (_bundle$bundle_id2 = bundle.bundle_id) !== null && _bundle$bundle_id2 !== void 0 ? _bundle$bundle_id2 : bundle.id) !== null && _ref63 !== void 0 ? _ref63 : '', (_ref64 = (_bundle$bundle_group_2 = bundle.bundle_group_id) !== null && _bundle$bundle_group_2 !== void 0 ? _bundle$bundle_group_2 : bundle.group_id) !== null && _ref64 !== void 0 ? _ref64 : '', (_ref65 = (_ref66 = (_bundle$bundle_produc3 = bundle.bundle_product_id) !== null && _bundle$bundle_produc3 !== void 0 ? _bundle$bundle_produc3 : bundle._bundle_product_id) !== null && _ref66 !== void 0 ? _ref66 : bundle.product_id) !== null && _ref65 !== void 0 ? _ref65 : '', (_ref67 = (_bundle$bundle_varian3 = bundle.bundle_variant_id) !== null && _bundle$bundle_varian3 !== void 0 ? _bundle$bundle_varian3 : bundle.product_variant_id) !== null && _ref67 !== void 0 ? _ref67 : 0].join('|');
+      return [(_ref62 = (_bundle$bundle_id2 = bundle.bundle_id) !== null && _bundle$bundle_id2 !== void 0 ? _bundle$bundle_id2 : bundle.id) !== null && _ref62 !== void 0 ? _ref62 : '', (_ref63 = (_bundle$bundle_group_2 = bundle.bundle_group_id) !== null && _bundle$bundle_group_2 !== void 0 ? _bundle$bundle_group_2 : bundle.group_id) !== null && _ref63 !== void 0 ? _ref63 : '', (_ref64 = (_ref65 = (_bundle$bundle_produc3 = bundle.bundle_product_id) !== null && _bundle$bundle_produc3 !== void 0 ? _bundle$bundle_produc3 : bundle._bundle_product_id) !== null && _ref65 !== void 0 ? _ref65 : bundle.product_id) !== null && _ref64 !== void 0 ? _ref64 : '', (_ref66 = (_bundle$bundle_varian3 = bundle.bundle_variant_id) !== null && _bundle$bundle_varian3 !== void 0 ? _bundle$bundle_varian3 : bundle.product_variant_id) !== null && _ref66 !== void 0 ? _ref66 : 0].join('|');
     }
   }, {
     key: "preservePersistedBundlePriceFields",
     value: function preservePersistedBundlePriceFields(previousBundles, nextBundles) {
-      var _this27 = this;
+      var _this28 = this;
       if (!Array.isArray(nextBundles)) return nextBundles;
       if (!Array.isArray(previousBundles) || previousBundles.length === 0) return nextBundles;
       var previousByIdentity = new Map();
       previousBundles.forEach(function (bundle) {
-        var identity = _this27.getBundleRuntimeIdentity(bundle);
+        var identity = _this28.getBundleRuntimeIdentity(bundle);
         if (identity) previousByIdentity.set(identity, bundle);
       });
       return nextBundles.map(function (bundle, index) {
         if (!bundle || _typeof(bundle) !== 'object') return bundle;
-        var previous = previousByIdentity.get(_this27.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
+        var previous = previousByIdentity.get(_this28.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
         if (!previous || _typeof(previous) !== 'object') return bundle;
         return _objectSpread(_objectSpread(_objectSpread({}, bundle), (bundle.cover === undefined || bundle.cover === null || bundle.cover === '') && previous.cover !== undefined && previous.cover !== null && previous.cover !== '' ? {
           cover: previous.cover
@@ -4388,13 +4383,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         delete nextProduct.metadata.main_product_original_price;
         delete nextProduct.metadata.price_schema_version;
       } else if (callerChangesLineConfiguration && !callerUpdatesTopPrice && !callerUpdatesMainMeta) {
-        var _ref68, _targetProduct$metada10, _targetProduct$metada11, _ref69, _targetProduct$metada12, _targetProduct$metada13, _targetProduct$metada14;
+        var _ref67, _targetProduct$metada10, _targetProduct$metada11, _ref68, _targetProduct$metada12, _targetProduct$metada13, _targetProduct$metada14;
         // 仅 option / bundle 变化时，保留历史 source 和主商品折扣金额，
         // 但必须让 original 与 selling 一起随新的 option 金额移动。
         var previousOptionSum = sumOptionUnitPrice(getProductSkuOptions(targetProduct));
         var nextOptionSum = sumOptionUnitPrice(getProductSkuOptions(nextProduct));
-        var _previousMainOriginal = new Decimal(Number((_ref68 = (_targetProduct$metada10 = (_targetProduct$metada11 = targetProduct.metadata) === null || _targetProduct$metada11 === void 0 ? void 0 : _targetProduct$metada11.main_product_original_price) !== null && _targetProduct$metada10 !== void 0 ? _targetProduct$metada10 : targetProduct.original_price) !== null && _ref68 !== void 0 ? _ref68 : 0) || 0);
-        var _previousMainSelling = new Decimal(Number((_ref69 = (_targetProduct$metada12 = (_targetProduct$metada13 = targetProduct.metadata) === null || _targetProduct$metada13 === void 0 ? void 0 : _targetProduct$metada13.main_product_selling_price) !== null && _targetProduct$metada12 !== void 0 ? _targetProduct$metada12 : targetProduct.selling_price) !== null && _ref69 !== void 0 ? _ref69 : _previousMainOriginal.toNumber()) || 0);
+        var _previousMainOriginal = new Decimal(Number((_ref67 = (_targetProduct$metada10 = (_targetProduct$metada11 = targetProduct.metadata) === null || _targetProduct$metada11 === void 0 ? void 0 : _targetProduct$metada11.main_product_original_price) !== null && _targetProduct$metada10 !== void 0 ? _targetProduct$metada10 : targetProduct.original_price) !== null && _ref67 !== void 0 ? _ref67 : 0) || 0);
+        var _previousMainSelling = new Decimal(Number((_ref68 = (_targetProduct$metada12 = (_targetProduct$metada13 = targetProduct.metadata) === null || _targetProduct$metada13 === void 0 ? void 0 : _targetProduct$metada13.main_product_selling_price) !== null && _targetProduct$metada12 !== void 0 ? _targetProduct$metada12 : targetProduct.selling_price) !== null && _ref68 !== void 0 ? _ref68 : _previousMainOriginal.toNumber()) || 0);
         var _preservedDiscount = _previousMainOriginal.minus(_previousMainSelling);
         var previousSource = ((_targetProduct$metada14 = targetProduct.metadata) === null || _targetProduct$metada14 === void 0 ? void 0 : _targetProduct$metada14.source_product_price) != null ? new Decimal(Number(targetProduct.metadata.source_product_price) || 0) : _previousMainOriginal.minus(previousOptionSum);
         var _nextMainOriginal = previousSource.plus(nextOptionSum);
@@ -4453,21 +4448,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProduct",
     value: function () {
-      var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(params) {
+      var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(params) {
         var tempOrder, updatedProductUid;
-        return _regeneratorRuntime().wrap(function _callee23$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+        return _regeneratorRuntime().wrap(function _callee21$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params);
-              _context25.next = 4;
+              _context23.next = 4;
               return this.applyPromotion();
             case 4:
               this.applyDiscount({
                 reapplyBookingDiscountProductUids: params.allow_booking_discount_reapply && updatedProductUid ? [String(updatedProductUid)] : undefined
               });
               this.sanitizeTempOrderProducts(tempOrder);
-              _context25.next = 8;
+              _context23.next = 8;
               return this.recalculateSummary({
                 createIfMissing: true
               });
@@ -4476,14 +4471,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('updateOrderProduct success', {
                 params: params
               });
-              return _context25.abrupt("return", tempOrder.products);
+              return _context23.abrupt("return", tempOrder.products);
             case 11:
             case "end":
-              return _context25.stop();
+              return _context23.stop();
           }
-        }, _callee23, this);
+        }, _callee21, this);
       }));
-      function updateOrderProduct(_x31) {
+      function updateOrderProduct(_x26) {
         return _updateOrderProduct.apply(this, arguments);
       }
       return updateOrderProduct;
@@ -4491,28 +4486,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProducts",
     value: function () {
-      var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(paramsList) {
-        var _this28 = this;
+      var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(paramsList) {
+        var _this29 = this;
         var tempOrder, reapplyBookingDiscountProductUids;
-        return _regeneratorRuntime().wrap(function _callee24$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+        return _regeneratorRuntime().wrap(function _callee22$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (paramsList.length) {
-                _context26.next = 3;
+                _context24.next = 3;
                 break;
               }
-              return _context26.abrupt("return", tempOrder.products);
+              return _context24.abrupt("return", tempOrder.products);
             case 3:
               reapplyBookingDiscountProductUids = paramsList.reduce(function (acc, params) {
-                var updatedProductUid = _this28.applyOrderProductUpdateToTempOrder(tempOrder, params);
+                var updatedProductUid = _this29.applyOrderProductUpdateToTempOrder(tempOrder, params);
                 // 批量改预约时间时，延迟到最后一次折扣计算里统一恢复已选预约折扣卡。
                 if (params.allow_booking_discount_reapply && updatedProductUid) {
                   acc.push(String(updatedProductUid));
                 }
                 return acc;
               }, []);
-              _context26.next = 6;
+              _context24.next = 6;
               return this.finalizeAfterProductsMutation(tempOrder, {
                 reapplyBookingDiscountProductUids: reapplyBookingDiscountProductUids.length ? reapplyBookingDiscountProductUids : undefined
               });
@@ -4520,14 +4515,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('updateOrderProduct success', {
                 paramsList: paramsList
               });
-              return _context26.abrupt("return", tempOrder.products);
+              return _context24.abrupt("return", tempOrder.products);
             case 8:
             case "end":
-              return _context26.stop();
+              return _context24.stop();
           }
-        }, _callee24, this);
+        }, _callee22, this);
       }));
-      function updateOrderProducts(_x32) {
+      function updateOrderProducts(_x27) {
         return _updateOrderProducts.apply(this, arguments);
       }
       return updateOrderProducts;
@@ -4535,11 +4530,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProductQuantity",
     value: function () {
-      var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(params) {
+      var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(params) {
         var _targetProduct$metada17;
         var product_id, product_variant_id, num, unique_identification_number, identity_key, product_sku, product_bundle, tempOrder, identityLookup, productIndex, targetUid, targetProduct, normalizedProduct;
-        return _regeneratorRuntime().wrap(function _callee25$(_context27) {
-          while (1) switch (_context27.prev = _context27.next) {
+        return _regeneratorRuntime().wrap(function _callee23$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
               product_id = params.product_id, product_variant_id = params.product_variant_id, num = params.num, unique_identification_number = params.unique_identification_number, identity_key = params.identity_key, product_sku = params.product_sku, product_bundle = params.product_bundle;
               tempOrder = this.ensureTempOrder();
@@ -4568,7 +4563,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 productIndex = getProductIdentityIndex(tempOrder.products, identityLookup);
               }
               if (!(productIndex === -1)) {
-                _context27.next = 12;
+                _context25.next = 12;
                 break;
               }
               throw new Error('[Order] 目标商品不存在，无法更新数量');
@@ -4582,12 +4577,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }));
               normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
               tempOrder.products[productIndex] = normalizedProduct;
-              _context27.next = 18;
+              _context25.next = 18;
               return this.applyPromotion();
             case 18:
               this.applyDiscount();
               this.sanitizeTempOrderProducts(tempOrder);
-              _context27.next = 22;
+              _context25.next = 22;
               return this.recalculateSummary({
                 createIfMissing: true
               });
@@ -4596,14 +4591,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('updateOrderProductQuantity success', {
                 params: params
               });
-              return _context27.abrupt("return", tempOrder.products);
+              return _context25.abrupt("return", tempOrder.products);
             case 25:
             case "end":
-              return _context27.stop();
+              return _context25.stop();
           }
-        }, _callee25, this);
+        }, _callee23, this);
       }));
-      function updateOrderProductQuantity(_x33) {
+      function updateOrderProductQuantity(_x28) {
         return _updateOrderProductQuantity.apply(this, arguments);
       }
       return updateOrderProductQuantity;
@@ -4644,19 +4639,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "finalizeAfterProductsMutation",
     value: (function () {
-      var _finalizeAfterProductsMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(tempOrder, options) {
-        return _regeneratorRuntime().wrap(function _callee26$(_context28) {
-          while (1) switch (_context28.prev = _context28.next) {
+      var _finalizeAfterProductsMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(tempOrder, options) {
+        return _regeneratorRuntime().wrap(function _callee24$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
               this.syncTempOrderHolderFromBookings(tempOrder);
-              _context28.next = 3;
+              _context26.next = 3;
               return this.applyPromotion();
             case 3:
               this.applyDiscount({
                 reapplyBookingDiscountProductUids: options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids
               });
               this.sanitizeTempOrderProducts(tempOrder);
-              _context28.next = 7;
+              _context26.next = 7;
               return this.recalculateSummary({
                 createIfMissing: true
               });
@@ -4664,11 +4659,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.persistTempOrder();
             case 8:
             case "end":
-              return _context28.stop();
+              return _context26.stop();
           }
-        }, _callee26, this);
+        }, _callee24, this);
       }));
-      function finalizeAfterProductsMutation(_x34, _x35) {
+      function finalizeAfterProductsMutation(_x29, _x30) {
         return _finalizeAfterProductsMutation.apply(this, arguments);
       }
       return finalizeAfterProductsMutation;
@@ -4683,18 +4678,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeProductsFromOrder",
     value: (function () {
-      var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(identities, options) {
-        var _this29 = this;
+      var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(identities, options) {
+        var _this30 = this;
         var tempOrder, productsBeforeRemove, bookingsBeforeRemove, preserveDisplayPosition, anchorIndex, productsAfterAnchor, matchedProducts, removedProducts, _i2, _removedProducts, product, linkedBookingUidsToRemove, _iterator21, _step21, _loop3, remainingProductIndex, remainingProduct, nextProduct, productsWithoutRemaining, nextProductIndex;
-        return _regeneratorRuntime().wrap(function _callee27$(_context30) {
-          while (1) switch (_context30.prev = _context30.next) {
+        return _regeneratorRuntime().wrap(function _callee25$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (identities.length) {
-                _context30.next = 3;
+                _context28.next = 3;
                 break;
               }
-              return _context30.abrupt("return", tempOrder.products);
+              return _context28.abrupt("return", tempOrder.products);
             case 3:
               productsBeforeRemove = tempOrder.products || [];
               bookingsBeforeRemove = tempOrder.bookings || [];
@@ -4724,29 +4719,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               linkedBookingUidsToRemove = new Set();
               _iterator21 = _createForOfIteratorHelper(matchedProducts);
-              _context30.prev = 14;
+              _context28.prev = 14;
               _loop3 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop3() {
                 var _metadata11, _metadata12, _metadata13, _metadata14;
                 var product, productUid, productBookingUid, isAddTimeProduct;
-                return _regeneratorRuntime().wrap(function _loop3$(_context29) {
-                  while (1) switch (_context29.prev = _context29.next) {
+                return _regeneratorRuntime().wrap(function _loop3$(_context27) {
+                  while (1) switch (_context27.prev = _context27.next) {
                     case 0:
                       product = _step21.value;
                       productUid = (product === null || product === void 0 || (_metadata11 = product.metadata) === null || _metadata11 === void 0 ? void 0 : _metadata11.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
                       productBookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_metadata12 = product.metadata) === null || _metadata12 === void 0 ? void 0 : _metadata12.booking_uid);
                       isAddTimeProduct = (product === null || product === void 0 || (_metadata13 = product.metadata) === null || _metadata13 === void 0 ? void 0 : _metadata13.product_add_schedule_time) !== undefined && (product === null || product === void 0 || (_metadata14 = product.metadata) === null || _metadata14 === void 0 ? void 0 : _metadata14.product_add_schedule_time) !== null;
                       if (!isAddTimeProduct) {
-                        _context29.next = 6;
+                        _context27.next = 6;
                         break;
                       }
-                      return _context29.abrupt("return", 1);
+                      return _context27.abrupt("return", 1);
                     case 6:
                       if (productBookingUid !== undefined && productBookingUid !== null && productBookingUid !== '') {
                         linkedBookingUidsToRemove.add(String(productBookingUid));
                       }
                       if (productUid !== undefined && productUid !== null && productUid !== '') {
                         bookingsBeforeRemove.forEach(function (booking) {
-                          var bookingUid = _this29.getBookingUniqueIdentificationNumber(booking);
+                          var bookingUid = _this30.getBookingUniqueIdentificationNumber(booking);
                           if (bookingUid && String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === String(productUid)) {
                             linkedBookingUidsToRemove.add(bookingUid);
                           }
@@ -4754,37 +4749,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }
                     case 8:
                     case "end":
-                      return _context29.stop();
+                      return _context27.stop();
                   }
                 }, _loop3);
               });
               _iterator21.s();
             case 17:
               if ((_step21 = _iterator21.n()).done) {
-                _context30.next = 23;
+                _context28.next = 23;
                 break;
               }
-              return _context30.delegateYield(_loop3(), "t0", 19);
+              return _context28.delegateYield(_loop3(), "t0", 19);
             case 19:
-              if (!_context30.t0) {
-                _context30.next = 21;
+              if (!_context28.t0) {
+                _context28.next = 21;
                 break;
               }
-              return _context30.abrupt("continue", 21);
+              return _context28.abrupt("continue", 21);
             case 21:
-              _context30.next = 17;
+              _context28.next = 17;
               break;
             case 23:
-              _context30.next = 28;
+              _context28.next = 28;
               break;
             case 25:
-              _context30.prev = 25;
-              _context30.t1 = _context30["catch"](14);
-              _iterator21.e(_context30.t1);
+              _context28.prev = 25;
+              _context28.t1 = _context28["catch"](14);
+              _iterator21.e(_context28.t1);
             case 28:
-              _context30.prev = 28;
+              _context28.prev = 28;
               _iterator21.f();
-              return _context30.finish(28);
+              return _context28.finish(28);
             case 31:
               if (linkedBookingUidsToRemove.size > 0) {
                 // 删除主预约商品时，同步移除挂在同一 booking_uid 下的加时商品，避免残留孤儿行。
@@ -4811,20 +4806,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   tempOrder.products = nextProductIndex >= 0 ? [].concat(_toConsumableArray(productsWithoutRemaining.slice(0, nextProductIndex)), [remainingProduct], _toConsumableArray(productsWithoutRemaining.slice(nextProductIndex))) : [].concat(_toConsumableArray(productsWithoutRemaining), [remainingProduct]);
                 }
               }
-              _context30.next = 35;
+              _context28.next = 35;
               return this.finalizeAfterProductsMutation(tempOrder);
             case 35:
               this.logInfo('removeProductsFromOrder success', {
                 identities: identities
               });
-              return _context30.abrupt("return", tempOrder.products);
+              return _context28.abrupt("return", tempOrder.products);
             case 37:
             case "end":
-              return _context30.stop();
+              return _context28.stop();
           }
-        }, _callee27, this, [[14, 25, 28, 31]]);
+        }, _callee25, this, [[14, 25, 28, 31]]);
       }));
-      function removeProductsFromOrder(_x36, _x37) {
+      function removeProductsFromOrder(_x31, _x32) {
         return _removeProductsFromOrder.apply(this, arguments);
       }
       return removeProductsFromOrder;
@@ -4832,18 +4827,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeProductFromOrder",
     value: function () {
-      var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(identity, options) {
-        return _regeneratorRuntime().wrap(function _callee28$(_context31) {
-          while (1) switch (_context31.prev = _context31.next) {
+      var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(identity, options) {
+        return _regeneratorRuntime().wrap(function _callee26$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
-              return _context31.abrupt("return", this.removeProductsFromOrder([identity], options));
+              return _context29.abrupt("return", this.removeProductsFromOrder([identity], options));
             case 1:
             case "end":
-              return _context31.stop();
+              return _context29.stop();
           }
-        }, _callee28, this);
+        }, _callee26, this);
       }));
-      function removeProductFromOrder(_x38, _x39) {
+      function removeProductFromOrder(_x33, _x34) {
         return _removeProductFromOrder.apply(this, arguments);
       }
       return removeProductFromOrder;
@@ -4855,10 +4850,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clearOrderCartLines",
     value: (function () {
-      var _clearOrderCartLines = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
+      var _clearOrderCartLines = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27() {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee29$(_context32) {
-          while (1) switch (_context32.prev = _context32.next) {
+        return _regeneratorRuntime().wrap(function _callee27$(_context30) {
+          while (1) switch (_context30.prev = _context30.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               tempOrder.products = [];
@@ -4869,24 +4864,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   productsByUid: {}
                 });
               }
-              _context32.next = 7;
+              _context30.next = 7;
               return this.applyPromotion();
             case 7:
               this.applyDiscount();
               this.sanitizeTempOrderProducts(tempOrder);
-              _context32.next = 11;
+              _context30.next = 11;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 11:
               this.persistTempOrder();
               this.logInfo('clearOrderCartLines success', {});
-              return _context32.abrupt("return", tempOrder);
+              return _context30.abrupt("return", tempOrder);
             case 14:
             case "end":
-              return _context32.stop();
+              return _context30.stop();
           }
-        }, _callee29, this);
+        }, _callee27, this);
       }));
       function clearOrderCartLines() {
         return _clearOrderCartLines.apply(this, arguments);
@@ -4897,23 +4892,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildCurrentSubmitPayloadForLocalPrint",
     value: function buildCurrentSubmitPayloadForLocalPrint(params) {
-      var _params$cacheId, _this$otherParams3, _ref70, _params$businessCode, _this$otherParams4, _this$otherParams5;
+      var _params$cacheId, _this$otherParams3, _ref69, _params$businessCode, _this$otherParams4, _this$otherParams5;
       var tempOrder = this.ensureTempOrder();
       this.persistTempOrder();
       var payload = buildSubmitPayload({
         tempOrder: tempOrder,
         cacheId: (_params$cacheId = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId !== void 0 ? _params$cacheId : this.cacheId,
         platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.platform),
-        businessCode: (_ref70 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.businessCode) !== null && _ref70 !== void 0 ? _ref70 : (_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.business_code,
+        businessCode: (_ref69 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.businessCode) !== null && _ref69 !== void 0 ? _ref69 : (_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.business_code,
         channel: params === null || params === void 0 ? void 0 : params.channel,
         type: params === null || params === void 0 ? void 0 : params.type,
         summary: this.store.summary || createEmptySummary(),
         enhance: function enhance(nextPayload) {
-          var _ref71, _tempOrder$order_numb, _ref72, _tempOrder$shop_order, _ref73, _tempOrder$shop_full_;
+          var _ref70, _tempOrder$order_numb, _ref71, _tempOrder$shop_order, _ref72, _tempOrder$shop_full_;
           return _objectSpread(_objectSpread({}, nextPayload), {}, {
-            order_number: (_ref71 = (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : nextPayload.order_number) !== null && _ref71 !== void 0 ? _ref71 : null,
-            shop_order_number: (_ref72 = (_tempOrder$shop_order = tempOrder.shop_order_number) !== null && _tempOrder$shop_order !== void 0 ? _tempOrder$shop_order : nextPayload.shop_order_number) !== null && _ref72 !== void 0 ? _ref72 : null,
-            shop_full_order_number: (_ref73 = (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : nextPayload.shop_full_order_number) !== null && _ref73 !== void 0 ? _ref73 : null,
+            order_number: (_ref70 = (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : nextPayload.order_number) !== null && _ref70 !== void 0 ? _ref70 : null,
+            shop_order_number: (_ref71 = (_tempOrder$shop_order = tempOrder.shop_order_number) !== null && _tempOrder$shop_order !== void 0 ? _tempOrder$shop_order : nextPayload.shop_order_number) !== null && _ref71 !== void 0 ? _ref71 : null,
+            shop_full_order_number: (_ref72 = (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : nextPayload.shop_full_order_number) !== null && _ref72 !== void 0 ? _ref72 : null,
             small_ticket_data_flag: 1
           });
         }
@@ -4924,17 +4919,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyLocalPrintOrderNumbers",
     value: function () {
-      var _applyLocalPrintOrderNumbers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(order) {
+      var _applyLocalPrintOrderNumbers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(order) {
         var tempOrder, shopOrderNumber, shopFullOrderNumber;
-        return _regeneratorRuntime().wrap(function _callee30$(_context33) {
-          while (1) switch (_context33.prev = _context33.next) {
+        return _regeneratorRuntime().wrap(function _callee28$(_context31) {
+          while (1) switch (_context31.prev = _context31.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (!(!order || _typeof(order) !== 'object')) {
-                _context33.next = 3;
+                _context31.next = 3;
                 break;
               }
-              return _context33.abrupt("return", tempOrder);
+              return _context31.abrupt("return", tempOrder);
             case 3:
               shopOrderNumber = order.shop_order_number;
               shopFullOrderNumber = order.shop_full_order_number;
@@ -4945,17 +4940,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.shop_full_order_number = String(shopFullOrderNumber);
               }
               this.persistTempOrder();
-              _context33.next = 10;
+              _context31.next = 10;
               return this.saveDraft();
             case 10:
-              return _context33.abrupt("return", tempOrder);
+              return _context31.abrupt("return", tempOrder);
             case 11:
             case "end":
-              return _context33.stop();
+              return _context31.stop();
           }
-        }, _callee30, this);
+        }, _callee28, this);
       }));
-      function applyLocalPrintOrderNumbers(_x40) {
+      function applyLocalPrintOrderNumbers(_x35) {
         return _applyLocalPrintOrderNumbers.apply(this, arguments);
       }
       return applyLocalPrintOrderNumbers;
@@ -4963,35 +4958,35 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "saveTempOrderAsDraft",
     value: function () {
-      var _saveTempOrderAsDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(params) {
+      var _saveTempOrderAsDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(params) {
         var _params$cacheId2, _this$otherParams6, _this$otherParams7, _this$otherParams8, _params$type, _this$otherParams9, _payload$products;
         var tempOrder, latestSummary, payload;
-        return _regeneratorRuntime().wrap(function _callee31$(_context34) {
-          while (1) switch (_context34.prev = _context34.next) {
+        return _regeneratorRuntime().wrap(function _callee29$(_context32) {
+          while (1) switch (_context32.prev = _context32.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               this.ensureExternalSaleNumber(tempOrder);
               this.persistTempOrder();
-              _context34.next = 5;
+              _context32.next = 5;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 5:
-              _context34.t1 = _context34.sent;
-              if (_context34.t1) {
-                _context34.next = 8;
+              _context32.t1 = _context32.sent;
+              if (_context32.t1) {
+                _context32.next = 8;
                 break;
               }
-              _context34.t1 = this.store.summary;
+              _context32.t1 = this.store.summary;
             case 8:
-              _context34.t0 = _context34.t1;
-              if (_context34.t0) {
-                _context34.next = 11;
+              _context32.t0 = _context32.t1;
+              if (_context32.t0) {
+                _context32.next = 11;
                 break;
               }
-              _context34.t0 = createEmptySummary();
+              _context32.t0 = createEmptySummary();
             case 11:
-              latestSummary = _context34.t0;
+              latestSummary = _context32.t0;
               payload = buildSubmitPayload({
                 tempOrder: tempOrder,
                 cacheId: (_params$cacheId2 = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId2 !== void 0 ? _params$cacheId2 : this.cacheId,
@@ -5012,17 +5007,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 externalSaleNumber: payload.external_sale_number,
                 productsCount: ((_payload$products = payload.products) === null || _payload$products === void 0 ? void 0 : _payload$products.length) || 0
               });
-              return _context34.abrupt("return", this.request.post('/order/sales/draft', payload, {
+              return _context32.abrupt("return", this.request.post('/order/sales/draft', payload, {
                 osServer: true,
                 customToast: function customToast() {}
               }));
             case 18:
             case "end":
-              return _context34.stop();
+              return _context32.stop();
           }
-        }, _callee31, this);
+        }, _callee29, this);
       }));
-      function saveTempOrderAsDraft(_x41) {
+      function saveTempOrderAsDraft(_x36) {
         return _saveTempOrderAsDraft.apply(this, arguments);
       }
       return saveTempOrderAsDraft;
@@ -5036,18 +5031,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitTempOrder",
     value: (function () {
-      var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(params) {
-        return _regeneratorRuntime().wrap(function _callee32$(_context35) {
-          while (1) switch (_context35.prev = _context35.next) {
+      var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(params) {
+        return _regeneratorRuntime().wrap(function _callee30$(_context33) {
+          while (1) switch (_context33.prev = _context33.next) {
             case 0:
-              return _context35.abrupt("return", this.runSubmitTempOrder(params));
+              return _context33.abrupt("return", this.runSubmitTempOrder(params));
             case 1:
             case "end":
-              return _context35.stop();
+              return _context33.stop();
           }
-        }, _callee32, this);
+        }, _callee30, this);
       }));
-      function submitTempOrder(_x42) {
+      function submitTempOrder(_x37) {
         return _submitTempOrder.apply(this, arguments);
       }
       return submitTempOrder;
@@ -5055,20 +5050,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitTempOrderAsync",
     value: function () {
-      var _submitTempOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(params) {
-        return _regeneratorRuntime().wrap(function _callee33$(_context36) {
-          while (1) switch (_context36.prev = _context36.next) {
+      var _submitTempOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(params) {
+        return _regeneratorRuntime().wrap(function _callee31$(_context34) {
+          while (1) switch (_context34.prev = _context34.next) {
             case 0:
-              return _context36.abrupt("return", this.runSubmitTempOrder(_objectSpread(_objectSpread({}, params), {}, {
+              return _context34.abrupt("return", this.runSubmitTempOrder(_objectSpread(_objectSpread({}, params), {}, {
                 syncMode: true
               })));
             case 1:
             case "end":
-              return _context36.stop();
+              return _context34.stop();
           }
-        }, _callee33, this);
+        }, _callee31, this);
       }));
-      function submitTempOrderAsync(_x43) {
+      function submitTempOrderAsync(_x38) {
         return _submitTempOrderAsync.apply(this, arguments);
       }
       return submitTempOrderAsync;
@@ -5076,11 +5071,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "runSubmitTempOrder",
     value: function () {
-      var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(params) {
-        var _params$cacheId3, _this$otherParams10, _ref74, _ref75, _submitSnapshot$busin, _this$otherParams11, _this$otherParams12, _submitSnapshot$type;
+      var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(params) {
+        var _params$cacheId3, _this$otherParams10, _ref73, _ref74, _submitSnapshot$busin, _this$otherParams11, _this$otherParams12, _submitSnapshot$type;
         var tempOrder, shouldConfirmPendingVoucherPayments, hasPaymentOverride, preparedPaymentOverride, latestSummary, effectiveCacheId, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, submitSnapshot, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
-        return _regeneratorRuntime().wrap(function _callee34$(_context37) {
-          while (1) switch (_context37.prev = _context37.next) {
+        return _regeneratorRuntime().wrap(function _callee32$(_context35) {
+          while (1) switch (_context35.prev = _context35.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               shouldConfirmPendingVoucherPayments = (params === null || params === void 0 ? void 0 : params.confirmPendingVoucherPayments) !== false;
@@ -5100,26 +5095,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               this.persistTempOrder();
-              _context37.next = 8;
+              _context35.next = 8;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 8:
-              _context37.t1 = _context37.sent;
-              if (_context37.t1) {
-                _context37.next = 11;
+              _context35.t1 = _context35.sent;
+              if (_context35.t1) {
+                _context35.next = 11;
                 break;
               }
-              _context37.t1 = this.store.summary;
+              _context35.t1 = this.store.summary;
             case 11:
-              _context37.t0 = _context37.t1;
-              if (_context37.t0) {
-                _context37.next = 14;
+              _context35.t0 = _context35.t1;
+              if (_context35.t0) {
+                _context35.next = 14;
                 break;
               }
-              _context37.t0 = createEmptySummary();
+              _context35.t0 = createEmptySummary();
             case 14:
-              latestSummary = _context37.t0;
+              latestSummary = _context35.t0;
               effectiveCacheId = (_params$cacheId3 = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId3 !== void 0 ? _params$cacheId3 : this.cacheId;
               hasPaymentStatusOverride = (params === null || params === void 0 ? void 0 : params.paymentStatus) !== undefined;
               hasSmallTicketDataFlagOverride = (params === null || params === void 0 ? void 0 : params.smallTicketDataFlag) !== undefined;
@@ -5139,7 +5134,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder,
                 cacheId: effectiveCacheId,
                 platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 ? void 0 : _this$otherParams10.platform),
-                businessCode: (_ref74 = (_ref75 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref75 !== void 0 ? _ref75 : (_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.businessCode) !== null && _ref74 !== void 0 ? _ref74 : (_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.business_code,
+                businessCode: (_ref73 = (_ref74 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref74 !== void 0 ? _ref74 : (_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.businessCode) !== null && _ref73 !== void 0 ? _ref73 : (_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.business_code,
                 channel: params === null || params === void 0 ? void 0 : params.channel,
                 type: (_submitSnapshot$type = submitSnapshot.type) !== null && _submitSnapshot$type !== void 0 ? _submitSnapshot$type : params === null || params === void 0 ? void 0 : params.type,
                 summary: latestSummary,
@@ -5154,10 +5149,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!payload.created_at) {
                 payload.created_at = dayjs().format('YYYY-MM-DD HH:mm:ss');
               }
-              _context37.next = 26;
+              _context35.next = 26;
               return this.saveDraft();
             case 26:
-              _context37.prev = 26;
+              _context35.prev = 26;
               this.logInfo('submitTempOrder calling sales checkout', {
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
@@ -5167,43 +5162,43 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 smallTicketDataFlag: payload.small_ticket_data_flag,
                 syncMode: payload.sync_mode
               });
-              _context37.next = 30;
+              _context35.next = 30;
               return this.submitSalesOrder({
                 query: payload
               });
             case 30:
-              result = _context37.sent;
-              _context37.next = 43;
+              result = _context35.sent;
+              _context35.next = 43;
               break;
             case 33:
-              _context37.prev = 33;
-              _context37.t2 = _context37["catch"](26);
-              backendErrorResponse = this.extractSubmitErrorResponse(_context37.t2);
+              _context35.prev = 33;
+              _context35.t2 = _context35["catch"](26);
+              backendErrorResponse = this.extractSubmitErrorResponse(_context35.t2);
               if (!backendErrorResponse) {
-                _context37.next = 40;
+                _context35.next = 40;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
-              return _context37.abrupt("return", backendErrorResponse);
+              return _context35.abrupt("return", backendErrorResponse);
             case 40:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
-                error: _context37.t2 instanceof Error ? _context37.t2.message : String(_context37.t2),
+                error: _context35.t2 instanceof Error ? _context35.t2.message : String(_context35.t2),
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
                 paymentStatus: payload.payment_status,
                 paymentsCount: ((_payload$payments2 = payload.payments) === null || _payload$payments2 === void 0 ? void 0 : _payload$payments2.length) || 0
               });
-              throw _context37.t2;
+              throw _context35.t2;
             case 43:
               if (!this.isSubmitResponseRejected(result)) {
-                _context37.next = 47;
+                _context35.next = 47;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
-              return _context37.abrupt("return", result);
+              return _context35.abrupt("return", result);
             case 47:
               submittedOrderId = this.extractOrderIdFromSubmitResult(result);
               this.logInfo('runSubmitTempOrder: 提交成功', {
@@ -5214,15 +5209,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 })
               });
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
-                _context37.next = 56;
+                _context35.next = 56;
                 break;
               }
               tempOrder.order_id = submittedOrderId;
               resultRecord = result;
-              _context37.next = 54;
+              _context35.next = 54;
               return this.markLocalOrderSynced(submittedOrderId, (resultRecord === null || resultRecord === void 0 ? void 0 : resultRecord.data) || resultRecord || {});
             case 54:
-              _context37.next = 57;
+              _context35.next = 57;
               break;
             case 56:
               if (this.isLocalPendingSubmitResult(result)) {
@@ -5231,14 +5226,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 this.store.syncState = 'submitted';
               }
             case 57:
-              return _context37.abrupt("return", result);
+              return _context35.abrupt("return", result);
             case 58:
             case "end":
-              return _context37.stop();
+              return _context35.stop();
           }
-        }, _callee34, this, [[26, 33]]);
+        }, _callee32, this, [[26, 33]]);
       }));
-      function runSubmitTempOrder(_x44) {
+      function runSubmitTempOrder(_x39) {
         return _runSubmitTempOrder.apply(this, arguments);
       }
       return runSubmitTempOrder;
@@ -5246,10 +5241,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "markLocalOrderSynced",
     value: function () {
-      var _markLocalOrderSynced = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35(orderId, remoteOrder) {
+      var _markLocalOrderSynced = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(orderId, remoteOrder) {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee35$(_context38) {
-          while (1) switch (_context38.prev = _context38.next) {
+        return _regeneratorRuntime().wrap(function _callee33$(_context36) {
+          while (1) switch (_context36.prev = _context36.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               tempOrder.order_id = orderId;
@@ -5257,15 +5252,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.store.lastOrderInfo = remoteOrder;
               this.store.syncState = 'submitted';
               this.persistTempOrder();
-              _context38.next = 8;
+              _context36.next = 8;
               return this.saveDraft();
             case 8:
             case "end":
-              return _context38.stop();
+              return _context36.stop();
           }
-        }, _callee35, this);
+        }, _callee33, this);
       }));
-      function markLocalOrderSynced(_x45, _x46) {
+      function markLocalOrderSynced(_x40, _x41) {
         return _markLocalOrderSynced.apply(this, arguments);
       }
       return markLocalOrderSynced;
@@ -5308,10 +5303,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function extractSubmitErrorResponse(error) {
       var _error$response,
         _error$response2,
-        _this30 = this;
+        _this31 = this;
       var candidates = [error === null || error === void 0 || (_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.data, error === null || error === void 0 ? void 0 : error.data, error === null || error === void 0 || (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : _error$response2.body, error === null || error === void 0 ? void 0 : error.body];
       return candidates.find(function (candidate) {
-        return _this30.isSubmitErrorResponse(candidate);
+        return _this31.isSubmitErrorResponse(candidate);
       }) || null;
     }
   }, {
@@ -5338,33 +5333,33 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncPaymentsToOrder",
     value: function () {
-      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
-        var _this31 = this,
+      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(params) {
+        var _this32 = this,
           _params$confirmPendin;
         var tempOrder, needsPaymentNumber, devicePrefix, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, orderPaidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, submitParams, submitResult;
-        return _regeneratorRuntime().wrap(function _callee36$(_context39) {
-          while (1) switch (_context39.prev = _context39.next) {
+        return _regeneratorRuntime().wrap(function _callee34$(_context37) {
+          while (1) switch (_context37.prev = _context37.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               needsPaymentNumber = (params.payments || []).some(function (payment) {
                 return String(payment.payment_number || '').trim() === '';
               });
               if (!needsPaymentNumber) {
-                _context39.next = 8;
+                _context37.next = 8;
                 break;
               }
-              _context39.next = 5;
+              _context37.next = 5;
               return this.getPaymentNumberDevicePrefixAsync();
             case 5:
-              _context39.t0 = _context39.sent;
-              _context39.next = 9;
+              _context37.t0 = _context37.sent;
+              _context37.next = 9;
               break;
             case 8:
-              _context39.t0 = 'LOCAL';
+              _context37.t0 = 'LOCAL';
             case 9:
-              devicePrefix = _context39.t0;
+              devicePrefix = _context37.t0;
               mappedPayments = mapPaymentItemsToOrderPayments((params.payments || []).map(function (payment) {
-                return _this31.normalizePaymentSource(payment, {
+                return _this32.normalizePaymentSource(payment, {
                   defaultPaid: false,
                   devicePrefix: devicePrefix
                 });
@@ -5377,20 +5372,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               tempOrder.payments = effectivePayments;
               tempOrder.payment_status = paymentStatus;
               this.persistTempOrder();
-              _context39.next = 21;
+              _context37.next = 21;
               return this.saveDraft();
             case 21:
               if (params.submitWhenPaid) {
-                _context39.next = 23;
+                _context37.next = 23;
                 break;
               }
-              return _context39.abrupt("return", completion);
+              return _context37.abrupt("return", completion);
             case 23:
               if (!(this.store.syncState === 'submitting')) {
-                _context39.next = 25;
+                _context37.next = 25;
                 break;
               }
-              return _context39.abrupt("return", completion);
+              return _context37.abrupt("return", completion);
             case 25:
               this.store.syncState = 'submitting';
               paymentSyncIdempotencyToken = this.buildPaymentSyncIdempotencyToken(tempOrder, effectivePayments);
@@ -5409,32 +5404,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               };
               if (!(params.checkoutSyncTaskEnabled === false)) {
-                _context39.next = 34;
+                _context37.next = 34;
                 break;
               }
-              _context39.next = 31;
+              _context37.next = 31;
               return this.submitTempOrderAsync(submitParams);
             case 31:
-              _context39.t1 = _context39.sent;
-              _context39.next = 37;
+              _context37.t1 = _context37.sent;
+              _context37.next = 37;
               break;
             case 34:
-              _context39.next = 36;
+              _context37.next = 36;
               return this.submitTempOrder(submitParams);
             case 36:
-              _context39.t1 = _context39.sent;
+              _context37.t1 = _context37.sent;
             case 37:
-              submitResult = _context39.t1;
-              return _context39.abrupt("return", _objectSpread(_objectSpread({}, completion), {}, {
+              submitResult = _context37.t1;
+              return _context37.abrupt("return", _objectSpread(_objectSpread({}, completion), {}, {
                 submitResult: submitResult
               }));
             case 39:
             case "end":
-              return _context39.stop();
+              return _context37.stop();
           }
-        }, _callee36, this);
+        }, _callee34, this);
       }));
-      function syncPaymentsToOrder(_x47) {
+      function syncPaymentsToOrder(_x42) {
         return _syncPaymentsToOrder.apply(this, arguments);
       }
       return syncPaymentsToOrder;
@@ -5442,7 +5437,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createOrder",
     value: function createOrder(params) {
-      var _this32 = this;
+      var _this33 = this;
       var order = _objectSpread({
         type: (params === null || params === void 0 ? void 0 : params.type) || 'appointment_booking',
         // 要从外面拿，virtual
@@ -5474,7 +5469,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
 
           // 为预约补齐 holder 信息
           if (params !== null && params !== void 0 && (_params$extraData = params.extraData) !== null && _params$extraData !== void 0 && _params$extraData.is_add_holder_info) {
-            ensureCartItemOriginHolder(item, _this32.window);
+            ensureCartItemOriginHolder(item, _this33.window);
           }
 
           // 购物车是否为普通商品
@@ -5531,11 +5526,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitOrder",
     value: function () {
-      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(order) {
+      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35(order) {
         var _order$query$cartItem, _params$bookings, _params$relation_prod;
         var url, query, fetchUrl, params;
-        return _regeneratorRuntime().wrap(function _callee37$(_context40) {
-          while (1) switch (_context40.prev = _context40.next) {
+        return _regeneratorRuntime().wrap(function _callee35$(_context38) {
+          while (1) switch (_context38.prev = _context38.next) {
             case 0:
               this.logInfo('submitOrder called', {
                 url: order.url,
@@ -5555,14 +5550,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 relationProductsCount: ((_params$relation_prod = params.relation_products) === null || _params$relation_prod === void 0 ? void 0 : _params$relation_prod.length) || 0,
                 scheduleDate: params.schedule_date
               });
-              return _context40.abrupt("return", this.request.post(fetchUrl, params));
+              return _context38.abrupt("return", this.request.post(fetchUrl, params));
             case 6:
             case "end":
-              return _context40.stop();
+              return _context38.stop();
           }
-        }, _callee37, this);
+        }, _callee35, this);
       }));
-      function submitOrder(_x48) {
+      function submitOrder(_x43) {
         return _submitOrder.apply(this, arguments);
       }
       return submitOrder;
@@ -5570,13 +5565,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "cancelOrder",
     value: function () {
-      var _cancelOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(params) {
+      var _cancelOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
         var payload;
-        return _regeneratorRuntime().wrap(function _callee38$(_context41) {
-          while (1) switch (_context41.prev = _context41.next) {
+        return _regeneratorRuntime().wrap(function _callee36$(_context39) {
+          while (1) switch (_context39.prev = _context39.next) {
             case 0:
               if (!(!Array.isArray(params.order_ids) || params.order_ids.length === 0)) {
-                _context41.next = 2;
+                _context39.next = 2;
                 break;
               }
               throw new Error('取消订单失败：order_ids 不能为空');
@@ -5592,16 +5587,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 method: 'PUT',
                 orderIdsCount: params.order_ids.length
               });
-              return _context41.abrupt("return", this.request.put('/order/update-status', payload, {
+              return _context39.abrupt("return", this.request.put('/order/update-status', payload, {
                 isShopApi: true
               }));
             case 5:
             case "end":
-              return _context41.stop();
+              return _context39.stop();
           }
-        }, _callee38, this);
+        }, _callee36, this);
       }));
-      function cancelOrder(_x49) {
+      function cancelOrder(_x44) {
         return _cancelOrder.apply(this, arguments);
       }
       return cancelOrder;
@@ -5609,19 +5604,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "changeBookingStatus",
     value: function () {
-      var _changeBookingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(params) {
+      var _changeBookingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(params) {
         var url, payload;
-        return _regeneratorRuntime().wrap(function _callee39$(_context42) {
-          while (1) switch (_context42.prev = _context42.next) {
+        return _regeneratorRuntime().wrap(function _callee37$(_context40) {
+          while (1) switch (_context40.prev = _context40.next) {
             case 0:
               if (params.booking_id) {
-                _context42.next = 2;
+                _context40.next = 2;
                 break;
               }
               throw new Error('变更预约状态失败：booking_id 不能为空');
             case 2:
               if (params.appointment_status) {
-                _context42.next = 4;
+                _context40.next = 4;
                 break;
               }
               throw new Error('变更预约状态失败：appointment_status 不能为空');
@@ -5636,16 +5631,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 bookingId: params.booking_id,
                 appointmentStatus: params.appointment_status
               });
-              return _context42.abrupt("return", this.request.put(url, payload, {
+              return _context40.abrupt("return", this.request.put(url, payload, {
                 isShopApi: true
               }));
             case 8:
             case "end":
-              return _context42.stop();
+              return _context40.stop();
           }
-        }, _callee39, this);
+        }, _callee37, this);
       }));
-      function changeBookingStatus(_x50) {
+      function changeBookingStatus(_x45) {
         return _changeBookingStatus.apply(this, arguments);
       }
       return changeBookingStatus;
@@ -5663,11 +5658,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createOrderByCheckout",
     value: (function () {
-      var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(params) {
+      var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(params) {
         var _params$payments, _params$bookings2, _params$relation_prod2, _params$payments2, _params$payments3, _params$bookings3, _params$relation_prod3, _params$payments4;
         var onlineStorePaymentCodeList, _orderData$payments, _orderData$bookings, _orderData$relation_p, _orderData$payments2, _orderData$payments3, _orderData$bookings2, _orderData$relation_p2, _orderData$payments4, _orderData$payments5, _response$data, orderData, response;
-        return _regeneratorRuntime().wrap(function _callee40$(_context43) {
-          while (1) switch (_context43.prev = _context43.next) {
+        return _regeneratorRuntime().wrap(function _callee38$(_context41) {
+          while (1) switch (_context41.prev = _context41.next) {
             case 0:
               // 过滤掉由在线店铺下单的 payment 支付数据
               onlineStorePaymentCodeList = ['WXPAY', 'WECHAT', 'ALIPAY', 'APPLE_PAY', 'CREDIT_CARD_3DS', 'CREDIT_CARD_TOKEN', 'GOOGLE_PAY', 'GOOGLE_PAY_3DS', 'CREDIT_CARD'];
@@ -5701,7 +5696,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 relationProductsCount: ((_params$relation_prod3 = params.relation_products) === null || _params$relation_prod3 === void 0 ? void 0 : _params$relation_prod3.length) || 0,
                 paymentsCount: ((_params$payments4 = params.payments) === null || _params$payments4 === void 0 ? void 0 : _params$payments4.length) || 0
               });
-              _context43.prev = 4;
+              _context41.prev = 4;
               // 构建订单数据，设置默认值并允许 params 覆盖
               orderData = _objectSpread({
                 sales_channel: 'my_pisel',
@@ -5763,13 +5758,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 hasOrderId: !!orderData.order_id,
                 smallTicketDataFlag: orderData.small_ticket_data_flag
               });
-              _context43.next = 12;
+              _context41.next = 12;
               return this.request.post('/order/checkout', orderData, {
                 osServer: true,
                 customToast: function customToast() {}
               });
             case 12:
-              response = _context43.sent;
+              response = _context41.sent;
               this.logInfo('Order API called successfully', {
                 response: response
               });
@@ -5777,22 +5772,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 success: !!response,
                 hasOrderId: !!(response !== null && response !== void 0 && (_response$data = response.data) !== null && _response$data !== void 0 && _response$data.order_id || response !== null && response !== void 0 && response.order_id)
               });
-              return _context43.abrupt("return", response);
+              return _context41.abrupt("return", response);
             case 18:
-              _context43.prev = 18;
-              _context43.t0 = _context43["catch"](4);
-              console.error('[Order] createOrderByCheckout 创建订单失败:', _context43.t0);
+              _context41.prev = 18;
+              _context41.t0 = _context41["catch"](4);
+              console.error('[Order] createOrderByCheckout 创建订单失败:', _context41.t0);
               this.logInfo('Order API called failed', {
-                error: _context43.t0 instanceof Error ? _context43.t0.message : String(_context43.t0)
+                error: _context41.t0 instanceof Error ? _context41.t0.message : String(_context41.t0)
               });
-              throw _context43.t0;
+              throw _context41.t0;
             case 23:
             case "end":
-              return _context43.stop();
+              return _context41.stop();
           }
-        }, _callee40, this, [[4, 18]]);
+        }, _callee38, this, [[4, 18]]);
       }));
-      function createOrderByCheckout(_x51) {
+      function createOrderByCheckout(_x46) {
         return _createOrderByCheckout.apply(this, arguments);
       }
       return createOrderByCheckout;
@@ -5800,24 +5795,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitSalesOrder",
     value: function () {
-      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41(params) {
+      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(params) {
         var url, query, fetchUrl;
-        return _regeneratorRuntime().wrap(function _callee41$(_context44) {
-          while (1) switch (_context44.prev = _context44.next) {
+        return _regeneratorRuntime().wrap(function _callee39$(_context42) {
+          while (1) switch (_context42.prev = _context42.next) {
             case 0:
               url = params.url, query = params.query;
               fetchUrl = url || '/order/sales/checkout';
-              return _context44.abrupt("return", this.request.post(fetchUrl, query, {
+              return _context42.abrupt("return", this.request.post(fetchUrl, query, {
                 osServer: true,
                 customToast: function customToast() {}
               }));
             case 3:
             case "end":
-              return _context44.stop();
+              return _context42.stop();
           }
-        }, _callee41, this);
+        }, _callee39, this);
       }));
-      function submitSalesOrder(_x52) {
+      function submitSalesOrder(_x47) {
         return _submitSalesOrder.apply(this, arguments);
       }
       return submitSalesOrder;
@@ -5831,37 +5826,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sendCustomerPayLink",
     value: (function () {
-      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee42(params) {
+      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(params) {
         var _params$emails;
         var orderIds;
-        return _regeneratorRuntime().wrap(function _callee42$(_context45) {
-          while (1) switch (_context45.prev = _context45.next) {
+        return _regeneratorRuntime().wrap(function _callee40$(_context43) {
+          while (1) switch (_context43.prev = _context43.next) {
             case 0:
               orderIds = params.order_ids || params.orderIds || [];
               if (orderIds.length) {
-                _context45.next = 3;
+                _context43.next = 3;
                 break;
               }
               throw new Error('发送支付链接前必须先提交本地订单并取得订单 ID');
             case 3:
               if ((_params$emails = params.emails) !== null && _params$emails !== void 0 && _params$emails.length) {
-                _context45.next = 5;
+                _context43.next = 5;
                 break;
               }
               throw new Error('发送支付链接需要至少一个邮箱');
             case 5:
-              return _context45.abrupt("return", this.request.post('/order/batch-email', {
+              return _context43.abrupt("return", this.request.post('/order/batch-email', {
                 order_ids: orderIds,
                 notify_action: params.notify_action || 'order_payment_reminder',
                 emails: params.emails
               }));
             case 6:
             case "end":
-              return _context45.stop();
+              return _context43.stop();
           }
-        }, _callee42, this);
+        }, _callee40, this);
       }));
-      function sendCustomerPayLink(_x53) {
+      function sendCustomerPayLink(_x48) {
         return _sendCustomerPayLink.apply(this, arguments);
       }
       return sendCustomerPayLink;
@@ -5869,14 +5864,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getSalesOrderByLookup",
     value: function () {
-      var _getSalesOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43(params) {
+      var _getSalesOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41(params) {
         var lookup, res;
-        return _regeneratorRuntime().wrap(function _callee43$(_context46) {
-          while (1) switch (_context46.prev = _context46.next) {
+        return _regeneratorRuntime().wrap(function _callee41$(_context44) {
+          while (1) switch (_context44.prev = _context44.next) {
             case 0:
               lookup = params.lookup === undefined || params.lookup === null ? '' : String(params.lookup).trim();
               if (lookup) {
-                _context46.next = 3;
+                _context44.next = 3;
                 break;
               }
               throw new Error('加载销售详情需要 lookup');
@@ -5885,7 +5880,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (lookup.startsWith('LOCAL_')) {
                 params.forceRemote = false;
               }
-              _context46.next = 6;
+              _context44.next = 6;
               return this.request.get("/order/sales/".concat(encodeURIComponent(lookup)), _objectSpread({
                 with: ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info', 'refunds']
               }, params.forceRemote ? {
@@ -5894,18 +5889,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 osServer: true
               });
             case 6:
-              res = _context46.sent;
+              res = _context44.sent;
               if (res.code === 200) {
                 this.store.lastOrderInfo = res.data;
               }
-              return _context46.abrupt("return", res);
+              return _context44.abrupt("return", res);
             case 9:
             case "end":
-              return _context46.stop();
+              return _context44.stop();
           }
-        }, _callee43, this);
+        }, _callee41, this);
       }));
-      function getSalesOrderByLookup(_x54) {
+      function getSalesOrderByLookup(_x49) {
         return _getSalesOrderByLookup.apply(this, arguments);
       }
       return getSalesOrderByLookup;
@@ -5919,11 +5914,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hydrateTempOrderFromRecord",
     value: (function () {
-      var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee44(record, options) {
+      var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee42(record, options) {
         var _this$store$discount20;
         var sourceRaw, identityReadySource, normalizedCollections, raw, hasIdentityChanges, identityLogMetadata, hasIdentityWarnings, nextTempOrder, sourceLastOrderInfo, isDraftOrder, syntheticIdentityOptions, rawSummary, summarySurcharges, hadSyntheticDraftOrderId, hydratedEditDiscounts, currentDiscounts, currentScanDiscounts, hydratedDiscountIds, retainedScanDiscounts, nextDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount21, _this$store$discount22;
-        return _regeneratorRuntime().wrap(function _callee44$(_context47) {
-          while (1) switch (_context47.prev = _context47.next) {
+        return _regeneratorRuntime().wrap(function _callee42$(_context45) {
+          while (1) switch (_context45.prev = _context45.next) {
             case 0:
               sourceRaw = record && _typeof(record) === 'object' && record.data && record.order_id == null ? record.data : record || {};
               identityReadySource = this.seedAnonymousBookingUidsFromProducts(sourceRaw);
@@ -5993,34 +5988,34 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               nextDiscounts = [].concat(_toConsumableArray(hydratedEditDiscounts), _toConsumableArray(retainedScanDiscounts));
               shouldSkipEmptyDiscountSync = nextDiscounts.length === 0 && currentDiscounts.length === 0;
               if (shouldSkipEmptyDiscountSync) {
-                _context47.next = 31;
+                _context45.next = 31;
                 break;
               }
               OrderModule.populateSavedAmounts(nextTempOrder.products, nextDiscounts);
-              _context47.next = 29;
+              _context45.next = 29;
               return (_this$store$discount21 = this.store.discount) === null || _this$store$discount21 === void 0 ? void 0 : _this$store$discount21.setOriginalDiscountList(nextDiscounts);
             case 29:
-              _context47.next = 31;
+              _context45.next = 31;
               return (_this$store$discount22 = this.store.discount) === null || _this$store$discount22 === void 0 ? void 0 : _this$store$discount22.setDiscountList(nextDiscounts);
             case 31:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context47.next = 34;
+                _context45.next = 34;
                 break;
               }
-              _context47.next = 34;
+              _context45.next = 34;
               return this.recalculateSummary({
                 createIfMissing: false
               });
             case 34:
               this.persistTempOrder();
-              return _context47.abrupt("return", nextTempOrder);
+              return _context45.abrupt("return", nextTempOrder);
             case 36:
             case "end":
-              return _context47.stop();
+              return _context45.stop();
           }
-        }, _callee44, this);
+        }, _callee42, this);
       }));
-      function hydrateTempOrderFromRecord(_x55, _x56) {
+      function hydrateTempOrderFromRecord(_x50, _x51) {
         return _hydrateTempOrderFromRecord.apply(this, arguments);
       }
       return hydrateTempOrderFromRecord;
@@ -6134,7 +6129,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeTempOrderForRuntime",
     value: function normalizeTempOrderForRuntime(raw, options) {
-      var _this33 = this;
+      var _this34 = this;
       var runtimeRaw = this.withoutSyntheticDraftOrderIdForRuntime(raw);
       var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), runtimeRaw || {});
       // ES 列表详情使用 id 表示订单主键；OS 详情态统一依赖 order_id 驱动操作按钮。
@@ -6158,12 +6153,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       nextTempOrder.holder = raw.holder && _typeof(raw.holder) === 'object' ? _objectSpread({}, raw.holder) : null;
       var rawProducts = Array.isArray(raw.products) ? raw.products : [];
       nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map(function (p) {
-        return _this33.normalizeHydratedOrderProduct(p, {
+        return _this34.normalizeHydratedOrderProduct(p, {
           makeEditMark: options === null || options === void 0 ? void 0 : options.makeEditMark
         });
       }) : [];
       nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map(function (b) {
-        var booking = _this33.normalizeHydratedBookingHolder(b || {});
+        var booking = _this34.normalizeHydratedBookingHolder(b || {});
         return _objectSpread(_objectSpread({}, booking), {}, {
           is_all: normalizeBookingIsAll(booking),
           sub_type: normalizeBookingSubType(booking)
@@ -6193,7 +6188,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _step24;
       try {
         for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
-          var _product$metadata11, _ref76, _ref77, _existed$origin, _rawProduct$metadata;
+          var _product$metadata11, _ref75, _ref76, _existed$origin, _rawProduct$metadata;
           var _step24$value = _slicedToArray(_step24.value, 2),
             index = _step24$value[0],
             product = _step24$value[1];
@@ -6201,7 +6196,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           if (!uid) continue;
           var existed = productsByUid[uid] && _typeof(productsByUid[uid]) === 'object' ? productsByUid[uid] : {};
           var rawProduct = rawProducts[index] && _typeof(rawProducts[index]) === 'object' ? rawProducts[index] : product;
-          var origin = (_ref76 = (_ref77 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref77 !== void 0 ? _ref77 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref76 !== void 0 ? _ref76 : rawProduct;
+          var origin = (_ref75 = (_ref76 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref76 !== void 0 ? _ref76 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref75 !== void 0 ? _ref75 : rawProduct;
           var originSnapshot = cloneDeep(origin);
           var productOptionString = this.buildHydratedProductOptionString(rawProduct) || this.buildHydratedProductOptionString(product);
           if (productOptionString && originSnapshot && _typeof(originSnapshot) === 'object') {
@@ -6330,10 +6325,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedProductOptionItem",
     value: function normalizeHydratedProductOptionItem(optionItem) {
-      var _ref78, _optionItem$num, _ref79, _optionItem$add_price;
-      var rawNum = (_ref78 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref78 !== void 0 ? _ref78 : 1;
+      var _ref77, _optionItem$num, _ref78, _optionItem$add_price;
+      var rawNum = (_ref77 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref77 !== void 0 ? _ref77 : 1;
       var parsedNum = Number(rawNum);
-      var rawPrice = (_ref79 = (_optionItem$add_price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _optionItem$add_price !== void 0 ? _optionItem$add_price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _ref79 !== void 0 ? _ref79 : 0;
+      var rawPrice = (_ref78 = (_optionItem$add_price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _optionItem$add_price !== void 0 ? _optionItem$add_price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _ref78 !== void 0 ? _ref78 : 0;
       var parsedPrice = Number(rawPrice);
       var normalized = _objectSpread(_objectSpread({}, optionItem), {}, {
         option_group_item_id: optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id,
@@ -6350,7 +6345,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedOrderProduct",
     value: function normalizeHydratedOrderProduct(product, options) {
-      var _this34 = this;
+      var _this35 = this;
       var row = _objectSpread({}, product || {});
       if (row.num === undefined && row.product_quantity !== undefined) {
         row.num = row.product_quantity;
@@ -6358,7 +6353,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 _this34.normalizeHydratedProductOptionItem(optionItem || {});
+          return _this35.normalizeHydratedProductOptionItem(optionItem || {});
         }))
       });
       delete row["product_".concat('option', "_item")];
@@ -6395,27 +6390,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderInfo",
     value: function () {
-      var _getOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee45(order_id) {
+      var _getOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43(order_id) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee45$(_context48) {
-          while (1) switch (_context48.prev = _context48.next) {
+        return _regeneratorRuntime().wrap(function _callee43$(_context46) {
+          while (1) switch (_context46.prev = _context46.next) {
             case 0:
-              _context48.next = 2;
+              _context46.next = 2;
               return this.request.get("/order/sales/".concat(order_id), {
                 with: ['products', 'bookings']
               }, {
                 osServer: true
               });
             case 2:
-              res = _context48.sent;
-              return _context48.abrupt("return", res);
+              res = _context46.sent;
+              return _context46.abrupt("return", res);
             case 4:
             case "end":
-              return _context48.stop();
+              return _context46.stop();
           }
-        }, _callee45, this);
+        }, _callee43, this);
       }));
-      function getOrderInfo(_x57) {
+      function getOrderInfo(_x52) {
         return _getOrderInfo.apply(this, arguments);
       }
       return getOrderInfo;
@@ -6474,10 +6469,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             _step29;
           try {
             for (_iterator29.s(); !(_step29 = _iterator29.n()).done;) {
-              var _ref80, _bundle$num3;
               var bundle = _step29.value;
               var isPersistedBundleProduct = isPersistedProduct || Boolean((bundle === null || bundle === void 0 ? void 0 : bundle.order_detail_id) || (bundle === null || bundle === void 0 ? void 0 : bundle.orderDetailId) || (bundle === null || bundle === void 0 ? void 0 : bundle.booking_id));
-              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref80 = (_bundle$num3 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num3 !== void 0 ? _bundle$num3 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref80 !== void 0 ? _ref80 : 1) || 1).toNumber();
+              var bundleQty = Number(qty) || 1;
               var _iterator30 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
                 _step30;
               try {