@pisell/pisellos 2.3.23 → 2.3.25

package/dist/modules/Order/index.js

@@ -560,33 +560,71 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return ((_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 ? void 0 : _this$store$discount5.getDiscountList()) || [];
     }
   }, {
-    key: "ensureEditDiscountConfigForProductChange",
+    key: "syncScannedDiscountsToOriginalDiscountList",
     value: function () {
-      var _ensureEditDiscountConfigForProductChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(tempOrder) {
-        var _tempOrder$customer, _tempOrder$_extend, _tempOrder$_extend2, _this$store$discount6;
-        var orderId, customerId, currentDiscountList, hasRuntimeDiscounts;
+      var _syncScannedDiscountsToOriginalDiscountList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(discountList) {
+        var _this$store$discount6, _this$store$discount7, _this$store$discount8, _this$store$discount9;
+        var scanDiscounts, scanDiscountIds, originalDiscounts, nextOriginalDiscounts;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              scanDiscounts = (discountList || []).filter(function (discount) {
+                return discount === null || discount === void 0 ? void 0 : discount.isScan;
+              });
+              if (scanDiscounts.length) {
+                _context4.next = 3;
+                break;
+              }
+              return _context4.abrupt("return");
+            case 3:
+              scanDiscountIds = new Set(scanDiscounts.map(function (discount) {
+                return discount === null || discount === void 0 ? void 0 : discount.id;
+              }));
+              originalDiscounts = ((_this$store$discount6 = this.store.discount) === null || _this$store$discount6 === void 0 || (_this$store$discount7 = _this$store$discount6.getOriginalDiscountList) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.call(_this$store$discount6)) || [];
+              nextOriginalDiscounts = [].concat(_toConsumableArray(scanDiscounts), _toConsumableArray(originalDiscounts.filter(function (discount) {
+                return !scanDiscountIds.has(discount === null || discount === void 0 ? void 0 : discount.id);
+              })));
+              _context4.next = 8;
+              return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 || (_this$store$discount9 = _this$store$discount8.setOriginalDiscountList) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.call(_this$store$discount8, nextOriginalDiscounts);
+            case 8:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this);
+      }));
+      function syncScannedDiscountsToOriginalDiscountList(_x4) {
+        return _syncScannedDiscountsToOriginalDiscountList.apply(this, arguments);
+      }
+      return syncScannedDiscountsToOriginalDiscountList;
+    }()
+  }, {
+    key: "ensureEditDiscountConfigForProductChange",
+    value: function () {
+      var _ensureEditDiscountConfigForProductChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(tempOrder) {
+        var _tempOrder$customer, _tempOrder$_extend, _tempOrder$_extend2, _this$store$discount10;
+        var orderId, customerId, currentDiscountList, hasRuntimeDiscounts;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               orderId = tempOrder.order_id;
               customerId = Number(tempOrder.customer_id || ((_tempOrder$customer = tempOrder.customer) === null || _tempOrder$customer === void 0 ? void 0 : _tempOrder$customer.id) || ((_tempOrder$_extend = tempOrder._extend) === null || _tempOrder$_extend === void 0 || (_tempOrder$_extend = _tempOrder$_extend.customerSnapshot) === null || _tempOrder$_extend === void 0 ? void 0 : _tempOrder$_extend.id) || ((_tempOrder$_extend2 = tempOrder._extend) === null || _tempOrder$_extend2 === void 0 || (_tempOrder$_extend2 = _tempOrder$_extend2.customerSnapshot) === null || _tempOrder$_extend2 === void 0 ? void 0 : _tempOrder$_extend2.customer_id) || 0);
               if (!(!orderId || !customerId || customerId === 1)) {
-                _context4.next = 4;
+                _context5.next = 4;
                 break;
               }
-              return _context4.abrupt("return");
+              return _context5.abrupt("return");
             case 4:
-              currentDiscountList = ((_this$store$discount6 = this.store.discount) === null || _this$store$discount6 === void 0 ? void 0 : _this$store$discount6.getDiscountList()) || [];
+              currentDiscountList = ((_this$store$discount10 = this.store.discount) === null || _this$store$discount10 === void 0 ? void 0 : _this$store$discount10.getDiscountList()) || [];
               hasRuntimeDiscounts = currentDiscountList.some(function (discount) {
                 return !(discount !== null && discount !== void 0 && discount.isEditMode);
               });
               if (!hasRuntimeDiscounts) {
-                _context4.next = 8;
+                _context5.next = 8;
                 break;
               }
-              return _context4.abrupt("return");
+              return _context5.abrupt("return");
             case 8:
-              _context4.next = 10;
+              _context5.next = 10;
               return this.loadDiscountConfig({
                 customerId: customerId,
                 action: 'edit',
@@ -595,11 +633,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 10:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
-      function ensureEditDiscountConfigForProductChange(_x4) {
+      function ensureEditDiscountConfigForProductChange(_x5) {
         return _ensureEditDiscountConfigForProductChange.apply(this, arguments);
       }
       return ensureEditDiscountConfigForProductChange;
@@ -607,35 +645,35 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "scanCode",
     value: function () {
-      var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, customerId) {
-        var _this$store$discount7, _tempOrder$holder, _this$store$summary;
-        var resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelected, tempOrder, holders, _ref13, isAvailable, newDiscountList, unavailableReason, _this$store$discount8;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      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, unavailableReason, _this$store$discount12;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              _context5.next = 2;
-              return (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.batchSearch(code, {
+              _context6.next = 2;
+              return (_this$store$discount11 = this.store.discount) === null || _this$store$discount11 === void 0 ? void 0 : _this$store$discount11.batchSearch(code, {
                 customerId: customerId
               });
             case 2:
-              _context5.t0 = _context5.sent;
-              if (_context5.t0) {
-                _context5.next = 5;
+              _context6.t0 = _context6.sent;
+              if (_context6.t0) {
+                _context6.next = 5;
                 break;
               }
-              _context5.t0 = {
+              _context6.t0 = {
                 discountList: [],
                 unavailableReasonKey: null
               };
             case 5:
-              resultDiscountWithReason = _context5.t0;
+              resultDiscountWithReason = _context6.t0;
               resultDiscountList = resultDiscountWithReason.discountList, unavailableReasonKey = resultDiscountWithReason.unavailableReasonKey;
               rulesModule = this.store.rules;
               if (rulesModule) {
-                _context5.next = 10;
+                _context6.next = 10;
                 break;
               }
-              return _context5.abrupt("return", {
+              return _context6.abrupt("return", {
                 type: 'clientCalc',
                 isAvailable: false,
                 discountList: this.getDiscountList(),
@@ -644,10 +682,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 10:
               if (resultDiscountList.length) {
-                _context5.next = 12;
+                _context6.next = 12;
                 break;
               }
-              return _context5.abrupt("return", {
+              return _context6.abrupt("return", {
                 type: 'server',
                 isAvailable: false,
                 discountList: this.getDiscountList(),
@@ -668,16 +706,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   return m.id === n.id;
                 });
               }))) {
-                _context5.next = 16;
+                _context6.next = 18;
                 break;
               }
-              return _context5.abrupt("return", {
+              _context6.next = 17;
+              return this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
+            case 17:
+              return _context6.abrupt("return", {
                 type: 'clientCalc',
                 isAvailable: true,
                 discountList: this.getDiscountList(),
                 scannedDiscountList: resultDiscountList
               });
-            case 16:
+            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({
@@ -693,24 +734,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 isAvailable: false,
                 discountList: this.getDiscountList()
               }, isAvailable = _ref13.isAvailable, newDiscountList = _ref13.discountList, unavailableReason = _ref13.unavailableReason;
-              if (isAvailable && newDiscountList) {
-                (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 || _this$store$discount8.setDiscountList(newDiscountList);
-                this.applyDiscount();
+              if (!(isAvailable && newDiscountList)) {
+                _context6.next = 26;
+                break;
               }
-              return _context5.abrupt("return", {
+              (_this$store$discount12 = this.store.discount) === null || _this$store$discount12 === void 0 || _this$store$discount12.setDiscountList(newDiscountList);
+              this.applyDiscount();
+              _context6.next = 26;
+              return this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
+            case 26:
+              return _context6.abrupt("return", {
                 type: 'clientCalc',
                 isAvailable: isAvailable || false,
                 discountList: newDiscountList || this.getDiscountList(),
                 scannedDiscountList: resultDiscountList,
                 unavailableReason: unavailableReason
               });
-            case 21:
+            case 27:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, this);
+        }, _callee6, this);
       }));
-      function scanCode(_x5, _x6) {
+      function scanCode(_x6, _x7) {
         return _scanCode.apply(this, arguments);
       }
       return scanCode;
@@ -718,7 +764,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyDiscount",
     value: function applyDiscount(options) {
-      var _this$store$discount9,
+      var _this$store$discount13,
         _this$store$summary2,
         _this2 = this;
       var tempOrder = this.store.tempOrder;
@@ -728,7 +774,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (!tempOrder) return;
       this.syncLinkedBookingHoldersToProducts(tempOrder);
       delete tempOrder.discount_list;
-      var discountList = ((_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.getDiscountList()) || [];
+      var discountList = ((_this$store$discount13 = this.store.discount) === null || _this$store$discount13 === void 0 ? void 0 : _this$store$discount13.getDiscountList()) || [];
       var shouldSkipDiscountCalculation = this.shouldSkipDiscountCalculation(tempOrder);
       if (shouldSkipDiscountCalculation) return;
       var rulesModule = this.store.rules;
@@ -760,9 +806,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         }));
       }
       if (result !== null && result !== void 0 && result.discountList) {
-        var _this$store$discount10;
+        var _this$store$discount14;
         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$store$discount14 = this.store.discount) === null || _this$store$discount14 === void 0 || _this$store$discount14.setDiscountList(result.discountList);
       }
       this.hasActiveCustomerBoundDiscount = (tempOrder.products || []).some(function (product) {
         return _this2.productHasCustomerBoundDiscount(product);
@@ -824,42 +870,42 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyPromotion",
     value: (function () {
-      var _applyPromotion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+      var _applyPromotion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
         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) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               if (!this.isApplyingPromotion) {
-                _context8.next = 2;
+                _context9.next = 2;
                 break;
               }
-              return _context8.abrupt("return");
+              return _context9.abrupt("return");
             case 2:
               if (this.promotionEvaluator) {
-                _context8.next = 4;
+                _context9.next = 4;
                 break;
               }
-              return _context8.abrupt("return");
+              return _context9.abrupt("return");
             case 4:
               tempOrder = this.store.tempOrder;
               if (tempOrder) {
-                _context8.next = 7;
+                _context9.next = 7;
                 break;
               }
-              return _context8.abrupt("return");
+              return _context9.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;
+                _context9.next = 10;
                 break;
               }
-              return _context8.abrupt("return");
+              return _context9.abrupt("return");
             case 10:
               this.isApplyingPromotion = true;
-              _context8.prev = 11;
+              _context9.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));
@@ -871,20 +917,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
 
               // step 2: toReduce —— 调整数量
               _iterator3 = _createForOfIteratorHelper(result.giftActions.toReduce);
-              _context8.prev = 15;
+              _context9.prev = 15;
               _iterator3.s();
             case 17:
               if ((_step3 = _iterator3.n()).done) {
-                _context8.next = 37;
+                _context9.next = 37;
                 break;
               }
               reduce = _step3.value;
               _iterator6 = _createForOfIteratorHelper(reduce.items);
-              _context8.prev = 20;
+              _context9.prev = 20;
               _loop2 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop2() {
                 var item, product;
-                return _regeneratorRuntime().wrap(function _loop2$(_context7) {
-                  while (1) switch (_context7.prev = _context7.next) {
+                return _regeneratorRuntime().wrap(function _loop2$(_context8) {
+                  while (1) switch (_context8.prev = _context8.next) {
                     case 0:
                       item = _step6.value;
                       product = result.products.find(function (p) {
@@ -895,52 +941,52 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }
                     case 3:
                     case "end":
-                      return _context7.stop();
+                      return _context8.stop();
                   }
                 }, _loop2);
               });
               _iterator6.s();
             case 23:
               if ((_step6 = _iterator6.n()).done) {
-                _context8.next = 27;
+                _context9.next = 27;
                 break;
               }
-              return _context8.delegateYield(_loop2(), "t0", 25);
+              return _context9.delegateYield(_loop2(), "t0", 25);
             case 25:
-              _context8.next = 23;
+              _context9.next = 23;
               break;
             case 27:
-              _context8.next = 32;
+              _context9.next = 32;
               break;
             case 29:
-              _context8.prev = 29;
-              _context8.t1 = _context8["catch"](20);
-              _iterator6.e(_context8.t1);
+              _context9.prev = 29;
+              _context9.t1 = _context9["catch"](20);
+              _iterator6.e(_context9.t1);
             case 32:
-              _context8.prev = 32;
+              _context9.prev = 32;
               _iterator6.f();
-              return _context8.finish(32);
+              return _context9.finish(32);
             case 35:
-              _context8.next = 17;
+              _context9.next = 17;
               break;
             case 37:
-              _context8.next = 42;
+              _context9.next = 42;
               break;
             case 39:
-              _context8.prev = 39;
-              _context8.t2 = _context8["catch"](15);
-              _iterator3.e(_context8.t2);
+              _context9.prev = 39;
+              _context9.t2 = _context9["catch"](15);
+              _iterator3.e(_context9.t2);
             case 42:
-              _context8.prev = 42;
+              _context9.prev = 42;
               _iterator3.f();
-              return _context8.finish(42);
+              return _context9.finish(42);
             case 45:
               if (!(result.giftActions.toAdd.length > 0)) {
-                _context8.next = 68;
+                _context9.next = 68;
                 break;
               }
               if (this.giftSelectResolver) {
-                _context8.next = 50;
+                _context9.next = 50;
                 break;
               }
               if (result.giftActions.toAdd.some(function (g) {
@@ -951,19 +997,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               } else {
                 console.warn('[OrderModule] giftSelectResolver not set, skip applying single-option gifts', result.giftActions.toAdd);
               }
-              _context8.next = 68;
+              _context9.next = 68;
               break;
             case 50:
               _iterator4 = _createForOfIteratorHelper(result.giftActions.toAdd);
-              _context8.prev = 51;
+              _context9.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) {
-                  while (1) switch (_context6.prev = _context6.next) {
+                return _regeneratorRuntime().wrap(function _loop$(_context7) {
+                  while (1) switch (_context7.prev = _context7.next) {
                     case 0:
                       addAction = _step4.value;
                       if (!(addAction.giftOptions.length === 1)) {
-                        _context6.next = 6;
+                        _context7.next = 6;
                         break;
                       }
                       sameStrategy = result.products.find(function (p) {
@@ -971,14 +1017,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                         return ((_p$metadata = p.metadata) === null || _p$metadata === void 0 || (_p$metadata = _p$metadata._giftInfo) === null || _p$metadata === void 0 ? void 0 : _p$metadata.strategyId) === addAction.strategyId;
                       });
                       if (!(sameStrategy && !sameStrategy.booking_uid && !((_sameStrategy$metadat = sameStrategy.metadata) !== null && _sameStrategy$metadat !== void 0 && _sameStrategy$metadat.booking_uid))) {
-                        _context6.next = 6;
+                        _context7.next = 6;
                         break;
                       }
                       sameStrategy.num = (Number(sameStrategy.num) || 0) + (addAction.giftCount || 1);
-                      return _context6.abrupt("return", 1);
+                      return _context7.abrupt("return", 1);
                     case 6:
-                      _context6.prev = 6;
-                      _context6.next = 9;
+                      _context7.prev = 6;
+                      _context7.next = 9;
                       return _this3.giftSelectResolver({
                         strategyId: addAction.strategyId,
                         strategyName: addAction.strategyName,
@@ -987,31 +1033,31 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                         sourceProductIds: addAction.sourceProductIds
                       });
                     case 9:
-                      giftResult = _context6.sent;
+                      giftResult = _context7.sent;
                       giftProducts = Array.isArray(giftResult) ? giftResult : giftResult === null || giftResult === void 0 ? void 0 : giftResult.products;
                       giftBookings = Array.isArray(giftResult) ? [] : (giftResult === null || giftResult === void 0 ? void 0 : giftResult.bookings) || [];
                       if (!(Array.isArray(giftProducts) && giftProducts.length > 0)) {
-                        _context6.next = 37;
+                        _context7.next = 37;
                         break;
                       }
                       _iterator5 = _createForOfIteratorHelper(giftProducts.entries());
-                      _context6.prev = 14;
+                      _context7.prev = 14;
                       _iterator5.s();
                     case 16:
                       if ((_step5 = _iterator5.n()).done) {
-                        _context6.next = 29;
+                        _context7.next = 29;
                         break;
                       }
                       _step5$value = _slicedToArray(_step5.value, 2), index = _step5$value[0], gp = _step5$value[1];
                       if (gp) {
-                        _context6.next = 20;
+                        _context7.next = 20;
                         break;
                       }
-                      return _context6.abrupt("continue", 27);
+                      return _context7.abrupt("continue", 27);
                     case 20:
                       booking = giftBookings[index];
                       if (!booking) {
-                        _context6.next = 26;
+                        _context7.next = 26;
                         break;
                       }
                       linked = _this3.createLinkedProductAndBooking({
@@ -1020,65 +1066,65 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       });
                       result.products.push(linked.product);
                       tempOrder.bookings = [].concat(_toConsumableArray(tempOrder.bookings || []), [linked.booking]);
-                      return _context6.abrupt("continue", 27);
+                      return _context7.abrupt("continue", 27);
                     case 26:
                       // normalize 略过：调用方应保证返回完整 OrderProduct。
                       result.products.push(gp);
                     case 27:
-                      _context6.next = 16;
+                      _context7.next = 16;
                       break;
                     case 29:
-                      _context6.next = 34;
+                      _context7.next = 34;
                       break;
                     case 31:
-                      _context6.prev = 31;
-                      _context6.t0 = _context6["catch"](14);
-                      _iterator5.e(_context6.t0);
+                      _context7.prev = 31;
+                      _context7.t0 = _context7["catch"](14);
+                      _iterator5.e(_context7.t0);
                     case 34:
-                      _context6.prev = 34;
+                      _context7.prev = 34;
                       _iterator5.f();
-                      return _context6.finish(34);
+                      return _context7.finish(34);
                     case 37:
-                      _context6.next = 42;
+                      _context7.next = 42;
                       break;
                     case 39:
-                      _context6.prev = 39;
-                      _context6.t1 = _context6["catch"](6);
+                      _context7.prev = 39;
+                      _context7.t1 = _context7["catch"](6);
                       // 用户取消 / 选择失败 → 视为放弃本次新增
-                      console.warn('[OrderModule] giftSelectResolver rejected, skip add gift', addAction.strategyId, _context6.t1);
+                      console.warn('[OrderModule] giftSelectResolver rejected, skip add gift', addAction.strategyId, _context7.t1);
                     case 42:
                     case "end":
-                      return _context6.stop();
+                      return _context7.stop();
                   }
                 }, _loop, null, [[6, 39], [14, 31, 34, 37]]);
               });
               _iterator4.s();
             case 54:
               if ((_step4 = _iterator4.n()).done) {
-                _context8.next = 60;
+                _context9.next = 60;
                 break;
               }
-              return _context8.delegateYield(_loop(), "t3", 56);
+              return _context9.delegateYield(_loop(), "t3", 56);
             case 56:
-              if (!_context8.t3) {
-                _context8.next = 58;
+              if (!_context9.t3) {
+                _context9.next = 58;
                 break;
               }
-              return _context8.abrupt("continue", 58);
+              return _context9.abrupt("continue", 58);
             case 58:
-              _context8.next = 54;
+              _context9.next = 54;
               break;
             case 60:
-              _context8.next = 65;
+              _context9.next = 65;
               break;
             case 62:
-              _context8.prev = 62;
-              _context8.t4 = _context8["catch"](51);
-              _iterator4.e(_context8.t4);
+              _context9.prev = 62;
+              _context9.t4 = _context9["catch"](51);
+              _iterator4.e(_context9.t4);
             case 65:
-              _context8.prev = 65;
+              _context9.prev = 65;
               _iterator4.f();
-              return _context8.finish(65);
+              return _context9.finish(65);
             case 68:
               tempOrder.products = result.products;
               this.lastUnfulfilledPromotions = result.unfulfilledPromotions;
@@ -1097,21 +1143,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 products: tempOrder.products
               };
               this.effectsEmit('onPromotionApplied', payload);
-              _context8.next = 78;
+              _context9.next = 78;
               break;
             case 75:
-              _context8.prev = 75;
-              _context8.t5 = _context8["catch"](11);
-              console.error('[OrderModule] applyPromotion failed', _context8.t5);
+              _context9.prev = 75;
+              _context9.t5 = _context9["catch"](11);
+              console.error('[OrderModule] applyPromotion failed', _context9.t5);
             case 78:
-              _context8.prev = 78;
+              _context9.prev = 78;
               this.isApplyingPromotion = false;
-              return _context8.finish(78);
+              return _context9.finish(78);
             case 81:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
-        }, _callee6, this, [[11, 75, 78, 81], [15, 39, 42, 45], [20, 29, 32, 35], [51, 62, 65, 68]]);
+        }, _callee7, this, [[11, 75, 78, 81], [15, 39, 42, 45], [20, 29, 32, 35], [51, 62, 65, 68]]);
       }));
       function applyPromotion() {
         return _applyPromotion.apply(this, arguments);
@@ -1233,14 +1279,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "saveDraft",
     value: function () {
-      var _saveDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-        return _regeneratorRuntime().wrap(function _callee7$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+      var _saveDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+        return _regeneratorRuntime().wrap(function _callee8$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
-        }, _callee7);
+        }, _callee8);
       }));
       function saveDraft() {
         return _saveDraft.apply(this, arguments);
@@ -1255,18 +1301,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hydrateTempOrderFromLocalRecord",
     value: function () {
-      var _hydrateTempOrderFromLocalRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(record) {
-        return _regeneratorRuntime().wrap(function _callee8$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+      var _hydrateTempOrderFromLocalRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(record) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              return _context10.abrupt("return", this.hydrateTempOrderFromRecord(record));
+              return _context11.abrupt("return", this.hydrateTempOrderFromRecord(record));
             case 1:
             case "end":
-              return _context10.stop();
+              return _context11.stop();
           }
-        }, _callee8, this);
+        }, _callee9, this);
       }));
-      function hydrateTempOrderFromLocalRecord(_x7) {
+      function hydrateTempOrderFromLocalRecord(_x8) {
         return _hydrateTempOrderFromLocalRecord.apply(this, arguments);
       }
       return hydrateTempOrderFromLocalRecord;
@@ -2161,7 +2207,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "restoreOrder",
     value: function restoreOrder() {
-      var _this$store$discount11, _this$store$discount12;
+      var _this$store$discount15, _this$store$discount16;
       this.logInfo('restoreOrder start', {});
       var freshTempOrder = this.createDefaultTempOrderInstance();
       this.ensureExternalSaleNumber(freshTempOrder);
@@ -2169,8 +2215,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       this.store.summary = createEmptySummary();
       this.store.lastOrderInfo = undefined;
       this.store.syncState = undefined;
-      void ((_this$store$discount11 = this.store.discount) === null || _this$store$discount11 === void 0 ? void 0 : _this$store$discount11.setOriginalDiscountList([]));
-      void ((_this$store$discount12 = this.store.discount) === null || _this$store$discount12 === void 0 ? void 0 : _this$store$discount12.setDiscountList([]));
+      void ((_this$store$discount15 = this.store.discount) === null || _this$store$discount15 === void 0 ? void 0 : _this$store$discount15.setOriginalDiscountList([]));
+      void ((_this$store$discount16 = this.store.discount) === null || _this$store$discount16 === void 0 ? void 0 : _this$store$discount16.setDiscountList([]));
       this.persistTempOrder();
       return freshTempOrder;
     }
@@ -2182,13 +2228,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "replaceTempOrder",
     value: function () {
-      var _replaceTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(tempOrder, options) {
+      var _replaceTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(tempOrder, options) {
         var nextTempOrder;
-        return _regeneratorRuntime().wrap(function _callee9$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return _regeneratorRuntime().wrap(function _callee10$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
               if (isTempOrder(tempOrder)) {
-                _context11.next = 2;
+                _context12.next = 2;
                 break;
               }
               throw new Error('无效的 tempOrder 数据');
@@ -2198,15 +2244,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               this.store.tempOrder = nextTempOrder;
               if (!((options === null || options === void 0 ? void 0 : options.recalculateSummary) !== false)) {
-                _context11.next = 9;
+                _context12.next = 9;
                 break;
               }
-              _context11.next = 7;
+              _context12.next = 7;
               return this.recalculateSummary({
                 createIfMissing: false
               });
             case 7:
-              _context11.next = 10;
+              _context12.next = 10;
               break;
             case 9:
               this.store.summary = createEmptySummary();
@@ -2215,20 +2261,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 this.persistTempOrder();
               }
               if (!(options !== null && options !== void 0 && options.saveDraft)) {
-                _context11.next = 14;
+                _context12.next = 14;
                 break;
               }
-              _context11.next = 14;
+              _context12.next = 14;
               return this.saveDraft();
             case 14:
-              return _context11.abrupt("return", nextTempOrder);
+              return _context12.abrupt("return", nextTempOrder);
             case 15:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
-        }, _callee9, this);
+        }, _callee10, this);
       }));
-      function replaceTempOrder(_x8, _x9) {
+      function replaceTempOrder(_x9, _x10) {
         return _replaceTempOrder.apply(this, arguments);
       }
       return replaceTempOrder;
@@ -2314,32 +2360,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addNewOrder",
     value: function () {
-      var _addNewOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+      var _addNewOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee10$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+        return _regeneratorRuntime().wrap(function _callee11$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               this.ensureExternalSaleNumber(tempOrder);
-              _context12.next = 4;
+              _context13.next = 4;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 4:
               this.persistTempOrder();
               if (!this.draftPersistEnabled) {
-                _context12.next = 8;
+                _context13.next = 8;
                 break;
               }
-              _context12.next = 8;
+              _context13.next = 8;
               return this.saveDraft();
             case 8:
-              return _context12.abrupt("return", tempOrder);
+              return _context13.abrupt("return", tempOrder);
             case 9:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
-        }, _callee10, this);
+        }, _callee11, this);
       }));
       function addNewOrder() {
         return _addNewOrder.apply(this, arguments);
@@ -2691,18 +2737,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "recalculateSummary",
     value: function () {
-      var _recalculateSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(options) {
+      var _recalculateSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(options) {
         var _this$otherParams2, _ref47, _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 _callee11$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+        return _regeneratorRuntime().wrap(function _callee12$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               tempOrder = options !== null && options !== void 0 && options.createIfMissing ? this.ensureTempOrder() : this.store.tempOrder;
               if (tempOrder) {
-                _context13.next = 3;
+                _context14.next = 3;
                 break;
               }
-              return _context13.abrupt("return", null);
+              return _context14.abrupt("return", null);
             case 3:
               this.sanitizeTempOrderProducts(tempOrder);
               originalSnapshot = this.getOriginalSalesSnapshot(tempOrder);
@@ -2710,10 +2756,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               shouldReuseOriginalSnapshot = originalSnapshot && !hasShopDiscountChanged;
               snapshotSummary = shouldReuseOriginalSnapshot ? this.restoreOriginalSnapshotIfProductsUnchanged(tempOrder, originalSnapshot) : null;
               if (!snapshotSummary) {
-                _context13.next = 10;
+                _context14.next = 10;
                 break;
               }
-              return _context13.abrupt("return", snapshotSummary);
+              return _context14.abrupt("return", snapshotSummary);
             case 10:
               shouldFullRecalculateFromSnapshot = Boolean(originalSnapshot);
               summaryProducts = shouldFullRecalculateFromSnapshot ? cloneDeep(tempOrder.products || []) : tempOrder.products;
@@ -2725,7 +2771,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               totalRefundAmount = existedSummary.total_refund_amount || '0.00';
               paidPaymentSummary = this.calculatePaidPaymentSummary(tempOrder.payments || []);
               if (salesSummary) {
-                _context13.next = 26;
+                _context14.next = 26;
                 break;
               }
               emptyBaseSummary = _objectSpread(_objectSpread(_objectSpread({}, createEmptySummary()), existedSummary), {}, {
@@ -2751,9 +2797,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 previousSummary: existedSummary,
                 summary: emptySummary
               });
-              return _context13.abrupt("return", this.store.summary);
+              return _context14.abrupt("return", this.store.summary);
             case 26:
-              _context13.next = 28;
+              _context14.next = 28;
               return salesSummary.getSummary(_objectSpread({
                 products: summaryProducts,
                 isPriceIncludeTax: tempOrder.is_price_include_tax,
@@ -2762,7 +2808,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 channel: this.otherParams.channel
               } : {}));
             case 28:
-              salesSummaryResult = _context13.sent;
+              salesSummaryResult = _context14.sent;
               if (shouldFullRecalculateFromSnapshot) {
                 tempOrder.products = summaryProducts;
               }
@@ -2807,14 +2853,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 previousSummary: existedSummary,
                 summary: summary
               });
-              return _context13.abrupt("return", this.store.summary);
+              return _context14.abrupt("return", this.store.summary);
             case 46:
             case "end":
-              return _context13.stop();
+              return _context14.stop();
           }
-        }, _callee11, this);
+        }, _callee12, this);
       }));
