@pisell/pisellos 0.10.43 → 0.10.45

package/dist/modules/Order/index.js

@@ -32,10 +32,12 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
 import { OrderHooks } from "./types";
-import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, ensureCartItemOriginHolder, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeOrderMetaList, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, buildPointCardSnapshotFromWalletPassList, mergeOrderProductDisplayFields, resolveIsFormSubject, isMarkdownBundle } from "./utils";
+import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, ensureCartItemOriginHolder, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeOrderMetaList, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, buildPointCardSnapshotFromWalletPassList, buildVirtualCurrencySnapshotFromList, mergeOrderProductDisplayFields, resolveIsFormSubject, isMarkdownBundle } from "./utils";
 import { isNormalProduct } from "../Product/utils";
 import dayjs from 'dayjs';
+import { getDiscountLifecycleReason } from "../Discount/availability";
 import { stripOsPrivatePayloadFields } from "../../utils/os-private-payload";
+import { buildSalesNoteText, decodeSalesNotesSnapshot, getSalesNotePolicy } from "./salesNotes";
 import { ensureOrderPaymentNumber, mergeOrderPaymentRecord, resolveOrderPaymentIdentity } from "./payment-utils";
 import { resolvePaymentNumberDevicePrefix, resolvePaymentNumberDevicePrefixFromDeviceId } from "../../utils/payment-number";
 import { processCartPromotion, appendPromotionTags as _appendPromotionTags, getOrderProductUid as getPromotionUid, PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY } from "../../solution/BaseSales/utils/cartPromotion";
@@ -166,6 +168,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "openCache", false);
     _defineProperty(_assertThisInitialized(_this), "sessionStoragePersistEnabled", false);
     _defineProperty(_assertThisInitialized(_this), "sessionStorageRestoreRecord", null);
+    /** 只允许当前订单最新的 prepare/config 请求回写客户资产态。 */
+    _defineProperty(_assertThisInitialized(_this), "customerWalletPrepareConfigEpoch", 0);
     _defineProperty(_assertThisInitialized(_this), "salesSummaryModuleName", void 0);
     _defineProperty(_assertThisInitialized(_this), "rulesHooksOverride", void 0);
     _defineProperty(_assertThisInitialized(_this), "moduleHooksOverride", void 0);
@@ -176,8 +180,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "promotionEvaluator", null);
     /** 赠品选择 resolver；由 SDK host bridge 注入 */
     _defineProperty(_assertThisInitialized(_this), "giftSelectResolver", null);
-    /** applyPromotion 递归保护 flag（写路径同步调 applyPromotion，禁止重入） */
+    /** 促销评估递归保护 flag（写路径同步评估促销，禁止重入） */
     _defineProperty(_assertThisInitialized(_this), "isApplyingPromotion", false);
+    /** 保持旧事件语义：同步事件监听器内触发的订单写入不得递归评估促销。 */
+    _defineProperty(_assertThisInitialized(_this), "isEmittingPromotionApplied", false);
     /** 商品曾应用过客户券卡，客户变更剥离后需强制跑一次 calcDiscount 复位价格 */
     _defineProperty(_assertThisInitialized(_this), "hasActiveCustomerBoundDiscount", false);
     /** 最近一次 applyPromotion 的未满足促销提示 */
