@pisell/pisellos 2.2.246 → 2.2.248

package/dist/modules/Order/index.js

@@ -91,6 +91,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "giftSelectResolver", null);
     /** applyPromotion 递归保护 flag（写路径同步调 applyPromotion，禁止重入） */
     _defineProperty(_assertThisInitialized(_this), "isApplyingPromotion", false);
+    /** 商品曾应用过客户券卡，客户变更剥离后需强制跑一次 calcDiscount 复位价格 */
+    _defineProperty(_assertThisInitialized(_this), "hasActiveCustomerBoundDiscount", false);
     /** 最近一次 applyPromotion 的未满足促销提示 */
     _defineProperty(_assertThisInitialized(_this), "lastUnfulfilledPromotions", []);
     /** 最近一次 applyPromotion 的赠品操作 diff（debug / SDK 读取使用） */
@@ -443,7 +445,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
         var _this$store$tempOrder, _this$store$discount, _this$store$tempOrder2;
-        var orderId, discountList, _this$store$discount2, _this$store$discount3, _this$store$discount4, currentEditDiscounts, currentEditDiscountIds, mergedDiscountList;
+        var orderId, discountList, _this$store$discount2, _this$store$discount3, _this$store$discount4, currentEditDiscounts, runtimeDiscountIds, runtimeDiscounts, mergedDiscountList;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -462,29 +464,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 3:
               discountList = _context3.sent;
               if (!discountList) {
-                _context3.next = 12;
+                _context3.next = 13;
                 break;
               }
               currentEditDiscounts = (((_this$store$discount2 = this.store.discount) === null || _this$store$discount2 === void 0 ? void 0 : _this$store$discount2.getDiscountList()) || []).filter(function (discount) {
                 return discount === null || discount === void 0 ? void 0 : discount.isEditMode;
               });
-              currentEditDiscountIds = new Set(currentEditDiscounts.map(function (discount) {
-                return discount === null || discount === void 0 ? void 0 : discount.id;
-              }));
-              mergedDiscountList = [].concat(_toConsumableArray(currentEditDiscounts), _toConsumableArray(discountList.filter(function (discount) {
-                return !currentEditDiscountIds.has(discount === null || discount === void 0 ? void 0 : discount.id);
-              })));
-              _context3.next = 10;
+              runtimeDiscountIds = new Set();
+              runtimeDiscounts = discountList.filter(function (discount) {
+                if (runtimeDiscountIds.has(discount === null || discount === void 0 ? void 0 : discount.id)) return false;
+                runtimeDiscountIds.add(discount === null || discount === void 0 ? void 0 : discount.id);
+                return true;
+              });
+              mergedDiscountList = [].concat(_toConsumableArray(currentEditDiscounts), _toConsumableArray(runtimeDiscounts));
+              _context3.next = 11;
               return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.setOriginalDiscountList(mergedDiscountList);
-            case 10:
-              _context3.next = 12;
+            case 11:
+              _context3.next = 13;
               return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.setDiscountList(mergedDiscountList);
-            case 12:
+            case 13:
               if (params.apply !== false && (_this$store$tempOrder2 = this.store.tempOrder) !== null && _this$store$tempOrder2 !== void 0 && (_this$store$tempOrder2 = _this$store$tempOrder2.products) !== null && _this$store$tempOrder2 !== void 0 && _this$store$tempOrder2.length) {
                 this.applyDiscount();
               }
               return _context3.abrupt("return", this.getDiscountList());
-            case 14:
+            case 15:
             case "end":
               return _context3.stop();
           }
@@ -660,13 +663,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyDiscount",
     value: function applyDiscount() {
-      var _this$store$discount9, _tempOrder$holder3, _tempOrder$holder4, _this$store$summary2;
+      var _this$store$discount9,
+        _tempOrder$holder3,
+        _tempOrder$holder4,
+        _this$store$summary2,
+        _this2 = this;
       var tempOrder = this.store.tempOrder;
       // 任意 products CRUD 后都应当重算 discount 状态；即使 products 为空，
       // 也需要让 Rules.calcDiscount 把 DiscountModule 的 isSelected / isAvailable /
       // appliedProductDetails / savedAmount 复位。
       if (!tempOrder) return;
       delete tempOrder.discount_list;
+      if (this.shouldSkipDiscountCalculation(tempOrder)) return;
       var rulesModule = this.store.rules;
       if (!rulesModule) return;
       var discountList = ((_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.getDiscountList()) || [];
@@ -700,6 +708,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         OrderModule.populateSavedAmounts(result.productList || tempOrder.products, result.discountList);
         (_this$store$discount10 = this.store.discount) === null || _this$store$discount10 === void 0 || _this$store$discount10.setDiscountList(result.discountList);
       }
+      this.hasActiveCustomerBoundDiscount = (tempOrder.products || []).some(function (product) {
+        return _this2.productHasCustomerBoundDiscount(product);
+      });
     }
 
     // ─── 促销/赠品 ──────────────────────────────────────