-      function recalculateSummary(_x10) {
+      function recalculateSummary(_x11) {
         return _recalculateSummary.apply(this, arguments);
       }
       return recalculateSummary;
@@ -2822,30 +2868,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderSummary",
     value: function () {
-      var _getOrderSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+      var _getOrderSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
         var summary;
-        return _regeneratorRuntime().wrap(function _callee12$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regeneratorRuntime().wrap(function _callee13$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              _context14.next = 2;
+              _context15.next = 2;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 2:
-              summary = _context14.sent;
+              summary = _context15.sent;
               if (summary) {
-                _context14.next = 5;
+                _context15.next = 5;
                 break;
               }
-              return _context14.abrupt("return", createEmptySummary());
+              return _context15.abrupt("return", createEmptySummary());
             case 5:
               this.persistTempOrder();
-              return _context14.abrupt("return", summary);
+              return _context15.abrupt("return", summary);
             case 7:
             case "end":
-              return _context14.stop();
+              return _context15.stop();
           }
-        }, _callee12, this);
+        }, _callee13, this);
       }));
       function getOrderSummary() {
         return _getOrderSummary.apply(this, arguments);
@@ -2869,23 +2915,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncTempOrderNoteToRemote",
     value: function () {
-      var _syncTempOrderNoteToRemote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(orderId, note) {
-        return _regeneratorRuntime().wrap(function _callee13$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+      var _syncTempOrderNoteToRemote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(orderId, note) {
+        return _regeneratorRuntime().wrap(function _callee14$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              _context15.next = 2;
+              _context16.next = 2;
               return this.request.put("/order/order/".concat(orderId, "/note"), {
                 note: note
               });
             case 2:
-              return _context15.abrupt("return", note);
+              return _context16.abrupt("return", note);
             case 3:
             case "end":
-              return _context15.stop();
+              return _context16.stop();
           }
-        }, _callee13, this);
+        }, _callee14, this);
       }));