@@ -592,7 +598,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createDefaultRulesHooks",
     value: function createDefaultRulesHooks() {
-      return createDefaultOrderRulesHooks();
+      var _this2 = this;
+      return createDefaultOrderRulesHooks(function () {
+        var _this2$store$tempOrde;
+        return ((_this2$store$tempOrde = _this2.store.tempOrder) === null || _this2$store$tempOrde === void 0 ? void 0 : _this2$store$tempOrde.bookings) || [];
+      });
+    }
+
+    /**
+     * Stable across notifyTempOrderChanged's immutable copy, but changes when a
+     * different local/server order becomes current.
+     */
+  }, {
+    key: "getDiscountConfigOrderIdentityKey",
+    value: function getDiscountConfigOrderIdentityKey(tempOrder) {
+      var _ref12, _identity$orderId, _tempOrder$request_un, _ref13, _identity$externalSal, _ref14, _ref15, _identity$localId, _tempOrder$_extend;
+      var identity = this.getOrderIdentity();
+      return JSON.stringify([(_ref12 = (_identity$orderId = identity === null || identity === void 0 ? void 0 : identity.orderId) !== null && _identity$orderId !== void 0 ? _identity$orderId : tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.order_id) !== null && _ref12 !== void 0 ? _ref12 : '', (_tempOrder$request_un = tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.request_unique_idempotency_token) !== null && _tempOrder$request_un !== void 0 ? _tempOrder$request_un : '', (_ref13 = (_identity$externalSal = identity === null || identity === void 0 ? void 0 : identity.externalSaleNumber) !== null && _identity$externalSal !== void 0 ? _identity$externalSal : tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.external_sale_number) !== null && _ref13 !== void 0 ? _ref13 : '', (_ref14 = (_ref15 = (_identity$localId = identity === null || identity === void 0 ? void 0 : identity.localId) !== null && _identity$localId !== void 0 ? _identity$localId : tempOrder === null || tempOrder === void 0 || (_tempOrder$_extend = tempOrder._extend) === null || _tempOrder$_extend === void 0 ? void 0 : _tempOrder$_extend.localId) !== null && _ref15 !== void 0 ? _ref15 : this.cacheId) !== null && _ref14 !== void 0 ? _ref14 : '']);
     }
 
     // ─── Discount: 公共 API ───
@@ -600,13 +622,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "loadDiscountConfig",
     value: function () {
       var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
-        var _this$store$tempOrder, _this$store$discount, _this$store$tempOrder2;
-        var orderId, prepareConfigResult, discountList, _this$store$discount2, _this$store$discount3, _this$store$discount4, currentDiscountList, currentCommittedDiscounts, currentScanDiscounts, currentScanDiscountById, committedDiscountById, mergedCommittedDiscountIds, refreshedScanDiscountIds, runtimeDiscountIds, runtimeDiscounts, retainedCommittedDiscounts, retainedScanDiscounts, mergedDiscountList;
+        var _this$store$tempOrder,
+          _this$store$discount,
+          _this3 = this,
+          _this$store$tempOrder2;
+        var orderId, requestEpoch, requestOrderIdentityKey, prepareConfigResult, isCurrentRequest, discountList, _this$store$discount2, _this$store$discount3, _this$store$discount4, currentDiscountList, currentCommittedDiscounts, currentScanDiscounts, currentScanDiscountById, committedDiscountById, mergedCommittedDiscountIds, refreshedScanDiscountIds, runtimeDiscountIds, runtimeDiscounts, retainedCommittedDiscounts, retainedScanDiscounts, mergedDiscountList;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               orderId = params.orderId || ((_this$store$tempOrder = this.store.tempOrder) === null || _this$store$tempOrder === void 0 ? void 0 : _this$store$tempOrder.order_id) || undefined;
-              _context3.next = 3;
+              requestEpoch = ++this.customerWalletPrepareConfigEpoch;
+              requestOrderIdentityKey = this.getDiscountConfigOrderIdentityKey(this.store.tempOrder);
+              _context3.next = 5;
               return (_this$store$discount = this.store.discount) === null || _this$store$discount === void 0 ? void 0 : _this$store$discount.loadPrepareConfig(_objectSpread({
                 customer_id: params.customerId,
                 action: params.action || (orderId ? 'edit' : 'create'),
@@ -617,23 +644,34 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 with_available_wallet_pass_flag: 1,
                 with_virtual_currency: 1,
                 with_entitlement_pass: 1,
+                filter_order_wallet_pass_usage: 0,
                 request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
               }, orderId ? {
                 order_id: orderId
               } : {}));
-            case 3:
+            case 5:
               prepareConfigResult = _context3.sent;
+              isCurrentRequest = function isCurrentRequest() {
+                var _this3$store$tempOrde, _this3$store$tempOrde2;
+                return requestEpoch === _this3.customerWalletPrepareConfigEpoch && _this3.getDiscountConfigOrderIdentityKey(_this3.store.tempOrder) === requestOrderIdentityKey && String((_this3$store$tempOrde = (_this3$store$tempOrde2 = _this3.store.tempOrder) === null || _this3$store$tempOrde2 === void 0 ? void 0 : _this3$store$tempOrde2.customer_id) !== null && _this3$store$tempOrde !== void 0 ? _this3$store$tempOrde : '') === String(params.customerId);
+              };
+              if (isCurrentRequest()) {
+                _context3.next = 9;
+                break;
+              }
+              return _context3.abrupt("return", this.getDiscountList());
+            case 9:
               discountList = prepareConfigResult === null || prepareConfigResult === void 0 ? void 0 : prepareConfigResult.discountList;
-              this.store.availableWalletIds = (prepareConfigResult === null || prepareConfigResult === void 0 ? void 0 : prepareConfigResult.availableWalletIds) || [];
-              this.store.virtualCurrencyList = (prepareConfigResult === null || prepareConfigResult === void 0 ? void 0 : prepareConfigResult.virtualCurrencyList) || [];
               if (prepareConfigResult) {
-                this.writePointCardSnapshotFromPrepareConfig({
+                this.writeCustomerWalletSnapshotsFromPrepareConfig({
                   customerId: params.customerId,
-                  availableWalletPassList: prepareConfigResult.availableWalletPassList || []
+                  availableWalletIds: prepareConfigResult.availableWalletIds || [],
+                  availableWalletPassList: prepareConfigResult.availableWalletPassList || [],
+                  virtualCurrencyList: prepareConfigResult.virtualCurrencyList || []
                 });
               }
               if (!discountList) {
-                _context3.next = 25;
+                _context3.next = 32;
                 break;
               }
               currentDiscountList = ((_this$store$discount2 = this.store.discount) === null || _this$store$discount2 === void 0 ? void 0 : _this$store$discount2.getDiscountList()) || [];
@@ -699,17 +737,35 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return id === null || !refreshedScanDiscountIds.has(id);
               });
               mergedDiscountList = [].concat(_toConsumableArray(retainedCommittedDiscounts), _toConsumableArray(retainedScanDiscounts), _toConsumableArray(runtimeDiscounts));
-              _context3.next = 23;
+              if (isCurrentRequest()) {
+                _context3.next = 26;
+                break;
+              }
+              return _context3.abrupt("return", this.getDiscountList());
+            case 26:
+              _context3.next = 28;
               return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.setOriginalDiscountList(mergedDiscountList);
-            case 23:
-              _context3.next = 25;
+            case 28:
+              if (isCurrentRequest()) {
+                _context3.next = 30;
+                break;
+              }
+              return _context3.abrupt("return", this.getDiscountList());
+            case 30:
+              _context3.next = 32;
               return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.setDiscountList(mergedDiscountList);
-            case 25:
+            case 32:
+              if (isCurrentRequest()) {
+                _context3.next = 34;
+                break;
+              }
+              return _context3.abrupt("return", this.getDiscountList());
+            case 34:
               if (params.apply !== false && (_this$store$tempOrder2 = this.store.tempOrder) !== null && _this$store$tempOrder2 !== void 0 && (_this$store$tempOrder2 = _this$store$tempOrder2.products) !== null && _this$store$tempOrder2 !== void 0 && _this$store$tempOrder2.length) {
                 this.applyDiscount();
               }
               return _context3.abrupt("return", this.getDiscountList());
-            case 27:
+            case 36:
             case "end":
               return _context3.stop();
           }
@@ -736,6 +792,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function getVirtualCurrencyList() {
       return cloneDeep(this.store.virtualCurrencyList || []);
     }
+  }, {
+    key: "getCustomerWalletPrepareConfigEpoch",
+    value: function getCustomerWalletPrepareConfigEpoch() {
+      return this.customerWalletPrepareConfigEpoch;
+    }
   }, {
     key: "syncScannedDiscountsToOriginalDiscountList",
     value: function () {
@@ -778,13 +839,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "ensureEditDiscountConfigForProductChange",
     value: function () {
       var _ensureEditDiscountConfigForProductChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(tempOrder) {
-        var _tempOrder$customer, _tempOrder$_extend, _tempOrder$_extend2, _this$store$discount10;
+        var _tempOrder$customer, _tempOrder$_extend2, _tempOrder$_extend3, _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);
+              customerId = Number(tempOrder.customer_id || ((_tempOrder$customer = tempOrder.customer) === null || _tempOrder$customer === void 0 ? void 0 : _tempOrder$customer.id) || ((_tempOrder$_extend2 = tempOrder._extend) === null || _tempOrder$_extend2 === void 0 || (_tempOrder$_extend2 = _tempOrder$_extend2.customerSnapshot) === null || _tempOrder$_extend2 === void 0 ? void 0 : _tempOrder$_extend2.id) || ((_tempOrder$_extend3 = tempOrder._extend) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3.customerSnapshot) === null || _tempOrder$_extend3 === void 0 ? void 0 : _tempOrder$_extend3.customer_id) || 0);
               if (!(!orderId || !customerId || customerId === 1)) {
                 _context5.next = 4;
                 break;
@@ -824,7 +885,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(code, customerId) {
         var _this$store$discount11, _tempOrder$holder, _this$store$summary;
-        var resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelected, tempOrder, holders, _ref12, isAvailable, newDiscountList, evaluatedDiscountList, unavailableReason, shouldRetainForLater, normalizedNewDiscountList, retainedDiscountList, resolvedDiscountList, _this$store$discount12, _this$store$discount13;
+        var resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelected, tempOrder, holders, _ref16, isAvailable, newDiscountList, evaluatedDiscountList, unavailableReason, scannedIds, evaluatedScannedDiscounts, shouldRetainForLater, normalizedNewDiscountList, resolvedDiscountList, _this$store$discount12, _this$store$discount13, retainedDiscounts;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -914,7 +975,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 20:
               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) || [];
-              _ref12 = rulesModule.isDiscountListAvailable({
+              _ref16 = rulesModule.isDiscountListAvailable({
                 productList: (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.products) || [],
                 oldDiscountList: this.getDiscountList(),
                 newDiscountList: withScanList,
@@ -926,47 +987,66 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }) || {
                 isAvailable: false,
                 discountList: this.getDiscountList()
-              }, isAvailable = _ref12.isAvailable, newDiscountList = _ref12.discountList, evaluatedDiscountList = _ref12.evaluatedDiscountList, unavailableReason = _ref12.unavailableReason;
-              shouldRetainForLater = !isAvailable && unavailableReason === UnavailableReason.ProductNotApplicable && withScanList.some(isCustomerPromotionDiscount);
+              }, isAvailable = _ref16.isAvailable, newDiscountList = _ref16.discountList, evaluatedDiscountList = _ref16.evaluatedDiscountList, unavailableReason = _ref16.unavailableReason;
+              scannedIds = new Set(withScanList.map(function (discount) {
+                return String(discount.id);
+              }));
+              evaluatedScannedDiscounts = (evaluatedDiscountList || withScanList).filter(function (discount) {
+                return scannedIds.has(String(discount.id)) && isCustomerPromotionDiscount(discount) && !getDiscountLifecycleReason(discount);
+              });
+              shouldRetainForLater = !isAvailable && evaluatedScannedDiscounts.length > 0;
               normalizedNewDiscountList = newDiscountList ? markScannedDiscounts(newDiscountList, withScanList) : undefined;
-              retainedDiscountList = evaluatedDiscountList ? markScannedDiscounts(evaluatedDiscountList, withScanList) : normalizedNewDiscountList;
               resolvedDiscountList = normalizedNewDiscountList || this.getDiscountList();
               if (!(isAvailable && normalizedNewDiscountList)) {
-                _context6.next = 36;
+                _context6.next = 37;
                 break;
               }
-              _context6.next = 30;
+              _context6.next = 31;
               return (_this$store$discount12 = this.store.discount) === null || _this$store$discount12 === void 0 ? void 0 : _this$store$discount12.setDiscountList(normalizedNewDiscountList);
-            case 30:
+            case 31:
               this.applyDiscount();
-              _context6.next = 33;
+              _context6.next = 34;
               return this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
-            case 33:
+            case 34:
               resolvedDiscountList = this.getDiscountList();
-              _context6.next = 42;
+              _context6.next = 45;
               break;
-            case 36:
-              if (!(shouldRetainForLater && retainedDiscountList)) {
-                _context6.next = 42;
+            case 37:
+              if (!shouldRetainForLater) {
+                _context6.next = 45;
                 break;
               }
-              _context6.next = 39;
-              return (_this$store$discount13 = this.store.discount) === null || _this$store$discount13 === void 0 ? void 0 : _this$store$discount13.setDiscountList(retainedDiscountList);
-            case 39:
-              _context6.next = 41;
+              // 只合并本次识别的卡券；不把试算产生的其他选券状态写回订单。
+              retainedDiscounts = new Map(this.getDiscountList().map(function (discount) {
+                return [String(discount.id), discount];
+              }));
+              evaluatedScannedDiscounts.forEach(function (discount) {
+                retainedDiscounts.set(String(discount.id), _objectSpread(_objectSpread({}, discount), {}, {
+                  isScan: true,
+                  isAvailable: false,
+                  isSelected: false,
+                  reasonCode: discount.reasonCode || 'product_not_applicable',
+                  appliedProductDetails: [],
+                  savedAmount: 0
+                }));
+              });
+              _context6.next = 42;
+              return (_this$store$discount13 = this.store.discount) === null || _this$store$discount13 === void 0 ? void 0 : _this$store$discount13.setDiscountList(_toConsumableArray(retainedDiscounts.values()));
+            case 42:
+              _context6.next = 44;
               return this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
-            case 41:
+            case 44:
               resolvedDiscountList = this.getDiscountList();
-            case 42:
+            case 45:
               return _context6.abrupt("return", {
                 type: 'clientCalc',
                 isAvailable: isAvailable || false,
                 isAccepted: Boolean(isAvailable || shouldRetainForLater),
                 discountList: resolvedDiscountList,
-                scannedDiscountList: resultDiscountList,
+                scannedDiscountList: evaluatedScannedDiscounts,
                 unavailableReason: unavailableReason
               });
-            case 43:
+            case 46:
             case "end":
               return _context6.stop();
           }
@@ -982,7 +1062,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function applyDiscount(options) {
       var _this$store$discount16,
         _this$store$summary2,
-        _this2 = this;
+        _this4 = this;
       var tempOrder = this.store.tempOrder;
       // 任意 products CRUD 后都应当重算 discount 状态；即使 products 为空，
       // 也需要让 Rules.calcDiscount 把 DiscountModule 的 isSelected / isAvailable /
@@ -1018,9 +1098,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (result !== null && result !== void 0 && result.productList) {
         var previousProductsByUid = indexOrderProductsByUid(tempOrder.products);
         tempOrder.products = this.applyProductDiscountPrices((result.productList || []).map(function (product, index) {
-          var _ref13;
+          var _ref17;
           var uid = getOrderProductLineUid(product);
-          var previous = (_ref13 = uid ? previousProductsByUid.get(uid) : undefined) !== null && _ref13 !== void 0 ? _ref13 : previousProductsByUid.get("__index__:".concat(index));
+          var previous = (_ref17 = uid ? previousProductsByUid.get(uid) : undefined) !== null && _ref17 !== void 0 ? _ref17 : previousProductsByUid.get("__index__:".concat(index));
           if (isManualProductDiscountProduct(previous)) {
             return previous;
           }
@@ -1038,7 +1118,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         (_this$store$discount17 = this.store.discount) === null || _this$store$discount17 === void 0 || _this$store$discount17.setDiscountList(result.discountList);
       }
       this.hasActiveCustomerBoundDiscount = (tempOrder.products || []).some(function (product) {
-        return _this2.productHasCustomerBoundDiscount(product);
+        return _this4.productHasCustomerBoundDiscount(product);
       });
     }
 
@@ -1084,7 +1164,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     }
 
     /**
-     * 应用购物车促销：计算 → 差异化赠品 → 写回 tempOrder.products → emit onPromotionApplied。
+     * 只执行购物车促销评估与赠品写回，不发布稳定态事件。
      *
      * 调用时机：写路径（add/update/remove/clear/setCustomer）末尾自动触发；外部一般无需手动调。
      *
@@ -1092,51 +1172,52 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
      * - 不调用任何公开 CRUD API（如 removeProductFromOrder），全部内部 mutate tempOrder.products，避免事件风暴；
      * - 用 `isApplyingPromotion` 防递归；
      * - 多选项赠品依赖 giftSelectResolver，未注入则跳过且 console.warn；
-     * - 不主动调用 applyDiscount / recalculateSummary，调用方负责跟进。
+     * - 不主动调用 applyDiscount / recalculateSummary，调用方负责跟进；
+     * - 返回的 payload 只能在 applyDiscount（商品写路径还需 summary/persist）完成后发布。
      */
   }, {
-    key: "applyPromotion",
+    key: "evaluatePromotion",
     value: (function () {
-      var _applyPromotion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+      var _evaluatePromotion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
         var _this$promotionEvalua,
           _this$promotionEvalua2,
-          _this3 = this;
+          _this5 = this;
         var tempOrder, strategyConfigs, result, removeSet, _iterator3, _step3, reduce, _iterator6, _step6, _loop2, _iterator4, _step4, _loop, payload;
         return _regeneratorRuntime().wrap(function _callee7$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              if (!this.isApplyingPromotion) {
+              if (!(this.isApplyingPromotion || this.isEmittingPromotionApplied)) {
                 _context9.next = 2;
                 break;
               }
-              return _context9.abrupt("return");
+              return _context9.abrupt("return", null);
             case 2:
               if (this.promotionEvaluator) {
                 _context9.next = 4;
                 break;
               }
-              return _context9.abrupt("return");
+              return _context9.abrupt("return", null);
             case 4:
               tempOrder = this.store.tempOrder;
               if (tempOrder) {
                 _context9.next = 7;
                 break;
               }
-              return _context9.abrupt("return");
+              return _context9.abrupt("return", null);
             case 7:
               if (!this.isActiveVirtualSettlementOrder(tempOrder)) {
                 _context9.next = 10;
                 break;
               }
               tempOrder.products = normalizeVirtualSettlementProducts(tempOrder.products);
-              return _context9.abrupt("return");
+              return _context9.abrupt("return", null);
             case 10:
               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)) {
                 _context9.next = 13;
                 break;
               }
-              return _context9.abrupt("return");
+              return _context9.abrupt("return", null);
             case 13:
               this.isApplyingPromotion = true;
               _context9.prev = 14;
@@ -1259,7 +1340,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     case 6:
                       _context7.prev = 6;
                       _context7.next = 9;
-                      return _this3.giftSelectResolver({
+                      return _this5.giftSelectResolver({
                         strategyId: addAction.strategyId,
                         strategyName: addAction.strategyName,
                         giftCount: addAction.giftCount,
@@ -1294,7 +1375,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                         _context7.next = 26;
                         break;
                       }
-                      linked = _this3.createLinkedProductAndBooking({
+                      linked = _this5.createLinkedProductAndBooking({
                         product: gp,
                         booking: booking
                       });
@@ -1376,22 +1457,84 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }),
                 products: tempOrder.products
               };
-              this.effectsEmit('onPromotionApplied', payload);
-              _context9.next = 81;
-              break;
+              return _context9.abrupt("return", payload);
             case 78:
               _context9.prev = 78;
               _context9.t5 = _context9["catch"](14);
               console.error('[OrderModule] applyPromotion failed', _context9.t5);
-            case 81:
-              _context9.prev = 81;
+              return _context9.abrupt("return", null);
+            case 82:
+              _context9.prev = 82;
               this.isApplyingPromotion = false;
-              return _context9.finish(81);
-            case 84:
+              return _context9.finish(82);
+            case 85:
             case "end":
               return _context9.stop();
           }
-        }, _callee7, this, [[14, 78, 81, 84], [18, 42, 45, 48], [23, 32, 35, 38], [54, 65, 68, 71]]);
+        }, _callee7, this, [[14, 78, 82, 85], [18, 42, 45, 48], [23, 32, 35, 38], [54, 65, 68, 71]]);
+      }));
+      function evaluatePromotion() {
+        return _evaluatePromotion.apply(this, arguments);
+      }
+      return evaluatePromotion;
+    }() /** 发布促销稳定态；products 必须读取折扣计算后的当前数组。 */)
+  }, {
+    key: "emitPromotionApplied",
+    value: function emitPromotionApplied(payload) {
+      var _this$store$tempOrder3;
+      if (!payload) return;
+      var products = ((_this$store$tempOrder3 = this.store.tempOrder) === null || _this$store$tempOrder3 === void 0 ? void 0 : _this$store$tempOrder3.products) || payload.products;
+      this.isEmittingPromotionApplied = true;
+      try {
+        void this.effectsEmit('onPromotionApplied', _objectSpread(_objectSpread({}, payload), {}, {
+          products: products
+        }));
+      } finally {
+        // effectsEmit 同步调用监听器后返回 Promise；保持既有的非阻塞事件行为。
+        this.isEmittingPromotionApplied = false;
+      }
+    }
+
+    /** 公开入口：促销、折扣、summary 与持久化完成后发布稳定态事件。 */
+  }, {
+    key: "applyPromotion",
+    value: (function () {
+      var _applyPromotion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+        var payload, tempOrder;
+        return _regeneratorRuntime().wrap(function _callee8$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
+            case 0:
+              _context10.next = 2;
+              return this.evaluatePromotion();
+            case 2:
+              payload = _context10.sent;
+              if (payload) {
+                _context10.next = 5;
+                break;
+              }
+              return _context10.abrupt("return");
+            case 5:
+              tempOrder = this.store.tempOrder;
+              if (tempOrder) {
+                _context10.next = 8;
+                break;
+              }
+              return _context10.abrupt("return");
+            case 8:
+              this.applyDiscount();
+              this.sanitizeTempOrderProducts(tempOrder);
+              _context10.next = 12;
+              return this.recalculateSummary({
+                createIfMissing: true
+              });
+            case 12:
+              this.persistTempOrder();
+              this.emitPromotionApplied(payload);
+            case 14:
+            case "end":
+              return _context10.stop();
+          }
+        }, _callee8, this);
       }));
       function applyPromotion() {
         return _applyPromotion.apply(this, arguments);
@@ -1517,6 +1660,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (!this.store.tempOrder) return;
       this.store.tempOrder = _objectSpread(_objectSpread({}, this.store.tempOrder), {}, {
         products: _toConsumableArray(this.store.tempOrder.products),
+        notes: _toConsumableArray(this.store.tempOrder.notes || []),
         bookings: this.store.tempOrder.bookings ? _toConsumableArray(this.store.tempOrder.bookings) : []
       });
       this.persistTempOrder();
@@ -1531,12 +1675,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       });
     }
   }, {
-    key: "clearTempOrderPointCardSnapshot",
-    value: function clearTempOrderPointCardSnapshot(tempOrder) {
+    key: "clearTempOrderCustomerWalletSnapshots",
+    value: function clearTempOrderCustomerWalletSnapshots(tempOrder) {
       var orderMetaList = normalizeOrderMetaList(tempOrder.order_meta_list);
       if (!orderMetaList) return;
       var nextOrderMetaList = _objectSpread({}, orderMetaList);
       delete nextOrderMetaList.point_cards_snapshot;
+      delete nextOrderMetaList.virtual_currency_snapshot;
       if (Object.keys(nextOrderMetaList).length === 0) {
         delete tempOrder.order_meta_list;
         return;
@@ -1544,15 +1689,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       tempOrder.order_meta_list = nextOrderMetaList;
     }
   }, {
-    key: "writePointCardSnapshotFromPrepareConfig",
-    value: function writePointCardSnapshotFromPrepareConfig(params) {
+    key: "clearCustomerWalletState",
+    value: function clearCustomerWalletState(tempOrder) {
+      this.clearCustomerWalletRuntimeState();
+      this.clearTempOrderCustomerWalletSnapshots(tempOrder);
+    }
+  }, {
+    key: "clearCustomerWalletRuntimeState",
+    value: function clearCustomerWalletRuntimeState() {
+      this.customerWalletPrepareConfigEpoch += 1;
+      this.store.availableWalletIds = [];
+      this.store.virtualCurrencyList = [];
+    }
+  }, {
+    key: "writeCustomerWalletSnapshotsFromPrepareConfig",
+    value: function writeCustomerWalletSnapshotsFromPrepareConfig(params) {
       var _tempOrder$customer_i;
       var tempOrder = this.store.tempOrder;
       if (!tempOrder) return;
       if (String((_tempOrder$customer_i = tempOrder.customer_id) !== null && _tempOrder$customer_i !== void 0 ? _tempOrder$customer_i : '') !== String(params.customerId)) return;
+      var virtualCurrencyList = Array.isArray(params.virtualCurrencyList) ? params.virtualCurrencyList : [];
       tempOrder.order_meta_list = _objectSpread(_objectSpread({}, normalizeOrderMetaList(tempOrder.order_meta_list) || {}), {}, {
-        point_cards_snapshot: buildPointCardSnapshotFromWalletPassList(params.availableWalletPassList)
+        point_cards_snapshot: buildPointCardSnapshotFromWalletPassList(params.availableWalletPassList),
+        virtual_currency_snapshot: buildVirtualCurrencySnapshotFromList(virtualCurrencyList)
       });
+      this.store.availableWalletIds = _toConsumableArray(params.availableWalletIds);
+      this.store.virtualCurrencyList = cloneDeep(virtualCurrencyList);
       this.persistTempOrder();
       this.saveDraftInBackground();
     }
@@ -1615,14 +1777,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "saveDraft",
     value: function () {
-      var _saveDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-        return _regeneratorRuntime().wrap(function _callee8$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+      var _saveDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+        return _regeneratorRuntime().wrap(function _callee9$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
             case "end":
-              return _context10.stop();
+              return _context11.stop();
           }
-        }, _callee8);
+        }, _callee9);
       }));
       function saveDraft() {
         return _saveDraft.apply(this, arguments);
@@ -1637,16 +1799,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hydrateTempOrderFromLocalRecord",
     value: function () {
-      var _hydrateTempOrderFromLocalRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(record) {
-        return _regeneratorRuntime().wrap(function _callee9$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+      var _hydrateTempOrderFromLocalRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(record) {
+        return _regeneratorRuntime().wrap(function _callee10$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              return _context11.abrupt("return", this.hydrateTempOrderFromRecord(record));
+              return _context12.abrupt("return", this.hydrateTempOrderFromRecord(record));
             case 1:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
-        }, _callee9, this);
+        }, _callee10, this);
       }));
       function hydrateTempOrderFromLocalRecord(_x8) {
         return _hydrateTempOrderFromLocalRecord.apply(this, arguments);
@@ -1656,15 +1818,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "extractOrderIdFromSubmitResult",
     value: function extractOrderIdFromSubmitResult(result) {
-      var _ref14, _ref15, _ref16, _result$data$order_id, _result$data, _result$data2;
-      return (_ref14 = (_ref15 = (_ref16 = (_result$data$order_id = result === null || result === void 0 || (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.order_id) !== null && _result$data$order_id !== void 0 ? _result$data$order_id : result === null || result === void 0 ? void 0 : result.order_id) !== null && _ref16 !== void 0 ? _ref16 : result === null || result === void 0 || (_result$data2 = result.data) === null || _result$data2 === void 0 ? void 0 : _result$data2.id) !== null && _ref15 !== void 0 ? _ref15 : result === null || result === void 0 ? void 0 : result.id) !== null && _ref14 !== void 0 ? _ref14 : null;
+      var _ref18, _ref19, _ref20, _result$data$order_id, _result$data, _result$data2;
+      return (_ref18 = (_ref19 = (_ref20 = (_result$data$order_id = result === null || result === void 0 || (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.order_id) !== null && _result$data$order_id !== void 0 ? _result$data$order_id : result === null || result === void 0 ? void 0 : result.order_id) !== null && _ref20 !== void 0 ? _ref20 : result === null || result === void 0 || (_result$data2 = result.data) === null || _result$data2 === void 0 ? void 0 : _result$data2.id) !== null && _ref19 !== void 0 ? _ref19 : result === null || result === void 0 ? void 0 : result.id) !== null && _ref18 !== void 0 ? _ref18 : null;
     }
   }, {
     key: "calculatePaymentEffectiveAmount",
     value: function calculatePaymentEffectiveAmount(payment) {
-      var _ref17, _payment$origin_amoun;
+      var _ref21, _payment$origin_amoun;
       var amount = new Decimal(payment.amount || 0);
-      var originAmount = new Decimal((_ref17 = (_payment$origin_amoun = payment.origin_amount) !== null && _payment$origin_amoun !== void 0 ? _payment$origin_amoun : payment.amount) !== null && _ref17 !== void 0 ? _ref17 : 0);
+      var originAmount = new Decimal((_ref21 = (_payment$origin_amoun = payment.origin_amount) !== null && _payment$origin_amoun !== void 0 ? _payment$origin_amoun : payment.amount) !== null && _ref21 !== void 0 ? _ref21 : 0);
       var serviceFee = new Decimal(payment.service_fee || 0);
       // TODO: 后端允许 amount 表示顾客实际支付总额后，移除这个兼容分支。
       var effectiveAmount = serviceFee.gt(0) && amount.eq(originAmount) ? amount.plus(serviceFee) : amount;
@@ -1674,23 +1836,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculatePaymentTotal",
     value: function calculatePaymentTotal(payments) {
-      var _this4 = this;
+      var _this6 = this;
       return mapPaymentItemsToOrderPayments(payments, {
         includeVoided: false
       }).reduce(function (sum, payment) {
         if (!isPaidPaymentRecord(payment)) return sum;
-        return sum.plus(_this4.calculatePaymentEffectiveAmount(payment));
+        return sum.plus(_this6.calculatePaymentEffectiveAmount(payment));
       }, new Decimal(0));
     }
   }, {
     key: "calculateOrderPaidPaymentTotal",
     value: function calculateOrderPaidPaymentTotal(payments) {
-      var _this5 = this;
+      var _this7 = this;
       return mapPaymentItemsToOrderPayments(payments, {
         includeVoided: false
       }).reduce(function (sum, payment) {
         if (!isPaidPaymentRecord(payment)) return sum;
-        return sum.plus(_this5.calculatePaymentGapAmount(payment));
+        return sum.plus(_this7.calculatePaymentGapAmount(payment));
       }, new Decimal(0));
     }
   }, {
@@ -1826,13 +1988,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculateDepositPaidAmount",
     value: function calculateDepositPaidAmount(payments) {
-      var _this6 = this;
+      var _this8 = this;
       return (payments || []).reduce(function (sum, payment) {
         var paymentRecord = payment;
         if (!isPaidPaymentRecord(paymentRecord)) return sum;
         var isDepositPayment = paymentRecord.type === 'deposit' || paymentRecord.order_payment_type === 'deposit';
         if (!isDepositPayment) return sum;
-        return sum.plus(_this6.calculatePaymentGapAmount(paymentRecord));
+        return sum.plus(_this8.calculatePaymentGapAmount(paymentRecord));
       }, new Decimal(0));
     }
   }, {
@@ -1869,28 +2031,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getPaymentNumberDevicePrefixSync",
     value: function getPaymentNumberDevicePrefixSync() {
-      var _this7 = this;
+      var _this9 = this;
       return resolvePaymentNumberDevicePrefixFromDeviceId(function (key) {
-        return _this7.getPaymentNumberAppData(key);
+        return _this9.getPaymentNumberAppData(key);
       });
     }
   }, {
     key: "getPaymentNumberDevicePrefixAsync",
     value: function getPaymentNumberDevicePrefixAsync() {
-      var _this8 = this;
+      var _this10 = this;
       return resolvePaymentNumberDevicePrefix(function (key) {
-        return _this8.getPaymentNumberAppData(key);
+        return _this10.getPaymentNumberAppData(key);
       });
     }
   }, {
     key: "normalizePaymentSource",
     value: function normalizePaymentSource(payment, options) {
-      var _ref18, _paymentRecord$origin;
+      var _ref22, _paymentRecord$origin;
       var paymentRecord = payment;
       var metadata = paymentRecord.metadata && _typeof(paymentRecord.metadata) === 'object' ? _objectSpread({}, paymentRecord.metadata) : {};
       var normalized = ensureOrderPaymentNumber(_objectSpread(_objectSpread({}, paymentRecord), {}, {
         metadata: metadata,
-        origin_amount: (_ref18 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref18 !== void 0 ? _ref18 : '0.00'
+        origin_amount: (_ref22 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref22 !== void 0 ? _ref22 : '0.00'
       }), (options === null || options === void 0 ? void 0 : options.devicePrefix) || this.getPaymentNumberDevicePrefixSync(), createUuidV4);
       if (paymentRecord.status !== undefined) {
         normalized.status = paymentRecord.status;
@@ -2009,16 +2171,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculatePaidPaymentSummary",
     value: function calculatePaidPaymentSummary(payments) {
-      var _this9 = this;
+      var _this11 = this;
       return (payments || []).reduce(function (summary, payment) {
         var paymentRecord = payment;
         if (!isPaidPaymentRecord(paymentRecord)) return summary;
         return {
           customerPaidAmount: summary.customerPaidAmount.plus(paymentRecord.amount || 0),
-          orderPaidAmount: summary.orderPaidAmount.plus(_this9.calculatePaymentOrderAmount(paymentRecord)),
-          gapPaidAmount: summary.gapPaidAmount.plus(_this9.calculatePaymentGapAmount(paymentRecord)),
-          payServiceChargeAmount: summary.payServiceChargeAmount.plus(_this9.calculatePaymentServiceFee(paymentRecord)),
-          roundingAmount: summary.roundingAmount.plus(_this9.calculatePaymentRoundingAmount(paymentRecord))
+          orderPaidAmount: summary.orderPaidAmount.plus(_this11.calculatePaymentOrderAmount(paymentRecord)),
+          gapPaidAmount: summary.gapPaidAmount.plus(_this11.calculatePaymentGapAmount(paymentRecord)),
+          payServiceChargeAmount: summary.payServiceChargeAmount.plus(_this11.calculatePaymentServiceFee(paymentRecord)),
+          roundingAmount: summary.roundingAmount.plus(_this11.calculatePaymentRoundingAmount(paymentRecord))
         };
       }, {
         customerPaidAmount: new Decimal(0),
@@ -2225,15 +2387,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeFingerprintValue",
     value: function normalizeFingerprintValue(value) {
-      var _this10 = this;
+      var _this12 = this;
       if (Array.isArray(value)) {
         return value.map(function (item) {
-          return _this10.normalizeFingerprintValue(item);
+          return _this12.normalizeFingerprintValue(item);
         });
       }
       if (!value || _typeof(value) !== 'object') return value !== null && value !== void 0 ? value : '';
       return Object.keys(value).sort().reduce(function (result, key) {
-        result[key] = _this10.normalizeFingerprintValue(value[key]);
+        result[key] = _this12.normalizeFingerprintValue(value[key]);
         return result;
       }, {});
     }
@@ -2246,9 +2408,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _product$payment_pric,
         _sku$code,
         _sku$barcode,
-        _ref19,
+        _ref23,
         _sku$variant_id,
-        _this11 = this;
+        _this13 = this;
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
       var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
       var discountTypes = ((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
@@ -2276,37 +2438,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         product_sku: this.normalizeFingerprintValue({
           code: (_sku$code = sku.code) !== null && _sku$code !== void 0 ? _sku$code : '',
           barcode: (_sku$barcode = sku.barcode) !== null && _sku$barcode !== void 0 ? _sku$barcode : '',
-          variant_id: (_ref19 = (_sku$variant_id = sku.variant_id) !== null && _sku$variant_id !== void 0 ? _sku$variant_id : product === null || product === void 0 ? void 0 : product.product_variant_id) !== null && _ref19 !== void 0 ? _ref19 : 0,
+          variant_id: (_ref23 = (_sku$variant_id = sku.variant_id) !== null && _sku$variant_id !== void 0 ? _sku$variant_id : product === null || product === void 0 ? void 0 : product.product_variant_id) !== null && _ref23 !== void 0 ? _ref23 : 0,
           variant: sku.variant || [],
           option: getProductSkuOptions(product || {}).map(function (option) {
-            var _ref20, _option$id, _option$option_group_, _ref21, _option$option_group_2, _option$num, _option$add_price;
+            var _ref24, _option$id, _option$option_group_, _ref25, _option$option_group_2, _option$num, _option$add_price;
             return {
-              id: (_ref20 = (_option$id = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id !== void 0 ? _option$id : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref20 !== void 0 ? _ref20 : null,
+              id: (_ref24 = (_option$id = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id !== void 0 ? _option$id : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref24 !== void 0 ? _ref24 : null,
               option_group_id: (_option$option_group_ = option === null || option === void 0 ? void 0 : option.option_group_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : null,
-              option_group_item_id: (_ref21 = (_option$option_group_2 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_2 !== void 0 ? _option$option_group_2 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref21 !== void 0 ? _ref21 : null,
+              option_group_item_id: (_ref25 = (_option$option_group_2 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_2 !== void 0 ? _option$option_group_2 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref25 !== void 0 ? _ref25 : null,
               num: Number((_option$num = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num !== void 0 ? _option$num : 1) || 1,
-              add_price: _this11.normalizeFingerprintMoney((_option$add_price = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price !== void 0 ? _option$add_price : option === null || option === void 0 ? void 0 : option.price)
+              add_price: _this13.normalizeFingerprintMoney((_option$add_price = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price !== void 0 ? _option$add_price : option === null || option === void 0 ? void 0 : option.price)
             };
           })
         }),
         product_bundle: this.normalizeFingerprintValue(((product === null || product === void 0 ? void 0 : product.product_bundle) || []).map(function (bundle) {
-          var _ref22, _ref23, _bundle$bundle_produc, _ref24, _bundle$bundle_varian, _bundle$num, _bundle$price_type, _bundle$price_type_ex;
+          var _ref26, _ref27, _bundle$bundle_produc, _ref28, _bundle$bundle_varian, _bundle$num, _bundle$price_type, _bundle$price_type_ex;
           return {
-            bundle_product_id: (_ref22 = (_ref23 = (_bundle$bundle_produc = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref23 !== void 0 ? _ref23 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref22 !== void 0 ? _ref22 : null,
-            bundle_variant_id: (_ref24 = (_bundle$bundle_varian = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle === null || bundle === void 0 ? void 0 : bundle.product_variant_id) !== null && _ref24 !== void 0 ? _ref24 : 0,
+            bundle_product_id: (_ref26 = (_ref27 = (_bundle$bundle_produc = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref27 !== void 0 ? _ref27 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref26 !== void 0 ? _ref26 : null,
+            bundle_variant_id: (_ref28 = (_bundle$bundle_varian = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle === null || bundle === void 0 ? void 0 : bundle.product_variant_id) !== null && _ref28 !== void 0 ? _ref28 : 0,
             num: getSafeProductNum((_bundle$num = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle === null || bundle === void 0 ? void 0 : bundle.quantity),
-            price: _this11.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.price),
-            bundle_selling_price: _this11.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price),
+            price: _this13.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.price),
+            bundle_selling_price: _this13.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price),
             price_type: (_bundle$price_type = bundle === null || bundle === void 0 ? void 0 : bundle.price_type) !== null && _bundle$price_type !== void 0 ? _bundle$price_type : '',
             price_type_ext: (_bundle$price_type_ex = bundle === null || bundle === void 0 ? void 0 : bundle.price_type_ext) !== null && _bundle$price_type_ex !== void 0 ? _bundle$price_type_ex : ''
           };
         })),
         discount_list: this.normalizeFingerprintValue(((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
-          var _ref25, _discount$type2, _ref26, _ref27, _discount$discount_id, _discount$discount;
+          var _ref29, _discount$type2, _ref30, _ref31, _discount$discount_id, _discount$discount;
           return {
-            type: (_ref25 = (_discount$type2 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type2 !== void 0 ? _discount$type2 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref25 !== void 0 ? _ref25 : '',
-            discount_id: (_ref26 = (_ref27 = (_discount$discount_id = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id !== void 0 ? _discount$discount_id : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref27 !== void 0 ? _ref27 : discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) !== null && _ref26 !== void 0 ? _ref26 : null,
-            amount: _this11.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
+            type: (_ref29 = (_discount$type2 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type2 !== void 0 ? _discount$type2 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref29 !== void 0 ? _ref29 : '',
+            discount_id: (_ref30 = (_ref31 = (_discount$discount_id = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id !== void 0 ? _discount$discount_id : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref31 !== void 0 ? _ref31 : discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) !== null && _ref30 !== void 0 ? _ref30 : null,
+            amount: _this13.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
           };
         }))
       };
@@ -2314,9 +2476,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildOrderProductsFingerprint",
     value: function buildOrderProductsFingerprint(products) {
-      var _this12 = this;
+      var _this14 = this;
       var items = (products || []).map(function (product) {
-        return _this12.buildProductFingerprintItem(product);
+        return _this14.buildProductFingerprintItem(product);
       });
       items.sort(function (left, right) {
         return JSON.stringify(left).localeCompare(JSON.stringify(right));
@@ -2329,16 +2491,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _product$product_id3,
         _product$product_vari2,
         _product$num2,
-        _ref28,
+        _ref32,
         _metadata$unique_iden,
         _metadata$price_overr,
         _metadata$is_manual_d,
         _metadata$product_dis,
         _sku$code2,
         _sku$barcode2,
-        _ref29,
+        _ref33,
         _sku$variant_id2,
-        _this13 = this;
+        _this15 = this;
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
       var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
       var discountTypes = ((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
@@ -2355,7 +2517,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         extension_type: extensionType,
         num: getSafeProductNum((_product$num2 = product === null || product === void 0 ? void 0 : product.num) !== null && _product$num2 !== void 0 ? _product$num2 : product === null || product === void 0 ? void 0 : product.product_quantity),
         metadata: {
-          unique_identification_number: (_ref28 = (_metadata$unique_iden = metadata.unique_identification_number) !== null && _metadata$unique_iden !== void 0 ? _metadata$unique_iden : product === null || product === void 0 ? void 0 : product.unique_identification_number) !== null && _ref28 !== void 0 ? _ref28 : '',
+          unique_identification_number: (_ref32 = (_metadata$unique_iden = metadata.unique_identification_number) !== null && _metadata$unique_iden !== void 0 ? _metadata$unique_iden : product === null || product === void 0 ? void 0 : product.unique_identification_number) !== null && _ref32 !== void 0 ? _ref32 : '',
           price_override: (_metadata$price_overr = metadata.price_override) !== null && _metadata$price_overr !== void 0 ? _metadata$price_overr : '',
           is_manual_discount: (_metadata$is_manual_d = metadata.is_manual_discount) !== null && _metadata$is_manual_d !== void 0 ? _metadata$is_manual_d : '',
           product_discount_reason: (_metadata$product_dis = metadata.product_discount_reason) !== null && _metadata$product_dis !== void 0 ? _metadata$product_dis : ''
@@ -2363,47 +2525,47 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         product_sku: this.normalizeFingerprintValue({
           code: (_sku$code2 = sku.code) !== null && _sku$code2 !== void 0 ? _sku$code2 : '',
           barcode: (_sku$barcode2 = sku.barcode) !== null && _sku$barcode2 !== void 0 ? _sku$barcode2 : '',
-          variant_id: (_ref29 = (_sku$variant_id2 = sku.variant_id) !== null && _sku$variant_id2 !== void 0 ? _sku$variant_id2 : product === null || product === void 0 ? void 0 : product.product_variant_id) !== null && _ref29 !== void 0 ? _ref29 : 0,
+          variant_id: (_ref33 = (_sku$variant_id2 = sku.variant_id) !== null && _sku$variant_id2 !== void 0 ? _sku$variant_id2 : product === null || product === void 0 ? void 0 : product.product_variant_id) !== null && _ref33 !== void 0 ? _ref33 : 0,
           variant: sku.variant || [],
           option: getProductSkuOptions(product || {}).map(function (option) {
-            var _ref30, _option$id2, _option$option_group_3, _ref31, _option$option_group_4, _option$num2, _option$add_price2;
+            var _ref34, _option$id2, _option$option_group_3, _ref35, _option$option_group_4, _option$num2, _option$add_price2;
             return {
-              id: (_ref30 = (_option$id2 = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id2 !== void 0 ? _option$id2 : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref30 !== void 0 ? _ref30 : null,
+              id: (_ref34 = (_option$id2 = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id2 !== void 0 ? _option$id2 : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref34 !== void 0 ? _ref34 : null,
               option_group_id: (_option$option_group_3 = option === null || option === void 0 ? void 0 : option.option_group_id) !== null && _option$option_group_3 !== void 0 ? _option$option_group_3 : null,
-              option_group_item_id: (_ref31 = (_option$option_group_4 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_4 !== void 0 ? _option$option_group_4 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref31 !== void 0 ? _ref31 : null,
+              option_group_item_id: (_ref35 = (_option$option_group_4 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_4 !== void 0 ? _option$option_group_4 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref35 !== void 0 ? _ref35 : null,
               num: Number((_option$num2 = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num2 !== void 0 ? _option$num2 : 1) || 1,
-              add_price: _this13.normalizeFingerprintMoney((_option$add_price2 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price2 !== void 0 ? _option$add_price2 : option === null || option === void 0 ? void 0 : option.price)
+              add_price: _this15.normalizeFingerprintMoney((_option$add_price2 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price2 !== void 0 ? _option$add_price2 : option === null || option === void 0 ? void 0 : option.price)
             };
           })
         }),
         product_bundle: this.normalizeFingerprintValue(((product === null || product === void 0 ? void 0 : product.product_bundle) || []).map(function (bundle) {
-          var _ref32, _bundle$bundle_id, _ref33, _bundle$bundle_group_, _ref34, _ref35, _bundle$bundle_produc2, _ref36, _bundle$bundle_varian2, _bundle$num2, _bundle$price_type2, _bundle$price_type_ex2;
+          var _ref36, _bundle$bundle_id, _ref37, _bundle$bundle_group_, _ref38, _ref39, _bundle$bundle_produc2, _ref40, _bundle$bundle_varian2, _bundle$num2, _bundle$price_type2, _bundle$price_type_ex2;
           return {
-            bundle_id: (_ref32 = (_bundle$bundle_id = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_id) !== null && _bundle$bundle_id !== void 0 ? _bundle$bundle_id : bundle === null || bundle === void 0 ? void 0 : bundle.id) !== null && _ref32 !== void 0 ? _ref32 : null,
-            bundle_group_id: (_ref33 = (_bundle$bundle_group_ = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle === null || bundle === void 0 ? void 0 : bundle.group_id) !== null && _ref33 !== void 0 ? _ref33 : null,
-            bundle_product_id: (_ref34 = (_ref35 = (_bundle$bundle_produc2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref35 !== void 0 ? _ref35 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref34 !== void 0 ? _ref34 : null,
-            bundle_variant_id: (_ref36 = (_bundle$bundle_varian2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_variant_id) !== null && _bundle$bundle_varian2 !== void 0 ? _bundle$bundle_varian2 : bundle === null || bundle === void 0 ? void 0 : bundle.product_variant_id) !== null && _ref36 !== void 0 ? _ref36 : 0,
+            bundle_id: (_ref36 = (_bundle$bundle_id = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_id) !== null && _bundle$bundle_id !== void 0 ? _bundle$bundle_id : bundle === null || bundle === void 0 ? void 0 : bundle.id) !== null && _ref36 !== void 0 ? _ref36 : null,
+            bundle_group_id: (_ref37 = (_bundle$bundle_group_ = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle === null || bundle === void 0 ? void 0 : bundle.group_id) !== null && _ref37 !== void 0 ? _ref37 : null,
+            bundle_product_id: (_ref38 = (_ref39 = (_bundle$bundle_produc2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref39 !== void 0 ? _ref39 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref38 !== void 0 ? _ref38 : null,
+            bundle_variant_id: (_ref40 = (_bundle$bundle_varian2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_variant_id) !== null && _bundle$bundle_varian2 !== void 0 ? _bundle$bundle_varian2 : bundle === null || bundle === void 0 ? void 0 : bundle.product_variant_id) !== null && _ref40 !== void 0 ? _ref40 : 0,
             num: getSafeProductNum((_bundle$num2 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num2 !== void 0 ? _bundle$num2 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity),
             price_type: (_bundle$price_type2 = bundle === null || bundle === void 0 ? void 0 : bundle.price_type) !== null && _bundle$price_type2 !== void 0 ? _bundle$price_type2 : '',
             price_type_ext: (_bundle$price_type_ex2 = bundle === null || bundle === void 0 ? void 0 : bundle.price_type_ext) !== null && _bundle$price_type_ex2 !== void 0 ? _bundle$price_type_ex2 : '',
-            option: _this13.normalizeFingerprintValue(((bundle === null || bundle === void 0 ? void 0 : bundle.option) || []).map(function (option) {
-              var _ref37, _option$id3, _option$option_group_5, _ref38, _option$option_group_6, _option$num3, _option$add_price3;
+            option: _this15.normalizeFingerprintValue(((bundle === null || bundle === void 0 ? void 0 : bundle.option) || []).map(function (option) {
+              var _ref41, _option$id3, _option$option_group_5, _ref42, _option$option_group_6, _option$num3, _option$add_price3;
               return {
-                id: (_ref37 = (_option$id3 = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id3 !== void 0 ? _option$id3 : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref37 !== void 0 ? _ref37 : null,
+                id: (_ref41 = (_option$id3 = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id3 !== void 0 ? _option$id3 : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref41 !== void 0 ? _ref41 : null,
                 option_group_id: (_option$option_group_5 = option === null || option === void 0 ? void 0 : option.option_group_id) !== null && _option$option_group_5 !== void 0 ? _option$option_group_5 : null,
-                option_group_item_id: (_ref38 = (_option$option_group_6 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_6 !== void 0 ? _option$option_group_6 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref38 !== void 0 ? _ref38 : null,
+                option_group_item_id: (_ref42 = (_option$option_group_6 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_6 !== void 0 ? _option$option_group_6 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref42 !== void 0 ? _ref42 : null,
                 num: Number((_option$num3 = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num3 !== void 0 ? _option$num3 : 1) || 1,
-                add_price: _this13.normalizeFingerprintMoney((_option$add_price3 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price3 !== void 0 ? _option$add_price3 : option === null || option === void 0 ? void 0 : option.price)
+                add_price: _this15.normalizeFingerprintMoney((_option$add_price3 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price3 !== void 0 ? _option$add_price3 : option === null || option === void 0 ? void 0 : option.price)
               };
             }))
           };
         })),
         discount_list: this.normalizeFingerprintValue(((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
-          var _ref39, _discount$type4, _ref40, _ref41, _discount$discount_id2, _discount$discount2;
+          var _ref43, _discount$type4, _ref44, _ref45, _discount$discount_id2, _discount$discount2;
           return {
-            type: (_ref39 = (_discount$type4 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type4 !== void 0 ? _discount$type4 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref39 !== void 0 ? _ref39 : '',
-            discount_id: (_ref40 = (_ref41 = (_discount$discount_id2 = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id2 !== void 0 ? _discount$discount_id2 : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref41 !== void 0 ? _ref41 : discount === null || discount === void 0 || (_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) !== null && _ref40 !== void 0 ? _ref40 : null,
-            amount: _this13.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
+            type: (_ref43 = (_discount$type4 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type4 !== void 0 ? _discount$type4 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref43 !== void 0 ? _ref43 : '',
+            discount_id: (_ref44 = (_ref45 = (_discount$discount_id2 = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id2 !== void 0 ? _discount$discount_id2 : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref45 !== void 0 ? _ref45 : discount === null || discount === void 0 || (_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) !== null && _ref44 !== void 0 ? _ref44 : null,
+            amount: _this15.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
           };
         }))
       };
@@ -2411,9 +2573,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildOrderProductsStructuralFingerprint",
     value: function buildOrderProductsStructuralFingerprint(products) {
-      var _this14 = this;
+      var _this16 = this;
       var items = (products || []).map(function (product) {
-        return _this14.buildProductStructuralFingerprintItem(product);
+        return _this16.buildProductStructuralFingerprintItem(product);
       });
       items.sort(function (left, right) {
         return JSON.stringify(left).localeCompare(JSON.stringify(right));
@@ -2423,8 +2585,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getManualDepositOverride",
     value: function getManualDepositOverride(tempOrder) {
-      var _tempOrder$_extend3;
-      var override = (_tempOrder$_extend3 = tempOrder._extend) === null || _tempOrder$_extend3 === void 0 ? void 0 : _tempOrder$_extend3.manualDepositOverride;
+      var _tempOrder$_extend4;
+      var override = (_tempOrder$_extend4 = tempOrder._extend) === null || _tempOrder$_extend4 === void 0 ? void 0 : _tempOrder$_extend4.manualDepositOverride;
       if (!override || _typeof(override) !== 'object') return null;
       if (typeof override.amount !== 'string') return null;
       if (typeof override.productStructuralFingerprint !== 'string') return null;
@@ -2443,16 +2605,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clearManualDepositOverride",
     value: function clearManualDepositOverride(tempOrder) {
-      var _tempOrder$_extend4;
-      if (!((_tempOrder$_extend4 = tempOrder._extend) !== null && _tempOrder$_extend4 !== void 0 && _tempOrder$_extend4.manualDepositOverride)) return;
+      var _tempOrder$_extend5;
+      if (!((_tempOrder$_extend5 = tempOrder._extend) !== null && _tempOrder$_extend5 !== void 0 && _tempOrder$_extend5.manualDepositOverride)) return;
       tempOrder._extend = _objectSpread({}, tempOrder._extend);
       delete tempOrder._extend.manualDepositOverride;
     }
   }, {
     key: "getOriginalSalesSnapshot",
     value: function getOriginalSalesSnapshot(tempOrder) {
-      var _tempOrder$_extend5;
-      var snapshot = (_tempOrder$_extend5 = tempOrder._extend) === null || _tempOrder$_extend5 === void 0 ? void 0 : _tempOrder$_extend5.originalSalesSnapshot;
+      var _tempOrder$_extend6;
+      var snapshot = (_tempOrder$_extend6 = tempOrder._extend) === null || _tempOrder$_extend6 === void 0 ? void 0 : _tempOrder$_extend6.originalSalesSnapshot;
       if (!snapshot || _typeof(snapshot) !== 'object') return null;
       if (typeof snapshot.productFingerprint !== 'string') return null;
       return snapshot;
@@ -2656,6 +2818,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var freshTempOrder = this.createDefaultTempOrderInstance();
       this.ensureExternalSaleNumber(freshTempOrder);
       this.store.tempOrder = freshTempOrder;
+      this.clearCustomerWalletRuntimeState();
       this.store.summary = createEmptySummary();
       this.store.lastOrderInfo = undefined;
       this.store.syncState = undefined;
@@ -2672,13 +2835,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "replaceTempOrder",
     value: function () {
-      var _replaceTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(tempOrder, options) {
+      var _replaceTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(tempOrder, options) {
         var nextTempOrder;
-        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:
               if (isTempOrder(tempOrder)) {
-                _context12.next = 2;
+                _context13.next = 2;
                 break;
               }
               throw new Error('无效的 tempOrder 数据');
@@ -2688,36 +2851,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 ensureIdentity: false
               });
               this.store.tempOrder = nextTempOrder;
+              this.clearCustomerWalletRuntimeState();
               if (!((options === null || options === void 0 ? void 0 : options.recalculateSummary) !== false)) {
-                _context12.next = 10;
+                _context13.next = 11;
                 break;
               }
-              _context12.next = 8;
+              _context13.next = 9;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 8:
-              _context12.next = 11;
+            case 9:
+              _context13.next = 12;
               break;
-            case 10:
-              this.store.summary = createEmptySummary();
             case 11:
+              this.store.summary = createEmptySummary();
+            case 12:
               if ((options === null || options === void 0 ? void 0 : options.persist) !== false) {
                 this.persistTempOrder();
               }
               if (!(options !== null && options !== void 0 && options.saveDraft)) {
-                _context12.next = 15;
+                _context13.next = 16;
                 break;
               }
-              _context12.next = 15;
+              _context13.next = 16;
               return this.saveDraft();
-            case 15:
-              return _context12.abrupt("return", nextTempOrder);
             case 16:
+              return _context13.abrupt("return", nextTempOrder);
+            case 17:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
-        }, _callee10, this);
+        }, _callee11, this);
       }));
       function replaceTempOrder(_x9, _x10) {
         return _replaceTempOrder.apply(this, arguments);
@@ -2727,13 +2891,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderIdentity",
     value: function getOrderIdentity() {
-      var _ref42, _ref43, _tempOrder$order_id, _tempOrder$_extend6;
+      var _ref46, _ref47, _tempOrder$order_id, _tempOrder$_extend7;
       var tempOrder = this.store.tempOrder;
       if (!tempOrder) return null;
       var lastOrderInfo = this.store.lastOrderInfo || {};
-      var orderId = (_ref42 = (_ref43 = (_tempOrder$order_id = tempOrder.order_id) !== null && _tempOrder$order_id !== void 0 ? _tempOrder$order_id : lastOrderInfo.order_id) !== null && _ref43 !== void 0 ? _ref43 : lastOrderInfo.id) !== null && _ref42 !== void 0 ? _ref42 : null;
+      var orderId = (_ref46 = (_ref47 = (_tempOrder$order_id = tempOrder.order_id) !== null && _tempOrder$order_id !== void 0 ? _tempOrder$order_id : lastOrderInfo.order_id) !== null && _ref47 !== void 0 ? _ref47 : lastOrderInfo.id) !== null && _ref46 !== void 0 ? _ref46 : null;
       return {
-        localId: this.cacheId || ((_tempOrder$_extend6 = tempOrder._extend) === null || _tempOrder$_extend6 === void 0 ? void 0 : _tempOrder$_extend6.localId),
+        localId: this.cacheId || ((_tempOrder$_extend7 = tempOrder._extend) === null || _tempOrder$_extend7 === void 0 ? void 0 : _tempOrder$_extend7.localId),
         orderId: orderId,
         externalSaleNumber: tempOrder.external_sale_number || lastOrderInfo.external_sale_number || '',
         orderNumber: tempOrder.order_number || lastOrderInfo.order_number || '',
@@ -2805,32 +2969,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addNewOrder",
     value: function () {
-      var _addNewOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+      var _addNewOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
         var tempOrder;
-        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 = this.ensureTempOrder();
               this.ensureExternalSaleNumber(tempOrder);
-              _context13.next = 4;
+              _context14.next = 4;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 4:
               this.persistTempOrder();
               if (!this.draftPersistEnabled) {
-                _context13.next = 8;
+                _context14.next = 8;
                 break;
               }
-              _context13.next = 8;
+              _context14.next = 8;
               return this.saveDraft();
             case 8:
-              return _context13.abrupt("return", tempOrder);
+              return _context14.abrupt("return", tempOrder);
             case 9:
             case "end":
-              return _context13.stop();
+              return _context14.stop();
           }
-        }, _callee11, this);
+        }, _callee12, this);
       }));
       function addNewOrder() {
         return _addNewOrder.apply(this, arguments);
@@ -2863,9 +3027,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sanitizeTempOrderProducts",
     value: function sanitizeTempOrderProducts(tempOrder) {
-      var _this15 = this;
+      var _this17 = this;
       tempOrder.products = (tempOrder.products || []).map(function (product) {
-        return _this15.sanitizeOrderProductForTempOrder(_this15.normalizeVirtualSettlementProductIfEnabled(product));
+        return _this17.sanitizeOrderProductForTempOrder(_this17.normalizeVirtualSettlementProductIfEnabled(product));
       });
       this.syncTempOrderSettlementState(tempOrder);
       ensureUniqueProductLineUids(tempOrder);
@@ -2886,8 +3050,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "repairDuplicateProductLineIdentities",
     value: function repairDuplicateProductLineIdentities(tempOrder) {
-      var _tempOrder$_extend7;
-      var result = repairDuplicateOrderProductLineIdentities(tempOrder.products, (_tempOrder$_extend7 = tempOrder._extend) === null || _tempOrder$_extend7 === void 0 ? void 0 : _tempOrder$_extend7.productsByUid);
+      var _tempOrder$_extend8;
+      var result = repairDuplicateOrderProductLineIdentities(tempOrder.products, (_tempOrder$_extend8 = tempOrder._extend) === null || _tempOrder$_extend8 === void 0 ? void 0 : _tempOrder$_extend8.productsByUid);
       if (!result.repairs.length) return;
       tempOrder.products = result.products;
       if (result.productsByUid) {
@@ -2901,11 +3065,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "captureProductRuntime",
     value: function captureProductRuntime(tempOrder, rawProduct, normalizedProduct, existedUid) {
-      var _extend$productsByUid, _ref44, _rawProduct$_origin;
+      var _extend$productsByUid, _ref48, _rawProduct$_origin;
       var uid = existedUid || this.getProductUid(normalizedProduct);
       var extend = this.ensureExtend(tempOrder);
       var existed = ((_extend$productsByUid = extend.productsByUid) === null || _extend$productsByUid === void 0 ? void 0 : _extend$productsByUid[uid]) || {};
-      var origin = (_ref44 = (_rawProduct$_origin = rawProduct._origin) !== null && _rawProduct$_origin !== void 0 ? _rawProduct$_origin : normalizedProduct._origin) !== null && _ref44 !== void 0 ? _ref44 : existed.origin;
+      var origin = (_ref48 = (_rawProduct$_origin = rawProduct._origin) !== null && _rawProduct$_origin !== void 0 ? _rawProduct$_origin : normalizedProduct._origin) !== null && _ref48 !== void 0 ? _ref48 : existed.origin;
       extend.productsByUid[uid] = _objectSpread(_objectSpread({}, existed), origin !== undefined ? {
         origin: origin
       } : {});
@@ -2985,7 +3149,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncLinkedBookingHoldersToProducts",
     value: function syncLinkedBookingHoldersToProducts(tempOrder) {
-      var _this16 = this;
+      var _this18 = this;
       var bookings = tempOrder.bookings || [];
       var products = tempOrder.products || [];
       if (!bookings.length || !products.length) return;
@@ -3010,7 +3174,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         var bookingUid = product.booking_uid || ((_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.booking_uid);
         var linkedBooking = (productUid !== undefined && productUid !== null && String(productUid) !== '' ? bookingByProductUid.get(String(productUid)) : undefined) || (bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '' ? bookingByBookingUid.get(String(bookingUid)) : undefined);
         if (linkedBooking) {
-          _this16.setProductHolderFromBooking(product, linkedBooking);
+          _this18.setProductHolderFromBooking(product, linkedBooking);
         }
       });
     }
@@ -3048,7 +3212,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildTempOrderHolderFromBookings",
     value: function buildTempOrderHolderFromBookings(tempOrder) {
-      var _baseHolder$customer_, _baseHolder, _ref45, _baseHolder$form_id, _baseHolder2, _tempOrder$holder2, _baseHolder3, _this$otherParams2;
+      var _baseHolder$customer_, _baseHolder, _ref49, _baseHolder$form_id, _baseHolder2, _tempOrder$holder2, _baseHolder3, _this$otherParams2;
       var holderRecords = [];
       var holderNames = [];
       var baseHolder = null;
@@ -3095,7 +3259,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       var nextHolder = {
         customer_id: (_baseHolder$customer_ = (_baseHolder = baseHolder) === null || _baseHolder === void 0 ? void 0 : _baseHolder.customer_id) !== null && _baseHolder$customer_ !== void 0 ? _baseHolder$customer_ : tempOrder.customer_id,
-        form_id: (_ref45 = (_baseHolder$form_id = (_baseHolder2 = baseHolder) === null || _baseHolder2 === void 0 ? void 0 : _baseHolder2.form_id) !== null && _baseHolder$form_id !== void 0 ? _baseHolder$form_id : (_tempOrder$holder2 = tempOrder.holder) === null || _tempOrder$holder2 === void 0 ? void 0 : _tempOrder$holder2.form_id) !== null && _ref45 !== void 0 ? _ref45 : 0,
+        form_id: (_ref49 = (_baseHolder$form_id = (_baseHolder2 = baseHolder) === null || _baseHolder2 === void 0 ? void 0 : _baseHolder2.form_id) !== null && _baseHolder$form_id !== void 0 ? _baseHolder$form_id : (_tempOrder$holder2 = tempOrder.holder) === null || _tempOrder$holder2 === void 0 ? void 0 : _tempOrder$holder2.form_id) !== null && _ref49 !== void 0 ? _ref49 : 0,
         form_record: holderRecords
       };
       if (holderNames.length) {
@@ -3138,9 +3302,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "findBookingIndexByUniqueIdentificationNumber",
     value: function findBookingIndexByUniqueIdentificationNumber(tempOrder, uniqueIdentificationNumber) {
-      var _this17 = this;
+      var _this19 = this;
       return (tempOrder.bookings || []).findIndex(function (booking) {
-        return _this17.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
+        return _this19.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
       });
     }
   }, {
@@ -3148,12 +3312,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function removeLinkedBookingsForProduct(tempOrder, product) {
       var _product$metadata5,
         _product$metadata6,
-        _this18 = this;
+        _this20 = this;
       var productUid = (product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
       var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.booking_uid);
       if (!productUid && !bookingUid) return;
       tempOrder.bookings = (tempOrder.bookings || []).filter(function (booking) {
-        var currentBookingUid = _this18.getBookingUniqueIdentificationNumber(booking);
+        var currentBookingUid = _this20.getBookingUniqueIdentificationNumber(booking);
         if (bookingUid && currentBookingUid === String(bookingUid)) return false;
         if (productUid && String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === String(productUid)) return false;
         return true;
@@ -3170,9 +3334,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyOrderProductsDepositSummary",
     value: function applyOrderProductsDepositSummary(tempOrder, summary) {
-      var _tempOrder$_extend8;
+      var _tempOrder$_extend9;
       var depositSummary = calculateOrderProductsDeposit(tempOrder.products || [], {
-        productsByUid: (_tempOrder$_extend8 = tempOrder._extend) === null || _tempOrder$_extend8 === void 0 ? void 0 : _tempOrder$_extend8.productsByUid
+        productsByUid: (_tempOrder$_extend9 = tempOrder._extend) === null || _tempOrder$_extend9 === void 0 ? void 0 : _tempOrder$_extend9.productsByUid
       });
       var manualDepositOverride = this.getManualDepositOverride(tempOrder);
       var currentStructuralFingerprint = manualDepositOverride ? this.buildOrderProductsStructuralFingerprint(tempOrder.products) : '';
@@ -3199,18 +3363,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "recalculateSummary",
     value: function () {
-      var _recalculateSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(options) {
-        var _this$otherParams3, _ref46, _salesSummaryResult$e;
+      var _recalculateSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(options) {
+        var _this$otherParams3, _ref50, _salesSummaryResult$e;
         var tempOrder, originalSnapshot, hasShopDiscountChanged, shouldReuseOriginalSnapshot, snapshotSummary, shouldFullRecalculateFromSnapshot, summaryProducts, salesSummary, existedSummary, totalRefundAmount, paidPaymentSummary, emptyBaseSummary, emptySummaryBase, emptySummaryWithDeposit, emptySummary, salesSummaryResult, roundingAmount, payServiceChargeAmount, hasSalesSummaryAmount, expectAmount, amountPaymentPatch, normalizedExpectAmountPatch, summaryForGap, summary;
-        return _regeneratorRuntime().wrap(function _callee12$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regeneratorRuntime().wrap(function _callee13$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
               tempOrder = options !== null && options !== void 0 && options.createIfMissing ? this.ensureTempOrder() : this.store.tempOrder;
               if (tempOrder) {
-                _context14.next = 3;
+                _context15.next = 3;
                 break;
               }
-              return _context14.abrupt("return", null);
+              return _context15.abrupt("return", null);
             case 3:
               this.sanitizeTempOrderProducts(tempOrder);
               originalSnapshot = this.getOriginalSalesSnapshot(tempOrder);
@@ -3218,10 +3382,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               shouldReuseOriginalSnapshot = originalSnapshot && !hasShopDiscountChanged;
               snapshotSummary = shouldReuseOriginalSnapshot ? this.restoreOriginalSnapshotIfProductsUnchanged(tempOrder, originalSnapshot) : null;
               if (!snapshotSummary) {
-                _context14.next = 10;
+                _context15.next = 10;
                 break;
               }
-              return _context14.abrupt("return", snapshotSummary);
+              return _context15.abrupt("return", snapshotSummary);
             case 10:
               shouldFullRecalculateFromSnapshot = Boolean(originalSnapshot);
               summaryProducts = shouldFullRecalculateFromSnapshot ? cloneDeep(tempOrder.products || []) : tempOrder.products;
@@ -3233,7 +3397,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               totalRefundAmount = existedSummary.total_refund_amount || '0.00';
               paidPaymentSummary = this.calculatePaidPaymentSummary(tempOrder.payments || []);
               if (salesSummary) {
-                _context14.next = 26;
+                _context15.next = 26;
                 break;
               }
               emptyBaseSummary = _objectSpread(_objectSpread(_objectSpread({}, createEmptySummary()), existedSummary), {}, {
@@ -3259,9 +3423,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 previousSummary: existedSummary,
                 summary: emptySummary
               });
-              return _context14.abrupt("return", this.store.summary);
+              return _context15.abrupt("return", this.store.summary);
             case 26:
-              _context14.next = 28;
+              _context15.next = 28;
               return salesSummary.getSummary(_objectSpread({
                 products: summaryProducts,
                 isPriceIncludeTax: tempOrder.is_price_include_tax,
@@ -3271,7 +3435,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 channel: this.otherParams.channel
               } : {}));
             case 28:
-              salesSummaryResult = _context14.sent;
+              salesSummaryResult = _context15.sent;
               if (shouldFullRecalculateFromSnapshot) {
                 tempOrder.products = summaryProducts;
               }
@@ -3279,7 +3443,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               roundingAmount = paidPaymentSummary.roundingAmount;
               payServiceChargeAmount = paidPaymentSummary.payServiceChargeAmount;
               hasSalesSummaryAmount = salesSummaryResult.expect_amount !== undefined || salesSummaryResult.total_amount !== undefined;
-              expectAmount = hasSalesSummaryAmount ? new Decimal((_ref46 = (_salesSummaryResult$e = salesSummaryResult.expect_amount) !== null && _salesSummaryResult$e !== void 0 ? _salesSummaryResult$e : salesSummaryResult.total_amount) !== null && _ref46 !== void 0 ? _ref46 : 0) : null;
+              expectAmount = hasSalesSummaryAmount ? new Decimal((_ref50 = (_salesSummaryResult$e = salesSummaryResult.expect_amount) !== null && _salesSummaryResult$e !== void 0 ? _salesSummaryResult$e : salesSummaryResult.total_amount) !== null && _ref50 !== void 0 ? _ref50 : 0) : null;
               amountPaymentPatch = hasSalesSummaryAmount || !roundingAmount.eq(0) || !payServiceChargeAmount.eq(0) ? _objectSpread({
                 rounding_amount: roundingAmount.toFixed(2)
               }, expectAmount ? {
@@ -3316,12 +3480,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 previousSummary: existedSummary,
                 summary: summary
               });
-              return _context14.abrupt("return", this.store.summary);
+              return _context15.abrupt("return", this.store.summary);
             case 46:
             case "end":
-              return _context14.stop();
+              return _context15.stop();
           }
-        }, _callee12, this);
+        }, _callee13, this);
       }));
       function recalculateSummary(_x11) {
         return _recalculateSummary.apply(this, arguments);
@@ -3331,30 +3495,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderSummary",
     value: function () {
-      var _getOrderSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+      var _getOrderSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
         var summary;
-        return _regeneratorRuntime().wrap(function _callee13$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        return _regeneratorRuntime().wrap(function _callee14$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              _context15.next = 2;
+              _context16.next = 2;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 2:
-              summary = _context15.sent;
+              summary = _context16.sent;
               if (summary) {
-                _context15.next = 5;
+                _context16.next = 5;
                 break;
               }
-              return _context15.abrupt("return", createEmptySummary());
+              return _context16.abrupt("return", createEmptySummary());
             case 5:
               this.persistTempOrder();
-              return _context15.abrupt("return", summary);
+              return _context16.abrupt("return", summary);
             case 7:
             case "end":
-              return _context15.stop();
+              return _context16.stop();
           }
-        }, _callee13, this);
+        }, _callee14, this);
       }));
       function getOrderSummary() {
         return _getOrderSummary.apply(this, arguments);
@@ -3378,21 +3542,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncTempOrderNoteToRemote",
     value: function () {
-      var _syncTempOrderNoteToRemote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(orderId, note) {
-        return _regeneratorRuntime().wrap(function _callee14$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+      var _syncTempOrderNoteToRemote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(orderId, note) {
+        return _regeneratorRuntime().wrap(function _callee15$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
-              _context16.next = 2;
+              _context17.next = 2;
               return this.request.put("/order/order/".concat(orderId, "/note"), {
                 note: note
               });
             case 2:
-              return _context16.abrupt("return", note);
+              return _context17.abrupt("return", note);
             case 3:
             case "end":
-              return _context16.stop();
+              return _context17.stop();
           }
-        }, _callee14, this);
+        }, _callee15, this);
       }));
       function syncTempOrderNoteToRemote(_x12, _x13) {
         return _syncTempOrderNoteToRemote.apply(this, arguments);
@@ -3402,72 +3566,370 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTempOrderNote",
     value: function getTempOrderNote() {
-      var _this$store$tempOrder3;
-      return ((_this$store$tempOrder3 = this.store.tempOrder) === null || _this$store$tempOrder3 === void 0 ? void 0 : _this$store$tempOrder3.note) || '';
+      var _this$store$tempOrder4;
+      return ((_this$store$tempOrder4 = this.store.tempOrder) === null || _this$store$tempOrder4 === void 0 ? void 0 : _this$store$tempOrder4.note) || '';
     }
   }, {
-    key: "updateTempOrderShopDiscount",
-    value: function updateTempOrderShopDiscount(amount) {
-      var tempOrder = this.ensureTempOrder();
-      var discount = Decimal.max(new Decimal(Number(amount) || 0), 0).toDecimalPlaces(2).toFixed(2);
-      tempOrder.shop_discount = discount;
-      this.persistTempOrder();
-      return tempOrder.shop_discount;
+    key: "ensureSalesNotesRuntimeState",
+    value: function ensureSalesNotesRuntimeState(tempOrder) {
+      var hadNotesSnapshot = Array.isArray(tempOrder.notes);
+      if (!Array.isArray(tempOrder.notes)) tempOrder.notes = [];
+      if (!tempOrder._extend || _typeof(tempOrder._extend) !== 'object') {
+        tempOrder._extend = {
+          productsByUid: {}
+        };
+      }
+      if (!tempOrder._extend.salesNotesState) {
+        tempOrder._extend.salesNotesState = {
+          loaded: hadNotesSnapshot,
+          dirty: false
+        };
+      }
+      return tempOrder._extend.salesNotesState;
     }
   }, {
-    key: "updateTempOrderDepositAmount",
-    value: function updateTempOrderDepositAmount(amount) {
-      var tempOrder = this.ensureTempOrder();
-      var depositAmount = this.normalizeDepositAmount(amount);
-      var previousSummary = this.store.summary || createEmptySummary();
-      var summaryWithDeposit = this.applyDepositAmountToSummary(tempOrder, _objectSpread(_objectSpread({}, createEmptySummary()), previousSummary), depositAmount);
-      this.setManualDepositOverride(tempOrder, depositAmount);
-      var paidPaymentSummary = this.calculatePaidPaymentSummary(tempOrder.payments || []);
-      var summary = _objectSpread(_objectSpread({}, summaryWithDeposit), {}, {
-        amount_gap: this.calculateSummaryAmountGap({
-          tempOrder: tempOrder,
-          summary: summaryWithDeposit,
-          orderPaidAmount: paidPaymentSummary.gapPaidAmount
-        })
+    key: "ensureSalesNotesLoadedForMutation",
+    value: function ensureSalesNotesLoadedForMutation(tempOrder) {
+      var state = this.ensureSalesNotesRuntimeState(tempOrder);
+      if (state.loaded) return;
+      if (tempOrder.order_id === null || tempOrder.order_id === undefined) {
+        state.loaded = true;
+        tempOrder.notes = [];
+        return;
+      }
+      throw new Error('[Order Notes] 当前订单 Notes 尚未完整加载，禁止提交部分快照');
+    }
+  }, {
+    key: "normalizeSalesNoteUuid",
+    value: function normalizeSalesNoteUuid(value, field) {
+      var uuid = String(value !== null && value !== void 0 ? value : '').trim();
+      if (!uuid) throw new Error("[Order Notes] ".concat(field, " \u4E0D\u80FD\u4E3A\u7A7A"));
+      if (uuid.length > 255) {
+        throw new Error("[Order Notes] ".concat(field, " \u4E0D\u80FD\u8D85\u8FC7 255 \u4E2A\u5B57\u7B26"));
+      }
+      return uuid;
+    }
+  }, {
+    key: "getSalesNotePrimaryRelation",
+    value: function getSalesNotePrimaryRelation(note) {
+      return note.note_relations.find(function (relation) {
+        return relation.is_primary === 1;
+      }) || null;
+    }
+  }, {
+    key: "removeSalesNotesForMissingProductLines",
+    value: function removeSalesNotesForMissingProductLines(tempOrder) {
+      var _this21 = this;
+      var state = this.ensureSalesNotesRuntimeState(tempOrder);
+      if (!state.loaded || !Array.isArray(tempOrder.notes) || tempOrder.notes.length === 0) {
+        return;
+      }
+      var remainingProductUids = new Set((tempOrder.products || []).map(function (product) {
+        var _product$metadata7;
+        return ((_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.unique_identification_number) || product.unique_identification_number;
+      }).filter(function (uid) {
+        return typeof uid === 'string' && uid.length > 0;
+      }));
+      var nextNotes = tempOrder.notes.filter(function (note) {
+        var primary = _this21.getSalesNotePrimaryRelation(note);
+        if (!primary || primary.target_type !== 'order_detail') return true;
+        return remainingProductUids.has(primary.target_uuid);
       });
-      this.store.summary = summary;
-      this.updateTempOrderPaymentStatus(tempOrder, {
-        previousSummary: previousSummary,
-        summary: summary
+      if (nextNotes.length === tempOrder.notes.length) return;
+      tempOrder.notes = nextNotes;
+      state.dirty = true;
+    }
+  }, {
+    key: "setSalesNoteOnTempOrder",
+    value: function setSalesNoteOnTempOrder(tempOrder, input) {
+      var _input$target,
+        _this22 = this,
+        _tempOrder$shop_order;
+      this.ensureSalesNotesLoadedForMutation(tempOrder);
+      var note_type = String(input.note_type || '').trim();
+      var policy = getSalesNotePolicy(note_type);
+      if (!policy) {
+        throw new Error("[Order Notes] \u5F53\u524D\u672A\u6CE8\u518C\u5907\u6CE8\u7C7B\u578B: ".concat(note_type || '(empty)'));
+      }
+      if (((_input$target = input.target) === null || _input$target === void 0 ? void 0 : _input$target.target_type) !== 'order_detail') {
+        throw new Error('[Order Notes] 本期只支持 order_detail 作为主体');
+      }
+      var target_uuid = this.normalizeSalesNoteUuid(input.target.target_uuid, 'target_uuid');
+      var targetProductExists = (tempOrder.products || []).some(function (product) {
+        var _product$metadata8;
+        var productLineUid = ((_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.unique_identification_number) || product.unique_identification_number;
+        return String(productLineUid !== null && productLineUid !== void 0 ? productLineUid : '') === target_uuid;
       });
-      this.persistTempOrder();
-      return summary;
+      if (!targetProductExists) {
+        throw new Error('[Order Notes] 目标商品行不存在');
+      }
+      var text = buildSalesNoteText(input.text);
+      var notes = tempOrder.notes || [];
+      // 当前 allergy policy 固定同一商品行只保留一条；业务调用方不参与去重规则。
+      var existingIndex = policy.uniquePerPrimaryTarget ? notes.findIndex(function (note) {
+        var primary = _this22.getSalesNotePrimaryRelation(note);
+        return note.note_type === note_type && (primary === null || primary === void 0 ? void 0 : primary.target_type) === 'order_detail' && primary.target_uuid === target_uuid;
+      }) : -1;
+      var existing = existingIndex >= 0 ? notes[existingIndex] : null;
+      var existingPrimary = existing === null || existing === void 0 ? void 0 : existing.note_relations.find(function (relation) {
+        return relation.is_primary === 1 && relation.target_type === 'order_detail';
+      });
+      var existingOrderRelation = existing === null || existing === void 0 ? void 0 : existing.note_relations.find(function (relation) {
+        return relation.is_primary === 0 && relation.target_type === 'order';
+      });
+      var note = {
+        uuid: (existing === null || existing === void 0 ? void 0 : existing.uuid) || createUuidV4(),
+        note_type: policy.note_type,
+        content: {
+          text: text
+        },
+        importance: policy.importance,
+        note_relations: [{
+          uuid: (existingPrimary === null || existingPrimary === void 0 ? void 0 : existingPrimary.uuid) || createUuidV4(),
+          relation_type: policy.primary_relation_type,
+          target_type: 'order_detail',
+          target_uuid: target_uuid,
+          is_primary: 1
+        }, {
+          uuid: (existingOrderRelation === null || existingOrderRelation === void 0 ? void 0 : existingOrderRelation.uuid) || createUuidV4(),
+          relation_type: policy.secondary_order_relation_type,
+          target_type: 'order',
+          target_uuid: String((_tempOrder$shop_order = tempOrder.shop_order_number) !== null && _tempOrder$shop_order !== void 0 ? _tempOrder$shop_order : ''),
+          is_primary: 0
+        }]
+      };
+      var duplicateIndex = notes.findIndex(function (item, index) {
+        return item.uuid === note.uuid && index !== existingIndex;
+      });
+      if (duplicateIndex >= 0) {
+        throw new Error('[Order Notes] uuid 已被其他 Note 使用');
+      }
+      tempOrder.notes = existingIndex >= 0 ? notes.map(function (item, index) {
+        return index === existingIndex ? note : item;
+      }) : [].concat(_toConsumableArray(notes), [note]);
+      var state = this.ensureSalesNotesRuntimeState(tempOrder);
+      state.loaded = true;
+      state.dirty = true;
+      return note;
     }
   }, {
-    key: "updateTempOrderBuzzer",
-    value: function updateTempOrderBuzzer(buzzer) {
+    key: "getSalesNotes",
+    value: function getSalesNotes() {
       var tempOrder = this.ensureTempOrder();
-      tempOrder.buzzer = String(buzzer || '');
-      this.persistTempOrder();
-      return tempOrder.buzzer;
+      this.ensureSalesNotesRuntimeState(tempOrder);
+      return cloneDeep(tempOrder.notes || []);
     }
   }, {
-    key: "updateTempOrderContactsInfo",
-    value: function updateTempOrderContactsInfo(contactsInfo) {
+    key: "createSalesNotesMutationSnapshot",
+    value: function createSalesNotesMutationSnapshot() {
+      var _tempOrder$order_id2;
       var tempOrder = this.ensureTempOrder();
-      tempOrder.contacts_info = contactsInfo && _typeof(contactsInfo) === 'object' && !Array.isArray(contactsInfo) ? contactsInfo : null;
-      this.persistTempOrder();
-      return tempOrder.contacts_info;
+      var state = this.ensureSalesNotesRuntimeState(tempOrder);
+      return {
+        orderIdentity: {
+          orderId: (_tempOrder$order_id2 = tempOrder.order_id) !== null && _tempOrder$order_id2 !== void 0 ? _tempOrder$order_id2 : null,
+          externalSaleNumber: String(tempOrder.external_sale_number || '')
+        },
+        notes: cloneDeep(tempOrder.notes || []),
+        state: cloneDeep(state)
+      };
+    }
+  }, {
+    key: "restoreSalesNotesMutationSnapshot",
+    value: function restoreSalesNotesMutationSnapshot(snapshot) {
+      var _snapshot$state, _snapshot$state2;
+      if (!snapshot || !Array.isArray(snapshot.notes) || !snapshot.orderIdentity || typeof snapshot.orderIdentity.externalSaleNumber !== 'string' || typeof ((_snapshot$state = snapshot.state) === null || _snapshot$state === void 0 ? void 0 : _snapshot$state.loaded) !== 'boolean' || typeof ((_snapshot$state2 = snapshot.state) === null || _snapshot$state2 === void 0 ? void 0 : _snapshot$state2.dirty) !== 'boolean') {
+        throw new Error('[Order Notes] 无效的 mutation snapshot');
+      }
+      var tempOrder = this.store.tempOrder;
+      if (!tempOrder) throw new Error('[Order Notes] 当前订单不存在');
+      var snapshotOrderId = snapshot.orderIdentity.orderId;
+      var currentOrderId = tempOrder.order_id;
+      var hasSnapshotOrderId = snapshotOrderId !== null && snapshotOrderId !== undefined && String(snapshotOrderId).trim().length > 0;
+      var hasCurrentOrderId = currentOrderId !== null && currentOrderId !== undefined && String(currentOrderId).trim().length > 0;
+      var isSameOrder = hasSnapshotOrderId && hasCurrentOrderId ? String(snapshotOrderId) === String(currentOrderId) : Boolean(snapshot.orderIdentity.externalSaleNumber) && snapshot.orderIdentity.externalSaleNumber === String(tempOrder.external_sale_number || '');
+      if (!isSameOrder) {
+        throw new Error('[Order Notes] 当前订单已切换，拒绝恢复旧订单快照');
+      }
+      this.ensureSalesNotesRuntimeState(tempOrder);
+      tempOrder.notes = cloneDeep(snapshot.notes);
+      tempOrder._extend.salesNotesState = cloneDeep(snapshot.state);
+      this.notifyTempOrderChanged();
+    }
+  }, {
+    key: "setSalesNote",
+    value: function () {
+      var _setSalesNote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(input) {
+        var tempOrder, note;
+        return _regeneratorRuntime().wrap(function _callee16$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
+            case 0:
+              tempOrder = this.ensureTempOrder();
+              note = this.setSalesNoteOnTempOrder(tempOrder, input);
+              this.notifyTempOrderChanged();
+              return _context18.abrupt("return", cloneDeep(note));
+            case 4:
+            case "end":
+              return _context18.stop();
+          }
+        }, _callee16, this);
+      }));
+      function setSalesNote(_x14) {
+        return _setSalesNote.apply(this, arguments);
+      }
+      return setSalesNote;
+    }()
+  }, {
+    key: "removeSalesNote",
+    value: function () {
+      var _removeSalesNote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(uuid) {
+        var tempOrder, normalizedUuid, notes, nextNotes, state;
+        return _regeneratorRuntime().wrap(function _callee17$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
+            case 0:
+              tempOrder = this.ensureTempOrder();
+              this.ensureSalesNotesLoadedForMutation(tempOrder);
+              normalizedUuid = this.normalizeSalesNoteUuid(uuid, 'uuid');
+              notes = tempOrder.notes || [];
+              nextNotes = notes.filter(function (note) {
+                return note.uuid !== normalizedUuid;
+              });
+              if (!(nextNotes.length === notes.length)) {
+                _context19.next = 7;
+                break;
+              }
+              return _context19.abrupt("return");
+            case 7:
+              tempOrder.notes = nextNotes;
+              state = this.ensureSalesNotesRuntimeState(tempOrder);
+              state.dirty = true;
+              this.notifyTempOrderChanged();
+            case 11:
+            case "end":
+              return _context19.stop();
+          }
+        }, _callee17, this);
+      }));
+      function removeSalesNote(_x15) {
+        return _removeSalesNote.apply(this, arguments);
+      }
+      return removeSalesNote;
+    }()
+  }, {
+    key: "clearSalesNotes",
+    value: function () {
+      var _clearSalesNotes = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
+        var tempOrder, state;
+        return _regeneratorRuntime().wrap(function _callee18$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
+            case 0:
+              tempOrder = this.ensureTempOrder();
+              tempOrder.notes = [];
+              state = this.ensureSalesNotesRuntimeState(tempOrder);
+              state.loaded = true;
+              state.dirty = true;
+              this.notifyTempOrderChanged();
+            case 6:
+            case "end":
+              return _context20.stop();
+          }
+        }, _callee18, this);
+      }));
+      function clearSalesNotes() {
+        return _clearSalesNotes.apply(this, arguments);
+      }
+      return clearSalesNotes;
+    }()
+  }, {
+    key: "updateTempOrderShopDiscount",
+    value: function updateTempOrderShopDiscount(amount) {
+      var tempOrder = this.ensureTempOrder();
+      var discount = Decimal.max(new Decimal(Number(amount) || 0), 0).toDecimalPlaces(2).toFixed(2);
+      tempOrder.shop_discount = discount;
+      this.persistTempOrder();
+      return tempOrder.shop_discount;
+    }
+  }, {
+    key: "updateTempOrderDepositAmount",
+    value: function updateTempOrderDepositAmount(amount) {
+      var tempOrder = this.ensureTempOrder();
+      var depositAmount = this.normalizeDepositAmount(amount);
+      var previousSummary = this.store.summary || createEmptySummary();
+      var summaryWithDeposit = this.applyDepositAmountToSummary(tempOrder, _objectSpread(_objectSpread({}, createEmptySummary()), previousSummary), depositAmount);
+      this.setManualDepositOverride(tempOrder, depositAmount);
+      var paidPaymentSummary = this.calculatePaidPaymentSummary(tempOrder.payments || []);
+      var summary = _objectSpread(_objectSpread({}, summaryWithDeposit), {}, {
+        amount_gap: this.calculateSummaryAmountGap({
+          tempOrder: tempOrder,
+          summary: summaryWithDeposit,
+          orderPaidAmount: paidPaymentSummary.gapPaidAmount
+        })
+      });
+      this.store.summary = summary;
+      this.updateTempOrderPaymentStatus(tempOrder, {
+        previousSummary: previousSummary,
+        summary: summary
+      });
+      this.persistTempOrder();
+      return summary;
+    }
+  }, {
+    key: "updateTempOrderBuzzer",
+    value: function updateTempOrderBuzzer(buzzer) {
+      var tempOrder = this.ensureTempOrder();
+      tempOrder.buzzer = String(buzzer || '');
+      this.persistTempOrder();
+      return tempOrder.buzzer;
+    }
+  }, {
+    key: "updateTempOrderShopServiceData",
+    value: function updateTempOrderShopServiceData(patch) {
+      var tempOrder = this.ensureTempOrder();
+      var metadata = tempOrder.metadata && _typeof(tempOrder.metadata) === 'object' && !Array.isArray(tempOrder.metadata) ? tempOrder.metadata : {};
+      var currentShopServiceData = metadata.shop_service_data && _typeof(metadata.shop_service_data) === 'object' && !Array.isArray(metadata.shop_service_data) ? metadata.shop_service_data : {};
+      var shopServiceData = _objectSpread(_objectSpread({}, currentShopServiceData), patch);
+      tempOrder.metadata = _objectSpread(_objectSpread({}, metadata), {}, {
+        shop_service_data: shopServiceData
+      });
+      this.persistTempOrder();
+      return shopServiceData;
+    }
+  }, {
+    key: "updateTempOrderPickupReferenceMode",
+    value: function updateTempOrderPickupReferenceMode(mode) {
+      return this.updateTempOrderShopServiceData({
+        pickup_reference_mode: mode
+      });
+    }
+  }, {
+    key: "updateTempOrderServiceType",
+    value: function updateTempOrderServiceType(serviceType) {
+      return this.updateTempOrderShopServiceData({
+        service_type: serviceType
+      });
+    }
+  }, {
+    key: "updateTempOrderContactsInfo",
+    value: function updateTempOrderContactsInfo(contactsInfo) {
+      var tempOrder = this.ensureTempOrder();
+      tempOrder.contacts_info = contactsInfo && _typeof(contactsInfo) === 'object' && !Array.isArray(contactsInfo) ? contactsInfo : null;
+      this.persistTempOrder();
+      return tempOrder.contacts_info;
     }
   }, {
     key: "buildTempOrderCustomer",
     value: function buildTempOrderCustomer(params) {
-      var _ref47, _ref48, _ref49, _source$name, _ref50, _ref51, _ref52, _source$customer_name, _source$id, _source$customer_id, _ref53, _source$country_calli, _source$phone, _source$email;
+      var _ref51, _ref52, _ref53, _source$name, _ref54, _ref55, _ref56, _source$customer_name, _source$id, _source$customer_id, _ref57, _source$country_calli, _source$phone, _source$email;
       if (!params.customerId) return null;
       var source = params.source ? cloneDeep(params.source) : {};
-      var name = (_ref47 = (_ref48 = (_ref49 = (_source$name = source.name) !== null && _source$name !== void 0 ? _source$name : source.display_name) !== null && _ref49 !== void 0 ? _ref49 : source.customerName) !== null && _ref48 !== void 0 ? _ref48 : source.customer_name) !== null && _ref47 !== void 0 ? _ref47 : params.customerName;
-      var customerName = (_ref50 = (_ref51 = (_ref52 = (_source$customer_name = source.customer_name) !== null && _source$customer_name !== void 0 ? _source$customer_name : source.customerName) !== null && _ref52 !== void 0 ? _ref52 : source.display_name) !== null && _ref51 !== void 0 ? _ref51 : source.name) !== null && _ref50 !== void 0 ? _ref50 : params.customerName;
+      var name = (_ref51 = (_ref52 = (_ref53 = (_source$name = source.name) !== null && _source$name !== void 0 ? _source$name : source.display_name) !== null && _ref53 !== void 0 ? _ref53 : source.customerName) !== null && _ref52 !== void 0 ? _ref52 : source.customer_name) !== null && _ref51 !== void 0 ? _ref51 : params.customerName;
+      var customerName = (_ref54 = (_ref55 = (_ref56 = (_source$customer_name = source.customer_name) !== null && _source$customer_name !== void 0 ? _source$customer_name : source.customerName) !== null && _ref56 !== void 0 ? _ref56 : source.display_name) !== null && _ref55 !== void 0 ? _ref55 : source.name) !== null && _ref54 !== void 0 ? _ref54 : params.customerName;
       return _objectSpread(_objectSpread({}, source), {}, {
         id: (_source$id = source.id) !== null && _source$id !== void 0 ? _source$id : params.customerId,
         customer_id: (_source$customer_id = source.customer_id) !== null && _source$customer_id !== void 0 ? _source$customer_id : params.customerId,
         name: String(name || ''),
         customer_name: String(customerName || ''),
-        country_calling_code: String((_ref53 = (_source$country_calli = source.country_calling_code) !== null && _source$country_calli !== void 0 ? _source$country_calli : source.countryCallingCode) !== null && _ref53 !== void 0 ? _ref53 : params.countryCallingCode),
+        country_calling_code: String((_ref57 = (_source$country_calli = source.country_calling_code) !== null && _source$country_calli !== void 0 ? _source$country_calli : source.countryCallingCode) !== null && _ref57 !== void 0 ? _ref57 : params.countryCallingCode),
         phone: String((_source$phone = source.phone) !== null && _source$phone !== void 0 ? _source$phone : params.phone),
         email: String((_source$email = source.email) !== null && _source$email !== void 0 ? _source$email : params.email)
       });
@@ -3487,15 +3949,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "productHasCustomerBoundDiscount",
     value: function productHasCustomerBoundDiscount(product) {
-      var _this19 = this;
+      var _this23 = this;
       if (((product === null || product === void 0 ? void 0 : product.discount_list) || []).some(function (discount) {
-        return _this19.isCustomerBoundDiscount(discount);
+        return _this23.isCustomerBoundDiscount(discount);
       })) {
         return true;
       }
       return ((product === null || product === void 0 ? void 0 : product.product_bundle) || []).some(function (bundle) {
         return ((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []).some(function (discount) {
-          return _this19.isCustomerBoundDiscount(discount);
+          return _this23.isCustomerBoundDiscount(discount);
         });
       });
     }
@@ -3504,18 +3966,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function shouldSkipDiscountCalculation(tempOrder) {
       var _this$store$discount20,
         _this$store$discount21,
-        _this20 = this;
+        _this24 = this;
       if (this.hasActiveCustomerBoundDiscount) return false;
       var discountList = ((_this$store$discount20 = this.store.discount) === null || _this$store$discount20 === void 0 || (_this$store$discount21 = _this$store$discount20.getDiscountList) === null || _this$store$discount21 === void 0 ? void 0 : _this$store$discount21.call(_this$store$discount20)) || [];
       if (discountList.length > 0) return false;
       return !(tempOrder.products || []).some(function (product) {
-        return _this20.productHasCustomerBoundDiscount(product);
+        return _this24.productHasCustomerBoundDiscount(product);
       });
     }
   }, {
     key: "clearCustomerBoundDiscounts",
     value: function clearCustomerBoundDiscounts(tempOrder) {
-      var _this21 = this,
+      var _this25 = this,
         _discountModule$getDi,
         _discountModule$getOr,
         _discountModule$setDi,
@@ -3524,7 +3986,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var filterDiscountList = function filterDiscountList(discountList) {
         if (!Array.isArray(discountList)) return [];
         return discountList.filter(function (discount) {
-          var shouldRemove = _this21.isCustomerBoundDiscount(discount);
+          var shouldRemove = _this25.isCustomerBoundDiscount(discount);
           if (shouldRemove) didRemoveCustomerBoundDiscount = true;
           return !shouldRemove;
         });
@@ -3551,12 +4013,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var currentDiscounts = ((_discountModule$getDi = discountModule.getDiscountList) === null || _discountModule$getDi === void 0 ? void 0 : _discountModule$getDi.call(discountModule)) || [];
       var currentOriginalDiscounts = ((_discountModule$getOr = discountModule.getOriginalDiscountList) === null || _discountModule$getOr === void 0 ? void 0 : _discountModule$getOr.call(discountModule)) || [];
       var nextDiscounts = currentDiscounts.filter(function (discount) {
-        if (_this21.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
-        return !_this21.isCustomerBoundDiscount(discount);
+        if (_this25.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
+        return !_this25.isCustomerBoundDiscount(discount);
       });
       var nextOriginalDiscounts = currentOriginalDiscounts.filter(function (discount) {
-        if (_this21.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
-        return !_this21.isCustomerBoundDiscount(discount);
+        if (_this25.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
+        return !_this25.isCustomerBoundDiscount(discount);
       });
       void ((_discountModule$setDi = discountModule.setDiscountList) === null || _discountModule$setDi === void 0 ? void 0 : _discountModule$setDi.call(discountModule, nextDiscounts));
       void ((_discountModule$setOr = discountModule.setOriginalDiscountList) === null || _discountModule$setOr === void 0 ? void 0 : _discountModule$setOr.call(discountModule, nextOriginalDiscounts));
@@ -3571,14 +4033,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateTempOrderCustomer",
     value: function updateTempOrderCustomer(customer) {
-      var _tempOrder$customer_i3, _ref54, _ref55, _customer$customer_id, _ref56, _ref57, _ref58, _customer$customer_na, _ref59, _customer$country_cal, _tempOrder$customer_i4;
+      var _tempOrder$customer_i3, _ref58, _ref59, _customer$customer_id, _ref60, _ref61, _ref62, _customer$customer_na, _ref63, _customer$country_cal, _tempOrder$customer_i4;
       var tempOrder = this.ensureTempOrder();
       var previousCustomerId = (_tempOrder$customer_i3 = tempOrder.customer_id) !== null && _tempOrder$customer_i3 !== void 0 ? _tempOrder$customer_i3 : null;
-      var customerId = (_ref54 = (_ref55 = (_customer$customer_id = customer.customer_id) !== null && _customer$customer_id !== void 0 ? _customer$customer_id : customer.customerId) !== null && _ref55 !== void 0 ? _ref55 : customer.id) !== null && _ref54 !== void 0 ? _ref54 : null;
-      var customerName = (_ref56 = (_ref57 = (_ref58 = (_customer$customer_na = customer.customer_name) !== null && _customer$customer_na !== void 0 ? _customer$customer_na : customer.customerName) !== null && _ref58 !== void 0 ? _ref58 : customer.display_name) !== null && _ref57 !== void 0 ? _ref57 : customer.name) !== null && _ref56 !== void 0 ? _ref56 : '';
+      var customerId = (_ref58 = (_ref59 = (_customer$customer_id = customer.customer_id) !== null && _customer$customer_id !== void 0 ? _customer$customer_id : customer.customerId) !== null && _ref59 !== void 0 ? _ref59 : customer.id) !== null && _ref58 !== void 0 ? _ref58 : null;
+      var customerName = (_ref60 = (_ref61 = (_ref62 = (_customer$customer_na = customer.customer_name) !== null && _customer$customer_na !== void 0 ? _customer$customer_na : customer.customerName) !== null && _ref62 !== void 0 ? _ref62 : customer.display_name) !== null && _ref61 !== void 0 ? _ref61 : customer.name) !== null && _ref60 !== void 0 ? _ref60 : '';
       tempOrder.customer_id = customerId === null || customerId === undefined || customerId === '' ? null : Number(customerId);
       tempOrder.customer_name = String(customerName || '');
-      tempOrder.country_calling_code = String((_ref59 = (_customer$country_cal = customer.country_calling_code) !== null && _customer$country_cal !== void 0 ? _customer$country_cal : customer.countryCallingCode) !== null && _ref59 !== void 0 ? _ref59 : '');
+      tempOrder.country_calling_code = String((_ref63 = (_customer$country_cal = customer.country_calling_code) !== null && _customer$country_cal !== void 0 ? _customer$country_cal : customer.countryCallingCode) !== null && _ref63 !== void 0 ? _ref63 : '');
       tempOrder.phone = String(customer.phone || '');
       tempOrder.email = String(customer.email || '');
       tempOrder.customer = this.buildTempOrderCustomer({
@@ -3591,8 +4053,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       });
       var nextCustomerId = (_tempOrder$customer_i4 = tempOrder.customer_id) !== null && _tempOrder$customer_i4 !== void 0 ? _tempOrder$customer_i4 : null;
       if (String(previousCustomerId !== null && previousCustomerId !== void 0 ? previousCustomerId : '') !== String(nextCustomerId !== null && nextCustomerId !== void 0 ? nextCustomerId : '')) {
-        this.store.availableWalletIds = [];
-        this.clearTempOrderPointCardSnapshot(tempOrder);
+        this.clearCustomerWalletState(tempOrder);
       }
       this.persistTempOrder();
       return {
@@ -3631,9 +4092,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       var nextCustomerId = (_tempOrder$customer_i6 = tempOrder.customer_id) !== null && _tempOrder$customer_i6 !== void 0 ? _tempOrder$customer_i6 : null;
       if (String(previousCustomerId !== null && previousCustomerId !== void 0 ? previousCustomerId : '') !== String(nextCustomerId !== null && nextCustomerId !== void 0 ? nextCustomerId : '')) {
-        this.store.availableWalletIds = [];
-        this.store.virtualCurrencyList = [];
-        this.clearTempOrderPointCardSnapshot(tempOrder);
+        this.clearCustomerWalletState(tempOrder);
         clearTempOrderHolderAssignments(tempOrder);
         this.clearCustomerBoundDiscounts(tempOrder);
         this.applyDiscount();
@@ -3662,8 +4121,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderCustomerSnapshot",
     value: function getOrderCustomerSnapshot() {
-      var _this$store$tempOrder4;
-      var snapshot = (_this$store$tempOrder4 = this.store.tempOrder) === null || _this$store$tempOrder4 === void 0 || (_this$store$tempOrder4 = _this$store$tempOrder4._extend) === null || _this$store$tempOrder4 === void 0 ? void 0 : _this$store$tempOrder4.customerSnapshot;
+      var _this$store$tempOrder5;
+      var snapshot = (_this$store$tempOrder5 = this.store.tempOrder) === null || _this$store$tempOrder5 === void 0 || (_this$store$tempOrder5 = _this$store$tempOrder5._extend) === null || _this$store$tempOrder5 === void 0 ? void 0 : _this$store$tempOrder5.customerSnapshot;
       return snapshot ? cloneDeep(snapshot) : null;
     }
   }, {
@@ -3678,9 +4137,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       tempOrder.email = '';
       tempOrder.customer = null;
       if (tempOrder._extend) delete tempOrder._extend.customerSnapshot;
-      this.store.availableWalletIds = [];
-      this.store.virtualCurrencyList = [];
-      this.clearTempOrderPointCardSnapshot(tempOrder);
+      this.clearCustomerWalletState(tempOrder);
       this.clearCustomerBoundDiscounts(tempOrder);
       this.applyDiscount();
       this.persistTempOrder();
@@ -3725,10 +4182,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setOrderPayments",
     value: function setOrderPayments(payments) {
-      var _this22 = this;
+      var _this26 = this;
       var tempOrder = this.ensureTempOrder();
       tempOrder.payments = mapPaymentItemsToOrderPayments((payments || []).map(function (payment) {
-        return _this22.normalizePaymentSource(payment, {
+        return _this26.normalizePaymentSource(payment, {
           defaultPaid: false
         });
       }));
@@ -3748,34 +4205,34 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addOrderPaymentAsync",
     value: (function () {
-      var _addOrderPaymentAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(payment) {
+      var _addOrderPaymentAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(payment) {
         var hasPaymentNumber, devicePrefix;
-        return _regeneratorRuntime().wrap(function _callee15$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        return _regeneratorRuntime().wrap(function _callee19$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
               hasPaymentNumber = String(payment.payment_number || '').trim() !== '';
               if (!hasPaymentNumber) {
-                _context17.next = 5;
+                _context21.next = 5;
                 break;
               }
-              _context17.t0 = 'LOCAL';
-              _context17.next = 8;
+              _context21.t0 = 'LOCAL';
+              _context21.next = 8;
               break;
             case 5:
-              _context17.next = 7;
+              _context21.next = 7;
               return this.getPaymentNumberDevicePrefixAsync();
             case 7:
-              _context17.t0 = _context17.sent;
+              _context21.t0 = _context21.sent;
             case 8:
-              devicePrefix = _context17.t0;
-              return _context17.abrupt("return", this.addOrderPaymentWithDevicePrefix(payment, devicePrefix));
+              devicePrefix = _context21.t0;
+              return _context21.abrupt("return", this.addOrderPaymentWithDevicePrefix(payment, devicePrefix));
             case 10:
             case "end":
-              return _context17.stop();
+              return _context21.stop();
           }
-        }, _callee15, this);
+        }, _callee19, this);
       }));
-      function addOrderPaymentAsync(_x14) {
+      function addOrderPaymentAsync(_x16) {
         return _addOrderPaymentAsync.apply(this, arguments);
       }
       return addOrderPaymentAsync;
@@ -3783,7 +4240,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addOrderPaymentWithDevicePrefix",
     value: function addOrderPaymentWithDevicePrefix(payment, devicePrefix) {
-      var _this23 = this;
+      var _this27 = this;
       this.logInfo('addOrderPayment', {
         payment: payment
       });
@@ -3801,7 +4258,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this23.logError('recalculate summary after addOrderPayment failed', {
+        _this27.logError('recalculate summary after addOrderPayment failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -3815,7 +4272,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderPayment",
     value: (function () {
-      var _updateOrderPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(paymentIdentity, updates) {
+      var _updateOrderPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(paymentIdentity, updates) {
         var options,
           tempOrder,
           identity,
@@ -3824,17 +4281,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           updatedPayment,
           summary,
           payments,
-          _args18 = arguments;
-        return _regeneratorRuntime().wrap(function _callee16$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+          _args22 = arguments;
+        return _regeneratorRuntime().wrap(function _callee20$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
-              options = _args18.length > 2 && _args18[2] !== undefined ? _args18[2] : {};
+              options = _args22.length > 2 && _args22[2] !== undefined ? _args22[2] : {};
               tempOrder = this.ensureTempOrder();
               identity = String(paymentIdentity);
               matchMode = options.matchBy === 'compat' || options.matchBy === 'legacy' ? 'compat' : 'payment_number';
               matchedPayment = resolveOrderPaymentIdentity(tempOrder.payments || [], identity, matchMode);
               if (matchedPayment) {
-                _context18.next = 7;
+                _context22.next = 7;
                 break;
               }
               throw new Error("\u672A\u627E\u5230\u652F\u4ED8\u9879: ".concat(identity));
@@ -3849,15 +4306,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return nextPayment;
               });
               this.persistTempOrder();
-              _context18.next = 12;
+              _context22.next = 12;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 12:
-              summary = _context18.sent;
+              summary = _context22.sent;
               this.persistTempOrder();
               payments = tempOrder.payments;
-              return _context18.abrupt("return", {
+              return _context22.abrupt("return", {
                 updated: true,
                 payment: payments[matchedPayment.index] || updatedPayment,
                 payments: payments,
@@ -3865,11 +4322,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 16:
             case "end":
-              return _context18.stop();
+              return _context22.stop();
           }
-        }, _callee16, this);
+        }, _callee20, this);
       }));
-      function updateOrderPayment(_x15, _x16) {
+      function updateOrderPayment(_x17, _x18) {
         return _updateOrderPayment.apply(this, arguments);
       }
       return updateOrderPayment;
@@ -3914,7 +4371,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyPaymentLifecycleChange",
     value: function applyPaymentLifecycleChange(tempOrder, options) {
-      var _this24 = this;
+      var _this28 = this;
       this.updateTempOrderPaymentStatus(tempOrder);
       if ((options === null || options === void 0 ? void 0 : options.persist) !== false) {
         this.persistTempOrder();
@@ -3924,7 +4381,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this24.logError("recalculate summary after ".concat(logContext, " failed"), {
+        _this28.logError("recalculate summary after ".concat(logContext, " failed"), {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -3968,7 +4425,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateVoucherOrderPayments",
     value: function updateVoucherOrderPayments(payments, options) {
-      var _this25 = this;
+      var _this29 = this;
       var tempOrder = this.ensureTempOrder();
       var isOrderPaymentType = function isOrderPaymentType(value) {
         return value === 'normal' || value === 'deposit';
@@ -4003,7 +4460,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         });
       };
       var mappedVouchers = mapPaymentItemsToOrderPayments(payments.map(function (payment) {
-        return _this25.normalizePaymentSource(normalizeVoucherPaymentStatus(withVoucherPaymentType(payment)), {
+        return _this29.normalizePaymentSource(normalizeVoucherPaymentStatus(withVoucherPaymentType(payment)), {
           defaultPaid: false,
           devicePrefix: options === null || options === void 0 ? void 0 : options.devicePrefix
         });
@@ -4056,7 +4513,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this25.logError('recalculate summary after updateVoucherOrderPayments failed', {
+        _this29.logError('recalculate summary after updateVoucherOrderPayments failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -4065,38 +4522,38 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateVoucherOrderPaymentsAsync",
     value: function () {
-      var _updateVoucherOrderPaymentsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(payments, options) {
+      var _updateVoucherOrderPaymentsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(payments, options) {
         var needsPaymentNumber, devicePrefix;
-        return _regeneratorRuntime().wrap(function _callee17$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+        return _regeneratorRuntime().wrap(function _callee21$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
               needsPaymentNumber = (payments || []).some(function (payment) {
                 return String(payment.payment_number || '').trim() === '';
               });
               if (!needsPaymentNumber) {
-                _context19.next = 7;
+                _context23.next = 7;
                 break;
               }
-              _context19.next = 4;
+              _context23.next = 4;
               return this.getPaymentNumberDevicePrefixAsync();
             case 4:
-              _context19.t0 = _context19.sent;
-              _context19.next = 8;
+              _context23.t0 = _context23.sent;
+              _context23.next = 8;
               break;
             case 7:
-              _context19.t0 = 'LOCAL';
+              _context23.t0 = 'LOCAL';
             case 8:
-              devicePrefix = _context19.t0;
-              return _context19.abrupt("return", this.updateVoucherOrderPayments(payments, _objectSpread(_objectSpread({}, options), {}, {
+              devicePrefix = _context23.t0;
+              return _context23.abrupt("return", this.updateVoucherOrderPayments(payments, _objectSpread(_objectSpread({}, options), {}, {
                 devicePrefix: devicePrefix
               })));
             case 10:
             case "end":
-              return _context19.stop();
+              return _context23.stop();
           }
-        }, _callee17, this);
+        }, _callee21, this);
       }));
-      function updateVoucherOrderPaymentsAsync(_x17, _x18) {
+      function updateVoucherOrderPaymentsAsync(_x19, _x20) {
         return _updateVoucherOrderPaymentsAsync.apply(this, arguments);
       }
       return updateVoucherOrderPaymentsAsync;
@@ -4114,7 +4571,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "shouldMergeProductToOrder",
     value: function shouldMergeProductToOrder(params) {
       var _this$orderHooks,
-        _this26 = this;
+        _this30 = this;
       var onBeforeMergeProductToOrder = (_this$orderHooks = this.orderHooks) === null || _this$orderHooks === void 0 ? void 0 : _this$orderHooks.onBeforeMergeProductToOrder;
       if (!onBeforeMergeProductToOrder) return true;
       var result = onBeforeMergeProductToOrder(_objectSpread(_objectSpread({}, params), {}, {
@@ -4122,7 +4579,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }));
       if (result && _typeof(result) === 'object' && typeof result.then === 'function') {
         return Promise.resolve(result).then(function (resolved) {
-          return _this26.normalizeShouldMergeProductResult(resolved);
+          return _this30.normalizeShouldMergeProductResult(resolved);
         });
       }
       return this.normalizeShouldMergeProductResult(result);
@@ -4142,8 +4599,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hasLinkedBookingUid",
     value: function hasLinkedBookingUid(product) {
-      var _product$booking_uid, _product$metadata7;
-      var bookingUid = (_product$booking_uid = product === null || product === void 0 ? void 0 : product.booking_uid) !== null && _product$booking_uid !== void 0 ? _product$booking_uid : product === null || product === void 0 || (_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.booking_uid;
+      var _product$booking_uid, _product$metadata9;
+      var bookingUid = (_product$booking_uid = product === null || product === void 0 ? void 0 : product.booking_uid) !== null && _product$booking_uid !== void 0 ? _product$booking_uid : product === null || product === void 0 || (_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.booking_uid;
       return bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '';
     }
   }, {
@@ -4171,7 +4628,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "assertAndLockProductSettlement",
     value: function assertAndLockProductSettlement(tempOrder, product) {
-      var _ref60, _ref61, _product$selling_pric;
+      var _ref64, _ref65, _product$selling_pric;
       if (!this.isMultiCurrencySettlementEnabled()) return;
       var currentKey = getTempOrderSettlementKey(tempOrder);
       var incomingKey = getSettlementKey(getSelectedSettlementSnapshot(product)) || 'legal_currency';
@@ -4198,7 +4655,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       applyTempOrderSettlementState(tempOrder, snapshot || {
         settlement_type: 'legal_currency',
-        price: (_ref60 = (_ref61 = (_product$selling_pric = product.selling_price) !== null && _product$selling_pric !== void 0 ? _product$selling_pric : product.original_price) !== null && _ref61 !== void 0 ? _ref61 : product.payment_price) !== null && _ref60 !== void 0 ? _ref60 : 0,
+        price: (_ref64 = (_ref65 = (_product$selling_pric = product.selling_price) !== null && _product$selling_pric !== void 0 ? _product$selling_pric : product.original_price) !== null && _ref65 !== void 0 ? _ref65 : product.payment_price) !== null && _ref64 !== void 0 ? _ref64 : 0,
         unit_label: tempOrder.currency_code,
         symbol: tempOrder.currency_symbol,
         amount_format: tempOrder.currency_format
@@ -4251,45 +4708,53 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "finalizeProductOrderMutation",
     value: function () {
-      var _finalizeProductOrderMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(tempOrder, options) {
-        var isVirtualSettlement;
-        return _regeneratorRuntime().wrap(function _callee18$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+      var _finalizeProductOrderMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(tempOrder, options) {
+        var isVirtualSettlement, promotionPayload;
+        return _regeneratorRuntime().wrap(function _callee22$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
               this.syncTempOrderHolderFromBookings(tempOrder);
               this.prepareVirtualSettlementTempOrder(tempOrder);
               isVirtualSettlement = this.isActiveVirtualSettlementOrder(tempOrder);
               if (!(!(options !== null && options !== void 0 && options.skipEditDiscountConfigRefresh) && !isVirtualSettlement)) {
-                _context20.next = 6;
+                _context24.next = 6;
                 break;
               }
-              _context20.next = 6;
+              _context24.next = 6;
               return this.ensureEditDiscountConfigForProductChange(tempOrder);
             case 6:
               if (!(!(options !== null && options !== void 0 && options.skipDiscountRecalculation) && !isVirtualSettlement)) {
-                _context20.next = 9;
+                _context24.next = 12;
                 break;
               }
-              _context20.next = 9;
-              return this.applyPromotion();
+              _context24.next = 9;
+              return this.evaluatePromotion();
             case 9:
+              _context24.t0 = _context24.sent;
+              _context24.next = 13;
+              break;
+            case 12:
+              _context24.t0 = null;
+            case 13:
+              promotionPayload = _context24.t0;
               if (!(options !== null && options !== void 0 && options.skipDiscountRecalculation) && !isVirtualSettlement) {
                 this.applyDiscount();
               }
               this.sanitizeTempOrderProducts(tempOrder);
-              _context20.next = 13;
+              _context24.next = 18;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 13:
+            case 18:
               this.persistTempOrder();
-            case 14:
+              this.emitPromotionApplied(promotionPayload);
+            case 20:
             case "end":
-              return _context20.stop();
+              return _context24.stop();
           }
-        }, _callee18, this);
+        }, _callee22, this);
       }));
-      function finalizeProductOrderMutation(_x19, _x20) {
+      function finalizeProductOrderMutation(_x21, _x22) {
         return _finalizeProductOrderMutation.apply(this, arguments);
       }
       return finalizeProductOrderMutation;
@@ -4315,7 +4780,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _metadata,
         _productToAdd$metadat,
         _origin,
-        _this27 = this;
+        _this31 = this;
       var linked = booking ? this.createLinkedProductAndBooking({
         product: product,
         booking: booking
@@ -4351,26 +4816,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var isIncomingCustomItem = ((_productToAdd$metadat = productToAdd.metadata) === null || _productToAdd$metadat === void 0 || (_productToAdd$metadat = _productToAdd$metadat.origin) === null || _productToAdd$metadat === void 0 ? void 0 : _productToAdd$metadat.isCustomItem) === true || ((_origin = productToAdd._origin) === null || _origin === void 0 ? void 0 : _origin.isCustomItem) === true;
       var shouldForceNewLine = disableMerge || !!booking || hasIncomingGoodPass || isIncomingPersistedEntitlementPass || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
       var matchedIndex = shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
-        if (_this27.hasGoodPassDiscount(item)) return false;
-        var isRuntimeEntitlementPass = _this27.isRuntimeEntitlementAppend(item, tempOrder);
+        if (_this31.hasGoodPassDiscount(item)) return false;
+        var isRuntimeEntitlementPass = _this31.isRuntimeEntitlementAppend(item, tempOrder);
         if (isIncomingEntitlementAppend !== isRuntimeEntitlementPass) {
           return false;
         }
-        if (isIncomingEntitlementAppend && _this27.isPersistedProductLine(item)) {
+        if (isIncomingEntitlementAppend && _this31.isPersistedProductLine(item)) {
           return false;
         }
-        var hasExistingProductNote = _this27.hasOrderProductLineNote(item);
+        var hasExistingProductNote = _this31.hasOrderProductLineNote(item);
         if ((hasIncomingProductNote || hasExistingProductNote) && (!isRuntimeEntitlementPass || String(normalizedIncoming.note || '').trim() !== String(item.note || '').trim())) {
           return false;
         }
         var hasExistingManualProductDiscount = isManualProductDiscountProduct(item);
-        if (isRuntimeEntitlementPass && !_this27.hasSameEntitlementMergePriceConfig(normalizedIncoming, item)) {
+        if (isRuntimeEntitlementPass && !_this31.hasSameEntitlementMergePriceConfig(normalizedIncoming, item)) {
           return false;
         }
         if ((hasIncomingManualProductDiscount || hasExistingManualProductDiscount) && !isRuntimeEntitlementPass) {
           return false;
         }
-        if (_this27.isPersistedProductLine(item)) return false;
+        if (_this31.isPersistedProductLine(item)) return false;
         if (item.product_id !== productToAdd.product_id) return false;
         if (item.product_variant_id !== productToAdd.product_variant_id) return false;
         var existedFingerprint = buildProductLineFingerprint(getProductSkuOptions(item), item.product_bundle);
@@ -4379,8 +4844,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var matchedProduct = matchedIndex === -1 ? null : tempOrder.products[matchedIndex];
       var existedFingerprint = matchedProduct ? buildProductLineFingerprint(getProductSkuOptions(matchedProduct), matchedProduct.product_bundle) : '';
       var commitProductLine = function commitProductLine(shouldMerge) {
+        var committedProduct;
         if (matchedIndex === -1 || !matchedProduct || !shouldMerge) {
-          _this27.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
+          _this31.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
           if (linked) {
             normalizedIncoming.booking_uid = linked.bookingUid;
             normalizedIncoming.metadata = _objectSpread(_objectSpread({}, normalizedIncoming.metadata || {}), {}, {
@@ -4393,11 +4859,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           } else {
             tempOrder.products = [].concat(_toConsumableArray(tempOrder.products), [normalizedIncoming]);
           }
+          committedProduct = normalizedIncoming;
         } else {
           var _targetProduct$metada;
           var targetProduct = matchedProduct;
           var targetUid = (_targetProduct$metada = targetProduct.metadata) === null || _targetProduct$metada === void 0 ? void 0 : _targetProduct$metada.unique_identification_number;
-          var normalizedProduct = _this27.normalizeVirtualSettlementProductIfEnabled(mergeOrderProductDisplayFields(targetProduct, normalizeOrderProduct(_objectSpread(_objectSpread({}, productToAdd), {}, {
+          var normalizedProduct = _this31.normalizeVirtualSettlementProductIfEnabled(mergeOrderProductDisplayFields(targetProduct, normalizeOrderProduct(_objectSpread(_objectSpread({}, productToAdd), {}, {
             metadata: _objectSpread(_objectSpread({}, productToAdd.metadata || {}), {}, {
               unique_identification_number: targetUid
             })
@@ -4420,7 +4887,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             order_detail_id: targetProduct.order_detail_id,
             num: nextNum
           });
-          _this27.captureProductRuntime(tempOrder, productToAdd, tempOrder.products[matchedIndex], targetUid);
+          _this31.captureProductRuntime(tempOrder, productToAdd, tempOrder.products[matchedIndex], targetUid);
+          committedProduct = tempOrder.products[matchedIndex];
           if (matchedIndex !== tempOrder.products.length - 1) {
             var mergedProduct = tempOrder.products[matchedIndex];
             tempOrder.products = [].concat(_toConsumableArray(tempOrder.products.slice(0, matchedIndex)), _toConsumableArray(tempOrder.products.slice(matchedIndex + 1)), [mergedProduct]);
@@ -4429,10 +4897,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         if (linked) {
           tempOrder.bookings = [].concat(_toConsumableArray(tempOrder.bookings || []), [linked.booking]);
         }
+        return committedProduct;
       };
       if (!matchedProduct) {
-        commitProductLine(false);
-        return;
+        return commitProductLine(false);
       }
       var shouldMerge = this.shouldMergeProductToOrder({
         incomingProduct: productToAdd,
@@ -4447,7 +4915,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (shouldMerge && _typeof(shouldMerge) === 'object' && typeof shouldMerge.then === 'function') {
         return Promise.resolve(shouldMerge).then(commitProductLine);
       }
-      commitProductLine(shouldMerge);
+      return commitProductLine(shouldMerge);
     }
 
     /**
@@ -4457,14 +4925,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createSplitBookingLine",
     value: function createSplitBookingLine(product, booking, index, splitCount) {
-      var _booking$metadata6, _ref62, _ref63, _bookingHolder$form_r, _booking$metadata7, _product$metadata8, _bookingHolder$name, _singleBooking$metada;
+      var _booking$metadata6, _ref66, _ref67, _bookingHolder$form_r, _booking$metadata7, _product$metadata10, _bookingHolder$name, _singleBooking$metada;
       var singleLine = cloneDeep(product);
       singleLine.num = 1;
       delete singleLine.product_quantity;
       var singleBooking = cloneDeep(booking);
       var bookingHolder = booking !== null && booking !== void 0 && booking.holder && _typeof(booking.holder) === 'object' ? booking.holder : null;
       var metadataHolder = booking !== null && booking !== void 0 && (_booking$metadata6 = booking.metadata) !== null && _booking$metadata6 !== void 0 && _booking$metadata6.holder && _typeof(booking.metadata.holder) === 'object' ? booking.metadata.holder : null;
-      var rawHolderIds = (_ref62 = (_ref63 = (_bookingHolder$form_r = bookingHolder === null || bookingHolder === void 0 ? void 0 : bookingHolder.form_record) !== null && _bookingHolder$form_r !== void 0 ? _bookingHolder$form_r : booking === null || booking === void 0 || (_booking$metadata7 = booking.metadata) === null || _booking$metadata7 === void 0 ? void 0 : _booking$metadata7.holder_id) !== null && _ref63 !== void 0 ? _ref63 : metadataHolder === null || metadataHolder === void 0 ? void 0 : metadataHolder.form_record) !== null && _ref62 !== void 0 ? _ref62 : product === null || product === void 0 || (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.holder_id;
+      var rawHolderIds = (_ref66 = (_ref67 = (_bookingHolder$form_r = bookingHolder === null || bookingHolder === void 0 ? void 0 : bookingHolder.form_record) !== null && _bookingHolder$form_r !== void 0 ? _bookingHolder$form_r : booking === null || booking === void 0 || (_booking$metadata7 = booking.metadata) === null || _booking$metadata7 === void 0 ? void 0 : _booking$metadata7.holder_id) !== null && _ref67 !== void 0 ? _ref67 : metadataHolder === null || metadataHolder === void 0 ? void 0 : metadataHolder.form_record) !== null && _ref66 !== void 0 ? _ref66 : product === null || product === void 0 || (_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.holder_id;
       var holderIds = (Array.isArray(rawHolderIds) ? rawHolderIds : [rawHolderIds]).map(function (holderId) {
         return holderId && _typeof(holderId) === 'object' ? holderId.form_record_id : holderId;
       }).filter(function (holderId) {
@@ -4528,12 +4996,53 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProductToOrder",
     value: (function () {
-      var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(product, booking, options) {
-        var tempOrder, insertAfterProductUid, anchorIndex, insertAtIndex, _ref64, _productRecord$num, productRecord, splitCount, i, splitLine, _appendResult, appendResult;
-        return _regeneratorRuntime().wrap(function _callee19$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+      var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(product, booking, options) {
+        var _this32 = this;
+        var tempOrder, salesNoteDrafts, mutationSnapshot, attachSalesNoteDrafts, rollbackProductAndNotesMutation, insertAfterProductUid, anchorIndex, insertAtIndex, _ref68, _productRecord$num, productRecord, splitCount, i, splitLine, committedProduct, _committedProduct, _committedProduct2;
+        return _regeneratorRuntime().wrap(function _callee23$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
+              salesNoteDrafts = ((options === null || options === void 0 ? void 0 : options.salesNotes) || []).map(function (draft) {
+                return {
+                  note_type: String(draft.note_type || '').trim(),
+                  text: {
+                    kind: 'resolved',
+                    text: buildSalesNoteText(draft.text)
+                  }
+                };
+              });
+              mutationSnapshot = salesNoteDrafts.length > 0 ? {
+                products: cloneDeep(tempOrder.products || []),
+                bookings: cloneDeep(tempOrder.bookings || []),
+                notes: cloneDeep(tempOrder.notes || []),
+                extend: cloneDeep(tempOrder._extend || {})
+              } : null;
+              attachSalesNoteDrafts = function attachSalesNoteDrafts(orderProduct) {
+                var _orderProduct$metadat;
+                if (!salesNoteDrafts.length) return;
+                var productLineUid = ((_orderProduct$metadat = orderProduct.metadata) === null || _orderProduct$metadat === void 0 ? void 0 : _orderProduct$metadat.unique_identification_number) || orderProduct.unique_identification_number;
+                if (!productLineUid) {
+                  throw new Error('[Order Notes] 商品行缺少 unique_identification_number');
+                }
+                salesNoteDrafts.forEach(function (draft) {
+                  _this32.setSalesNoteOnTempOrder(tempOrder, {
+                    note_type: draft.note_type,
+                    target: {
+                      target_type: 'order_detail',
+                      target_uuid: String(productLineUid)
+                    },
+                    text: draft.text
+                  });
+                });
+              };
+              rollbackProductAndNotesMutation = function rollbackProductAndNotesMutation() {
+                if (!mutationSnapshot) return;
+                tempOrder.products = mutationSnapshot.products;
+                tempOrder.bookings = mutationSnapshot.bookings;
+                tempOrder.notes = mutationSnapshot.notes;
+                tempOrder._extend = mutationSnapshot.extend;
+              };
               insertAfterProductUid = options === null || options === void 0 ? void 0 : options.insertAfterProductUid;
               anchorIndex = booking && insertAfterProductUid ? tempOrder.products.findIndex(function (line) {
                 var _line$metadata;
@@ -4541,71 +5050,99 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return uid !== undefined && uid !== null && String(uid) === String(insertAfterProductUid);
               }) : -1;
               insertAtIndex = anchorIndex >= 0 ? anchorIndex + 1 : undefined;
+              _context25.prev = 8;
               if (!booking) {
-                _context21.next = 22;
+                _context25.next = 33;
                 break;
               }
               productRecord = product;
-              splitCount = getSafeProductNum((_ref64 = (_productRecord$num = productRecord.num) !== null && _productRecord$num !== void 0 ? _productRecord$num : productRecord.product_quantity) !== null && _ref64 !== void 0 ? _ref64 : 1);
+              splitCount = getSafeProductNum((_ref68 = (_productRecord$num = productRecord.num) !== null && _productRecord$num !== void 0 ? _productRecord$num : productRecord.product_quantity) !== null && _ref68 !== void 0 ? _ref68 : 1);
               if (!(splitCount > 1)) {
-                _context21.next = 22;
+                _context25.next = 27;
                 break;
               }
               i = 0;
-            case 9:
+            case 14:
               if (!(i < splitCount)) {
-                _context21.next = 19;
+                _context25.next = 25;
                 break;
               }
               splitLine = this.createSplitBookingLine(productRecord, booking, i, splitCount);
-              _appendResult = this.appendProductLineToTempOrder(tempOrder, splitLine.product, splitLine.booking, {
+              if (i > 0) {
+                delete splitLine.product.unique_identification_number;
+                delete splitLine.product.identity_key;
+                if (splitLine.product.metadata) {
+                  splitLine.product.metadata = _objectSpread({}, splitLine.product.metadata);
+                  delete splitLine.product.metadata.unique_identification_number;
+                  delete splitLine.product.metadata.identity_key;
+                }
+                delete splitLine.booking.booking_uid;
+                if (splitLine.booking.metadata) {
+                  splitLine.booking.metadata = _objectSpread({}, splitLine.booking.metadata);
+                  delete splitLine.booking.metadata.unique_identification_number;
+                }
+              }
+              _context25.next = 19;
+              return this.appendProductLineToTempOrder(tempOrder, splitLine.product, splitLine.booking, {
                 insertAtIndex: insertAtIndex,
                 disableMerge: options === null || options === void 0 ? void 0 : options.disableMerge
               });
-              if (!_appendResult) {
-                _context21.next = 15;
-                break;
-              }
-              _context21.next = 15;
-              return _appendResult;
-            case 15:
+            case 19:
+              committedProduct = _context25.sent;
+              attachSalesNoteDrafts(committedProduct);
               if (insertAtIndex !== undefined) insertAtIndex += 1;
-            case 16:
+            case 22:
               i += 1;
-              _context21.next = 9;
+              _context25.next = 14;
               break;
-            case 19:
-              _context21.next = 21;
-              return this.finalizeProductOrderMutation(tempOrder);
-            case 21:
-              return _context21.abrupt("return", tempOrder.products);
-            case 22:
-              appendResult = this.appendProductLineToTempOrder(tempOrder, product, booking, {
+            case 25:
+              _context25.next = 31;
+              break;
+            case 27:
+              _context25.next = 29;
+              return this.appendProductLineToTempOrder(tempOrder, product, cloneDeep(booking), {
                 insertAtIndex: insertAtIndex,
                 disableMerge: options === null || options === void 0 ? void 0 : options.disableMerge
               });
-              if (!appendResult) {
-                _context21.next = 26;
-                break;
-              }
-              _context21.next = 26;
-              return appendResult;
-            case 26:
-              _context21.next = 28;
+            case 29:
+              _committedProduct = _context25.sent;
+              attachSalesNoteDrafts(_committedProduct);
+            case 31:
+              _context25.next = 37;
+              break;
+            case 33:
+              _context25.next = 35;
+              return this.appendProductLineToTempOrder(tempOrder, product, undefined, {
+                insertAtIndex: insertAtIndex,
+                disableMerge: options === null || options === void 0 ? void 0 : options.disableMerge
+              });
+            case 35:
+              _committedProduct2 = _context25.sent;
+              attachSalesNoteDrafts(_committedProduct2);
+            case 37:
+              _context25.next = 43;
+              break;
+            case 39:
+              _context25.prev = 39;
+              _context25.t0 = _context25["catch"](8);
+              rollbackProductAndNotesMutation();
+              throw _context25.t0;
+            case 43:
+              _context25.next = 45;
               return this.finalizeProductOrderMutation(tempOrder);
-            case 28:
+            case 45:
               this.logInfo('addProductToOrder success', {
                 product_id: product.product_id,
                 with_booking: !!booking
               });
-              return _context21.abrupt("return", tempOrder.products);
-            case 30:
+              return _context25.abrupt("return", tempOrder.products);
+            case 47:
             case "end":
-              return _context21.stop();
+              return _context25.stop();
           }
-        }, _callee19, this);
+        }, _callee23, this, [[8, 39]]);
       }));
-      function addProductToOrder(_x21, _x22, _x23) {
+      function addProductToOrder(_x23, _x24, _x25) {
         return _addProductToOrder.apply(this, arguments);
       }
       return addProductToOrder;
@@ -4623,101 +5160,101 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProductsToOrder",
     value: (function () {
-      var _addProductsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(items, options) {
-        var tempOrder, _iterator20, _step20, item, product, booking, _ref65, _productRecord$num2, productRecord, splitCount, i, splitLine, _appendResult2, appendResult;
-        return _regeneratorRuntime().wrap(function _callee20$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+      var _addProductsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(items, options) {
+        var tempOrder, _iterator20, _step20, item, product, booking, _ref69, _productRecord$num2, productRecord, splitCount, i, splitLine, _appendResult, appendResult;
+        return _regeneratorRuntime().wrap(function _callee24$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (!(!Array.isArray(items) || items.length === 0)) {
-                _context22.next = 3;
+                _context26.next = 3;
                 break;
               }
-              return _context22.abrupt("return", tempOrder.products);
+              return _context26.abrupt("return", tempOrder.products);
             case 3:
               _iterator20 = _createForOfIteratorHelper(items || []);
-              _context22.prev = 4;
+              _context26.prev = 4;
               _iterator20.s();
             case 6:
               if ((_step20 = _iterator20.n()).done) {
-                _context22.next = 32;
+                _context26.next = 32;
                 break;
               }
               item = _step20.value;
               product = item.product, booking = item.booking;
               if (product) {
-                _context22.next = 11;
+                _context26.next = 11;
                 break;
               }
-              return _context22.abrupt("continue", 30);
+              return _context26.abrupt("continue", 30);
             case 11:
               if (!booking) {
-                _context22.next = 26;
+                _context26.next = 26;
                 break;
               }
               productRecord = product;
-              splitCount = getSafeProductNum((_ref65 = (_productRecord$num2 = productRecord.num) !== null && _productRecord$num2 !== void 0 ? _productRecord$num2 : productRecord.product_quantity) !== null && _ref65 !== void 0 ? _ref65 : 1);
+              splitCount = getSafeProductNum((_ref69 = (_productRecord$num2 = productRecord.num) !== null && _productRecord$num2 !== void 0 ? _productRecord$num2 : productRecord.product_quantity) !== null && _ref69 !== void 0 ? _ref69 : 1);
               if (!(splitCount > 1)) {
-                _context22.next = 26;
+                _context26.next = 26;
                 break;
               }
               i = 0;
             case 16:
               if (!(i < splitCount)) {
-                _context22.next = 25;
+                _context26.next = 25;
                 break;
               }
               splitLine = this.createSplitBookingLine(productRecord, booking, i, splitCount);
-              _appendResult2 = this.appendProductLineToTempOrder(tempOrder, splitLine.product, splitLine.booking);
-              if (!_appendResult2) {
-                _context22.next = 22;
+              _appendResult = this.appendProductLineToTempOrder(tempOrder, splitLine.product, splitLine.booking);
+              if (!_appendResult) {
+                _context26.next = 22;
                 break;
               }
-              _context22.next = 22;
-              return _appendResult2;
+              _context26.next = 22;
+              return _appendResult;
             case 22:
               i += 1;
-              _context22.next = 16;
+              _context26.next = 16;
               break;
             case 25:
-              return _context22.abrupt("continue", 30);
+              return _context26.abrupt("continue", 30);
             case 26:
               appendResult = this.appendProductLineToTempOrder(tempOrder, product, booking);
               if (!appendResult) {
-                _context22.next = 30;
+                _context26.next = 30;
                 break;
               }
-              _context22.next = 30;
+              _context26.next = 30;
               return appendResult;
             case 30:
-              _context22.next = 6;
+              _context26.next = 6;
               break;
             case 32:
-              _context22.next = 37;
+              _context26.next = 37;
               break;
             case 34:
-              _context22.prev = 34;
-              _context22.t0 = _context22["catch"](4);
-              _iterator20.e(_context22.t0);
+              _context26.prev = 34;
+              _context26.t0 = _context26["catch"](4);
+              _iterator20.e(_context26.t0);
             case 37:
-              _context22.prev = 37;
+              _context26.prev = 37;
               _iterator20.f();
-              return _context22.finish(37);
+              return _context26.finish(37);
             case 40:
-              _context22.next = 42;
+              _context26.next = 42;
               return this.finalizeProductOrderMutation(tempOrder, options);
             case 42:
               this.logInfo('addProductsToOrder success', {
                 itemsCount: items.length
               });
-              return _context22.abrupt("return", tempOrder.products);
+              return _context26.abrupt("return", tempOrder.products);
             case 44:
             case "end":
-              return _context22.stop();
+              return _context26.stop();
           }
-        }, _callee20, this, [[4, 34, 37, 40]]);
+        }, _callee24, this, [[4, 34, 37, 40]]);
       }));
-      function addProductsToOrder(_x24, _x25) {
+      function addProductsToOrder(_x26, _x27) {
         return _addProductsToOrder.apply(this, arguments);
       }
       return addProductsToOrder;
@@ -4754,41 +5291,41 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "isPersistedProductLine",
     value: function isPersistedProductLine(product) {
-      var _product$metadata9;
-      return product.order_detail_id !== undefined && product.order_detail_id !== null && product.order_detail_id !== '' || ((_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.is_edit_for_runtime) === true;
+      var _product$metadata11;
+      return product.order_detail_id !== undefined && product.order_detail_id !== null && product.order_detail_id !== '' || ((_product$metadata11 = product.metadata) === null || _product$metadata11 === void 0 ? void 0 : _product$metadata11.is_edit_for_runtime) === true;
     }
   }, {
     key: "isRuntimeEntitlementAppend",
     value: function isRuntimeEntitlementAppend(product, tempOrder) {
-      var _product$metadata$uni, _product$metadata10, _tempOrder$_extend9, _product$_origin;
+      var _product$metadata$uni, _product$metadata12, _tempOrder$_extend10, _product$_origin;
       if (this.isPersistedProductLine(product)) return false;
-      var uid = (_product$metadata$uni = (_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.unique_identification_number) !== null && _product$metadata$uni !== void 0 ? _product$metadata$uni : product.unique_identification_number;
-      var storedOrigin = uid !== undefined && uid !== null && uid !== '' ? (_tempOrder$_extend9 = tempOrder._extend) === null || _tempOrder$_extend9 === void 0 || (_tempOrder$_extend9 = _tempOrder$_extend9.productsByUid) === null || _tempOrder$_extend9 === void 0 || (_tempOrder$_extend9 = _tempOrder$_extend9[String(uid)]) === null || _tempOrder$_extend9 === void 0 ? void 0 : _tempOrder$_extend9.origin : undefined;
+      var uid = (_product$metadata$uni = (_product$metadata12 = product.metadata) === null || _product$metadata12 === void 0 ? void 0 : _product$metadata12.unique_identification_number) !== null && _product$metadata$uni !== void 0 ? _product$metadata$uni : product.unique_identification_number;
+      var storedOrigin = uid !== undefined && uid !== null && uid !== '' ? (_tempOrder$_extend10 = tempOrder._extend) === null || _tempOrder$_extend10 === void 0 || (_tempOrder$_extend10 = _tempOrder$_extend10.productsByUid) === null || _tempOrder$_extend10 === void 0 || (_tempOrder$_extend10 = _tempOrder$_extend10[String(uid)]) === null || _tempOrder$_extend10 === void 0 ? void 0 : _tempOrder$_extend10.origin : undefined;
       return Boolean((product === null || product === void 0 || (_product$_origin = product._origin) === null || _product$_origin === void 0 ? void 0 : _product$_origin.__entitlementPassRuntimeAppend) === true || (storedOrigin === null || storedOrigin === void 0 ? void 0 : storedOrigin.__entitlementPassRuntimeAppend) === true);
     }
   }, {
     key: "hasSameEntitlementMergePriceConfig",
     value: function hasSameEntitlementMergePriceConfig(incoming, existing) {
-      var _this28 = this;
+      var _this33 = this;
       var buildPriceConfig = function buildPriceConfig(product) {
         var metadata = product.metadata || {};
         var bundle = (product.product_bundle || []).map(function (item) {
-          var _ref66, _item$bundle_id, _ref67, _ref68, _item$bundle_product_, _ref69, _item$bundle_variant_, _ref70, _item$price_type, _ref71, _item$price_type_ext;
+          var _ref70, _item$bundle_id, _ref71, _ref72, _item$bundle_product_, _ref73, _item$bundle_variant_, _ref74, _item$price_type, _ref75, _item$price_type_ext;
           return {
-            bundle_id: (_ref66 = (_item$bundle_id = item.bundle_id) !== null && _item$bundle_id !== void 0 ? _item$bundle_id : item.id) !== null && _ref66 !== void 0 ? _ref66 : null,
-            bundle_product_id: (_ref67 = (_ref68 = (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id) !== null && _ref68 !== void 0 ? _ref68 : item.product_id) !== null && _ref67 !== void 0 ? _ref67 : null,
-            bundle_variant_id: (_ref69 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.product_variant_id) !== null && _ref69 !== void 0 ? _ref69 : 0,
-            price_type: (_ref70 = (_item$price_type = item.price_type) !== null && _item$price_type !== void 0 ? _item$price_type : item.custom_price_type) !== null && _ref70 !== void 0 ? _ref70 : '',
-            price_type_ext: (_ref71 = (_item$price_type_ext = item.price_type_ext) !== null && _item$price_type_ext !== void 0 ? _item$price_type_ext : item.custom_price_type_ext) !== null && _ref71 !== void 0 ? _ref71 : ''
+            bundle_id: (_ref70 = (_item$bundle_id = item.bundle_id) !== null && _item$bundle_id !== void 0 ? _item$bundle_id : item.id) !== null && _ref70 !== void 0 ? _ref70 : null,
+            bundle_product_id: (_ref71 = (_ref72 = (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id) !== null && _ref72 !== void 0 ? _ref72 : item.product_id) !== null && _ref71 !== void 0 ? _ref71 : null,
+            bundle_variant_id: (_ref73 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.product_variant_id) !== null && _ref73 !== void 0 ? _ref73 : 0,
+            price_type: (_ref74 = (_item$price_type = item.price_type) !== null && _item$price_type !== void 0 ? _item$price_type : item.custom_price_type) !== null && _ref74 !== void 0 ? _ref74 : '',
+            price_type_ext: (_ref75 = (_item$price_type_ext = item.price_type_ext) !== null && _item$price_type_ext !== void 0 ? _item$price_type_ext : item.custom_price_type_ext) !== null && _ref75 !== void 0 ? _ref75 : ''
           };
         }).sort(function (left, right) {
           return JSON.stringify(left).localeCompare(JSON.stringify(right));
         });
         return JSON.stringify({
-          original_price: _this28.normalizeFingerprintMoney(product.original_price),
-          source_product_price: _this28.normalizeFingerprintMoney(metadata.source_product_price),
-          main_product_original_price: _this28.normalizeFingerprintMoney(metadata.main_product_original_price),
-          price_override: _this28.normalizeFingerprintMoney(metadata.price_override),
+          original_price: _this33.normalizeFingerprintMoney(product.original_price),
+          source_product_price: _this33.normalizeFingerprintMoney(metadata.source_product_price),
+          main_product_original_price: _this33.normalizeFingerprintMoney(metadata.main_product_original_price),
+          price_override: _this33.normalizeFingerprintMoney(metadata.price_override),
           is_manual_discount: Boolean(metadata.is_manual_discount),
           bundle: bundle
         });
@@ -4798,24 +5335,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getBundleRuntimeIdentity",
     value: function getBundleRuntimeIdentity(bundle) {
-      var _ref72, _bundle$bundle_id2, _ref73, _bundle$bundle_group_2, _ref74, _ref75, _bundle$bundle_produc3, _ref76, _bundle$bundle_varian3;
+      var _ref76, _bundle$bundle_id2, _ref77, _bundle$bundle_group_2, _ref78, _ref79, _bundle$bundle_produc3, _ref80, _bundle$bundle_varian3;
       if (!bundle || _typeof(bundle) !== 'object') return '';
-      return [(_ref72 = (_bundle$bundle_id2 = bundle.bundle_id) !== null && _bundle$bundle_id2 !== void 0 ? _bundle$bundle_id2 : bundle.id) !== null && _ref72 !== void 0 ? _ref72 : '', (_ref73 = (_bundle$bundle_group_2 = bundle.bundle_group_id) !== null && _bundle$bundle_group_2 !== void 0 ? _bundle$bundle_group_2 : bundle.group_id) !== null && _ref73 !== void 0 ? _ref73 : '', (_ref74 = (_ref75 = (_bundle$bundle_produc3 = bundle.bundle_product_id) !== null && _bundle$bundle_produc3 !== void 0 ? _bundle$bundle_produc3 : bundle._bundle_product_id) !== null && _ref75 !== void 0 ? _ref75 : bundle.product_id) !== null && _ref74 !== void 0 ? _ref74 : '', (_ref76 = (_bundle$bundle_varian3 = bundle.bundle_variant_id) !== null && _bundle$bundle_varian3 !== void 0 ? _bundle$bundle_varian3 : bundle.product_variant_id) !== null && _ref76 !== void 0 ? _ref76 : 0].join('|');
+      return [(_ref76 = (_bundle$bundle_id2 = bundle.bundle_id) !== null && _bundle$bundle_id2 !== void 0 ? _bundle$bundle_id2 : bundle.id) !== null && _ref76 !== void 0 ? _ref76 : '', (_ref77 = (_bundle$bundle_group_2 = bundle.bundle_group_id) !== null && _bundle$bundle_group_2 !== void 0 ? _bundle$bundle_group_2 : bundle.group_id) !== null && _ref77 !== void 0 ? _ref77 : '', (_ref78 = (_ref79 = (_bundle$bundle_produc3 = bundle.bundle_product_id) !== null && _bundle$bundle_produc3 !== void 0 ? _bundle$bundle_produc3 : bundle._bundle_product_id) !== null && _ref79 !== void 0 ? _ref79 : bundle.product_id) !== null && _ref78 !== void 0 ? _ref78 : '', (_ref80 = (_bundle$bundle_varian3 = bundle.bundle_variant_id) !== null && _bundle$bundle_varian3 !== void 0 ? _bundle$bundle_varian3 : bundle.product_variant_id) !== null && _ref80 !== void 0 ? _ref80 : 0].join('|');
     }
   }, {
     key: "preservePersistedBundlePriceFields",
     value: function preservePersistedBundlePriceFields(previousBundles, nextBundles) {
-      var _this29 = this;
+      var _this34 = this;
       if (!Array.isArray(nextBundles)) return nextBundles;
       if (!Array.isArray(previousBundles) || previousBundles.length === 0) return nextBundles;
       var previousByIdentity = new Map();
       previousBundles.forEach(function (bundle) {
-        var identity = _this29.getBundleRuntimeIdentity(bundle);
+        var identity = _this34.getBundleRuntimeIdentity(bundle);
         if (identity) previousByIdentity.set(identity, bundle);
       });
       return nextBundles.map(function (bundle, index) {
         if (!bundle || _typeof(bundle) !== 'object') return bundle;
-        var previous = previousByIdentity.get(_this29.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
+        var previous = previousByIdentity.get(_this34.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
         if (!previous || _typeof(previous) !== 'object') return bundle;
         return _objectSpread(_objectSpread(_objectSpread({}, bundle), (bundle.cover === undefined || bundle.cover === null || bundle.cover === '') && previous.cover !== undefined && previous.cover !== null && previous.cover !== '' ? {
           cover: previous.cover
@@ -4951,13 +5488,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         delete nextProduct.metadata.main_product_original_price;
         delete nextProduct.metadata.price_schema_version;
       } else if (callerChangesLineConfiguration && !callerUpdatesTopPrice && !callerUpdatesMainMeta) {
-        var _ref77, _targetProduct$metada10, _targetProduct$metada11, _ref78, _targetProduct$metada12, _targetProduct$metada13, _targetProduct$metada14;
+        var _ref81, _targetProduct$metada10, _targetProduct$metada11, _ref82, _targetProduct$metada12, _targetProduct$metada13, _targetProduct$metada14;
         // 仅 option / bundle 变化时，保留历史 source 和主商品折扣金额，
         // 但必须让 original 与 selling 一起随新的 option 金额移动。
         var previousOptionSum = sumOptionUnitPrice(getProductSkuOptions(targetProduct));
         var nextOptionSum = sumOptionUnitPrice(getProductSkuOptions(nextProduct));
-        var _previousMainOriginal = new Decimal(Number((_ref77 = (_targetProduct$metada10 = (_targetProduct$metada11 = targetProduct.metadata) === null || _targetProduct$metada11 === void 0 ? void 0 : _targetProduct$metada11.main_product_original_price) !== null && _targetProduct$metada10 !== void 0 ? _targetProduct$metada10 : targetProduct.original_price) !== null && _ref77 !== void 0 ? _ref77 : 0) || 0);
-        var _previousMainSelling = new Decimal(Number((_ref78 = (_targetProduct$metada12 = (_targetProduct$metada13 = targetProduct.metadata) === null || _targetProduct$metada13 === void 0 ? void 0 : _targetProduct$metada13.main_product_selling_price) !== null && _targetProduct$metada12 !== void 0 ? _targetProduct$metada12 : targetProduct.selling_price) !== null && _ref78 !== void 0 ? _ref78 : _previousMainOriginal.toNumber()) || 0);
+        var _previousMainOriginal = new Decimal(Number((_ref81 = (_targetProduct$metada10 = (_targetProduct$metada11 = targetProduct.metadata) === null || _targetProduct$metada11 === void 0 ? void 0 : _targetProduct$metada11.main_product_original_price) !== null && _targetProduct$metada10 !== void 0 ? _targetProduct$metada10 : targetProduct.original_price) !== null && _ref81 !== void 0 ? _ref81 : 0) || 0);
+        var _previousMainSelling = new Decimal(Number((_ref82 = (_targetProduct$metada12 = (_targetProduct$metada13 = targetProduct.metadata) === null || _targetProduct$metada13 === void 0 ? void 0 : _targetProduct$metada13.main_product_selling_price) !== null && _targetProduct$metada12 !== void 0 ? _targetProduct$metada12 : targetProduct.selling_price) !== null && _ref82 !== void 0 ? _ref82 : _previousMainOriginal.toNumber()) || 0);
         var _preservedDiscount = _previousMainOriginal.minus(_previousMainSelling);
         var previousSource = ((_targetProduct$metada14 = targetProduct.metadata) === null || _targetProduct$metada14 === void 0 ? void 0 : _targetProduct$metada14.source_product_price) != null ? new Decimal(Number(targetProduct.metadata.source_product_price) || 0) : _previousMainOriginal.minus(previousOptionSum);
         var _nextMainOriginal = previousSource.plus(nextOptionSum);
@@ -5016,37 +5553,39 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProduct",
     value: function () {
-      var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(params) {
-        var tempOrder, updatedProductUid;
-        return _regeneratorRuntime().wrap(function _callee21$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+      var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(params) {
+        var tempOrder, updatedProductUid, promotionPayload;
+        return _regeneratorRuntime().wrap(function _callee25$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params);
-              _context23.next = 4;
-              return this.applyPromotion();
+              _context27.next = 4;
+              return this.evaluatePromotion();
             case 4:
+              promotionPayload = _context27.sent;
               this.applyDiscount({
                 reapplyBookingDiscountProductUids: params.allow_booking_discount_reapply && updatedProductUid ? [String(updatedProductUid)] : undefined
               });
               this.sanitizeTempOrderProducts(tempOrder);
-              _context23.next = 8;
+              _context27.next = 9;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 8:
+            case 9:
               this.persistTempOrder();
+              this.emitPromotionApplied(promotionPayload);
               this.logInfo('updateOrderProduct success', {
                 params: params
               });
-              return _context23.abrupt("return", tempOrder.products);
-            case 11:
+              return _context27.abrupt("return", tempOrder.products);
+            case 13:
             case "end":
-              return _context23.stop();
+              return _context27.stop();
           }
-        }, _callee21, this);
+        }, _callee25, this);
       }));
-      function updateOrderProduct(_x26) {
+      function updateOrderProduct(_x28) {
         return _updateOrderProduct.apply(this, arguments);
       }
       return updateOrderProduct;
@@ -5054,28 +5593,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProducts",
     value: function () {
-      var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(paramsList) {
-        var _this30 = this;
+      var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(paramsList) {
+        var _this35 = this;
         var tempOrder, reapplyBookingDiscountProductUids;
-        return _regeneratorRuntime().wrap(function _callee22$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+        return _regeneratorRuntime().wrap(function _callee26$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (paramsList.length) {
-                _context24.next = 3;
+                _context28.next = 3;
                 break;
               }
-              return _context24.abrupt("return", tempOrder.products);
+              return _context28.abrupt("return", tempOrder.products);
             case 3:
               reapplyBookingDiscountProductUids = paramsList.reduce(function (acc, params) {
-                var updatedProductUid = _this30.applyOrderProductUpdateToTempOrder(tempOrder, params);
+                var updatedProductUid = _this35.applyOrderProductUpdateToTempOrder(tempOrder, params);
                 // 批量改预约时间时，延迟到最后一次折扣计算里统一恢复已选预约折扣卡。
                 if (params.allow_booking_discount_reapply && updatedProductUid) {
                   acc.push(String(updatedProductUid));
                 }
                 return acc;
               }, []);
-              _context24.next = 6;
+              _context28.next = 6;
               return this.finalizeAfterProductsMutation(tempOrder, {
                 reapplyBookingDiscountProductUids: reapplyBookingDiscountProductUids.length ? reapplyBookingDiscountProductUids : undefined
               });
@@ -5083,14 +5622,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('updateOrderProduct success', {
                 paramsList: paramsList
               });
-              return _context24.abrupt("return", tempOrder.products);
+              return _context28.abrupt("return", tempOrder.products);
             case 8:
             case "end":
-              return _context24.stop();
+              return _context28.stop();
           }
-        }, _callee22, this);
+        }, _callee26, this);
       }));
-      function updateOrderProducts(_x27) {
+      function updateOrderProducts(_x29) {
         return _updateOrderProducts.apply(this, arguments);
       }
       return updateOrderProducts;
@@ -5098,11 +5637,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProductQuantity",
     value: function () {
-      var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(params) {
+      var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(params) {
         var _targetProduct$metada17;
-        var product_id, product_variant_id, num, unique_identification_number, identity_key, product_sku, product_bundle, tempOrder, identityLookup, productIndex, targetUid, targetProduct, isPersistedOrderLine, normalizedProduct, settlementSnapshot, currencyProductId, asset, requiredAmount, balance;
-        return _regeneratorRuntime().wrap(function _callee23$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+        var product_id, product_variant_id, num, unique_identification_number, identity_key, product_sku, product_bundle, tempOrder, identityLookup, productIndex, targetUid, targetProduct, isPersistedOrderLine, normalizedProduct, settlementSnapshot, currencyProductId, asset, requiredAmount, balance, isVirtualSettlement, promotionPayload;
+        return _regeneratorRuntime().wrap(function _callee27$(_context29) {
+          while (1) switch (_context29.prev = _context29.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();
@@ -5132,7 +5671,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 productIndex = getProductIdentityIndex(tempOrder.products, identityLookup);
               }
               if (!(productIndex === -1)) {
-                _context25.next = 13;
+                _context29.next = 13;
                 break;
               }
               throw new Error('[Order] 目标商品不存在，无法更新数量');
@@ -5148,7 +5687,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               normalizedProduct.discount_list = normalizeOrderProductDiscountList(isPersistedOrderLine ? syncReducedEntitlementPassUsageCount(normalizedProduct.discount_list, targetProduct.num, normalizedProduct.num) : normalizedProduct.discount_list);
               settlementSnapshot = getSelectedSettlementSnapshot(normalizedProduct);
               if (!(this.isMultiCurrencySettlementEnabled() && (settlementSnapshot === null || settlementSnapshot === void 0 ? void 0 : settlementSnapshot.settlement_type) === 'virtual_currency' && tempOrder.customer_id && Number(tempOrder.customer_id) !== 1)) {
-                _context25.next = 27;
+                _context29.next = 27;
                 break;
               }
               currencyProductId = Number(settlementSnapshot.currency_product_id);
@@ -5156,7 +5695,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return Number(item === null || item === void 0 ? void 0 : item.product_id) === currencyProductId;
               });
               if (asset) {
-                _context25.next = 23;
+                _context29.next = 23;
                 break;
               }
               throw new VirtualCurrencyAssetNotFoundError(currencyProductId);
@@ -5168,40 +5707,50 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }, new Decimal(0));
               balance = new Decimal(asset.balance || 0);
               if (!balance.lt(requiredAmount)) {
-                _context25.next = 27;
+                _context29.next = 27;
                 break;
               }
               throw new VirtualCurrencyBalanceError(balance.toFixed(2), requiredAmount.toFixed(2));
             case 27:
               tempOrder.products[productIndex] = normalizedProduct;
               this.prepareVirtualSettlementTempOrder(tempOrder);
-              if (this.isActiveVirtualSettlementOrder(tempOrder)) {
-                _context25.next = 33;
+              isVirtualSettlement = this.isActiveVirtualSettlementOrder(tempOrder);
+              if (isVirtualSettlement) {
+                _context29.next = 36;
                 break;
               }
-              _context25.next = 32;
-              return this.applyPromotion();
-            case 32:
-              this.applyDiscount();
+              _context29.next = 33;
+              return this.evaluatePromotion();
             case 33:
+              _context29.t0 = _context29.sent;
+              _context29.next = 37;
+              break;
+            case 36:
+              _context29.t0 = null;
+            case 37:
+              promotionPayload = _context29.t0;
+              if (!isVirtualSettlement) {
+                this.applyDiscount();
+              }
               this.sanitizeTempOrderProducts(tempOrder);
-              _context25.next = 36;
+              _context29.next = 42;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 36:
+            case 42:
               this.persistTempOrder();
+              this.emitPromotionApplied(promotionPayload);
               this.logInfo('updateOrderProductQuantity success', {
                 params: params
               });
-              return _context25.abrupt("return", tempOrder.products);
-            case 39:
+              return _context29.abrupt("return", tempOrder.products);
+            case 46:
             case "end":
-              return _context25.stop();
+              return _context29.stop();
           }
-        }, _callee23, this);
+        }, _callee27, this);
       }));
-      function updateOrderProductQuantity(_x28) {
+      function updateOrderProductQuantity(_x30) {
         return _updateOrderProductQuantity.apply(this, arguments);
       }
       return updateOrderProductQuantity;
@@ -5242,31 +5791,34 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "finalizeAfterProductsMutation",
     value: (function () {
-      var _finalizeAfterProductsMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(tempOrder, options) {
-        return _regeneratorRuntime().wrap(function _callee24$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+      var _finalizeAfterProductsMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(tempOrder, options) {
+        var promotionPayload;
+        return _regeneratorRuntime().wrap(function _callee28$(_context30) {
+          while (1) switch (_context30.prev = _context30.next) {
             case 0:
               this.syncTempOrderHolderFromBookings(tempOrder);
-              _context26.next = 3;
-              return this.applyPromotion();
+              _context30.next = 3;
+              return this.evaluatePromotion();
             case 3:
+              promotionPayload = _context30.sent;
               this.applyDiscount({
                 reapplyBookingDiscountProductUids: options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids
               });
               this.sanitizeTempOrderProducts(tempOrder);
-              _context26.next = 7;
+              _context30.next = 8;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 7:
-              this.persistTempOrder();
             case 8:
+              this.persistTempOrder();
+              this.emitPromotionApplied(promotionPayload);
+            case 10:
             case "end":
-              return _context26.stop();
+              return _context30.stop();
           }
-        }, _callee24, this);
+        }, _callee28, this);
       }));
-      function finalizeAfterProductsMutation(_x29, _x30) {
+      function finalizeAfterProductsMutation(_x31, _x32) {
         return _finalizeAfterProductsMutation.apply(this, arguments);
       }
       return finalizeAfterProductsMutation;
@@ -5281,20 +5833,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeProductsFromOrder",
     value: (function () {
-      var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(identities, options) {
-        var _this31 = this;
+      var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(identities, options) {
+        var _this36 = this;
         var tempOrder, productsBeforeRemove, bookingsBeforeRemove, preserveDisplayPosition, anchorIndex, productsAfterAnchor, matchedProducts, removedProducts, _i2, _removedProducts, product, linkedBookingUidsToRemove, _iterator21, _step21, _loop3, remainingProductIndex, remainingProduct, nextProduct, productsWithoutRemaining, nextProductIndex;
-        return _regeneratorRuntime().wrap(function _callee25$(_context28) {
-          while (1) switch (_context28.prev = _context28.next) {
+        return _regeneratorRuntime().wrap(function _callee29$(_context32) {
+          while (1) switch (_context32.prev = _context32.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
-              this.repairDuplicateProductLineIdentities(tempOrder);
               if (identities.length) {
-                _context28.next = 4;
+                _context32.next = 3;
                 break;
               }
-              return _context28.abrupt("return", tempOrder.products);
-            case 4:
+              return _context32.abrupt("return", tempOrder.products);
+            case 3:
+              // 商品删除会同步删除以商品行为主关系的 Notes；快照不完整时禁止产生孤儿 Relation。
+              this.ensureSalesNotesLoadedForMutation(tempOrder);
+              this.repairDuplicateProductLineIdentities(tempOrder);
               productsBeforeRemove = tempOrder.products || [];
               bookingsBeforeRemove = tempOrder.bookings || [];
               preserveDisplayPosition = options === null || options === void 0 ? void 0 : options.preserveDisplayPosition;
@@ -5323,29 +5877,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               linkedBookingUidsToRemove = new Set();
               _iterator21 = _createForOfIteratorHelper(matchedProducts);
-              _context28.prev = 15;
+              _context32.prev = 16;
               _loop3 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop3() {
                 var _metadata11, _metadata12, _metadata13, _metadata14;
                 var product, productUid, productBookingUid, isAddTimeProduct;
-                return _regeneratorRuntime().wrap(function _loop3$(_context27) {
-                  while (1) switch (_context27.prev = _context27.next) {
+                return _regeneratorRuntime().wrap(function _loop3$(_context31) {
+                  while (1) switch (_context31.prev = _context31.next) {
                     case 0:
                       product = _step21.value;
                       productUid = (product === null || product === void 0 || (_metadata11 = product.metadata) === null || _metadata11 === void 0 ? void 0 : _metadata11.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
                       productBookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_metadata12 = product.metadata) === null || _metadata12 === void 0 ? void 0 : _metadata12.booking_uid);
                       isAddTimeProduct = (product === null || product === void 0 || (_metadata13 = product.metadata) === null || _metadata13 === void 0 ? void 0 : _metadata13.product_add_schedule_time) !== undefined && (product === null || product === void 0 || (_metadata14 = product.metadata) === null || _metadata14 === void 0 ? void 0 : _metadata14.product_add_schedule_time) !== null;
                       if (!isAddTimeProduct) {
-                        _context27.next = 6;
+                        _context31.next = 6;
                         break;
                       }
-                      return _context27.abrupt("return", 1);
+                      return _context31.abrupt("return", 1);
                     case 6:
                       if (productBookingUid !== undefined && productBookingUid !== null && productBookingUid !== '') {
                         linkedBookingUidsToRemove.add(String(productBookingUid));
                       }
                       if (productUid !== undefined && productUid !== null && productUid !== '') {
                         bookingsBeforeRemove.forEach(function (booking) {
-                          var bookingUid = _this31.getBookingUniqueIdentificationNumber(booking);
+                          var bookingUid = _this36.getBookingUniqueIdentificationNumber(booking);
                           if (bookingUid && String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === String(productUid)) {
                             linkedBookingUidsToRemove.add(bookingUid);
                           }
@@ -5353,38 +5907,38 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }
                     case 8:
                     case "end":
-                      return _context27.stop();
+                      return _context31.stop();
                   }
                 }, _loop3);
               });
               _iterator21.s();
-            case 18:
+            case 19:
               if ((_step21 = _iterator21.n()).done) {
-                _context28.next = 24;
+                _context32.next = 25;
                 break;
               }
-              return _context28.delegateYield(_loop3(), "t0", 20);
-            case 20:
-              if (!_context28.t0) {
-                _context28.next = 22;
+              return _context32.delegateYield(_loop3(), "t0", 21);
+            case 21:
+              if (!_context32.t0) {
+                _context32.next = 23;
                 break;
               }
-              return _context28.abrupt("continue", 22);
-            case 22:
-              _context28.next = 18;
+              return _context32.abrupt("continue", 23);
+            case 23:
+              _context32.next = 19;
               break;
-            case 24:
-              _context28.next = 29;
+            case 25:
+              _context32.next = 30;
               break;
-            case 26:
-              _context28.prev = 26;
-              _context28.t1 = _context28["catch"](15);
-              _iterator21.e(_context28.t1);
-            case 29:
-              _context28.prev = 29;
+            case 27:
+              _context32.prev = 27;
+              _context32.t1 = _context32["catch"](16);
+              _iterator21.e(_context32.t1);
+            case 30:
+              _context32.prev = 30;
               _iterator21.f();
-              return _context28.finish(29);
-            case 32:
+              return _context32.finish(30);
+            case 33:
               if (linkedBookingUidsToRemove.size > 0) {
                 // 删除主预约商品时，同步移除挂在同一 booking_uid 下的加时商品，避免残留孤儿行。
                 tempOrder.products = (tempOrder.products || []).filter(function (line) {
@@ -5410,20 +5964,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   tempOrder.products = nextProductIndex >= 0 ? [].concat(_toConsumableArray(productsWithoutRemaining.slice(0, nextProductIndex)), [remainingProduct], _toConsumableArray(productsWithoutRemaining.slice(nextProductIndex))) : [].concat(_toConsumableArray(productsWithoutRemaining), [remainingProduct]);
                 }
               }
-              _context28.next = 36;
+              this.removeSalesNotesForMissingProductLines(tempOrder);
+              _context32.next = 38;
               return this.finalizeAfterProductsMutation(tempOrder);
-            case 36:
+            case 38:
               this.logInfo('removeProductsFromOrder success', {
                 identities: identities
               });
-              return _context28.abrupt("return", tempOrder.products);
-            case 38:
+              return _context32.abrupt("return", tempOrder.products);
+            case 40:
             case "end":
-              return _context28.stop();
+              return _context32.stop();
           }
-        }, _callee25, this, [[15, 26, 29, 32]]);
+        }, _callee29, this, [[16, 27, 30, 33]]);
       }));
-      function removeProductsFromOrder(_x31, _x32) {
+      function removeProductsFromOrder(_x33, _x34) {
         return _removeProductsFromOrder.apply(this, arguments);
       }
       return removeProductsFromOrder;
@@ -5431,62 +5986,66 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeProductFromOrder",
     value: function () {
-      var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(identity, options) {
-        return _regeneratorRuntime().wrap(function _callee26$(_context29) {
-          while (1) switch (_context29.prev = _context29.next) {
+      var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(identity, options) {
+        return _regeneratorRuntime().wrap(function _callee30$(_context33) {
+          while (1) switch (_context33.prev = _context33.next) {
             case 0:
-              return _context29.abrupt("return", this.removeProductsFromOrder([identity], options));
+              return _context33.abrupt("return", this.removeProductsFromOrder([identity], options));
             case 1:
             case "end":
-              return _context29.stop();
+              return _context33.stop();
           }
-        }, _callee26, this);
+        }, _callee30, this);
       }));
-      function removeProductFromOrder(_x33, _x34) {
+      function removeProductFromOrder(_x35, _x36) {
         return _removeProductFromOrder.apply(this, arguments);
       }
       return removeProductFromOrder;
     }()
     /**
      * 仅清空购物车行（products / bookings），不重置整单。
-     * 用于「仅清空商品」；客户、备注、支付等协议字段保持不变。
+     * 普通整单 note 保持不变；以商品行为主体的 Sales Notes 同步删除。
      */
   }, {
     key: "clearOrderCartLines",
     value: (function () {
-      var _clearOrderCartLines = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27() {
-        var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee27$(_context30) {
-          while (1) switch (_context30.prev = _context30.next) {
+      var _clearOrderCartLines = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31() {
+        var tempOrder, promotionPayload;
+        return _regeneratorRuntime().wrap(function _callee31$(_context34) {
+          while (1) switch (_context34.prev = _context34.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
+              this.ensureSalesNotesLoadedForMutation(tempOrder);
               tempOrder.products = [];
               tempOrder.bookings = [];
               releaseTempOrderSettlementState(tempOrder);
+              this.removeSalesNotesForMissingProductLines(tempOrder);
               this.syncTempOrderHolderFromBookings(tempOrder);
               if (tempOrder._extend && _typeof(tempOrder._extend) === 'object') {
                 tempOrder._extend = _objectSpread(_objectSpread({}, tempOrder._extend), {}, {
                   productsByUid: {}
                 });
               }
-              _context30.next = 8;
-              return this.applyPromotion();
-            case 8:
+              _context34.next = 10;
+              return this.evaluatePromotion();
+            case 10:
+              promotionPayload = _context34.sent;
               this.applyDiscount();
               this.sanitizeTempOrderProducts(tempOrder);
-              _context30.next = 12;
+              _context34.next = 15;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 12:
+            case 15:
               this.persistTempOrder();
+              this.emitPromotionApplied(promotionPayload);
               this.logInfo('clearOrderCartLines success', {});
-              return _context30.abrupt("return", tempOrder);
-            case 15:
+              return _context34.abrupt("return", tempOrder);
+            case 19:
             case "end":
-              return _context30.stop();
+              return _context34.stop();
           }
-        }, _callee27, this);
+        }, _callee31, this);
       }));
       function clearOrderCartLines() {
         return _clearOrderCartLines.apply(this, arguments);
@@ -5500,15 +6059,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clearOrderForSettlementSwitch",
     value: (function () {
-      var _clearOrderForSettlementSwitch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28() {
+      var _clearOrderForSettlementSwitch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32() {
         var _this$store$discount22, _this$store$discount23;
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee28$(_context31) {
-          while (1) switch (_context31.prev = _context31.next) {
+        return _regeneratorRuntime().wrap(function _callee32$(_context35) {
+          while (1) switch (_context35.prev = _context35.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
+              this.ensureSalesNotesLoadedForMutation(tempOrder);
               tempOrder.products = [];
               tempOrder.bookings = [];
+              this.removeSalesNotesForMissingProductLines(tempOrder);
               tempOrder.discount_list = [];
               tempOrder.payments = [];
               tempOrder.refunds = [];
@@ -5521,28 +6082,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   productsByUid: {}
                 });
               }
-              _context31.next = 13;
+              _context35.next = 15;
               return (_this$store$discount22 = this.store.discount) === null || _this$store$discount22 === void 0 ? void 0 : _this$store$discount22.setDiscountList([]);
-            case 13:
-              _context31.next = 15;
-              return (_this$store$discount23 = this.store.discount) === null || _this$store$discount23 === void 0 ? void 0 : _this$store$discount23.setOriginalDiscountList([]);
             case 15:
+              _context35.next = 17;
+              return (_this$store$discount23 = this.store.discount) === null || _this$store$discount23 === void 0 ? void 0 : _this$store$discount23.setOriginalDiscountList([]);
+            case 17:
               this.hasActiveCustomerBoundDiscount = false;
               this.lastUnfulfilledPromotions = [];
               this.lastGiftActions = null;
-              _context31.next = 20;
+              _context35.next = 22;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 20:
+            case 22:
               this.persistTempOrder();
               this.logInfo('clearOrderForSettlementSwitch success', {});
-              return _context31.abrupt("return", tempOrder);
-            case 23:
+              return _context35.abrupt("return", tempOrder);
+            case 25:
             case "end":
-              return _context31.stop();
+              return _context35.stop();
           }
-        }, _callee28, this);
+        }, _callee32, this);
       }));
       function clearOrderForSettlementSwitch() {
         return _clearOrderForSettlementSwitch.apply(this, arguments);
@@ -5553,23 +6114,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildCurrentSubmitPayloadForLocalPrint",
     value: function buildCurrentSubmitPayloadForLocalPrint(params) {
-      var _params$cacheId, _this$otherParams5, _ref79, _params$businessCode, _this$otherParams6, _this$otherParams7;
+      var _params$cacheId, _this$otherParams5, _ref83, _params$businessCode, _this$otherParams6, _this$otherParams7;
       var tempOrder = this.ensureTempOrder();
       this.persistTempOrder();
       var payload = buildSubmitPayload({
         tempOrder: tempOrder,
         cacheId: (_params$cacheId = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId !== void 0 ? _params$cacheId : this.cacheId,
         platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.platform),
-        businessCode: (_ref79 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.businessCode) !== null && _ref79 !== void 0 ? _ref79 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.business_code,
+        businessCode: (_ref83 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.businessCode) !== null && _ref83 !== void 0 ? _ref83 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.business_code,
         channel: params === null || params === void 0 ? void 0 : params.channel,
         type: params === null || params === void 0 ? void 0 : params.type,
         summary: this.store.summary || createEmptySummary(),
         enhance: function enhance(nextPayload) {
-          var _ref80, _tempOrder$order_numb, _ref81, _tempOrder$shop_order, _ref82, _tempOrder$shop_full_;
+          var _ref84, _tempOrder$order_numb, _ref85, _tempOrder$shop_order2, _ref86, _tempOrder$shop_full_;
           return _objectSpread(_objectSpread({}, nextPayload), {}, {
-            order_number: (_ref80 = (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : nextPayload.order_number) !== null && _ref80 !== void 0 ? _ref80 : null,
-            shop_order_number: (_ref81 = (_tempOrder$shop_order = tempOrder.shop_order_number) !== null && _tempOrder$shop_order !== void 0 ? _tempOrder$shop_order : nextPayload.shop_order_number) !== null && _ref81 !== void 0 ? _ref81 : null,
-            shop_full_order_number: (_ref82 = (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : nextPayload.shop_full_order_number) !== null && _ref82 !== void 0 ? _ref82 : null,
+            order_number: (_ref84 = (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : nextPayload.order_number) !== null && _ref84 !== void 0 ? _ref84 : null,
+            shop_order_number: (_ref85 = (_tempOrder$shop_order2 = tempOrder.shop_order_number) !== null && _tempOrder$shop_order2 !== void 0 ? _tempOrder$shop_order2 : nextPayload.shop_order_number) !== null && _ref85 !== void 0 ? _ref85 : null,
+            shop_full_order_number: (_ref86 = (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : nextPayload.shop_full_order_number) !== null && _ref86 !== void 0 ? _ref86 : null,
             small_ticket_data_flag: 1
           });
         }
@@ -5580,17 +6141,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyLocalPrintOrderNumbers",
     value: function () {
-      var _applyLocalPrintOrderNumbers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(order) {
+      var _applyLocalPrintOrderNumbers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(order) {
         var tempOrder, shopOrderNumber, shopFullOrderNumber;
-        return _regeneratorRuntime().wrap(function _callee29$(_context32) {
-          while (1) switch (_context32.prev = _context32.next) {
+        return _regeneratorRuntime().wrap(function _callee33$(_context36) {
+          while (1) switch (_context36.prev = _context36.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (!(!order || _typeof(order) !== 'object')) {
-                _context32.next = 3;
+                _context36.next = 3;
                 break;
               }
-              return _context32.abrupt("return", tempOrder);
+              return _context36.abrupt("return", tempOrder);
             case 3:
               shopOrderNumber = order.shop_order_number;
               shopFullOrderNumber = order.shop_full_order_number;
@@ -5601,17 +6162,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.shop_full_order_number = String(shopFullOrderNumber);
               }
               this.persistTempOrder();
-              _context32.next = 10;
+              _context36.next = 10;
               return this.saveDraft();
             case 10:
-              return _context32.abrupt("return", tempOrder);
+              return _context36.abrupt("return", tempOrder);
             case 11:
             case "end":
-              return _context32.stop();
+              return _context36.stop();
           }
-        }, _callee29, this);
+        }, _callee33, this);
       }));
-      function applyLocalPrintOrderNumbers(_x35) {
+      function applyLocalPrintOrderNumbers(_x37) {
         return _applyLocalPrintOrderNumbers.apply(this, arguments);
       }
       return applyLocalPrintOrderNumbers;
@@ -5619,35 +6180,35 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "saveTempOrderAsDraft",
     value: function () {
-      var _saveTempOrderAsDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(params) {
+      var _saveTempOrderAsDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(params) {
         var _params$cacheId2, _this$otherParams8, _this$otherParams9, _this$otherParams10, _params$type, _this$otherParams11, _payload$products;
         var tempOrder, latestSummary, payload;
-        return _regeneratorRuntime().wrap(function _callee30$(_context33) {
-          while (1) switch (_context33.prev = _context33.next) {
+        return _regeneratorRuntime().wrap(function _callee34$(_context37) {
+          while (1) switch (_context37.prev = _context37.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               this.ensureExternalSaleNumber(tempOrder);
               this.persistTempOrder();
-              _context33.next = 5;
+              _context37.next = 5;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 5:
-              _context33.t1 = _context33.sent;
-              if (_context33.t1) {
-                _context33.next = 8;
+              _context37.t1 = _context37.sent;
+              if (_context37.t1) {
+                _context37.next = 8;
                 break;
               }
-              _context33.t1 = this.store.summary;
+              _context37.t1 = this.store.summary;
             case 8:
-              _context33.t0 = _context33.t1;
-              if (_context33.t0) {
-                _context33.next = 11;
+              _context37.t0 = _context37.t1;
+              if (_context37.t0) {
+                _context37.next = 11;
                 break;
               }
-              _context33.t0 = createEmptySummary();
+              _context37.t0 = createEmptySummary();
             case 11:
-              latestSummary = _context33.t0;
+              latestSummary = _context37.t0;
               payload = buildSubmitPayload({
                 tempOrder: tempOrder,
                 cacheId: (_params$cacheId2 = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId2 !== void 0 ? _params$cacheId2 : this.cacheId,
@@ -5668,17 +6229,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 externalSaleNumber: payload.external_sale_number,
                 productsCount: ((_payload$products = payload.products) === null || _payload$products === void 0 ? void 0 : _payload$products.length) || 0
               });
-              return _context33.abrupt("return", this.request.post('/order/sales/draft', payload, {
+              return _context37.abrupt("return", this.request.post('/order/sales/draft', payload, {
                 osServer: true,
                 customToast: function customToast() {}
               }));
             case 18:
             case "end":
-              return _context33.stop();
+              return _context37.stop();
           }
-        }, _callee30, this);
+        }, _callee34, this);
       }));
-      function saveTempOrderAsDraft(_x36) {
+      function saveTempOrderAsDraft(_x38) {
         return _saveTempOrderAsDraft.apply(this, arguments);
       }
       return saveTempOrderAsDraft;
@@ -5692,18 +6253,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitTempOrder",
     value: (function () {
-      var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(params) {
-        return _regeneratorRuntime().wrap(function _callee31$(_context34) {
-          while (1) switch (_context34.prev = _context34.next) {
+      var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35(params) {
+        return _regeneratorRuntime().wrap(function _callee35$(_context38) {
+          while (1) switch (_context38.prev = _context38.next) {
             case 0:
-              return _context34.abrupt("return", this.runSubmitTempOrder(params));
+              return _context38.abrupt("return", this.runSubmitTempOrder(params));
             case 1:
             case "end":
-              return _context34.stop();
+              return _context38.stop();
           }
-        }, _callee31, this);
+        }, _callee35, this);
       }));
-      function submitTempOrder(_x37) {
+      function submitTempOrder(_x39) {
         return _submitTempOrder.apply(this, arguments);
       }
       return submitTempOrder;
@@ -5711,20 +6272,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitTempOrderAsync",
     value: function () {
-      var _submitTempOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(params) {
-        return _regeneratorRuntime().wrap(function _callee32$(_context35) {
-          while (1) switch (_context35.prev = _context35.next) {
+      var _submitTempOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
+        return _regeneratorRuntime().wrap(function _callee36$(_context39) {
+          while (1) switch (_context39.prev = _context39.next) {
             case 0:
-              return _context35.abrupt("return", this.runSubmitTempOrder(_objectSpread(_objectSpread({}, params), {}, {
+              return _context39.abrupt("return", this.runSubmitTempOrder(_objectSpread(_objectSpread({}, params), {}, {
                 syncMode: true
               })));
             case 1:
             case "end":
-              return _context35.stop();
+              return _context39.stop();
           }
-        }, _callee32, this);
+        }, _callee36, this);
       }));
-      function submitTempOrderAsync(_x38) {
+      function submitTempOrderAsync(_x40) {
         return _submitTempOrderAsync.apply(this, arguments);
       }
       return submitTempOrderAsync;
@@ -5732,11 +6293,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "runSubmitTempOrder",
     value: function () {
-      var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(params) {
-        var _params$cacheId3, _this$otherParams12, _ref83, _ref84, _submitSnapshot$busin, _this$otherParams13, _this$otherParams14, _submitSnapshot$type;
-        var tempOrder, isOnlineStorePlatform, shouldConfirmPendingVoucherPayments, hasPaymentOverride, preparedPaymentOverride, latestSummary, effectiveCacheId, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, submitSnapshot, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
-        return _regeneratorRuntime().wrap(function _callee33$(_context36) {
-          while (1) switch (_context36.prev = _context36.next) {
+      var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(params) {
+        var _params$cacheId3, _this$otherParams12, _ref87, _ref88, _submitSnapshot$busin, _this$otherParams13, _this$otherParams14, _submitSnapshot$type;
+        var tempOrder, isOnlineStorePlatform, shouldConfirmPendingVoucherPayments, hasPaymentOverride, preparedPaymentOverride, latestSummary, effectiveCacheId, hasPaymentStatusOverride, shouldOverridePaymentStatus, hasSmallTicketDataFlagOverride, enhancePayload, submitSnapshot, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, isLocalPendingSubmit, salesNotesState, submittedOrderId, resultRecord;
+        return _regeneratorRuntime().wrap(function _callee37$(_context40) {
+          while (1) switch (_context40.prev = _context40.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               this.prepareVirtualSettlementTempOrder(tempOrder);
@@ -5760,33 +6321,34 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               this.persistTempOrder();
-              _context36.next = 10;
+              _context40.next = 10;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 10:
-              _context36.t1 = _context36.sent;
-              if (_context36.t1) {
-                _context36.next = 13;
+              _context40.t1 = _context40.sent;
+              if (_context40.t1) {
+                _context40.next = 13;
                 break;
               }
-              _context36.t1 = this.store.summary;
+              _context40.t1 = this.store.summary;
             case 13:
-              _context36.t0 = _context36.t1;
-              if (_context36.t0) {
-                _context36.next = 16;
+              _context40.t0 = _context40.t1;
+              if (_context40.t0) {
+                _context40.next = 16;
                 break;
               }
-              _context36.t0 = createEmptySummary();
+              _context40.t0 = createEmptySummary();
             case 16:
-              latestSummary = _context36.t0;
+              latestSummary = _context40.t0;
               effectiveCacheId = (_params$cacheId3 = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId3 !== void 0 ? _params$cacheId3 : this.cacheId;
               hasPaymentStatusOverride = (params === null || params === void 0 ? void 0 : params.paymentStatus) !== undefined;
+              shouldOverridePaymentStatus = hasPaymentStatusOverride && !isOnlineStorePlatform && !shouldConfirmPendingVoucherPayments;
               hasSmallTicketDataFlagOverride = (params === null || params === void 0 ? void 0 : params.smallTicketDataFlag) !== undefined;
               enhancePayload = hasPaymentOverride || hasPaymentStatusOverride || hasSmallTicketDataFlagOverride || params !== null && params !== void 0 && params.enhancePayload ? function (payload, ctx) {
                 var nextPayload = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, payload), hasPaymentOverride ? {
                   payments: preparedPaymentOverride || []
-                } : {}), hasPaymentStatusOverride && !isOnlineStorePlatform && !shouldConfirmPendingVoucherPayments ? {
+                } : {}), shouldOverridePaymentStatus ? {
                   payment_status: params === null || params === void 0 ? void 0 : params.paymentStatus
                 } : {}), hasSmallTicketDataFlagOverride ? {
                   small_ticket_data_flag: params === null || params === void 0 ? void 0 : params.smallTicketDataFlag
@@ -5799,7 +6361,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder,
                 cacheId: effectiveCacheId,
                 platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.platform),
-                businessCode: (_ref83 = (_ref84 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref84 !== void 0 ? _ref84 : (_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.businessCode) !== null && _ref83 !== void 0 ? _ref83 : (_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.business_code,
+                businessCode: (_ref87 = (_ref88 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref88 !== void 0 ? _ref88 : (_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.businessCode) !== null && _ref87 !== void 0 ? _ref87 : (_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.business_code,
                 channel: params === null || params === void 0 ? void 0 : params.channel,
                 type: (_submitSnapshot$type = submitSnapshot.type) !== null && _submitSnapshot$type !== void 0 ? _submitSnapshot$type : params === null || params === void 0 ? void 0 : params.type,
                 summary: latestSummary,
@@ -5814,10 +6376,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!payload.created_at) {
                 payload.created_at = dayjs().format('YYYY-MM-DD HH:mm:ss');
               }
-              _context36.next = 27;
+              _context40.next = 28;
               return this.saveDraft();
-            case 27:
-              _context36.prev = 27;
+            case 28:
+              _context40.prev = 28;
               this.logInfo('submitTempOrder calling sales checkout', {
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
@@ -5827,44 +6389,49 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 smallTicketDataFlag: payload.small_ticket_data_flag,
                 syncMode: payload.sync_mode
               });
-              _context36.next = 31;
+              _context40.next = 32;
               return this.submitSalesOrder({
                 query: payload
               });
-            case 31:
-              result = _context36.sent;
-              _context36.next = 44;
+            case 32:
+              result = _context40.sent;
+              _context40.next = 45;
               break;
-            case 34:
-              _context36.prev = 34;
-              _context36.t2 = _context36["catch"](27);
-              backendErrorResponse = this.extractSubmitErrorResponse(_context36.t2);
+            case 35:
+              _context40.prev = 35;
+              _context40.t2 = _context40["catch"](28);
+              backendErrorResponse = this.extractSubmitErrorResponse(_context40.t2);
               if (!backendErrorResponse) {
-                _context36.next = 41;
+                _context40.next = 42;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
-              return _context36.abrupt("return", backendErrorResponse);
-            case 41:
+              return _context40.abrupt("return", backendErrorResponse);
+            case 42:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
-                error: _context36.t2 instanceof Error ? _context36.t2.message : String(_context36.t2),
+                error: _context40.t2 instanceof Error ? _context40.t2.message : String(_context40.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 _context36.t2;
-            case 44:
+              throw _context40.t2;
+            case 45:
               if (!this.isSubmitResponseRejected(result)) {
-                _context36.next = 48;
+                _context40.next = 49;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
-              return _context36.abrupt("return", result);
-            case 48:
+              return _context40.abrupt("return", result);
+            case 49:
+              isLocalPendingSubmit = this.isLocalPendingSubmitResult(result); // need_sync=1 仅表示已进入本地同步队列，不能视为远端已确认 Notes。
+              if (Object.prototype.hasOwnProperty.call(payload, 'notes') && !isLocalPendingSubmit) {
+                salesNotesState = this.ensureSalesNotesRuntimeState(tempOrder);
+                salesNotesState.dirty = false;
+              }
               submittedOrderId = this.extractOrderIdFromSubmitResult(result);
               this.logInfo('runSubmitTempOrder: 提交成功', {
                 submittedOrderId: submittedOrderId,
@@ -5874,31 +6441,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 })
               });
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
-                _context36.next = 57;
+                _context40.next = 58;
                 break;
               }
               tempOrder.order_id = submittedOrderId;
               resultRecord = result;
-              _context36.next = 55;
+              _context40.next = 58;
               return this.markLocalOrderSynced(submittedOrderId, (resultRecord === null || resultRecord === void 0 ? void 0 : resultRecord.data) || resultRecord || {});
-            case 55:
-              _context36.next = 58;
-              break;
-            case 57:
-              if (this.isLocalPendingSubmitResult(result)) {
+            case 58:
+              if (isLocalPendingSubmit) {
                 this.store.syncState = 'local';
-              } else {
+              } else if (submittedOrderId === null || submittedOrderId === undefined) {
                 this.store.syncState = 'submitted';
               }
-            case 58:
-              return _context36.abrupt("return", result);
-            case 59:
+              return _context40.abrupt("return", result);
+            case 60:
             case "end":
-              return _context36.stop();
+              return _context40.stop();
           }
-        }, _callee33, this, [[27, 34]]);
+        }, _callee37, this, [[28, 35]]);
       }));
-      function runSubmitTempOrder(_x39) {
+      function runSubmitTempOrder(_x41) {
         return _runSubmitTempOrder.apply(this, arguments);
       }
       return runSubmitTempOrder;
@@ -5906,10 +6469,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "markLocalOrderSynced",
     value: function () {
-      var _markLocalOrderSynced = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(orderId, remoteOrder) {
+      var _markLocalOrderSynced = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(orderId, remoteOrder) {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee34$(_context37) {
-          while (1) switch (_context37.prev = _context37.next) {
+        return _regeneratorRuntime().wrap(function _callee38$(_context41) {
+          while (1) switch (_context41.prev = _context41.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               tempOrder.order_id = orderId;
@@ -5917,15 +6480,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.store.lastOrderInfo = remoteOrder;
               this.store.syncState = 'submitted';
               this.persistTempOrder();
-              _context37.next = 8;
+              _context41.next = 8;
               return this.saveDraft();
             case 8:
             case "end":
-              return _context37.stop();
+              return _context41.stop();
           }
-        }, _callee34, this);
+        }, _callee38, this);
       }));
-      function markLocalOrderSynced(_x40, _x41) {
+      function markLocalOrderSynced(_x42, _x43) {
         return _markLocalOrderSynced.apply(this, arguments);
       }
       return markLocalOrderSynced;
@@ -5968,10 +6531,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function extractSubmitErrorResponse(error) {
       var _error$response,
         _error$response2,
-        _this32 = this;
+        _this37 = this;
       var candidates = [error === null || error === void 0 || (_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.data, error === null || error === void 0 ? void 0 : error.data, error === null || error === void 0 || (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : _error$response2.body, error === null || error === void 0 ? void 0 : error.body];
       return candidates.find(function (candidate) {
-        return _this32.isSubmitErrorResponse(candidate);
+        return _this37.isSubmitErrorResponse(candidate);
       }) || null;
     }
   }, {
@@ -5998,33 +6561,33 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncPaymentsToOrder",
     value: function () {
-      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35(params) {
-        var _this33 = this,
+      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(params) {
+        var _this38 = this,
           _params$confirmPendin;
         var tempOrder, needsPaymentNumber, devicePrefix, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, orderPaidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, enhancePayload, submitParams, submitResult;
-        return _regeneratorRuntime().wrap(function _callee35$(_context38) {
-          while (1) switch (_context38.prev = _context38.next) {
+        return _regeneratorRuntime().wrap(function _callee39$(_context42) {
+          while (1) switch (_context42.prev = _context42.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               needsPaymentNumber = (params.payments || []).some(function (payment) {
                 return String(payment.payment_number || '').trim() === '';
               });
               if (!needsPaymentNumber) {
-                _context38.next = 8;
+                _context42.next = 8;
                 break;
               }
-              _context38.next = 5;
+              _context42.next = 5;
               return this.getPaymentNumberDevicePrefixAsync();
             case 5:
-              _context38.t0 = _context38.sent;
-              _context38.next = 9;
+              _context42.t0 = _context42.sent;
+              _context42.next = 9;
               break;
             case 8:
-              _context38.t0 = 'LOCAL';
+              _context42.t0 = 'LOCAL';
             case 9:
-              devicePrefix = _context38.t0;
+              devicePrefix = _context42.t0;
               mappedPayments = mapPaymentItemsToOrderPayments((params.payments || []).map(function (payment) {
-                return _this33.normalizePaymentSource(payment, {
+                return _this38.normalizePaymentSource(payment, {
                   defaultPaid: false,
                   devicePrefix: devicePrefix
                 });
@@ -6037,20 +6600,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               tempOrder.payments = effectivePayments;
               tempOrder.payment_status = paymentStatus;
               this.persistTempOrder();
-              _context38.next = 21;
+              _context42.next = 21;
               return this.saveDraft();
             case 21:
               if (params.submitWhenPaid) {
-                _context38.next = 23;
+                _context42.next = 23;
                 break;
               }
-              return _context38.abrupt("return", completion);
+              return _context42.abrupt("return", completion);
             case 23:
               if (!(this.store.syncState === 'submitting')) {
-                _context38.next = 25;
+                _context42.next = 25;
                 break;
               }
-              return _context38.abrupt("return", completion);
+              return _context42.abrupt("return", completion);
             case 25:
               this.store.syncState = 'submitting';
               paymentSyncIdempotencyToken = this.buildPaymentSyncIdempotencyToken(tempOrder, effectivePayments);
@@ -6070,32 +6633,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 enhancePayload: enhancePayload
               };
               if (!(params.checkoutSyncTaskEnabled === false)) {
-                _context38.next = 35;
+                _context42.next = 35;
                 break;
               }
-              _context38.next = 32;
+              _context42.next = 32;
               return this.submitTempOrderAsync(submitParams);
             case 32:
-              _context38.t1 = _context38.sent;
-              _context38.next = 38;
+              _context42.t1 = _context42.sent;
+              _context42.next = 38;
               break;
             case 35:
-              _context38.next = 37;
+              _context42.next = 37;
               return this.submitTempOrder(submitParams);
             case 37:
-              _context38.t1 = _context38.sent;
+              _context42.t1 = _context42.sent;
             case 38:
-              submitResult = _context38.t1;
-              return _context38.abrupt("return", _objectSpread(_objectSpread({}, completion), {}, {
+              submitResult = _context42.t1;
+              return _context42.abrupt("return", _objectSpread(_objectSpread({}, completion), {}, {
                 submitResult: submitResult
               }));
             case 40:
             case "end":
-              return _context38.stop();
+              return _context42.stop();
           }
-        }, _callee35, this);
+        }, _callee39, this);
       }));
-      function syncPaymentsToOrder(_x42) {
+      function syncPaymentsToOrder(_x44) {
         return _syncPaymentsToOrder.apply(this, arguments);
       }
       return syncPaymentsToOrder;
@@ -6103,7 +6666,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createOrder",
     value: function createOrder(params) {
-      var _this34 = this;
+      var _this39 = this;
       var order = _objectSpread({
         type: (params === null || params === void 0 ? void 0 : params.type) || 'appointment_booking',
         // 要从外面拿，virtual
@@ -6135,7 +6698,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
 
           // 为预约补齐 holder 信息
           if (params !== null && params !== void 0 && (_params$extraData = params.extraData) !== null && _params$extraData !== void 0 && _params$extraData.is_add_holder_info) {
-            ensureCartItemOriginHolder(item, _this34.window);
+            ensureCartItemOriginHolder(item, _this39.window);
           }
 
           // 购物车是否为普通商品
@@ -6192,11 +6755,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitOrder",
     value: function () {
-      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(order) {
+      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(order) {
         var _order$query$cartItem, _params$bookings, _params$relation_prod;
         var url, query, fetchUrl, params;
-        return _regeneratorRuntime().wrap(function _callee36$(_context39) {
-          while (1) switch (_context39.prev = _context39.next) {
+        return _regeneratorRuntime().wrap(function _callee40$(_context43) {
+          while (1) switch (_context43.prev = _context43.next) {
             case 0:
               this.logInfo('submitOrder called', {
                 url: order.url,
@@ -6216,14 +6779,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 _context39.abrupt("return", this.request.post(fetchUrl, params));
+              return _context43.abrupt("return", this.request.post(fetchUrl, params));
             case 6:
             case "end":
-              return _context39.stop();
+              return _context43.stop();
           }
-        }, _callee36, this);
+        }, _callee40, this);
       }));
-      function submitOrder(_x43) {
+      function submitOrder(_x45) {
         return _submitOrder.apply(this, arguments);
       }
       return submitOrder;
@@ -6231,13 +6794,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "cancelOrder",
     value: function () {
-      var _cancelOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(params) {
+      var _cancelOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41(params) {
         var payload;
-        return _regeneratorRuntime().wrap(function _callee37$(_context40) {
-          while (1) switch (_context40.prev = _context40.next) {
+        return _regeneratorRuntime().wrap(function _callee41$(_context44) {
+          while (1) switch (_context44.prev = _context44.next) {
             case 0:
               if (!(!Array.isArray(params.order_ids) || params.order_ids.length === 0)) {
-                _context40.next = 2;
+                _context44.next = 2;
                 break;
               }
               throw new Error('取消订单失败：order_ids 不能为空');
@@ -6253,16 +6816,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 method: 'PUT',
                 orderIdsCount: params.order_ids.length
               });
-              return _context40.abrupt("return", this.request.put('/order/update-status', payload, {
+              return _context44.abrupt("return", this.request.put('/order/update-status', payload, {
                 isShopApi: true
               }));
             case 5:
             case "end":
-              return _context40.stop();
+              return _context44.stop();
           }
-        }, _callee37, this);
+        }, _callee41, this);
       }));
-      function cancelOrder(_x44) {
+      function cancelOrder(_x46) {
         return _cancelOrder.apply(this, arguments);
       }
       return cancelOrder;
@@ -6270,19 +6833,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "changeBookingStatus",
     value: function () {
-      var _changeBookingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(params) {
+      var _changeBookingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee42(params) {
         var url, payload;
-        return _regeneratorRuntime().wrap(function _callee38$(_context41) {
-          while (1) switch (_context41.prev = _context41.next) {
+        return _regeneratorRuntime().wrap(function _callee42$(_context45) {
+          while (1) switch (_context45.prev = _context45.next) {
             case 0:
               if (params.booking_id) {
-                _context41.next = 2;
+                _context45.next = 2;
                 break;
               }
               throw new Error('变更预约状态失败：booking_id 不能为空');
             case 2:
               if (params.appointment_status) {
-                _context41.next = 4;
+                _context45.next = 4;
                 break;
               }
               throw new Error('变更预约状态失败：appointment_status 不能为空');
@@ -6297,16 +6860,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 bookingId: params.booking_id,
                 appointmentStatus: params.appointment_status
               });
-              return _context41.abrupt("return", this.request.put(url, payload, {
+              return _context45.abrupt("return", this.request.put(url, payload, {
                 isShopApi: true
               }));
             case 8:
             case "end":
-              return _context41.stop();
+              return _context45.stop();
           }
-        }, _callee38, this);
+        }, _callee42, this);
       }));
-      function changeBookingStatus(_x45) {
+      function changeBookingStatus(_x47) {
         return _changeBookingStatus.apply(this, arguments);
       }
       return changeBookingStatus;
@@ -6324,11 +6887,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createOrderByCheckout",
     value: (function () {
-      var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(params) {
+      var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43(params) {
         var _params$payments, _params$bookings2, _params$relation_prod2, _params$payments2, _params$payments3;
         var onlineStorePaymentCodeList, _orderData$payments, _orderData$bookings, _orderData$relation_p, _orderData$payments2, _orderData$payments3, orderData, response;
-        return _regeneratorRuntime().wrap(function _callee39$(_context42) {
-          while (1) switch (_context42.prev = _context42.next) {
+        return _regeneratorRuntime().wrap(function _callee43$(_context46) {
+          while (1) switch (_context46.prev = _context46.next) {
             case 0:
               // 过滤掉由在线店铺下单的 payment 支付数据
               onlineStorePaymentCodeList = ['WXPAY', 'WECHAT', 'ALIPAY', 'APPLE_PAY', 'CREDIT_CARD_3DS', 'CREDIT_CARD_TOKEN', 'GOOGLE_PAY', 'GOOGLE_PAY_3DS', 'CREDIT_CARD'];
@@ -6353,7 +6916,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   return p.code;
                 })) || []
               });
-              _context42.prev = 3;
+              _context46.prev = 3;
               // 构建订单数据，设置默认值并允许 params 覆盖
               orderData = _objectSpread({
                 sales_channel: 'my_pisel',
@@ -6401,32 +6964,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 hasOrderId: !!orderData.order_id,
                 smallTicketDataFlag: orderData.small_ticket_data_flag
               });
-              _context42.next = 10;
+              _context46.next = 10;
               return this.request.post('/order/checkout', orderData, {
                 osServer: true,
                 customToast: function customToast() {}
               });
             case 10:
-              response = _context42.sent;
+              response = _context46.sent;
               this.logInfo('Order API called successfully', {
                 response: response
               });
-              return _context42.abrupt("return", response);
+              return _context46.abrupt("return", response);
             case 15:
-              _context42.prev = 15;
-              _context42.t0 = _context42["catch"](3);
-              console.error('[Order] createOrderByCheckout 创建订单失败:', _context42.t0);
+              _context46.prev = 15;
+              _context46.t0 = _context46["catch"](3);
+              console.error('[Order] createOrderByCheckout 创建订单失败:', _context46.t0);
               this.logInfo('Order API called failed', {
-                error: _context42.t0 instanceof Error ? _context42.t0.message : String(_context42.t0)
+                error: _context46.t0 instanceof Error ? _context46.t0.message : String(_context46.t0)
               });
-              throw _context42.t0;
+              throw _context46.t0;
             case 20:
             case "end":
-              return _context42.stop();
+              return _context46.stop();
           }
-        }, _callee39, this, [[3, 15]]);
+        }, _callee43, this, [[3, 15]]);
       }));
-      function createOrderByCheckout(_x46) {
+      function createOrderByCheckout(_x48) {
         return _createOrderByCheckout.apply(this, arguments);
       }
       return createOrderByCheckout;
@@ -6434,25 +6997,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitSalesOrder",
     value: function () {
-      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(params) {
+      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee44(params) {
         var url, query, fetchUrl, requestQuery;
-        return _regeneratorRuntime().wrap(function _callee40$(_context43) {
-          while (1) switch (_context43.prev = _context43.next) {
+        return _regeneratorRuntime().wrap(function _callee44$(_context47) {
+          while (1) switch (_context47.prev = _context47.next) {
             case 0:
               url = params.url, query = params.query;
               fetchUrl = url || '/order/sales/checkout';
               requestQuery = this.isSalesCheckoutHandledByOsServer(fetchUrl) ? query : stripOsPrivatePayloadFields(query);
-              return _context43.abrupt("return", this.request.post(fetchUrl, requestQuery, {
+              return _context47.abrupt("return", this.request.post(fetchUrl, requestQuery, {
                 osServer: true,
                 customToast: function customToast() {}
               }));
             case 4:
             case "end":
-              return _context43.stop();
+              return _context47.stop();
           }
-        }, _callee40, this);
+        }, _callee44, this);
       }));
-      function submitSalesOrder(_x47) {
+      function submitSalesOrder(_x49) {
         return _submitSalesOrder.apply(this, arguments);
       }
       return submitSalesOrder;
@@ -6479,37 +7042,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sendCustomerPayLink",
     value: (function () {
-      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41(params) {
+      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee45(params) {
         var _params$emails;
         var orderIds;
-        return _regeneratorRuntime().wrap(function _callee41$(_context44) {
-          while (1) switch (_context44.prev = _context44.next) {
+        return _regeneratorRuntime().wrap(function _callee45$(_context48) {
+          while (1) switch (_context48.prev = _context48.next) {
             case 0:
               orderIds = params.order_ids || params.orderIds || [];
               if (orderIds.length) {
-                _context44.next = 3;
+                _context48.next = 3;
                 break;
               }
               throw new Error('发送支付链接前必须先提交本地订单并取得订单 ID');
             case 3:
               if ((_params$emails = params.emails) !== null && _params$emails !== void 0 && _params$emails.length) {
-                _context44.next = 5;
+                _context48.next = 5;
                 break;
               }
               throw new Error('发送支付链接需要至少一个邮箱');
             case 5:
-              return _context44.abrupt("return", this.request.post('/order/batch-email', {
+              return _context48.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 _context44.stop();
+              return _context48.stop();
           }
-        }, _callee41, this);
+        }, _callee45, this);
       }));
-      function sendCustomerPayLink(_x48) {
+      function sendCustomerPayLink(_x50) {
         return _sendCustomerPayLink.apply(this, arguments);
       }
       return sendCustomerPayLink;
@@ -6517,14 +7080,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getSalesOrderByLookup",
     value: function () {
-      var _getSalesOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee42(params) {
+      var _getSalesOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee46(params) {
         var lookup, res;
-        return _regeneratorRuntime().wrap(function _callee42$(_context45) {
-          while (1) switch (_context45.prev = _context45.next) {
+        return _regeneratorRuntime().wrap(function _callee46$(_context49) {
+          while (1) switch (_context49.prev = _context49.next) {
             case 0:
               lookup = params.lookup === undefined || params.lookup === null ? '' : String(params.lookup).trim();
               if (lookup) {
-                _context45.next = 3;
+                _context49.next = 3;
                 break;
               }
               throw new Error('加载销售详情需要 lookup');
@@ -6533,27 +7096,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (lookup.startsWith('LOCAL_')) {
                 params.forceRemote = false;
               }
-              _context45.next = 6;
+              _context49.next = 6;
               return this.request.get("/order/sales/".concat(encodeURIComponent(lookup)), _objectSpread({
-                with: ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info', 'order_meta_list', 'refunds']
+                with: ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info', 'order_meta_list', 'refunds', 'notes']
               }, params.forceRemote ? {
                 forceRemote: true
               } : {}), {
                 osServer: true
               });
             case 6:
-              res = _context45.sent;
+              res = _context49.sent;
               if (res.code === 200) {
                 this.store.lastOrderInfo = res.data;
               }
-              return _context45.abrupt("return", res);
+              return _context49.abrupt("return", res);
             case 9:
             case "end":
-              return _context45.stop();
+              return _context49.stop();
           }
-        }, _callee42, this);
+        }, _callee46, this);
       }));
-      function getSalesOrderByLookup(_x49) {
+      function getSalesOrderByLookup(_x51) {
         return _getSalesOrderByLookup.apply(this, arguments);
       }
       return getSalesOrderByLookup;
@@ -6567,11 +7130,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hydrateTempOrderFromRecord",
     value: (function () {
-      var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43(record, options) {
+      var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee47(record, options) {
         var _sourceRaw$_extend, _this$store$discount26;
         var sourceRaw, duplicateProductIdentityRepair, duplicateIdentityReadySource, identityReadySource, normalizedCollections, raw, hasIdentityChanges, identityLogMetadata, hasIdentityWarnings, isSessionStorageHydrate, isMergedSalesDetailHydrate, nextTempOrder, _this$store$discount24, _this$store$discount25, restoredSessionDiscounts, nextExtend, sourceLastOrderInfo, isDraftOrder, syntheticIdentityOptions, rawSummary, historicalDepositSnapshot, summarySurcharges, hadSyntheticDraftOrderId, hydratedEditDiscounts, currentDiscounts, currentScanDiscounts, hydratedDiscountIds, retainedScanDiscounts, nextDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount27, _this$store$discount28;
-        return _regeneratorRuntime().wrap(function _callee43$(_context46) {
-          while (1) switch (_context46.prev = _context46.next) {
+        return _regeneratorRuntime().wrap(function _callee47$(_context50) {
+          while (1) switch (_context50.prev = _context50.next) {
             case 0:
               sourceRaw = record && _typeof(record) === 'object' && record.data && record.order_id == null ? record.data : record || {};
               duplicateProductIdentityRepair = repairDuplicateOrderProductLineIdentities(Array.isArray(sourceRaw.products) ? sourceRaw.products : [], (_sourceRaw$_extend = sourceRaw._extend) === null || _sourceRaw$_extend === void 0 ? void 0 : _sourceRaw$_extend.productsByUid);
@@ -6607,11 +7170,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               isMergedSalesDetailHydrate = (options === null || options === void 0 ? void 0 : options.source) === 'mergedSalesDetail';
               nextTempOrder = this.normalizeTempOrderForRuntime(raw, {
                 // merge 前已只给远端商品补标记；这里不能把本地未提交商品一并变成 saved item。
-                makeEditMark: !isSessionStorageHydrate && !isMergedSalesDetailHydrate
+                makeEditMark: !isSessionStorageHydrate && !isMergedSalesDetailHydrate,
+                allowUnresolvedSalesNotes: isSessionStorageHydrate
               });
               this.store.tempOrder = nextTempOrder;
+              this.clearCustomerWalletRuntimeState();
               if (!isSessionStorageHydrate) {
-                _context46.next = 30;
+                _context50.next = 31;
                 break;
               }
               // 会话快照是未提交购物车，不应获得编辑订单的 saved/edit 标记与服务端基线。
@@ -6627,24 +7192,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               nextTempOrder.discount_list = restoredSessionDiscounts;
               this.store.summary = createEmptySummary();
               this.store.lastOrderInfo = undefined;
-              _context46.next = 23;
+              _context50.next = 24;
               return (_this$store$discount24 = this.store.discount) === null || _this$store$discount24 === void 0 ? void 0 : _this$store$discount24.setOriginalDiscountList(cloneDeep(restoredSessionDiscounts));
-            case 23:
-              _context46.next = 25;
+            case 24:
+              _context50.next = 26;
               return (_this$store$discount25 = this.store.discount) === null || _this$store$discount25 === void 0 ? void 0 : _this$store$discount25.setDiscountList(cloneDeep(restoredSessionDiscounts));
-            case 25:
+            case 26:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context46.next = 28;
+                _context50.next = 29;
                 break;
               }
-              _context46.next = 28;
+              _context50.next = 29;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 28:
+            case 29:
               this.persistTempOrder();
-              return _context46.abrupt("return", nextTempOrder);
-            case 30:
+              return _context50.abrupt("return", nextTempOrder);
+            case 31:
               // Server list compatibility may synthesize order_id from external_sale_number; tempOrder must not.
               sourceLastOrderInfo = sourceRaw.lastOrderInfo || sourceRaw;
               isDraftOrder = Number(nextTempOrder.is_draft_order || 0) === 1;
@@ -6695,34 +7260,34 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               nextDiscounts = [].concat(_toConsumableArray(hydratedEditDiscounts), _toConsumableArray(retainedScanDiscounts));
               shouldSkipEmptyDiscountSync = nextDiscounts.length === 0 && currentDiscounts.length === 0;
               if (shouldSkipEmptyDiscountSync) {
-                _context46.next = 54;
+                _context50.next = 55;
                 break;
               }
               OrderModule.populateSavedAmounts(nextTempOrder.products, nextDiscounts);
-              _context46.next = 52;
+              _context50.next = 53;
               return (_this$store$discount27 = this.store.discount) === null || _this$store$discount27 === void 0 ? void 0 : _this$store$discount27.setOriginalDiscountList(nextDiscounts);
-            case 52:
-              _context46.next = 54;
+            case 53:
+              _context50.next = 55;
               return (_this$store$discount28 = this.store.discount) === null || _this$store$discount28 === void 0 ? void 0 : _this$store$discount28.setDiscountList(nextDiscounts);
-            case 54:
+            case 55:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context46.next = 57;
+                _context50.next = 58;
                 break;
               }
-              _context46.next = 57;
+              _context50.next = 58;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 57:
+            case 58:
               this.persistTempOrder();
-              return _context46.abrupt("return", nextTempOrder);
-            case 59:
+              return _context50.abrupt("return", nextTempOrder);
+            case 60:
             case "end":
-              return _context46.stop();
+              return _context50.stop();
           }
-        }, _callee43, this);
+        }, _callee47, this);
       }));
-      function hydrateTempOrderFromRecord(_x50, _x51) {
+      function hydrateTempOrderFromRecord(_x52, _x53) {
         return _hydrateTempOrderFromRecord.apply(this, arguments);
       }
       return hydrateTempOrderFromRecord;
@@ -6775,10 +7340,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _step22;
       try {
         for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
-          var _product$metadata11;
+          var _product$metadata13;
           var product = _step22.value;
           var productUid = getOrderCollectionUid('product', product);
-          var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata11 = product.metadata) === null || _product$metadata11 === void 0 ? void 0 : _product$metadata11.booking_uid);
+          var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata13 = product.metadata) === null || _product$metadata13 === void 0 ? void 0 : _product$metadata13.booking_uid);
           if (!productUid || bookingUid === undefined || bookingUid === null || bookingUid === '') {
             continue;
           }
@@ -6836,7 +7401,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeTempOrderForRuntime",
     value: function normalizeTempOrderForRuntime(raw, options) {
-      var _this35 = this;
+      var _this40 = this,
+        _raw$_extend;
       var runtimeRaw = this.withoutSyntheticDraftOrderIdForRuntime(raw);
       var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), runtimeRaw || {});
       // ES 列表详情使用 id 表示订单主键；OS 详情态统一依赖 order_id 驱动操作按钮。
@@ -6860,12 +7426,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       nextTempOrder.holder = raw.holder && _typeof(raw.holder) === 'object' ? _objectSpread({}, raw.holder) : null;
       var rawProducts = Array.isArray(raw.products) ? raw.products : [];
       nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map(function (p) {
-        return _this35.normalizeHydratedOrderProduct(p, {
+        return _this40.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 = _this35.normalizeHydratedBookingHolder(b || {});
+        var booking = _this40.normalizeHydratedBookingHolder(b || {});
         return _objectSpread(_objectSpread({}, booking), {}, {
           is_all: normalizeBookingIsAll(booking),
           sub_type: normalizeBookingSubType(booking)
@@ -6874,6 +7440,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       nextTempOrder.payments = Array.isArray(raw.payments) ? raw.payments.map(function (p) {
         return _objectSpread({}, p || {});
       }) : [];
+      var rawHasSalesNotes = Object.prototype.hasOwnProperty.call(raw, 'notes');
+      var restoredSalesNotesState = (_raw$_extend = raw._extend) === null || _raw$_extend === void 0 ? void 0 : _raw$_extend.salesNotesState;
+      var allowUnresolvedSalesNotes = (options === null || options === void 0 ? void 0 : options.allowUnresolvedSalesNotes) === true || (restoredSalesNotesState === null || restoredSalesNotesState === void 0 ? void 0 : restoredSalesNotesState.dirty) === true || Number(raw.is_draft_order || 0) === 1;
+      var decodedSalesNotes = rawHasSalesNotes ? decodeSalesNotesSnapshot(raw.notes, {
+        allowUnresolvedOrderTarget: allowUnresolvedSalesNotes
+      }) : {
+        notes: [],
+        complete: false
+      };
+      var hasUnresolvedSalesNoteOrderTarget = decodedSalesNotes.notes.some(function (note) {
+        return note.note_relations.some(function (relation) {
+          return relation.is_primary === 0 && relation.relation_type === 'related_to' && relation.target_type === 'order' && relation.target_uuid === '';
+        });
+      });
+      nextTempOrder.notes = decodedSalesNotes.notes;
       nextTempOrder.surcharges = Array.isArray(raw.surcharges) ? raw.surcharges.map(function (s) {
         return _objectSpread({}, s || {});
       }) : [];
@@ -6891,20 +7472,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         productsByUid: {}
       };
       var tempOrderExtend = nextTempOrder._extend;
+      tempOrderExtend.salesNotesState = {
+        loaded: rawHasSalesNotes ? decodedSalesNotes.complete : (restoredSalesNotesState === null || restoredSalesNotesState === void 0 ? void 0 : restoredSalesNotesState.loaded) === true,
+        dirty: decodedSalesNotes.complete && ((restoredSalesNotesState === null || restoredSalesNotesState === void 0 ? void 0 : restoredSalesNotesState.dirty) === true || allowUnresolvedSalesNotes && hasUnresolvedSalesNoteOrderTarget)
+      };
       var productsByUid = tempOrderExtend.productsByUid || {};
       var _iterator24 = _createForOfIteratorHelper(nextTempOrder.products.entries()),
         _step24;
       try {
         for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
-          var _product$metadata12, _ref85, _ref86, _existed$origin, _rawProduct$metadata;
+          var _product$metadata14, _ref89, _ref90, _existed$origin, _rawProduct$metadata;
           var _step24$value = _slicedToArray(_step24.value, 2),
             index = _step24$value[0],
             product = _step24$value[1];
-          var uid = (_product$metadata12 = product.metadata) === null || _product$metadata12 === void 0 ? void 0 : _product$metadata12.unique_identification_number;
+          var uid = (_product$metadata14 = product.metadata) === null || _product$metadata14 === void 0 ? void 0 : _product$metadata14.unique_identification_number;
           if (!uid) continue;
           var existed = productsByUid[uid] && _typeof(productsByUid[uid]) === 'object' ? productsByUid[uid] : {};
           var rawProduct = rawProducts[index] && _typeof(rawProducts[index]) === 'object' ? rawProducts[index] : product;
-          var origin = (_ref85 = (_ref86 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref86 !== void 0 ? _ref86 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref85 !== void 0 ? _ref85 : rawProduct;
+          var origin = (_ref89 = (_ref90 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref90 !== void 0 ? _ref90 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref89 !== void 0 ? _ref89 : rawProduct;
           var originSnapshot = cloneDeep(origin);
           var productOptionString = this.buildHydratedProductOptionString(rawProduct) || this.buildHydratedProductOptionString(product);
           if (productOptionString && originSnapshot && _typeof(originSnapshot) === 'object') {
@@ -6955,8 +7540,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var bookingUidByProductUid = new Map();
       var productByUid = new Map();
       (tempOrder.products || []).forEach(function (product) {
-        var _product$metadata13;
-        var productUid = (product === null || product === void 0 || (_product$metadata13 = product.metadata) === null || _product$metadata13 === void 0 ? void 0 : _product$metadata13.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+        var _product$metadata15;
+        var productUid = (product === null || product === void 0 || (_product$metadata15 = product.metadata) === null || _product$metadata15 === void 0 ? void 0 : _product$metadata15.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
         if (productUid !== undefined && productUid !== null && String(productUid) !== '') {
           productByUid.set(String(productUid), product);
         }
@@ -6977,8 +7562,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         bookingUidByProductUid.set(String(productUid), bookingUid);
       });
       (tempOrder.products || []).forEach(function (product) {
-        var _product$metadata14;
-        var productUid = (product === null || product === void 0 || (_product$metadata14 = product.metadata) === null || _product$metadata14 === void 0 ? void 0 : _product$metadata14.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+        var _product$metadata16;
+        var productUid = (product === null || product === void 0 || (_product$metadata16 = product.metadata) === null || _product$metadata16 === void 0 ? void 0 : _product$metadata16.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
         if (productUid === undefined || productUid === null || String(productUid) === '') return;
         var bookingUid = bookingUidByProductUid.get(String(productUid));
         if (!bookingUid) return;
@@ -7033,10 +7618,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedProductOptionItem",
     value: function normalizeHydratedProductOptionItem(optionItem) {
-      var _ref87, _optionItem$num, _ref88, _optionItem$add_price;
-      var rawNum = (_ref87 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref87 !== void 0 ? _ref87 : 1;
+      var _ref91, _optionItem$num, _ref92, _optionItem$add_price;
+      var rawNum = (_ref91 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref91 !== void 0 ? _ref91 : 1;
       var parsedNum = Number(rawNum);
-      var rawPrice = (_ref88 = (_optionItem$add_price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _optionItem$add_price !== void 0 ? _optionItem$add_price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _ref88 !== void 0 ? _ref88 : 0;
+      var rawPrice = (_ref92 = (_optionItem$add_price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _optionItem$add_price !== void 0 ? _optionItem$add_price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _ref92 !== void 0 ? _ref92 : 0;
       var parsedPrice = Number(rawPrice);
       var normalized = _objectSpread(_objectSpread({}, optionItem), {}, {
         option_group_item_id: optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id,
@@ -7053,7 +7638,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedOrderProduct",
     value: function normalizeHydratedOrderProduct(product, options) {
-      var _this36 = this;
+      var _this41 = this;
       var row = _objectSpread({}, product || {});
       if (row.num === undefined && row.product_quantity !== undefined) {
         row.num = row.product_quantity;
@@ -7061,7 +7646,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var productSku = ensureProductSku(row);
       row.product_sku = _objectSpread(_objectSpread({}, productSku), {}, {
         option: normalizeProductSkuOptions(productSku.option.map(function (optionItem) {
-          return _this36.normalizeHydratedProductOptionItem(optionItem || {});
+          return _this41.normalizeHydratedProductOptionItem(optionItem || {});
         }))
       });
       delete row["product_".concat('option', "_item")];
@@ -7121,27 +7706,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderInfo",
     value: function () {
-      var _getOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee44(order_id) {
+      var _getOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee48(order_id) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee44$(_context47) {
-          while (1) switch (_context47.prev = _context47.next) {
+        return _regeneratorRuntime().wrap(function _callee48$(_context51) {
+          while (1) switch (_context51.prev = _context51.next) {
             case 0:
-              _context47.next = 2;
+              _context51.next = 2;
               return this.request.get("/order/sales/".concat(order_id), {
-                with: ['products', 'bookings']
+                with: ['products', 'bookings', 'notes']
               }, {
                 osServer: true
               });
             case 2:
-              res = _context47.sent;
-              return _context47.abrupt("return", res);
+              res = _context51.sent;
+              return _context51.abrupt("return", res);
             case 4:
             case "end":
-              return _context47.stop();
+              return _context51.stop();
           }
-        }, _callee44, this);
+        }, _callee48, this);
       }));
-      function getOrderInfo(_x52) {
+      function getOrderInfo(_x54) {
         return _getOrderInfo.apply(this, arguments);
       }
       return getOrderInfo;
@@ -7149,8 +7734,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getVouchers",
     value: function getVouchers() {
-      var _this$store$tempOrder5;
-      return ((_this$store$tempOrder5 = this.store.tempOrder) === null || _this$store$tempOrder5 === void 0 ? void 0 : _this$store$tempOrder5.vouchers) || [];
+      var _this$store$tempOrder6;
+      return ((_this$store$tempOrder6 = this.store.tempOrder) === null || _this$store$tempOrder6 === void 0 ? void 0 : _this$store$tempOrder6.vouchers) || [];
     }
   }], [{
     key: "populateSavedAmounts",