@@ -758,8 +769,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "applyPromotion",
     value: (function () {
       var _applyPromotion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        var _this2 = this;
-        var tempOrder, result, removeSet, _iterator3, _step3, reduce, _iterator6, _step6, _loop2, _iterator4, _step4, _loop, payload;
+        var _this$promotionEvalua,
+          _this$promotionEvalua2,
+          _this3 = this;
+        var tempOrder, strategyConfigs, result, removeSet, _iterator3, _step3, reduce, _iterator6, _step6, _loop2, _iterator4, _step4, _loop, payload;
         return _regeneratorRuntime().wrap(function _callee6$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
@@ -782,8 +795,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               return _context8.abrupt("return");
             case 7:
+              strategyConfigs = (_this$promotionEvalua = (_this$promotionEvalua2 = this.promotionEvaluator).getStrategyConfigs) === null || _this$promotionEvalua === void 0 ? void 0 : _this$promotionEvalua.call(_this$promotionEvalua2);
+              if (!(Array.isArray(strategyConfigs) && strategyConfigs.length === 0)) {
+                _context8.next = 10;
+                break;
+              }
+              return _context8.abrupt("return");
+            case 10:
               this.isApplyingPromotion = true;
-              _context8.prev = 8;
+              _context8.prev = 11;
               result = processCartPromotion(tempOrder.products, this.promotionEvaluator); // step 1: toRemove —— 直接过滤
               if (result.giftActions.toRemove.length > 0) {
                 removeSet = new Set(result.giftActions.toRemove.map(String));
@@ -795,16 +815,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
 
               // step 2: toReduce —— 调整数量
               _iterator3 = _createForOfIteratorHelper(result.giftActions.toReduce);
-              _context8.prev = 12;
+              _context8.prev = 15;
               _iterator3.s();
-            case 14:
+            case 17:
               if ((_step3 = _iterator3.n()).done) {
-                _context8.next = 34;
+                _context8.next = 37;
                 break;
               }
               reduce = _step3.value;
               _iterator6 = _createForOfIteratorHelper(reduce.items);
-              _context8.prev = 17;
+              _context8.prev = 20;
               _loop2 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop2() {
                 var item, product;
                 return _regeneratorRuntime().wrap(function _loop2$(_context7) {
@@ -824,47 +844,47 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }, _loop2);
               });
               _iterator6.s();
-            case 20:
+            case 23:
               if ((_step6 = _iterator6.n()).done) {
-                _context8.next = 24;
+                _context8.next = 27;
                 break;
               }
-              return _context8.delegateYield(_loop2(), "t0", 22);
-            case 22:
-              _context8.next = 20;
+              return _context8.delegateYield(_loop2(), "t0", 25);
+            case 25:
+              _context8.next = 23;
               break;
-            case 24:
-              _context8.next = 29;
+            case 27:
+              _context8.next = 32;
               break;
-            case 26:
-              _context8.prev = 26;
-              _context8.t1 = _context8["catch"](17);
-              _iterator6.e(_context8.t1);
             case 29:
               _context8.prev = 29;
-              _iterator6.f();
-              return _context8.finish(29);
+              _context8.t1 = _context8["catch"](20);
+              _iterator6.e(_context8.t1);
             case 32:
-              _context8.next = 14;
+              _context8.prev = 32;
+              _iterator6.f();
+              return _context8.finish(32);
+            case 35:
+              _context8.next = 17;
               break;
-            case 34:
-              _context8.next = 39;
+            case 37:
+              _context8.next = 42;
               break;
-            case 36:
-              _context8.prev = 36;
-              _context8.t2 = _context8["catch"](12);
-              _iterator3.e(_context8.t2);
             case 39:
               _context8.prev = 39;
-              _iterator3.f();
-              return _context8.finish(39);
+              _context8.t2 = _context8["catch"](15);
+              _iterator3.e(_context8.t2);
             case 42:
+              _context8.prev = 42;
+              _iterator3.f();
+              return _context8.finish(42);
+            case 45:
               if (!(result.giftActions.toAdd.length > 0)) {
-                _context8.next = 65;
+                _context8.next = 68;
                 break;
               }
               if (this.giftSelectResolver) {
-                _context8.next = 47;
+                _context8.next = 50;
                 break;
               }
               if (result.giftActions.toAdd.some(function (g) {
@@ -875,11 +895,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               } else {
                 console.warn('[OrderModule] giftSelectResolver not set, skip applying single-option gifts', result.giftActions.toAdd);
               }
-              _context8.next = 65;
+              _context8.next = 68;
               break;
-            case 47:
+            case 50:
               _iterator4 = _createForOfIteratorHelper(result.giftActions.toAdd);
-              _context8.prev = 48;
+              _context8.prev = 51;
               _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
                 var addAction, _sameStrategy$metadat, sameStrategy, giftResult, giftProducts, giftBookings, _iterator5, _step5, _step5$value, index, gp, booking, linked;
                 return _regeneratorRuntime().wrap(function _loop$(_context6) {
@@ -903,7 +923,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     case 6:
                       _context6.prev = 6;
                       _context6.next = 9;
-                      return _this2.giftSelectResolver({
+                      return _this3.giftSelectResolver({
                         strategyId: addAction.strategyId,
                         strategyName: addAction.strategyName,
                         giftCount: addAction.giftCount,
@@ -938,7 +958,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                         _context6.next = 26;
                         break;
                       }
-                      linked = _this2.createLinkedProductAndBooking({
+                      linked = _this3.createLinkedProductAndBooking({
                         product: gp,
                         booking: booking
                       });
@@ -977,33 +997,33 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }, _loop, null, [[6, 39], [14, 31, 34, 37]]);
               });
               _iterator4.s();
-            case 51:
+            case 54:
               if ((_step4 = _iterator4.n()).done) {
-                _context8.next = 57;
+                _context8.next = 60;
                 break;
               }
-              return _context8.delegateYield(_loop(), "t3", 53);
-            case 53:
+              return _context8.delegateYield(_loop(), "t3", 56);
+            case 56:
               if (!_context8.t3) {
-                _context8.next = 55;
+                _context8.next = 58;
                 break;
               }
-              return _context8.abrupt("continue", 55);
-            case 55:
-              _context8.next = 51;
+              return _context8.abrupt("continue", 58);
+            case 58:
+              _context8.next = 54;
               break;
-            case 57:
-              _context8.next = 62;
+            case 60:
+              _context8.next = 65;
               break;
-            case 59:
-              _context8.prev = 59;
-              _context8.t4 = _context8["catch"](48);
-              _iterator4.e(_context8.t4);
             case 62:
               _context8.prev = 62;
-              _iterator4.f();
-              return _context8.finish(62);
+              _context8.t4 = _context8["catch"](51);
+              _iterator4.e(_context8.t4);
             case 65:
+              _context8.prev = 65;
+              _iterator4.f();
+              return _context8.finish(65);
+            case 68:
               tempOrder.products = result.products;
               this.lastUnfulfilledPromotions = result.unfulfilledPromotions;
               this.lastGiftActions = result.giftActions;
@@ -1021,21 +1041,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 products: tempOrder.products
               };
               this.effectsEmit('onPromotionApplied', payload);
-              _context8.next = 75;
+              _context8.next = 78;
               break;
-            case 72:
-              _context8.prev = 72;
-              _context8.t5 = _context8["catch"](8);
-              console.error('[OrderModule] applyPromotion failed', _context8.t5);
             case 75:
               _context8.prev = 75;
-              this.isApplyingPromotion = false;
-              return _context8.finish(75);
+              _context8.t5 = _context8["catch"](11);
+              console.error('[OrderModule] applyPromotion failed', _context8.t5);
             case 78:
+              _context8.prev = 78;
+              this.isApplyingPromotion = false;
+              return _context8.finish(78);
+            case 81:
             case "end":
               return _context8.stop();
           }
-        }, _callee6, this, [[8, 72, 75, 78], [12, 36, 39, 42], [17, 26, 29, 32], [48, 59, 62, 65]]);
+        }, _callee6, this, [[11, 75, 78, 81], [15, 39, 42, 45], [20, 29, 32, 35], [51, 62, 65, 68]]);
       }));
       function applyPromotion() {
         return _applyPromotion.apply(this, arguments);
@@ -1211,11 +1231,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculatePaymentTotal",
     value: function calculatePaymentTotal(payments) {
-      var _this3 = this;
+      var _this4 = this;
       return mapPaymentItemsToOrderPayments(payments, {
         includeVoided: false
       }).reduce(function (sum, payment) {
-        return sum.plus(_this3.calculatePaymentEffectiveAmount(payment));
+        return sum.plus(_this4.calculatePaymentEffectiveAmount(payment));
       }, new Decimal(0));
     }
   }, {
@@ -1267,14 +1287,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculateDepositPaidAmount",
     value: function calculateDepositPaidAmount(payments) {
-      var _this4 = this;
+      var _this5 = this;
       return (payments || []).reduce(function (sum, payment) {
         var paymentRecord = payment;
         if ((paymentRecord === null || paymentRecord === void 0 ? void 0 : paymentRecord.status) !== 'paid') return sum;
         var isDepositPayment = paymentRecord.type === 'deposit' || paymentRecord.order_payment_type === 'deposit';
         if (!isDepositPayment) return sum;
         if (paymentRecord.origin_amount !== undefined && paymentRecord.origin_amount !== null && paymentRecord.origin_amount !== '') {
-          return sum.plus(_this4.calculatePaymentGapAmount(paymentRecord));
+          return sum.plus(_this5.calculatePaymentGapAmount(paymentRecord));
         }
         var rounding = new Decimal(paymentRecord.rounding_amount || 0);
         return sum.plus(new Decimal(paymentRecord.amount || 0).minus(rounding));
@@ -1419,16 +1439,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculatePaidPaymentSummary",
     value: function calculatePaidPaymentSummary(payments) {
-      var _this5 = this;
+      var _this6 = this;
       return (payments || []).reduce(function (summary, payment) {
         var paymentRecord = payment;
         if ((paymentRecord === null || paymentRecord === void 0 ? void 0 : paymentRecord.status) !== 'paid') return summary;
         return {
           customerPaidAmount: summary.customerPaidAmount.plus(paymentRecord.amount || 0),
           orderPaidAmount: summary.orderPaidAmount.plus(paymentRecord.origin_amount || 0),
-          gapPaidAmount: summary.gapPaidAmount.plus(_this5.calculatePaymentGapAmount(paymentRecord)),
-          payServiceChargeAmount: summary.payServiceChargeAmount.plus(_this5.calculatePaymentServiceFee(paymentRecord)),
-          roundingAmount: summary.roundingAmount.plus(_this5.calculatePaymentRoundingAmount(paymentRecord))
+          gapPaidAmount: summary.gapPaidAmount.plus(_this6.calculatePaymentGapAmount(paymentRecord)),
+          payServiceChargeAmount: summary.payServiceChargeAmount.plus(_this6.calculatePaymentServiceFee(paymentRecord)),
+          roundingAmount: summary.roundingAmount.plus(_this6.calculatePaymentRoundingAmount(paymentRecord))
         };
       }, {
         customerPaidAmount: new Decimal(0),
@@ -1613,15 +1633,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeFingerprintValue",
     value: function normalizeFingerprintValue(value) {
-      var _this6 = this;
+      var _this7 = this;
       if (Array.isArray(value)) {
         return value.map(function (item) {
-          return _this6.normalizeFingerprintValue(item);
+          return _this7.normalizeFingerprintValue(item);
         });
       }
       if (!value || _typeof(value) !== 'object') return value !== null && value !== void 0 ? value : '';
       return Object.keys(value).sort().reduce(function (result, key) {
-        result[key] = _this6.normalizeFingerprintValue(value[key]);
+        result[key] = _this7.normalizeFingerprintValue(value[key]);
         return result;
       }, {});
     }
@@ -1636,7 +1656,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _sku$barcode,
         _ref18,
         _sku$variant_id,
-        _this7 = this;
+        _this8 = this;
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
       var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
       var discountTypes = ((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
@@ -1670,7 +1690,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               option_group_id: (_option$option_group_ = option === null || option === void 0 ? void 0 : option.option_group_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : null,
               option_group_item_id: (_ref20 = (_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 && _ref20 !== void 0 ? _ref20 : 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: _this7.normalizeFingerprintMoney((_option$add_price = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price !== void 0 ? _option$add_price : option === null || option === void 0 ? void 0 : option.price)
+              add_price: _this8.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)
             };
           })
         }),
@@ -1680,8 +1700,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             bundle_product_id: (_ref21 = (_ref22 = (_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 && _ref22 !== void 0 ? _ref22 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref21 !== void 0 ? _ref21 : null,
             bundle_variant_id: (_ref23 = (_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 && _ref23 !== void 0 ? _ref23 : 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: _this7.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.price),
-            bundle_selling_price: _this7.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price),
+            price: _this8.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.price),
+            bundle_selling_price: _this8.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price),
             price_type: (_bundle$price_type = bundle === null || bundle === void 0 ? void 0 : bundle.price_type) !== null && _bundle$price_type !== void 0 ? _bundle$price_type : '',
             price_type_ext: (_bundle$price_type_ex = bundle === null || bundle === void 0 ? void 0 : bundle.price_type_ext) !== null && _bundle$price_type_ex !== void 0 ? _bundle$price_type_ex : ''
           };
@@ -1691,7 +1711,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           return {
             type: (_ref24 = (_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 && _ref24 !== void 0 ? _ref24 : '',
             discount_id: (_ref25 = (_ref26 = (_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 && _ref26 !== void 0 ? _ref26 : discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) !== null && _ref25 !== void 0 ? _ref25 : null,
-            amount: _this7.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
+            amount: _this8.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
           };
         }))
       };
@@ -1699,9 +1719,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildOrderProductsFingerprint",
     value: function buildOrderProductsFingerprint(products) {
-      var _this8 = this;
+      var _this9 = this;
       var items = (products || []).map(function (product) {
-        return _this8.buildProductFingerprintItem(product);
+        return _this9.buildProductFingerprintItem(product);
       });
       items.sort(function (left, right) {
         return JSON.stringify(left).localeCompare(JSON.stringify(right));
@@ -1723,7 +1743,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _sku$barcode2,
         _ref28,
         _sku$variant_id2,
-        _this9 = this;
+        _this10 = this;
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
       var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
       var discountTypes = ((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
@@ -1754,7 +1774,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               option_group_id: (_option$option_group_3 = option === null || option === void 0 ? void 0 : option.option_group_id) !== null && _option$option_group_3 !== void 0 ? _option$option_group_3 : null,
               option_group_item_id: (_ref30 = (_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 && _ref30 !== void 0 ? _ref30 : 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: _this9.normalizeFingerprintMoney((_option$add_price2 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price2 !== void 0 ? _option$add_price2 : option === null || option === void 0 ? void 0 : option.price)
+              add_price: _this10.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)
             };
           })
         }),
@@ -1768,14 +1788,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             num: getSafeProductNum((_bundle$num2 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num2 !== void 0 ? _bundle$num2 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity),
             price_type: (_bundle$price_type2 = bundle === null || bundle === void 0 ? void 0 : bundle.price_type) !== null && _bundle$price_type2 !== void 0 ? _bundle$price_type2 : '',
             price_type_ext: (_bundle$price_type_ex2 = bundle === null || bundle === void 0 ? void 0 : bundle.price_type_ext) !== null && _bundle$price_type_ex2 !== void 0 ? _bundle$price_type_ex2 : '',
-            option: _this9.normalizeFingerprintValue(((bundle === null || bundle === void 0 ? void 0 : bundle.option) || []).map(function (option) {
+            option: _this10.normalizeFingerprintValue(((bundle === null || bundle === void 0 ? void 0 : bundle.option) || []).map(function (option) {
               var _ref36, _option$id3, _option$option_group_5, _ref37, _option$option_group_6, _option$num3, _option$add_price3;
               return {
                 id: (_ref36 = (_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 && _ref36 !== void 0 ? _ref36 : 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: (_ref37 = (_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 && _ref37 !== void 0 ? _ref37 : 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: _this9.normalizeFingerprintMoney((_option$add_price3 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price3 !== void 0 ? _option$add_price3 : option === null || option === void 0 ? void 0 : option.price)
+                add_price: _this10.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)
               };
             }))
           };
@@ -1785,7 +1805,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           return {
             type: (_ref38 = (_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 && _ref38 !== void 0 ? _ref38 : '',
             discount_id: (_ref39 = (_ref40 = (_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 && _ref40 !== void 0 ? _ref40 : discount === null || discount === void 0 || (_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) !== null && _ref39 !== void 0 ? _ref39 : null,
-            amount: _this9.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
+            amount: _this10.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
           };
         }))
       };
@@ -1793,9 +1813,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildOrderProductsStructuralFingerprint",
     value: function buildOrderProductsStructuralFingerprint(products) {
-      var _this10 = this;
+      var _this11 = this;
       var items = (products || []).map(function (product) {
-        return _this10.buildProductStructuralFingerprintItem(product);
+        return _this11.buildProductStructuralFingerprintItem(product);
       });
       items.sort(function (left, right) {
         return JSON.stringify(left).localeCompare(JSON.stringify(right));
@@ -2200,9 +2220,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sanitizeTempOrderProducts",
     value: function sanitizeTempOrderProducts(tempOrder) {
-      var _this11 = this;
+      var _this12 = this;
       tempOrder.products = (tempOrder.products || []).map(function (product) {
-        return _this11.sanitizeOrderProductForTempOrder(product);
+        return _this12.sanitizeOrderProductForTempOrder(product);
       });
     }
   }, {
@@ -2415,9 +2435,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "findBookingIndexByUniqueIdentificationNumber",
     value: function findBookingIndexByUniqueIdentificationNumber(tempOrder, uniqueIdentificationNumber) {
-      var _this12 = this;
+      var _this13 = this;
       return (tempOrder.bookings || []).findIndex(function (booking) {
-        return _this12.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
+        return _this13.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
       });
     }
   }, {
@@ -2425,12 +2445,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function removeLinkedBookingsForProduct(tempOrder, product) {
       var _product$metadata5,
         _product$metadata6,
-        _this13 = this;
+        _this14 = this;
       var productUid = (product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
       var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.booking_uid);
       if (!productUid && !bookingUid) return;
       tempOrder.bookings = (tempOrder.bookings || []).filter(function (booking) {
-        var currentBookingUid = _this13.getBookingUniqueIdentificationNumber(booking);
+        var currentBookingUid = _this14.getBookingUniqueIdentificationNumber(booking);
         if (bookingUid && currentBookingUid === String(bookingUid)) return false;
         if (productUid && String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === String(productUid)) return false;
         return true;
@@ -2749,18 +2769,49 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var type = (_discount$type5 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type5 !== void 0 ? _discount$type5 : discount === null || discount === void 0 ? void 0 : discount.tag;
       return type === 'good_pass' || type === 'discount_card' || type === 'product_discount_card';
     }
+  }, {
+    key: "productHasCustomerBoundDiscount",
+    value: function productHasCustomerBoundDiscount(product) {
+      var _this15 = this;
+      if (((product === null || product === void 0 ? void 0 : product.discount_list) || []).some(function (discount) {
+        return _this15.isCustomerBoundDiscount(discount);
+      })) {
+        return true;
+      }
+      return ((product === null || product === void 0 ? void 0 : product.product_bundle) || []).some(function (bundle) {
+        return ((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []).some(function (discount) {
+          return _this15.isCustomerBoundDiscount(discount);
+        });
+      });
+    }
+  }, {
+    key: "shouldSkipDiscountCalculation",
+    value: function shouldSkipDiscountCalculation(tempOrder) {
+      var _this$store$discount13,
+        _this$store$discount14,
+        _this16 = this;
+      if (this.hasActiveCustomerBoundDiscount) return false;
+      var discountList = ((_this$store$discount13 = this.store.discount) === null || _this$store$discount13 === void 0 || (_this$store$discount14 = _this$store$discount13.getDiscountList) === null || _this$store$discount14 === void 0 ? void 0 : _this$store$discount14.call(_this$store$discount13)) || [];
+      if (discountList.length > 0) return false;
+      return !(tempOrder.products || []).some(function (product) {
+        return _this16.productHasCustomerBoundDiscount(product);
+      });
+    }
   }, {
     key: "clearCustomerBoundDiscounts",
     value: function clearCustomerBoundDiscounts(tempOrder) {
-      var _this14 = this,
+      var _this17 = this,
         _discountModule$getDi,
         _discountModule$getOr,
         _discountModule$setDi,
         _discountModule$setOr;
+      var didRemoveCustomerBoundDiscount = false;
       var filterDiscountList = function filterDiscountList(discountList) {
         if (!Array.isArray(discountList)) return [];
         return discountList.filter(function (discount) {
-          return !_this14.isCustomerBoundDiscount(discount);
+          var shouldRemove = _this17.isCustomerBoundDiscount(discount);
+          if (shouldRemove) didRemoveCustomerBoundDiscount = true;
+          return !shouldRemove;
         });
       };
       tempOrder.products = (tempOrder.products || []).map(function (product) {
@@ -2777,17 +2828,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         return nextProduct;
       });
       delete tempOrder.discount_list;
+      if (didRemoveCustomerBoundDiscount) {
+        this.hasActiveCustomerBoundDiscount = true;
+      }
       var discountModule = this.store.discount;
       if (!discountModule) return;
       var currentDiscounts = ((_discountModule$getDi = discountModule.getDiscountList) === null || _discountModule$getDi === void 0 ? void 0 : _discountModule$getDi.call(discountModule)) || [];
       var currentOriginalDiscounts = ((_discountModule$getOr = discountModule.getOriginalDiscountList) === null || _discountModule$getOr === void 0 ? void 0 : _discountModule$getOr.call(discountModule)) || [];
       var nextDiscounts = currentDiscounts.filter(function (discount) {
         if (discount !== null && discount !== void 0 && discount.isEditMode) return true;
-        return !_this14.isCustomerBoundDiscount(discount);
+        return !_this17.isCustomerBoundDiscount(discount);
       });
       var nextOriginalDiscounts = currentOriginalDiscounts.filter(function (discount) {
         if (discount !== null && discount !== void 0 && discount.isEditMode) return true;
-        return !_this14.isCustomerBoundDiscount(discount);
+        return !_this17.isCustomerBoundDiscount(discount);
       });
       void ((_discountModule$setDi = discountModule.setDiscountList) === null || _discountModule$setDi === void 0 ? void 0 : _discountModule$setDi.call(discountModule, nextDiscounts));
       void ((_discountModule$setOr = discountModule.setOriginalDiscountList) === null || _discountModule$setOr === void 0 ? void 0 : _discountModule$setOr.call(discountModule, nextOriginalDiscounts));
@@ -2954,7 +3008,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addOrderPayment",
     value: function addOrderPayment(payment) {
-      var _this15 = this;
+      var _this18 = this;
       this.logInfo('addOrderPayment', {
         payment: payment
       });
@@ -2971,7 +3025,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this15.logError('recalculate summary after addOrderPayment failed', {
+        _this18.logError('recalculate summary after addOrderPayment failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -3036,7 +3090,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateVoucherOrderPayments",
     value: function updateVoucherOrderPayments(payments) {
-      var _this16 = this;
+      var _this19 = this;
       var tempOrder = this.ensureTempOrder();
       var isVoucherPayment = function isVoucherPayment(payment) {
         return payment.voucher_id !== undefined && Number(payment.voucher_id) !== 0;
@@ -3057,7 +3111,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       //   return paymentRecord
       // };
       var mappedVouchers = mapPaymentItemsToOrderPayments(payments.map(function (payment) {
-        return _this16.normalizePaymentSource(payment, {
+        return _this19.normalizePaymentSource(payment, {
           defaultPaid: true
         });
       })).filter(function (payment) {
@@ -3086,7 +3140,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this16.logError('recalculate summary after updateVoucherOrderPayments failed', {
+        _this19.logError('recalculate summary after updateVoucherOrderPayments failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -3222,7 +3276,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _appendProductLineToTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(tempOrder, product, booking) {
         var _booking_uid,
           _metadata,
-          _this17 = this;
+          _this20 = this;
         var linked, productToAdd, incomingFingerprint, normalizedIncoming, incomingBookingUid, hasIncomingGoodPass, hasIncomingProductNote, hasIncomingBookingUid, shouldForceNewLine, matchedIndex, matchedProduct, existedFingerprint, shouldMerge, _targetProduct$metada, targetProduct, targetUid, normalizedProduct, nextNum, targetIsManualProductDiscount, nextDiscountList;
         return _regeneratorRuntime().wrap(function _callee16$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
@@ -3247,8 +3301,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
               shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid;
               matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
-                if (_this17.hasGoodPassDiscount(item)) return false;
-                if (_this17.hasOrderProductLineNote(item)) return false;
+                if (_this20.hasGoodPassDiscount(item)) return false;
+                if (_this20.hasOrderProductLineNote(item)) return false;
                 if (item.order_detail_id !== undefined && item.order_detail_id !== null) return false;
                 if (item.product_id !== productToAdd.product_id) return false;
                 if (item.product_variant_id !== productToAdd.product_variant_id) return false;
@@ -3538,17 +3592,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "preservePersistedBundlePriceFields",
     value: function preservePersistedBundlePriceFields(previousBundles, nextBundles) {
-      var _this18 = this;
+      var _this21 = 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 = _this18.getBundleRuntimeIdentity(bundle);
+        var identity = _this21.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(_this18.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
+        var previous = previousByIdentity.get(_this21.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
         if (!previous || _typeof(previous) !== 'object') return bundle;
         return _objectSpread(_objectSpread({}, bundle), {}, {
           price: previous.price,
@@ -3864,7 +3918,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "removeProductsFromOrder",
     value: (function () {
       var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(identities) {
-        var _this19 = this;
+        var _this22 = this;
         var tempOrder, productsBeforeRemove, bookingsBeforeRemove, matchedProducts, removedProducts, _i2, _removedProducts, product, linkedBookingUidsToRemove, _iterator21, _step21, _loop3;
         return _regeneratorRuntime().wrap(function _callee22$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
@@ -3919,7 +3973,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }
                       if (productUid !== undefined && productUid !== null && productUid !== '') {
                         bookingsBeforeRemove.forEach(function (booking) {
-                          var bookingUid = _this19.getBookingUniqueIdentificationNumber(booking);
+                          var bookingUid = _this22.getBookingUniqueIdentificationNumber(booking);
                           if (bookingUid && String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === String(productUid)) {
                             linkedBookingUidsToRemove.add(bookingUid);
                           }
@@ -4375,10 +4429,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function extractSubmitErrorResponse(error) {
       var _error$response,
         _error$response2,
-        _this20 = this;
+        _this23 = 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 _this20.isSubmitErrorResponse(candidate);
+        return _this23.isSubmitErrorResponse(candidate);
       }) || null;
     }
   }, {
@@ -4944,8 +4998,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "hydrateTempOrderFromRecord",
     value: (function () {
       var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(record, options) {
-        var _this$store$discount13;
-        var raw, nextTempOrder, rawSummary, summarySurcharges, hydratedEditDiscounts, currentDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount14, _this$store$discount15;
+        var _this$store$discount15;
+        var raw, nextTempOrder, rawSummary, summarySurcharges, hydratedEditDiscounts, currentDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount16, _this$store$discount17;
         return _regeneratorRuntime().wrap(function _callee38$(_context41) {
           while (1) switch (_context41.prev = _context41.next) {
             case 0:
@@ -4970,17 +5024,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               this.store.lastOrderInfo = raw.lastOrderInfo || raw;
               hydratedEditDiscounts = this.collectHydratedEditDiscounts(nextTempOrder.products);
-              currentDiscounts = typeof ((_this$store$discount13 = this.store.discount) === null || _this$store$discount13 === void 0 ? void 0 : _this$store$discount13.getDiscountList) === 'function' ? this.store.discount.getDiscountList() || [] : [];
+              currentDiscounts = typeof ((_this$store$discount15 = this.store.discount) === null || _this$store$discount15 === void 0 ? void 0 : _this$store$discount15.getDiscountList) === 'function' ? this.store.discount.getDiscountList() || [] : [];
               shouldSkipEmptyDiscountSync = hydratedEditDiscounts.length === 0 && currentDiscounts.length === 0;
               if (shouldSkipEmptyDiscountSync) {
                 _context41.next = 16;
                 break;
               }
               _context41.next = 14;
-              return (_this$store$discount14 = this.store.discount) === null || _this$store$discount14 === void 0 ? void 0 : _this$store$discount14.setOriginalDiscountList(hydratedEditDiscounts);
+              return (_this$store$discount16 = this.store.discount) === null || _this$store$discount16 === void 0 ? void 0 : _this$store$discount16.setOriginalDiscountList(hydratedEditDiscounts);
             case 14:
               _context41.next = 16;
-              return (_this$store$discount15 = this.store.discount) === null || _this$store$discount15 === void 0 ? void 0 : _this$store$discount15.setDiscountList(hydratedEditDiscounts);
+              return (_this$store$discount17 = this.store.discount) === null || _this$store$discount17 === void 0 ? void 0 : _this$store$discount17.setDiscountList(hydratedEditDiscounts);
             case 16:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
                 _context41.next = 19;
@@ -5007,7 +5061,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeTempOrderForRuntime",
     value: function normalizeTempOrderForRuntime(raw, options) {
-      var _this21 = this;
+      var _this24 = this;
       var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), raw || {});
       delete nextTempOrder.summary;
       delete nextTempOrder.lastOrderInfo;
@@ -5026,7 +5080,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       nextTempOrder.holder = raw.holder && _typeof(raw.holder) === 'object' ? _objectSpread({}, raw.holder) : null;
       var rawProducts = Array.isArray(raw.products) ? raw.products : [];
       nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map(function (p) {
-        return _this21.normalizeHydratedOrderProduct(p);
+        return _this24.normalizeHydratedOrderProduct(p);
       }) : [];
       nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map(function (b) {
         return _objectSpread(_objectSpread({}, b || {}), {}, {
@@ -5087,12 +5141,54 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _iterator22.f();
       }
       tempOrderExtend.productsByUid = productsByUid;
+      this.hydrateLinkedBookingIdentity(nextTempOrder);
       if ((options === null || options === void 0 ? void 0 : options.ensureIdentity) !== false) {
         this.ensureExternalSaleNumber(nextTempOrder);
       }
       nextTempOrder.vouchers = raw.vouchers || [];
       return nextTempOrder;
     }
+  }, {
+    key: "hydrateLinkedBookingIdentity",
+    value: function hydrateLinkedBookingIdentity(tempOrder) {
+      var bookingUidByProductUid = new Map();
+      var productByUid = new Map();
+      (tempOrder.products || []).forEach(function (product) {
+        var _product$metadata9;
+        var productUid = (product === null || product === void 0 || (_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+        if (productUid !== undefined && productUid !== null && String(productUid) !== '') {
+          productByUid.set(String(productUid), product);
+        }
+      });
+      (tempOrder.bookings || []).forEach(function (booking) {
+        var _matchedProduct$metad;
+        if (!booking || _typeof(booking) !== 'object') return;
+        if (!booking.metadata || _typeof(booking.metadata) !== 'object') {
+          booking.metadata = {};
+        }
+        var productUid = booking.product_uid || booking.metadata.product_uid;
+        if (productUid === undefined || productUid === null || String(productUid) === '') return;
+        var matchedProduct = productByUid.get(String(productUid));
+        var existedProductBookingUid = (matchedProduct === null || matchedProduct === void 0 ? void 0 : matchedProduct.booking_uid) || (matchedProduct === null || matchedProduct === void 0 || (_matchedProduct$metad = matchedProduct.metadata) === null || _matchedProduct$metad === void 0 ? void 0 : _matchedProduct$metad.booking_uid);
+        // 客户端订单详情可能缺少 booking 自身 uid，这里补齐后才能反写到商品行。
+        var bookingUid = String(booking.metadata.unique_identification_number || existedProductBookingUid || createUuidV4());
+        booking.metadata.unique_identification_number = bookingUid;
+        bookingUidByProductUid.set(String(productUid), bookingUid);
+      });
+      (tempOrder.products || []).forEach(function (product) {
+        var _product$metadata10;
+        var productUid = (product === null || product === void 0 || (_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+        if (productUid === undefined || productUid === null || String(productUid) === '') return;
+        var bookingUid = bookingUidByProductUid.get(String(productUid));
+        if (!bookingUid) return;
+        if (!product.metadata || _typeof(product.metadata) !== 'object') {
+          product.metadata = {};
+        }
+        var linkedBookingUid = String(product.booking_uid || product.metadata.booking_uid || bookingUid);
+        product.booking_uid = linkedBookingUid;
+        product.metadata.booking_uid = linkedBookingUid;
+      });
+    }
   }, {
     key: "pickHydratedDisplayText",
     value: function pickHydratedDisplayText(value) {
@@ -5154,7 +5250,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedOrderProduct",
     value: function normalizeHydratedOrderProduct(product) {
-      var _this22 = this;
+      var _this25 = this;
       var row = _objectSpread({}, product || {});
       if (row.num === undefined && row.product_quantity !== undefined) {
         row.num = row.product_quantity;
@@ -5162,7 +5258,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 _this22.normalizeHydratedProductOptionItem(optionItem || {});
+          return _this25.normalizeHydratedProductOptionItem(optionItem || {});
         }))
       });
       delete row["product_".concat('option', "_item")];
@@ -5220,13 +5316,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "populateSavedAmounts",
     value: function populateSavedAmounts(productList, discountList) {
       var savedMap = new Map();
-      var addDiscountAmount = function addDiscountAmount(discount, quantity) {
+      var editModeSavedMap = new Map();
+      var runtimeSavedMap = new Map();
+      var editModeDiscountKeys = new Set((discountList || []).filter(function (discount) {
+        return discount === null || discount === void 0 ? void 0 : discount.isEditMode;
+      }).map(function (discount) {
+        return discount === null || discount === void 0 ? void 0 : discount.id;
+      }).filter(function (id) {
+        return id !== undefined && id !== null;
+      }));
+      var addDiscountAmount = function addDiscountAmount(targetMap, discountKey, amount) {
+        targetMap.set(discountKey, (targetMap.get(discountKey) || new Decimal(0)).plus(amount));
+      };
+      var addProductDiscountAmount = function addProductDiscountAmount(discount, quantity, isPersistedProduct) {
         var _discount$discount3, _discount$metadata;
         var discountKey = ((_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.resource_id) || discount.id;
         if (discountKey == null) return;
         var qty = Number(quantity) || 1;
         var amount = new Decimal(discount.amount || 0).times(qty).plus(((_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.product_discount_difference) || 0);
-        savedMap.set(discountKey, (savedMap.get(discountKey) || new Decimal(0)).plus(amount));
+        addDiscountAmount(savedMap, discountKey, amount);
+        addDiscountAmount(isPersistedProduct || discount.order_discount_id != null ? editModeSavedMap : runtimeSavedMap, discountKey, amount);
       };
       var _iterator24 = _createForOfIteratorHelper(productList),
         _step24;
@@ -5234,12 +5343,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
           var product = _step24.value;
           var qty = product.num || 1;
+          var isPersistedProduct = Boolean(product.order_detail_id || product.orderDetailId || product.booking_id);
           var _iterator26 = _createForOfIteratorHelper(product.discount_list || []),
             _step26;
           try {
             for (_iterator26.s(); !(_step26 = _iterator26.n()).done;) {
               var pd = _step26.value;
-              addDiscountAmount(pd, qty);
+              addProductDiscountAmount(pd, qty, isPersistedProduct);
             }
           } catch (err) {
             _iterator26.e(err);
@@ -5252,13 +5362,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             for (_iterator27.s(); !(_step27 = _iterator27.n()).done;) {
               var _ref75, _bundle$num3;
               var bundle = _step27.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((_ref75 = (_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 && _ref75 !== void 0 ? _ref75 : 1) || 1).toNumber();
               var _iterator28 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
                 _step28;
               try {
                 for (_iterator28.s(); !(_step28 = _iterator28.n()).done;) {
                   var _pd = _step28.value;
-                  addDiscountAmount(_pd, bundleQty);
+                  addProductDiscountAmount(_pd, bundleQty, isPersistedBundleProduct);
                 }
               } catch (err) {
                 _iterator28.e(err);
@@ -5283,7 +5394,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         for (_iterator25.s(); !(_step25 = _iterator25.n()).done;) {
           var d = _step25.value;
           var key = d.id;
-          d.savedAmount = d.isSelected && key != null && savedMap.has(key) ? savedMap.get(key).toNumber() : 0;
+          var sourceMap = d.isEditMode ? editModeSavedMap : editModeDiscountKeys.has(key) ? runtimeSavedMap : savedMap;
+          d.savedAmount = d.isSelected && key != null && sourceMap.has(key) ? sourceMap.get(key).toNumber() : 0;
         }
       } catch (err) {
         _iterator25.e(err);