-      function syncTempOrderNoteToRemote(_x11, _x12) {
+      function syncTempOrderNoteToRemote(_x12, _x13) {
         return _syncTempOrderNoteToRemote.apply(this, arguments);
       }
       return syncTempOrderNoteToRemote;
@@ -2993,11 +3039,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "shouldSkipDiscountCalculation",
     value: function shouldSkipDiscountCalculation(tempOrder) {
-      var _this$store$discount13,
-        _this$store$discount14,
+      var _this$store$discount17,
+        _this$store$discount18,
         _this17 = 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)) || [];
+      var discountList = ((_this$store$discount17 = this.store.discount) === null || _this$store$discount17 === void 0 || (_this$store$discount18 = _this$store$discount17.getDiscountList) === null || _this$store$discount18 === void 0 ? void 0 : _this$store$discount18.call(_this$store$discount17)) || [];
       if (discountList.length > 0) return false;
       return !(tempOrder.products || []).some(function (product) {
         return _this17.productHasCustomerBoundDiscount(product);
@@ -3461,45 +3507,45 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "shouldMergeProductToOrder",
     value: function () {
-      var _shouldMergeProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(params) {
+      var _shouldMergeProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(params) {
         var _this$orderHooks;
         var onBeforeMergeProductToOrder, result;
-        return _regeneratorRuntime().wrap(function _callee14$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        return _regeneratorRuntime().wrap(function _callee15$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               onBeforeMergeProductToOrder = (_this$orderHooks = this.orderHooks) === null || _this$orderHooks === void 0 ? void 0 : _this$orderHooks.onBeforeMergeProductToOrder;
               if (onBeforeMergeProductToOrder) {
-                _context16.next = 3;
+                _context17.next = 3;
                 break;
               }
-              return _context16.abrupt("return", true);
+              return _context17.abrupt("return", true);
             case 3:
-              _context16.next = 5;
+              _context17.next = 5;
               return onBeforeMergeProductToOrder(_objectSpread(_objectSpread({}, params), {}, {
                 defaultShouldMerge: true
               }));
             case 5:
-              result = _context16.sent;
+              result = _context17.sent;
               if (!(typeof result === 'boolean')) {
-                _context16.next = 8;
+                _context17.next = 8;
                 break;
               }
-              return _context16.abrupt("return", result);
+              return _context17.abrupt("return", result);
             case 8:
               if (!(result && _typeof(result) === 'object' && typeof result.shouldMerge === 'boolean')) {
-                _context16.next = 10;
+                _context17.next = 10;
                 break;
               }
-              return _context16.abrupt("return", result.shouldMerge);
+              return _context17.abrupt("return", result.shouldMerge);
             case 10:
-              return _context16.abrupt("return", true);
+              return _context17.abrupt("return", true);
             case 11:
             case "end":
-              return _context16.stop();
+              return _context17.stop();
           }
-        }, _callee14, this);
+        }, _callee15, this);
       }));
-      function shouldMergeProductToOrder(_x13) {
+      function shouldMergeProductToOrder(_x14) {
         return _shouldMergeProductToOrder.apply(this, arguments);
       }
       return shouldMergeProductToOrder;
@@ -3535,30 +3581,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "finalizeProductOrderMutation",
     value: function () {
-      var _finalizeProductOrderMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(tempOrder, options) {
-        return _regeneratorRuntime().wrap(function _callee15$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+      var _finalizeProductOrderMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(tempOrder, options) {
+        return _regeneratorRuntime().wrap(function _callee16$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
               this.syncTempOrderHolderFromBookings(tempOrder);
               if (options !== null && options !== void 0 && options.skipEditDiscountConfigRefresh) {
-                _context17.next = 4;
+                _context18.next = 4;
                 break;
               }
-              _context17.next = 4;
+              _context18.next = 4;
               return this.ensureEditDiscountConfigForProductChange(tempOrder);
             case 4:
               if (options !== null && options !== void 0 && options.skipDiscountRecalculation) {
-                _context17.next = 7;
+                _context18.next = 7;
                 break;
               }
-              _context17.next = 7;
+              _context18.next = 7;
               return this.applyPromotion();
             case 7:
               if (!(options !== null && options !== void 0 && options.skipDiscountRecalculation)) {
                 this.applyDiscount();
               }
               this.sanitizeTempOrderProducts(tempOrder);
-              _context17.next = 11;
+              _context18.next = 11;
               return this.recalculateSummary({
                 createIfMissing: true
               });
@@ -3566,11 +3612,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.persistTempOrder();
             case 12:
             case "end":
-              return _context17.stop();
+              return _context18.stop();
           }
-        }, _callee15, this);
+        }, _callee16, this);
       }));
-      function finalizeProductOrderMutation(_x14, _x15) {
+      function finalizeProductOrderMutation(_x15, _x16) {
         return _finalizeProductOrderMutation.apply(this, arguments);
       }
       return finalizeProductOrderMutation;
@@ -3585,13 +3631,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "appendProductLineToTempOrder",
     value: (function () {
-      var _appendProductLineToTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(tempOrder, product, booking) {
+      var _appendProductLineToTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(tempOrder, product, booking) {
         var _booking_uid,
           _metadata,
           _this22 = 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) {
+        return _regeneratorRuntime().wrap(function _callee17$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
               linked = booking ? this.createLinkedProductAndBooking({
                 product: product,
@@ -3624,10 +3670,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               matchedProduct = matchedIndex === -1 ? null : tempOrder.products[matchedIndex];
               existedFingerprint = matchedProduct ? buildProductLineFingerprint(getProductSkuOptions(matchedProduct), matchedProduct.product_bundle) : '';
               if (!matchedProduct) {
-                _context18.next = 20;
+                _context19.next = 20;
                 break;
               }
-              _context18.next = 17;
+              _context19.next = 17;
               return this.shouldMergeProductToOrder({
                 incomingProduct: productToAdd,
                 normalizedIncoming: normalizedIncoming,
@@ -3639,13 +3685,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 booking: booking
               });
             case 17:
-              _context18.t0 = _context18.sent;
-              _context18.next = 21;
+              _context19.t0 = _context19.sent;
+              _context19.next = 21;
               break;
             case 20:
-              _context18.t0 = false;
+              _context19.t0 = false;
             case 21:
-              shouldMerge = _context18.t0;
+              shouldMerge = _context19.t0;
               if (matchedIndex === -1 || !matchedProduct || !shouldMerge) {
                 this.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
                 if (linked) {
@@ -3699,11 +3745,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
             case 24:
             case "end":
-              return _context18.stop();
+              return _context19.stop();
           }
-        }, _callee16, this);
+        }, _callee17, this);
       }));
-      function appendProductLineToTempOrder(_x16, _x17, _x18) {
+      function appendProductLineToTempOrder(_x17, _x18, _x19) {
         return _appendProductLineToTempOrder.apply(this, arguments);
       }
       return appendProductLineToTempOrder;
@@ -3719,61 +3765,61 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProductToOrder",
     value: (function () {
-      var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(product, booking) {
+      var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(product, booking) {
         var tempOrder, _ref61, _productRecord$num, productRecord, splitCount, i, singleLine;
-        return _regeneratorRuntime().wrap(function _callee17$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+        return _regeneratorRuntime().wrap(function _callee18$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (!booking) {
-                _context19.next = 18;
+                _context20.next = 18;
                 break;
               }
               productRecord = product;
               splitCount = getSafeProductNum((_ref61 = (_productRecord$num = productRecord.num) !== null && _productRecord$num !== void 0 ? _productRecord$num : productRecord.product_quantity) !== null && _ref61 !== void 0 ? _ref61 : 1);
               if (!(splitCount > 1)) {
-                _context19.next = 18;
+                _context20.next = 18;
                 break;
               }
               i = 0;
             case 6:
               if (!(i < splitCount)) {
-                _context19.next = 15;
+                _context20.next = 15;
                 break;
               }
               singleLine = cloneDeep(productRecord);
               singleLine.num = 1;
               delete singleLine.product_quantity;
-              _context19.next = 12;
+              _context20.next = 12;
               return this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking));
             case 12:
               i += 1;
-              _context19.next = 6;
+              _context20.next = 6;
               break;
             case 15:
-              _context19.next = 17;
+              _context20.next = 17;
               return this.finalizeProductOrderMutation(tempOrder);
             case 17:
-              return _context19.abrupt("return", tempOrder.products);
+              return _context20.abrupt("return", tempOrder.products);
             case 18:
-              _context19.next = 20;
+              _context20.next = 20;
               return this.appendProductLineToTempOrder(tempOrder, product, booking);
             case 20:
-              _context19.next = 22;
+              _context20.next = 22;
               return this.finalizeProductOrderMutation(tempOrder);
             case 22:
               this.logInfo('addProductToOrder success', {
                 product_id: product.product_id,
                 with_booking: !!booking
               });
-              return _context19.abrupt("return", tempOrder.products);
+              return _context20.abrupt("return", tempOrder.products);
             case 24:
             case "end":
-              return _context19.stop();
+              return _context20.stop();
           }
-        }, _callee17, this);
+        }, _callee18, this);
       }));
-      function addProductToOrder(_x19, _x20) {
+      function addProductToOrder(_x20, _x21) {
         return _addProductToOrder.apply(this, arguments);
       }
       return addProductToOrder;
@@ -3791,93 +3837,93 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProductsToOrder",
     value: (function () {
-      var _addProductsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(items, options) {
+      var _addProductsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(items, options) {
         var tempOrder, _iterator20, _step20, item, product, booking, _ref62, _productRecord$num2, productRecord, splitCount, i, singleLine;
-        return _regeneratorRuntime().wrap(function _callee18$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+        return _regeneratorRuntime().wrap(function _callee19$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (!(!Array.isArray(items) || items.length === 0)) {
-                _context20.next = 3;
+                _context21.next = 3;
                 break;
               }
-              return _context20.abrupt("return", tempOrder.products);
+              return _context21.abrupt("return", tempOrder.products);
             case 3:
               _iterator20 = _createForOfIteratorHelper(items || []);
-              _context20.prev = 4;
+              _context21.prev = 4;
               _iterator20.s();
             case 6:
               if ((_step20 = _iterator20.n()).done) {
-                _context20.next = 30;
+                _context21.next = 30;
                 break;
               }
               item = _step20.value;
               product = item.product, booking = item.booking;
               if (product) {
-                _context20.next = 11;
+                _context21.next = 11;
                 break;
               }
-              return _context20.abrupt("continue", 28);
+              return _context21.abrupt("continue", 28);
             case 11:
               if (!booking) {
-                _context20.next = 26;
+                _context21.next = 26;
                 break;
               }
               productRecord = product;
               splitCount = getSafeProductNum((_ref62 = (_productRecord$num2 = productRecord.num) !== null && _productRecord$num2 !== void 0 ? _productRecord$num2 : productRecord.product_quantity) !== null && _ref62 !== void 0 ? _ref62 : 1);
               if (!(splitCount > 1)) {
-                _context20.next = 26;
+                _context21.next = 26;
                 break;
               }
               i = 0;
             case 16:
               if (!(i < splitCount)) {
-                _context20.next = 25;
+                _context21.next = 25;
                 break;
               }
               singleLine = cloneDeep(productRecord);
               singleLine.num = 1;
               delete singleLine.product_quantity;
-              _context20.next = 22;
+              _context21.next = 22;
               return this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking));
             case 22:
               i += 1;
-              _context20.next = 16;
+              _context21.next = 16;
               break;
             case 25:
-              return _context20.abrupt("continue", 28);
+              return _context21.abrupt("continue", 28);
             case 26:
-              _context20.next = 28;
+              _context21.next = 28;
               return this.appendProductLineToTempOrder(tempOrder, product, booking);
             case 28:
-              _context20.next = 6;
+              _context21.next = 6;
               break;
             case 30:
-              _context20.next = 35;
+              _context21.next = 35;
               break;
             case 32:
-              _context20.prev = 32;
-              _context20.t0 = _context20["catch"](4);
-              _iterator20.e(_context20.t0);
+              _context21.prev = 32;
+              _context21.t0 = _context21["catch"](4);
+              _iterator20.e(_context21.t0);
             case 35:
-              _context20.prev = 35;
+              _context21.prev = 35;
               _iterator20.f();
-              return _context20.finish(35);
+              return _context21.finish(35);
             case 38:
-              _context20.next = 40;
+              _context21.next = 40;
               return this.finalizeProductOrderMutation(tempOrder, options);
             case 40:
               this.logInfo('addProductsToOrder success', {
                 itemsCount: items.length
               });
-              return _context20.abrupt("return", tempOrder.products);
+              return _context21.abrupt("return", tempOrder.products);
             case 42:
             case "end":
-              return _context20.stop();
+              return _context21.stop();
           }
-        }, _callee18, this, [[4, 32, 35, 38]]);
+        }, _callee19, this, [[4, 32, 35, 38]]);
       }));
-      function addProductsToOrder(_x21, _x22) {
+      function addProductsToOrder(_x22, _x23) {
         return _addProductsToOrder.apply(this, arguments);
       }
       return addProductsToOrder;
@@ -4074,21 +4120,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProduct",
     value: function () {
-      var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(params) {
+      var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(params) {
         var tempOrder, updatedProductUid;
-        return _regeneratorRuntime().wrap(function _callee19$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+        return _regeneratorRuntime().wrap(function _callee20$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params);
-              _context21.next = 4;
+              _context22.next = 4;
               return this.applyPromotion();
             case 4:
               this.applyDiscount({
                 reapplyBookingDiscountProductUids: params.allow_booking_discount_reapply && updatedProductUid ? [String(updatedProductUid)] : undefined
               });
               this.sanitizeTempOrderProducts(tempOrder);
-              _context21.next = 8;
+              _context22.next = 8;
               return this.recalculateSummary({
                 createIfMissing: true
               });
@@ -4097,14 +4143,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('updateOrderProduct success', {
                 params: params
               });
-              return _context21.abrupt("return", tempOrder.products);
+              return _context22.abrupt("return", tempOrder.products);
             case 11:
             case "end":
-              return _context21.stop();
+              return _context22.stop();
           }
-        }, _callee19, this);
+        }, _callee20, this);
       }));
-      function updateOrderProduct(_x23) {
+      function updateOrderProduct(_x24) {
         return _updateOrderProduct.apply(this, arguments);
       }
       return updateOrderProduct;
@@ -4112,18 +4158,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProducts",
     value: function () {
-      var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(paramsList) {
+      var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(paramsList) {
         var _this24 = this;
         var tempOrder, reapplyBookingDiscountProductUids;
-        return _regeneratorRuntime().wrap(function _callee20$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+        return _regeneratorRuntime().wrap(function _callee21$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (paramsList.length) {
-                _context22.next = 3;
+                _context23.next = 3;
                 break;
               }
-              return _context22.abrupt("return", tempOrder.products);
+              return _context23.abrupt("return", tempOrder.products);
             case 3:
               reapplyBookingDiscountProductUids = paramsList.reduce(function (acc, params) {
                 var updatedProductUid = _this24.applyOrderProductUpdateToTempOrder(tempOrder, params);
@@ -4133,7 +4179,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
                 return acc;
               }, []);
-              _context22.next = 6;
+              _context23.next = 6;
               return this.finalizeAfterProductsMutation(tempOrder, {
                 reapplyBookingDiscountProductUids: reapplyBookingDiscountProductUids.length ? reapplyBookingDiscountProductUids : undefined
               });
@@ -4141,14 +4187,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('updateOrderProduct success', {
                 paramsList: paramsList
               });
-              return _context22.abrupt("return", tempOrder.products);
+              return _context23.abrupt("return", tempOrder.products);
             case 8:
             case "end":
-              return _context22.stop();
+              return _context23.stop();
           }
-        }, _callee20, this);
+        }, _callee21, this);
       }));
-      function updateOrderProducts(_x24) {
+      function updateOrderProducts(_x25) {
         return _updateOrderProducts.apply(this, arguments);
       }
       return updateOrderProducts;
@@ -4156,11 +4202,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProductQuantity",
     value: function () {
-      var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(params) {
+      var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(params) {
         var _targetProduct$metada10;
         var product_id, product_variant_id, num, unique_identification_number, identity_key, product_sku, product_bundle, tempOrder, identityLookup, productIndex, targetUid, targetProduct, normalizedProduct;
-        return _regeneratorRuntime().wrap(function _callee21$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+        return _regeneratorRuntime().wrap(function _callee22$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
               product_id = params.product_id, product_variant_id = params.product_variant_id, num = params.num, unique_identification_number = params.unique_identification_number, identity_key = params.identity_key, product_sku = params.product_sku, product_bundle = params.product_bundle;
               tempOrder = this.ensureTempOrder();
@@ -4189,7 +4235,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 productIndex = getProductIdentityIndex(tempOrder.products, identityLookup);
               }
               if (!(productIndex === -1)) {
-                _context23.next = 12;
+                _context24.next = 12;
                 break;
               }
               throw new Error('[Order] 目标商品不存在，无法更新数量');
@@ -4203,12 +4249,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }));
               normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
               tempOrder.products[productIndex] = normalizedProduct;
-              _context23.next = 18;
+              _context24.next = 18;
               return this.applyPromotion();
             case 18:
               this.applyDiscount();
               this.sanitizeTempOrderProducts(tempOrder);
-              _context23.next = 22;
+              _context24.next = 22;
               return this.recalculateSummary({
                 createIfMissing: true
               });
@@ -4217,14 +4263,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('updateOrderProductQuantity success', {
                 params: params
               });
-              return _context23.abrupt("return", tempOrder.products);
+              return _context24.abrupt("return", tempOrder.products);
             case 25:
             case "end":
-              return _context23.stop();
+              return _context24.stop();
           }
-        }, _callee21, this);
+        }, _callee22, this);
       }));
-      function updateOrderProductQuantity(_x25) {
+      function updateOrderProductQuantity(_x26) {
         return _updateOrderProductQuantity.apply(this, arguments);
       }
       return updateOrderProductQuantity;
@@ -4265,19 +4311,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "finalizeAfterProductsMutation",
     value: (function () {
-      var _finalizeAfterProductsMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(tempOrder, options) {
-        return _regeneratorRuntime().wrap(function _callee22$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+      var _finalizeAfterProductsMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(tempOrder, options) {
+        return _regeneratorRuntime().wrap(function _callee23$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
               this.syncTempOrderHolderFromBookings(tempOrder);
-              _context24.next = 3;
+              _context25.next = 3;
               return this.applyPromotion();
             case 3:
               this.applyDiscount({
                 reapplyBookingDiscountProductUids: options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids
               });
               this.sanitizeTempOrderProducts(tempOrder);
-              _context24.next = 7;
+              _context25.next = 7;
               return this.recalculateSummary({
                 createIfMissing: true
               });
@@ -4285,11 +4331,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.persistTempOrder();
             case 8:
             case "end":
-              return _context24.stop();
+              return _context25.stop();
           }
-        }, _callee22, this);
+        }, _callee23, this);
       }));
-      function finalizeAfterProductsMutation(_x26, _x27) {
+      function finalizeAfterProductsMutation(_x27, _x28) {
         return _finalizeAfterProductsMutation.apply(this, arguments);
       }
       return finalizeAfterProductsMutation;
@@ -4304,18 +4350,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeProductsFromOrder",
     value: (function () {
-      var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(identities) {
+      var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(identities) {
         var _this25 = this;
         var tempOrder, productsBeforeRemove, bookingsBeforeRemove, matchedProducts, removedProducts, _i2, _removedProducts, product, linkedBookingUidsToRemove, _iterator21, _step21, _loop3;
-        return _regeneratorRuntime().wrap(function _callee23$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+        return _regeneratorRuntime().wrap(function _callee24$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (identities.length) {
-                _context26.next = 3;
+                _context27.next = 3;
                 break;
               }
-              return _context26.abrupt("return", tempOrder.products);
+              return _context27.abrupt("return", tempOrder.products);
             case 3:
               productsBeforeRemove = tempOrder.products || [];
               bookingsBeforeRemove = tempOrder.bookings || [];
@@ -4338,22 +4384,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               linkedBookingUidsToRemove = new Set();
               _iterator21 = _createForOfIteratorHelper(matchedProducts);
-              _context26.prev = 11;
+              _context27.prev = 11;
               _loop3 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop3() {
                 var _metadata8, _metadata9, _metadata10, _metadata11;
                 var product, productUid, productBookingUid, isAddTimeProduct;
-                return _regeneratorRuntime().wrap(function _loop3$(_context25) {
-                  while (1) switch (_context25.prev = _context25.next) {
+                return _regeneratorRuntime().wrap(function _loop3$(_context26) {
+                  while (1) switch (_context26.prev = _context26.next) {
                     case 0:
                       product = _step21.value;
                       productUid = (product === null || product === void 0 || (_metadata8 = product.metadata) === null || _metadata8 === void 0 ? void 0 : _metadata8.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 || (_metadata9 = product.metadata) === null || _metadata9 === void 0 ? void 0 : _metadata9.booking_uid);
                       isAddTimeProduct = (product === null || product === void 0 || (_metadata10 = product.metadata) === null || _metadata10 === void 0 ? void 0 : _metadata10.product_add_schedule_time) !== undefined && (product === null || product === void 0 || (_metadata11 = product.metadata) === null || _metadata11 === void 0 ? void 0 : _metadata11.product_add_schedule_time) !== null;
                       if (!isAddTimeProduct) {
-                        _context25.next = 6;
+                        _context26.next = 6;
                         break;
                       }
-                      return _context25.abrupt("return", 1);
+                      return _context26.abrupt("return", 1);
                     case 6:
                       if (productBookingUid !== undefined && productBookingUid !== null && productBookingUid !== '') {
                         linkedBookingUidsToRemove.add(String(productBookingUid));
@@ -4368,37 +4414,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }
                     case 8:
                     case "end":
-                      return _context25.stop();
+                      return _context26.stop();
                   }
                 }, _loop3);
               });
               _iterator21.s();
             case 14:
               if ((_step21 = _iterator21.n()).done) {
-                _context26.next = 20;
+                _context27.next = 20;
                 break;
               }
-              return _context26.delegateYield(_loop3(), "t0", 16);
+              return _context27.delegateYield(_loop3(), "t0", 16);
             case 16:
-              if (!_context26.t0) {
-                _context26.next = 18;
+              if (!_context27.t0) {
+                _context27.next = 18;
                 break;
               }
-              return _context26.abrupt("continue", 18);
+              return _context27.abrupt("continue", 18);
             case 18:
-              _context26.next = 14;
+              _context27.next = 14;
               break;
             case 20:
-              _context26.next = 25;
+              _context27.next = 25;
               break;
             case 22:
-              _context26.prev = 22;
-              _context26.t1 = _context26["catch"](11);
-              _iterator21.e(_context26.t1);
+              _context27.prev = 22;
+              _context27.t1 = _context27["catch"](11);
+              _iterator21.e(_context27.t1);
             case 25:
-              _context26.prev = 25;
+              _context27.prev = 25;
               _iterator21.f();
-              return _context26.finish(25);
+              return _context27.finish(25);
             case 28:
               if (linkedBookingUidsToRemove.size > 0) {
                 // 删除主预约商品时，同步移除挂在同一 booking_uid 下的加时商品，避免残留孤儿行。
@@ -4409,20 +4455,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   return !(isAddTimeProduct && lineBookingUid !== undefined && lineBookingUid !== null && linkedBookingUidsToRemove.has(String(lineBookingUid)));
                 });
               }
-              _context26.next = 31;
+              _context27.next = 31;
               return this.finalizeAfterProductsMutation(tempOrder);
             case 31:
               this.logInfo('removeProductsFromOrder success', {
                 identities: identities
               });
-              return _context26.abrupt("return", tempOrder.products);
+              return _context27.abrupt("return", tempOrder.products);
             case 33:
             case "end":
-              return _context26.stop();
+              return _context27.stop();
           }
-        }, _callee23, this, [[11, 22, 25, 28]]);
+        }, _callee24, this, [[11, 22, 25, 28]]);
       }));
-      function removeProductsFromOrder(_x28) {
+      function removeProductsFromOrder(_x29) {
         return _removeProductsFromOrder.apply(this, arguments);
       }
       return removeProductsFromOrder;
@@ -4430,18 +4476,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeProductFromOrder",
     value: function () {
-      var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(identity) {
-        return _regeneratorRuntime().wrap(function _callee24$(_context27) {
-          while (1) switch (_context27.prev = _context27.next) {
+      var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(identity) {
+        return _regeneratorRuntime().wrap(function _callee25$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
-              return _context27.abrupt("return", this.removeProductsFromOrder([identity]));
+              return _context28.abrupt("return", this.removeProductsFromOrder([identity]));
             case 1:
             case "end":
-              return _context27.stop();
+              return _context28.stop();
           }
-        }, _callee24, this);
+        }, _callee25, this);
       }));
-      function removeProductFromOrder(_x29) {
+      function removeProductFromOrder(_x30) {
         return _removeProductFromOrder.apply(this, arguments);
       }
       return removeProductFromOrder;
@@ -4453,10 +4499,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clearOrderCartLines",
     value: (function () {
-      var _clearOrderCartLines = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
+      var _clearOrderCartLines = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee25$(_context28) {
-          while (1) switch (_context28.prev = _context28.next) {
+        return _regeneratorRuntime().wrap(function _callee26$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               tempOrder.products = [];
@@ -4467,24 +4513,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   productsByUid: {}
                 });
               }
-              _context28.next = 7;
+              _context29.next = 7;
               return this.applyPromotion();
             case 7:
               this.applyDiscount();
               this.sanitizeTempOrderProducts(tempOrder);
-              _context28.next = 11;
+              _context29.next = 11;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 11:
               this.persistTempOrder();
               this.logInfo('clearOrderCartLines success', {});
-              return _context28.abrupt("return", tempOrder);
+              return _context29.abrupt("return", tempOrder);
             case 14:
             case "end":
-              return _context28.stop();
+              return _context29.stop();
           }
-        }, _callee25, this);
+        }, _callee26, this);
       }));
       function clearOrderCartLines() {
         return _clearOrderCartLines.apply(this, arguments);
@@ -4522,17 +4568,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyLocalPrintOrderNumbers",
     value: function () {
-      var _applyLocalPrintOrderNumbers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(order) {
+      var _applyLocalPrintOrderNumbers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(order) {
         var tempOrder, shopOrderNumber, shopFullOrderNumber;
-        return _regeneratorRuntime().wrap(function _callee26$(_context29) {
-          while (1) switch (_context29.prev = _context29.next) {
+        return _regeneratorRuntime().wrap(function _callee27$(_context30) {
+          while (1) switch (_context30.prev = _context30.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (!(!order || _typeof(order) !== 'object')) {
-                _context29.next = 3;
+                _context30.next = 3;
                 break;
               }
-              return _context29.abrupt("return", tempOrder);
+              return _context30.abrupt("return", tempOrder);
             case 3:
               shopOrderNumber = order.shop_order_number;
               shopFullOrderNumber = order.shop_full_order_number;
@@ -4543,17 +4589,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.shop_full_order_number = String(shopFullOrderNumber);
               }
               this.persistTempOrder();
-              _context29.next = 10;
+              _context30.next = 10;
               return this.saveDraft();
             case 10:
-              return _context29.abrupt("return", tempOrder);
+              return _context30.abrupt("return", tempOrder);
             case 11:
             case "end":
-              return _context29.stop();
+              return _context30.stop();
           }
-        }, _callee26, this);
+        }, _callee27, this);
       }));
-      function applyLocalPrintOrderNumbers(_x30) {
+      function applyLocalPrintOrderNumbers(_x31) {
         return _applyLocalPrintOrderNumbers.apply(this, arguments);
       }
       return applyLocalPrintOrderNumbers;
@@ -4567,18 +4613,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitTempOrder",
     value: (function () {
-      var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(params) {
-        return _regeneratorRuntime().wrap(function _callee27$(_context30) {
-          while (1) switch (_context30.prev = _context30.next) {
+      var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(params) {
+        return _regeneratorRuntime().wrap(function _callee28$(_context31) {
+          while (1) switch (_context31.prev = _context31.next) {
             case 0:
-              return _context30.abrupt("return", this.runSubmitTempOrder(params));
+              return _context31.abrupt("return", this.runSubmitTempOrder(params));
             case 1:
             case "end":
-              return _context30.stop();
+              return _context31.stop();
           }
-        }, _callee27, this);
+        }, _callee28, this);
       }));
-      function submitTempOrder(_x31) {
+      function submitTempOrder(_x32) {
         return _submitTempOrder.apply(this, arguments);
       }
       return submitTempOrder;
@@ -4586,20 +4632,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitTempOrderAsync",
     value: function () {
-      var _submitTempOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(params) {
-        return _regeneratorRuntime().wrap(function _callee28$(_context31) {
-          while (1) switch (_context31.prev = _context31.next) {
+      var _submitTempOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(params) {
+        return _regeneratorRuntime().wrap(function _callee29$(_context32) {
+          while (1) switch (_context32.prev = _context32.next) {
             case 0:
-              return _context31.abrupt("return", this.runSubmitTempOrder(_objectSpread(_objectSpread({}, params), {}, {
+              return _context32.abrupt("return", this.runSubmitTempOrder(_objectSpread(_objectSpread({}, params), {}, {
                 syncMode: true
               })));
             case 1:
             case "end":
-              return _context31.stop();
+              return _context32.stop();
           }
-        }, _callee28, this);
+        }, _callee29, this);
       }));
-      function submitTempOrderAsync(_x32) {
+      function submitTempOrderAsync(_x33) {
         return _submitTempOrderAsync.apply(this, arguments);
       }
       return submitTempOrderAsync;
@@ -4607,11 +4653,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "runSubmitTempOrder",
     value: function () {
-      var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(params) {
+      var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(params) {
         var _params$cacheId2, _this$otherParams6, _ref72, _ref73, _submitSnapshot$busin, _this$otherParams7, _this$otherParams8, _submitSnapshot$type;
         var tempOrder, shouldConfirmPendingVoucherPayments, hasPaymentOverride, preparedPaymentOverride, latestSummary, effectiveCacheId, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, submitSnapshot, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
-        return _regeneratorRuntime().wrap(function _callee29$(_context32) {
-          while (1) switch (_context32.prev = _context32.next) {
+        return _regeneratorRuntime().wrap(function _callee30$(_context33) {
+          while (1) switch (_context33.prev = _context33.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               shouldConfirmPendingVoucherPayments = (params === null || params === void 0 ? void 0 : params.confirmPendingVoucherPayments) !== false;
@@ -4631,26 +4677,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               this.persistTempOrder();
-              _context32.next = 8;
+              _context33.next = 8;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 8:
-              _context32.t1 = _context32.sent;
-              if (_context32.t1) {
-                _context32.next = 11;
+              _context33.t1 = _context33.sent;
+              if (_context33.t1) {
+                _context33.next = 11;
                 break;
               }
-              _context32.t1 = this.store.summary;
+              _context33.t1 = this.store.summary;
             case 11:
-              _context32.t0 = _context32.t1;
-              if (_context32.t0) {
-                _context32.next = 14;
+              _context33.t0 = _context33.t1;
+              if (_context33.t0) {
+                _context33.next = 14;
                 break;
               }
-              _context32.t0 = createEmptySummary();
+              _context33.t0 = createEmptySummary();
             case 14:
-              latestSummary = _context32.t0;
+              latestSummary = _context33.t0;
               effectiveCacheId = (_params$cacheId2 = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId2 !== void 0 ? _params$cacheId2 : this.cacheId;
               hasPaymentStatusOverride = (params === null || params === void 0 ? void 0 : params.paymentStatus) !== undefined;
               hasSmallTicketDataFlagOverride = (params === null || params === void 0 ? void 0 : params.smallTicketDataFlag) !== undefined;
@@ -4685,10 +4731,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!payload.created_at) {
                 payload.created_at = dayjs().format('YYYY-MM-DD HH:mm:ss');
               }
-              _context32.next = 26;
+              _context33.next = 26;
               return this.saveDraft();
             case 26:
-              _context32.prev = 26;
+              _context33.prev = 26;
               this.logInfo('submitTempOrder calling sales checkout', {
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
@@ -4698,43 +4744,43 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 smallTicketDataFlag: payload.small_ticket_data_flag,
                 syncMode: payload.sync_mode
               });
-              _context32.next = 30;
+              _context33.next = 30;
               return this.submitSalesOrder({
                 query: payload
               });
             case 30:
-              result = _context32.sent;
-              _context32.next = 43;
+              result = _context33.sent;
+              _context33.next = 43;
               break;
             case 33:
-              _context32.prev = 33;
-              _context32.t2 = _context32["catch"](26);
-              backendErrorResponse = this.extractSubmitErrorResponse(_context32.t2);
+              _context33.prev = 33;
+              _context33.t2 = _context33["catch"](26);
+              backendErrorResponse = this.extractSubmitErrorResponse(_context33.t2);
               if (!backendErrorResponse) {
-                _context32.next = 40;
+                _context33.next = 40;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
-              return _context32.abrupt("return", backendErrorResponse);
+              return _context33.abrupt("return", backendErrorResponse);
             case 40:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
-                error: _context32.t2 instanceof Error ? _context32.t2.message : String(_context32.t2),
+                error: _context33.t2 instanceof Error ? _context33.t2.message : String(_context33.t2),
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
                 paymentStatus: payload.payment_status,
                 paymentsCount: ((_payload$payments2 = payload.payments) === null || _payload$payments2 === void 0 ? void 0 : _payload$payments2.length) || 0
               });
-              throw _context32.t2;
+              throw _context33.t2;
             case 43:
               if (!this.isSubmitResponseRejected(result)) {
-                _context32.next = 47;
+                _context33.next = 47;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
-              return _context32.abrupt("return", result);
+              return _context33.abrupt("return", result);
             case 47:
               submittedOrderId = this.extractOrderIdFromSubmitResult(result);
               this.logInfo('runSubmitTempOrder: 提交成功', {
@@ -4745,15 +4791,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 })
               });
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
-                _context32.next = 56;
+                _context33.next = 56;
                 break;
               }
               tempOrder.order_id = submittedOrderId;
               resultRecord = result;
-              _context32.next = 54;
+              _context33.next = 54;
               return this.markLocalOrderSynced(submittedOrderId, (resultRecord === null || resultRecord === void 0 ? void 0 : resultRecord.data) || resultRecord || {});
             case 54:
-              _context32.next = 57;
+              _context33.next = 57;
               break;
             case 56:
               if (this.isLocalPendingSubmitResult(result)) {
@@ -4762,14 +4808,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 this.store.syncState = 'submitted';
               }
             case 57:
-              return _context32.abrupt("return", result);
+              return _context33.abrupt("return", result);
             case 58:
             case "end":
-              return _context32.stop();
+              return _context33.stop();
           }
-        }, _callee29, this, [[26, 33]]);
+        }, _callee30, this, [[26, 33]]);
       }));
-      function runSubmitTempOrder(_x33) {
+      function runSubmitTempOrder(_x34) {
         return _runSubmitTempOrder.apply(this, arguments);
       }
       return runSubmitTempOrder;
@@ -4777,10 +4823,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "markLocalOrderSynced",
     value: function () {
-      var _markLocalOrderSynced = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(orderId, remoteOrder) {
+      var _markLocalOrderSynced = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(orderId, remoteOrder) {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee30$(_context33) {
-          while (1) switch (_context33.prev = _context33.next) {
+        return _regeneratorRuntime().wrap(function _callee31$(_context34) {
+          while (1) switch (_context34.prev = _context34.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               tempOrder.order_id = orderId;
@@ -4788,15 +4834,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.store.lastOrderInfo = remoteOrder;
               this.store.syncState = 'submitted';
               this.persistTempOrder();
-              _context33.next = 8;
+              _context34.next = 8;
               return this.saveDraft();
             case 8:
             case "end":
-              return _context33.stop();
+              return _context34.stop();
           }
-        }, _callee30, this);
+        }, _callee31, this);
       }));
-      function markLocalOrderSynced(_x34, _x35) {
+      function markLocalOrderSynced(_x35, _x36) {
         return _markLocalOrderSynced.apply(this, arguments);
       }
       return markLocalOrderSynced;
@@ -4869,11 +4915,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncPaymentsToOrder",
     value: function () {
-      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(params) {
+      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(params) {
         var _params$confirmPendin;
         var tempOrder, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, paidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, submitResult;
-        return _regeneratorRuntime().wrap(function _callee31$(_context34) {
-          while (1) switch (_context34.prev = _context34.next) {
+        return _regeneratorRuntime().wrap(function _callee32$(_context35) {
+          while (1) switch (_context35.prev = _context35.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               mappedPayments = mapPaymentItemsToOrderPayments(params.payments || []);
@@ -4885,24 +4931,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               tempOrder.payments = effectivePayments;
               tempOrder.payment_status = paymentStatus;
               this.persistTempOrder();
-              _context34.next = 12;
+              _context35.next = 12;
               return this.saveDraft();
             case 12:
               if (params.submitWhenPaid) {
-                _context34.next = 14;
+                _context35.next = 14;
                 break;
               }
-              return _context34.abrupt("return", completion);
+              return _context35.abrupt("return", completion);
             case 14:
               if (!(this.store.syncState === 'submitting')) {
-                _context34.next = 16;
+                _context35.next = 16;
                 break;
               }
-              return _context34.abrupt("return", completion);
+              return _context35.abrupt("return", completion);
             case 16:
               this.store.syncState = 'submitting';
               paymentSyncIdempotencyToken = this.buildPaymentSyncIdempotencyToken(tempOrder, effectivePayments);
-              _context34.next = 20;
+              _context35.next = 20;
               return this.submitTempOrder({
                 payments: effectivePayments,
                 paymentStatus: paymentStatus,
@@ -4918,17 +4964,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               });
             case 20:
-              submitResult = _context34.sent;
-              return _context34.abrupt("return", _objectSpread(_objectSpread({}, completion), {}, {
+              submitResult = _context35.sent;
+              return _context35.abrupt("return", _objectSpread(_objectSpread({}, completion), {}, {
                 submitResult: submitResult
               }));
             case 22:
             case "end":
-              return _context34.stop();
+              return _context35.stop();
           }
-        }, _callee31, this);
+        }, _callee32, this);
       }));
-      function syncPaymentsToOrder(_x36) {
+      function syncPaymentsToOrder(_x37) {
         return _syncPaymentsToOrder.apply(this, arguments);
       }
       return syncPaymentsToOrder;
@@ -5017,11 +5063,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitOrder",
     value: function () {
-      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(order) {
+      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(order) {
         var _order$query$cartItem, _params$bookings, _params$relation_prod;
         var url, query, fetchUrl, params;
-        return _regeneratorRuntime().wrap(function _callee32$(_context35) {
-          while (1) switch (_context35.prev = _context35.next) {
+        return _regeneratorRuntime().wrap(function _callee33$(_context36) {
+          while (1) switch (_context36.prev = _context36.next) {
             case 0:
               this.logInfo('submitOrder called', {
                 url: order.url,
@@ -5041,14 +5087,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 _context35.abrupt("return", this.request.post(fetchUrl, params));
+              return _context36.abrupt("return", this.request.post(fetchUrl, params));
             case 6:
             case "end":
-              return _context35.stop();
+              return _context36.stop();
           }
-        }, _callee32, this);
+        }, _callee33, this);
       }));
-      function submitOrder(_x37) {
+      function submitOrder(_x38) {
         return _submitOrder.apply(this, arguments);
       }
       return submitOrder;
@@ -5056,13 +5102,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "cancelOrder",
     value: function () {
-      var _cancelOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(params) {
+      var _cancelOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(params) {
         var payload;
-        return _regeneratorRuntime().wrap(function _callee33$(_context36) {
-          while (1) switch (_context36.prev = _context36.next) {
+        return _regeneratorRuntime().wrap(function _callee34$(_context37) {
+          while (1) switch (_context37.prev = _context37.next) {
             case 0:
               if (!(!Array.isArray(params.order_ids) || params.order_ids.length === 0)) {
-                _context36.next = 2;
+                _context37.next = 2;
                 break;
               }
               throw new Error('取消订单失败：order_ids 不能为空');
@@ -5078,16 +5124,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 method: 'PUT',
                 orderIdsCount: params.order_ids.length
               });
-              return _context36.abrupt("return", this.request.put('/order/update-status', payload, {
+              return _context37.abrupt("return", this.request.put('/order/update-status', payload, {
                 isShopApi: true
               }));
             case 5:
             case "end":
-              return _context36.stop();
+              return _context37.stop();
           }
-        }, _callee33, this);
+        }, _callee34, this);
       }));
-      function cancelOrder(_x38) {
+      function cancelOrder(_x39) {
         return _cancelOrder.apply(this, arguments);
       }
       return cancelOrder;
@@ -5095,19 +5141,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "changeBookingStatus",
     value: function () {
-      var _changeBookingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(params) {
+      var _changeBookingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35(params) {
         var url, payload;
-        return _regeneratorRuntime().wrap(function _callee34$(_context37) {
-          while (1) switch (_context37.prev = _context37.next) {
+        return _regeneratorRuntime().wrap(function _callee35$(_context38) {
+          while (1) switch (_context38.prev = _context38.next) {
             case 0:
               if (params.booking_id) {
-                _context37.next = 2;
+                _context38.next = 2;
                 break;
               }
               throw new Error('变更预约状态失败：booking_id 不能为空');
             case 2:
               if (params.appointment_status) {
-                _context37.next = 4;
+                _context38.next = 4;
                 break;
               }
               throw new Error('变更预约状态失败：appointment_status 不能为空');
@@ -5122,16 +5168,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 bookingId: params.booking_id,
                 appointmentStatus: params.appointment_status
               });
-              return _context37.abrupt("return", this.request.put(url, payload, {
+              return _context38.abrupt("return", this.request.put(url, payload, {
                 isShopApi: true
               }));
             case 8:
             case "end":
-              return _context37.stop();
+              return _context38.stop();
           }
-        }, _callee34, this);
+        }, _callee35, this);
       }));
-      function changeBookingStatus(_x39) {
+      function changeBookingStatus(_x40) {
         return _changeBookingStatus.apply(this, arguments);
       }
       return changeBookingStatus;
@@ -5149,11 +5195,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createOrderByCheckout",
     value: (function () {
-      var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35(params) {
+      var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
         var _params$payments, _params$bookings2, _params$relation_prod2, _params$payments2, _params$payments3, _params$bookings3, _params$relation_prod3, _params$payments4;
         var onlineStorePaymentCodeList, _orderData$payments, _orderData$bookings, _orderData$relation_p, _orderData$payments2, _orderData$payments3, _orderData$bookings2, _orderData$relation_p2, _orderData$payments4, _orderData$payments5, _response$data, orderData, response;
-        return _regeneratorRuntime().wrap(function _callee35$(_context38) {
-          while (1) switch (_context38.prev = _context38.next) {
+        return _regeneratorRuntime().wrap(function _callee36$(_context39) {
+          while (1) switch (_context39.prev = _context39.next) {
             case 0:
               // 过滤掉由在线店铺下单的 payment 支付数据
               onlineStorePaymentCodeList = ['WXPAY', 'WECHAT', 'ALIPAY', 'APPLE_PAY', 'CREDIT_CARD_3DS', 'CREDIT_CARD_TOKEN', 'GOOGLE_PAY', 'GOOGLE_PAY_3DS', 'CREDIT_CARD'];
@@ -5187,7 +5233,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
               });
-              _context38.prev = 4;
+              _context39.prev = 4;
               // 构建订单数据，设置默认值并允许 params 覆盖
               orderData = _objectSpread({
                 sales_channel: 'my_pisel',
@@ -5249,13 +5295,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 hasOrderId: !!orderData.order_id,
                 smallTicketDataFlag: orderData.small_ticket_data_flag
               });
-              _context38.next = 12;
+              _context39.next = 12;
               return this.request.post('/order/checkout', orderData, {
                 osServer: true,
                 customToast: function customToast() {}
               });
             case 12:
-              response = _context38.sent;
+              response = _context39.sent;
               this.logInfo('Order API called successfully', {
                 response: response
               });
@@ -5263,22 +5309,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 _context38.abrupt("return", response);
+              return _context39.abrupt("return", response);
             case 18:
-              _context38.prev = 18;
-              _context38.t0 = _context38["catch"](4);
-              console.error('[Order] createOrderByCheckout 创建订单失败:', _context38.t0);
+              _context39.prev = 18;
+              _context39.t0 = _context39["catch"](4);
+              console.error('[Order] createOrderByCheckout 创建订单失败:', _context39.t0);
               this.logInfo('Order API called failed', {
-                error: _context38.t0 instanceof Error ? _context38.t0.message : String(_context38.t0)
+                error: _context39.t0 instanceof Error ? _context39.t0.message : String(_context39.t0)
               });
-              throw _context38.t0;
+              throw _context39.t0;
             case 23:
             case "end":
-              return _context38.stop();
+              return _context39.stop();
           }
-        }, _callee35, this, [[4, 18]]);
+        }, _callee36, this, [[4, 18]]);
       }));
-      function createOrderByCheckout(_x40) {
+      function createOrderByCheckout(_x41) {
         return _createOrderByCheckout.apply(this, arguments);
       }
       return createOrderByCheckout;
@@ -5286,24 +5332,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitSalesOrder",
     value: function () {
-      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
+      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(params) {
         var url, query, fetchUrl;
-        return _regeneratorRuntime().wrap(function _callee36$(_context39) {
-          while (1) switch (_context39.prev = _context39.next) {
+        return _regeneratorRuntime().wrap(function _callee37$(_context40) {
+          while (1) switch (_context40.prev = _context40.next) {
             case 0:
               url = params.url, query = params.query;
               fetchUrl = url || '/order/sales/checkout';
-              return _context39.abrupt("return", this.request.post(fetchUrl, query, {
+              return _context40.abrupt("return", this.request.post(fetchUrl, query, {
                 osServer: true,
                 customToast: function customToast() {}
               }));
             case 3:
             case "end":
-              return _context39.stop();
+              return _context40.stop();
           }
-        }, _callee36, this);
+        }, _callee37, this);
       }));
-      function submitSalesOrder(_x41) {
+      function submitSalesOrder(_x42) {
         return _submitSalesOrder.apply(this, arguments);
       }
       return submitSalesOrder;
@@ -5317,37 +5363,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sendCustomerPayLink",
     value: (function () {
-      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(params) {
+      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(params) {
         var _params$emails;
         var orderIds;
-        return _regeneratorRuntime().wrap(function _callee37$(_context40) {
-          while (1) switch (_context40.prev = _context40.next) {
+        return _regeneratorRuntime().wrap(function _callee38$(_context41) {
+          while (1) switch (_context41.prev = _context41.next) {
             case 0:
               orderIds = params.order_ids || params.orderIds || [];
               if (orderIds.length) {
-                _context40.next = 3;
+                _context41.next = 3;
                 break;
               }
               throw new Error('发送支付链接前必须先提交本地订单并取得订单 ID');
             case 3:
               if ((_params$emails = params.emails) !== null && _params$emails !== void 0 && _params$emails.length) {
-                _context40.next = 5;
+                _context41.next = 5;
                 break;
               }
               throw new Error('发送支付链接需要至少一个邮箱');
             case 5:
-              return _context40.abrupt("return", this.request.post('/order/batch-email', {
+              return _context41.abrupt("return", this.request.post('/order/batch-email', {
                 order_ids: orderIds,
                 notify_action: params.notify_action || 'order_payment_reminder',
                 emails: params.emails
               }));
             case 6:
             case "end":
-              return _context40.stop();
+              return _context41.stop();
           }
-        }, _callee37, this);
+        }, _callee38, this);
       }));
-      function sendCustomerPayLink(_x42) {
+      function sendCustomerPayLink(_x43) {
         return _sendCustomerPayLink.apply(this, arguments);
       }
       return sendCustomerPayLink;
@@ -5355,14 +5401,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getSalesOrderByLookup",
     value: function () {
-      var _getSalesOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(params) {
+      var _getSalesOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(params) {
         var lookup, res;
-        return _regeneratorRuntime().wrap(function _callee38$(_context41) {
-          while (1) switch (_context41.prev = _context41.next) {
+        return _regeneratorRuntime().wrap(function _callee39$(_context42) {
+          while (1) switch (_context42.prev = _context42.next) {
             case 0:
               lookup = params.lookup === undefined || params.lookup === null ? '' : String(params.lookup).trim();
               if (lookup) {
-                _context41.next = 3;
+                _context42.next = 3;
                 break;
               }
               throw new Error('加载销售详情需要 lookup');
@@ -5371,7 +5417,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (lookup.startsWith('LOCAL_')) {
                 params.forceRemote = false;
               }
-              _context41.next = 6;
+              _context42.next = 6;
               return this.request.get("/order/sales/".concat(encodeURIComponent(lookup)), _objectSpread({
                 with: ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info']
               }, params.forceRemote ? {
@@ -5380,18 +5426,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 osServer: true
               });
             case 6:
-              res = _context41.sent;
+              res = _context42.sent;
               if (res.code === 200) {
                 this.store.lastOrderInfo = res.data;
               }
-              return _context41.abrupt("return", res);
+              return _context42.abrupt("return", res);
             case 9:
             case "end":
-              return _context41.stop();
+              return _context42.stop();
           }
-        }, _callee38, this);
+        }, _callee39, this);
       }));
-      function getSalesOrderByLookup(_x43) {
+      function getSalesOrderByLookup(_x44) {
         return _getSalesOrderByLookup.apply(this, arguments);
       }
       return getSalesOrderByLookup;
@@ -5405,14 +5451,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hydrateTempOrderFromRecord",
     value: (function () {
-      var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(record, options) {
-        var _this$store$discount15;
-        var raw, nextTempOrder, rawSummary, summarySurcharges, hydratedEditDiscounts, currentDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount16, _this$store$discount17;
-        return _regeneratorRuntime().wrap(function _callee39$(_context42) {
-          while (1) switch (_context42.prev = _context42.next) {
+      var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(record, options) {
+        var _this$store$discount19;
+        var raw, nextTempOrder, rawSummary, summarySurcharges, hydratedEditDiscounts, currentDiscounts, currentScanDiscounts, hydratedDiscountIds, retainedScanDiscounts, nextDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount20, _this$store$discount21;
+        return _regeneratorRuntime().wrap(function _callee40$(_context43) {
+          while (1) switch (_context43.prev = _context43.next) {
             case 0:
               raw = record && _typeof(record) === 'object' && record.data && record.order_id == null ? record.data : record || {};
-              nextTempOrder = this.normalizeTempOrderForRuntime(raw);
+              nextTempOrder = this.normalizeTempOrderForRuntime(raw, {
+                makeEditMark: true
+              });
               rawSummary = raw.summary && _typeof(raw.summary) === 'object' ? raw.summary : {};
               summarySurcharges = Array.isArray(rawSummary.surcharges) ? rawSummary.surcharges.map(function (s) {
                 return _objectSpread({}, s || {});
@@ -5433,37 +5481,47 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               this.store.lastOrderInfo = raw.lastOrderInfo || raw;
               hydratedEditDiscounts = this.collectHydratedEditDiscounts(nextTempOrder.products);
-              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;
+              currentDiscounts = typeof ((_this$store$discount19 = this.store.discount) === null || _this$store$discount19 === void 0 ? void 0 : _this$store$discount19.getDiscountList) === 'function' ? this.store.discount.getDiscountList() || [] : [];
+              currentScanDiscounts = currentDiscounts.filter(function (discount) {
+                return discount === null || discount === void 0 ? void 0 : discount.isScan;
+              });
+              hydratedDiscountIds = new Set(hydratedEditDiscounts.map(function (discount) {
+                return discount === null || discount === void 0 ? void 0 : discount.id;
+              }));
+              retainedScanDiscounts = currentScanDiscounts.filter(function (discount) {
+                return !hydratedDiscountIds.has(discount === null || discount === void 0 ? void 0 : discount.id);
+              });
+              nextDiscounts = [].concat(_toConsumableArray(hydratedEditDiscounts), _toConsumableArray(retainedScanDiscounts));
+              shouldSkipEmptyDiscountSync = nextDiscounts.length === 0 && currentDiscounts.length === 0;
               if (shouldSkipEmptyDiscountSync) {
-                _context42.next = 17;
+                _context43.next = 21;
                 break;
               }
-              OrderModule.populateSavedAmounts(nextTempOrder.products, hydratedEditDiscounts);
-              _context42.next = 15;
-              return (_this$store$discount16 = this.store.discount) === null || _this$store$discount16 === void 0 ? void 0 : _this$store$discount16.setOriginalDiscountList(hydratedEditDiscounts);
-            case 15:
-              _context42.next = 17;
-              return (_this$store$discount17 = this.store.discount) === null || _this$store$discount17 === void 0 ? void 0 : _this$store$discount17.setDiscountList(hydratedEditDiscounts);
-            case 17:
+              OrderModule.populateSavedAmounts(nextTempOrder.products, nextDiscounts);
+              _context43.next = 19;
+              return (_this$store$discount20 = this.store.discount) === null || _this$store$discount20 === void 0 ? void 0 : _this$store$discount20.setOriginalDiscountList(nextDiscounts);
+            case 19:
+              _context43.next = 21;
+              return (_this$store$discount21 = this.store.discount) === null || _this$store$discount21 === void 0 ? void 0 : _this$store$discount21.setDiscountList(nextDiscounts);
+            case 21:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context42.next = 20;
+                _context43.next = 24;
                 break;
               }
-              _context42.next = 20;
+              _context43.next = 24;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 20:
+            case 24:
               this.persistTempOrder();
-              return _context42.abrupt("return", nextTempOrder);
-            case 22:
+              return _context43.abrupt("return", nextTempOrder);
+            case 26:
             case "end":
-              return _context42.stop();
+              return _context43.stop();
           }
-        }, _callee39, this);
+        }, _callee40, this);
       }));
-      function hydrateTempOrderFromRecord(_x44, _x45) {
+      function hydrateTempOrderFromRecord(_x45, _x46) {
         return _hydrateTempOrderFromRecord.apply(this, arguments);
       }
       return hydrateTempOrderFromRecord;
@@ -5527,7 +5585,9 @@ 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 _this27.normalizeHydratedOrderProduct(p);
+        return _this27.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 = _this27.normalizeHydratedBookingHolder(b || {});
@@ -5698,7 +5758,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     }
   }, {
     key: "normalizeHydratedOrderProduct",
-    value: function normalizeHydratedOrderProduct(product) {
+    value: function normalizeHydratedOrderProduct(product, options) {
       var _this28 = this;
       var row = _objectSpread({}, product || {});
       if (row.num === undefined && row.product_quantity !== undefined) {
@@ -5722,7 +5782,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         row.metadata.unique_identification_number = createUuidV4();
       }
       // 从云端、本地数据库中获取到的商品数据，先打上 runtime 标记，提供给 UI 做 saved items.
-      row.metadata.is_edit_for_runtime = true;
+      if (options !== null && options !== void 0 && options.makeEditMark) {
+        row.metadata.is_edit_for_runtime = true;
+      }
       var normalized = normalizeOrderProduct(row);
       normalized.discount_list = normalizeOrderProductDiscountList(normalized.discount_list);
       var result = _objectSpread(_objectSpread(_objectSpread({}, row), normalized), {}, {
@@ -5742,27 +5804,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderInfo",
     value: function () {
-      var _getOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(order_id) {
+      var _getOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41(order_id) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee40$(_context43) {
-          while (1) switch (_context43.prev = _context43.next) {
+        return _regeneratorRuntime().wrap(function _callee41$(_context44) {
+          while (1) switch (_context44.prev = _context44.next) {
             case 0:
-              _context43.next = 2;
+              _context44.next = 2;
               return this.request.get("/order/sales/".concat(order_id), {
                 with: ['products', 'bookings']
               }, {
                 osServer: true
               });
             case 2:
-              res = _context43.sent;
-              return _context43.abrupt("return", res);
+              res = _context44.sent;
+              return _context44.abrupt("return", res);
             case 4:
             case "end":
-              return _context43.stop();
+              return _context44.stop();
           }
-        }, _callee40, this);
+        }, _callee41, this);
       }));
-      function getOrderInfo(_x46) {
+      function getOrderInfo(_x47) {
         return _getOrderInfo.apply(this, arguments);
       }
       return getOrderInfo;