@pisell/pisellos 2.3.94 → 2.3.96

package/dist/modules/Order/index.js

@@ -35,6 +35,7 @@ import { OrderHooks } from "./types";
 import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, ensureCartItemOriginHolder, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, mergeOrderProductDisplayFields, resolveIsFormSubject } from "./utils";
 import { isNormalProduct } from "../Product/utils";
 import dayjs from 'dayjs';
+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";
@@ -1373,6 +1374,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();
@@ -1534,21 +1536,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return Decimal.max(new Decimal(Number(amount) || 0), 0).toDecimalPlaces(2).toFixed(2);
     }
   }, {
-    key: "getLastOrderDepositSnapshot",
-    value: function getLastOrderDepositSnapshot() {
-      var _lastOrderInfo$deposi, _lastOrderInfo$summar;
-      var lastOrderInfo = this.store.lastOrderInfo;
-      if (!lastOrderInfo || _typeof(lastOrderInfo) !== 'object') return null;
-      var rawDepositAmount = (_lastOrderInfo$deposi = lastOrderInfo.deposit_amount) !== null && _lastOrderInfo$deposi !== void 0 ? _lastOrderInfo$deposi : (_lastOrderInfo$summar = lastOrderInfo.summary) === null || _lastOrderInfo$summar === void 0 ? void 0 : _lastOrderInfo$summar.deposit_amount;
+    key: "normalizeDepositFlag",
+    value: function normalizeDepositFlag(value) {
+      if (value === 0 || value === '0') return 0;
+      if (value === 1 || value === '1') return 1;
+      return null;
+    }
+  }, {
+    key: "getHistoricalDepositSnapshot",
+    value: function getHistoricalDepositSnapshot(source) {
+      var _record$deposit_amoun, _record$summary, _this$normalizeDeposi;
+      if (!source || _typeof(source) !== 'object') return null;
+      var record = source;
+      var rawDepositAmount = (_record$deposit_amoun = record.deposit_amount) !== null && _record$deposit_amoun !== void 0 ? _record$deposit_amoun : (_record$summary = record.summary) === null || _record$summary === void 0 ? void 0 : _record$summary.deposit_amount;
       var depositAmount = this.normalizeDepositAmount(rawDepositAmount !== null && rawDepositAmount !== void 0 ? rawDepositAmount : 0);
-      var hasDepositAmount = new Decimal(depositAmount).gt(0);
-      var isDeposit = Number(lastOrderInfo.is_deposit) === 1 || hasDepositAmount;
-      if (!isDeposit || !hasDepositAmount) return null;
+      if (!new Decimal(depositAmount).gt(0)) return null;
       return {
-        isDeposit: 1,
+        // 兼容历史数据：旧快照缺少 is_deposit 时，沿用正定金金额的推导规则。
+        isDeposit: (_this$normalizeDeposi = this.normalizeDepositFlag(record.is_deposit)) !== null && _this$normalizeDeposi !== void 0 ? _this$normalizeDeposi : 1,
         depositAmount: depositAmount
       };
     }
+  }, {
+    key: "getLastOrderDepositSnapshot",
+    value: function getLastOrderDepositSnapshot() {
+      return this.getHistoricalDepositSnapshot(this.store.lastOrderInfo);
+    }
   }, {
     key: "getLastOrderSubmitSnapshot",
     value: function getLastOrderSubmitSnapshot() {
@@ -1595,7 +1608,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         })
       });
       tempOrder.deposit_amount = snapshot.depositAmount;
-      tempOrder.is_deposit = tempOrder.is_deposit === 0 && new Decimal(tempOrder.deposit_amount || 0).gt(0) ? 0 : snapshot.isDeposit;
+      tempOrder.is_deposit = snapshot.isDeposit;
       return nextSummary;
     }
   }, {
@@ -2305,6 +2318,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "restoreOriginalSnapshotIfProductsUnchanged",
     value: function restoreOriginalSnapshotIfProductsUnchanged(tempOrder, snapshot) {
+      var _historicalDepositSna;
       // merge hydrate 的商品集合包含本地未提交行，但 summary 仍来自远端旧订单，不能复用。
       if (snapshot.requiresFullSummaryRecalculation === true) return null;
       var currentFingerprint = this.buildOrderProductsFingerprint(tempOrder.products);
@@ -2316,10 +2330,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       var summary = _objectSpread(_objectSpread({}, createEmptySummary()), cloneDeep(snapshot.summary || {}));
       var shouldUseManualDepositOverride = Boolean(manualDepositOverride && manualDepositOverride.productStructuralFingerprint === this.buildOrderProductsStructuralFingerprint(tempOrder.products));
+      var historicalDepositSnapshot = this.getHistoricalDepositSnapshot(snapshot);
       if (shouldUseManualDepositOverride) {
         summary = this.applyDepositAmountToSummary(tempOrder, summary, manualDepositOverride.amount);
-      } else if (manualDepositOverride) {
-        this.clearManualDepositOverride(tempOrder);
+      } else {
+        if (manualDepositOverride) {
+          this.clearManualDepositOverride(tempOrder);
+        }
+        if (historicalDepositSnapshot) {
+          summary = this.applyDepositAmountToSummary(tempOrder, summary, historicalDepositSnapshot.depositAmount);
+          tempOrder.is_deposit = historicalDepositSnapshot.isDeposit;
+        }
       }
       var isPayableAmountUnchanged = this.isSnapshotPayableAmountUnchanged(tempOrder, snapshot, summary);
       if (!isPayableAmountUnchanged) return null;
@@ -2336,8 +2357,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         tempOrder.surcharges = cloneDeep(snapshot.surcharges);
       }
       tempOrder.surcharge_fee = summary.surcharge_fee || tempOrder.surcharge_fee;
-      tempOrder.deposit_amount = summary.deposit_amount || '0.00';
-      tempOrder.is_deposit = summary.deposit_amount !== '0.00' ? 1 : 0;
+      tempOrder.deposit_amount = this.normalizeDepositAmount(summary.deposit_amount || 0);
+      tempOrder.is_deposit = shouldUseManualDepositOverride ? new Decimal(tempOrder.deposit_amount).gt(0) ? 1 : 0 : (_historicalDepositSna = historicalDepositSnapshot === null || historicalDepositSnapshot === void 0 ? void 0 : historicalDepositSnapshot.isDeposit) !== null && _historicalDepositSna !== void 0 ? _historicalDepositSna : new Decimal(tempOrder.deposit_amount).gt(0) ? 1 : 0;
       var previousSummary = this.store.summary;
       this.store.summary = summary;
       this.updateTempOrderPaymentStatus(tempOrder, {
@@ -2998,7 +3019,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var isExistingDepositDisabled = tempOrder.is_deposit === 0 && new Decimal(tempOrder.deposit_amount || 0).gt(0);
       tempOrder.deposit_amount = depositAmount;
       tempOrder.is_deposit = hasDepositAmount && !isExistingDepositDisabled ? 1 : 0;
-      return this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
+      return shouldUseManualDepositOverride ? nextSummary : this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
     }
   }, {
     key: "recalculateSummary",
@@ -3208,6 +3229,277 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _this$store$tempOrder3;
       return ((_this$store$tempOrder3 = this.store.tempOrder) === null || _this$store$tempOrder3 === void 0 ? void 0 : _this$store$tempOrder3.note) || '';
     }
+  }, {
+    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: "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 _this19 = 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 = _this19.getSalesNotePrimaryRelation(note);
+        if (!primary || primary.target_type !== 'order_detail') return true;
+        return remainingProductUids.has(primary.target_uuid);
+      });
+      if (nextNotes.length === tempOrder.notes.length) return;
+      tempOrder.notes = nextNotes;
+      state.dirty = true;
+    }
+  }, {
+    key: "setSalesNoteOnTempOrder",
+    value: function setSalesNoteOnTempOrder(tempOrder, input) {
+      var _input$target,
+        _this20 = 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;
+      });
+      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 = _this20.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: "getSalesNotes",
+    value: function getSalesNotes() {
+      var tempOrder = this.ensureTempOrder();
+      this.ensureSalesNotesRuntimeState(tempOrder);
+      return cloneDeep(tempOrder.notes || []);
+    }
+  }, {
+    key: "createSalesNotesMutationSnapshot",
+    value: function createSalesNotesMutationSnapshot() {
+      var _tempOrder$order_id2;
+      var tempOrder = this.ensureTempOrder();
+      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 _callee15(input) {
+        var tempOrder, note;
+        return _regeneratorRuntime().wrap(function _callee15$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
+            case 0:
+              tempOrder = this.ensureTempOrder();
+              note = this.setSalesNoteOnTempOrder(tempOrder, input);
+              this.notifyTempOrderChanged();
+              return _context17.abrupt("return", cloneDeep(note));
+            case 4:
+            case "end":
+              return _context17.stop();
+          }
+        }, _callee15, this);
+      }));
+      function setSalesNote(_x14) {
+        return _setSalesNote.apply(this, arguments);
+      }
+      return setSalesNote;
+    }()
+  }, {
+    key: "removeSalesNote",
+    value: function () {
+      var _removeSalesNote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(uuid) {
+        var tempOrder, normalizedUuid, notes, nextNotes, state;
+        return _regeneratorRuntime().wrap(function _callee16$(_context18) {
+          while (1) switch (_context18.prev = _context18.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)) {
+                _context18.next = 7;
+                break;
+              }
+              return _context18.abrupt("return");
+            case 7:
+              tempOrder.notes = nextNotes;
+              state = this.ensureSalesNotesRuntimeState(tempOrder);
+              state.dirty = true;
+              this.notifyTempOrderChanged();
+            case 11:
+            case "end":
+              return _context18.stop();
+          }
+        }, _callee16, this);
+      }));
+      function removeSalesNote(_x15) {
+        return _removeSalesNote.apply(this, arguments);
+      }
+      return removeSalesNote;
+    }()
+  }, {
+    key: "clearSalesNotes",
+    value: function () {
+      var _clearSalesNotes = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
+        var tempOrder, state;
+        return _regeneratorRuntime().wrap(function _callee17$(_context19) {
+          while (1) switch (_context19.prev = _context19.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 _context19.stop();
+          }
+        }, _callee17, this);
+      }));
+      function clearSalesNotes() {
+        return _clearSalesNotes.apply(this, arguments);
+      }
+      return clearSalesNotes;
+    }()
   }, {
     key: "updateTempOrderShopDiscount",
     value: function updateTempOrderShopDiscount(amount) {
@@ -3249,6 +3541,33 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       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) {
@@ -3290,15 +3609,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "productHasCustomerBoundDiscount",
     value: function productHasCustomerBoundDiscount(product) {
-      var _this19 = this;
+      var _this21 = this;
       if (((product === null || product === void 0 ? void 0 : product.discount_list) || []).some(function (discount) {
-        return _this19.isCustomerBoundDiscount(discount);
+        return _this21.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 _this21.isCustomerBoundDiscount(discount);
         });
       });
     }
@@ -3307,18 +3626,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function shouldSkipDiscountCalculation(tempOrder) {
       var _this$store$discount18,
         _this$store$discount19,
-        _this20 = this;
+        _this22 = this;
       if (this.hasActiveCustomerBoundDiscount) return false;
       var discountList = ((_this$store$discount18 = this.store.discount) === null || _this$store$discount18 === void 0 || (_this$store$discount19 = _this$store$discount18.getDiscountList) === null || _this$store$discount19 === void 0 ? void 0 : _this$store$discount19.call(_this$store$discount18)) || [];
       if (discountList.length > 0) return false;
       return !(tempOrder.products || []).some(function (product) {
-        return _this20.productHasCustomerBoundDiscount(product);
+        return _this22.productHasCustomerBoundDiscount(product);
       });
     }
   }, {
     key: "clearCustomerBoundDiscounts",
     value: function clearCustomerBoundDiscounts(tempOrder) {
-      var _this21 = this,
+      var _this23 = this,
         _discountModule$getDi,
         _discountModule$getOr,
         _discountModule$setDi,
@@ -3327,7 +3646,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 = _this23.isCustomerBoundDiscount(discount);
           if (shouldRemove) didRemoveCustomerBoundDiscount = true;
           return !shouldRemove;
         });
@@ -3354,12 +3673,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 (_this23.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
+        return !_this23.isCustomerBoundDiscount(discount);
       });
       var nextOriginalDiscounts = currentOriginalDiscounts.filter(function (discount) {
-        if (_this21.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
-        return !_this21.isCustomerBoundDiscount(discount);
+        if (_this23.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
+        return !_this23.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));
@@ -3520,10 +3839,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setOrderPayments",
     value: function setOrderPayments(payments) {
-      var _this22 = this;
+      var _this24 = this;
       var tempOrder = this.ensureTempOrder();
       tempOrder.payments = mapPaymentItemsToOrderPayments((payments || []).map(function (payment) {
-        return _this22.normalizePaymentSource(payment, {
+        return _this24.normalizePaymentSource(payment, {
           defaultPaid: false
         });
       }));
@@ -3543,34 +3862,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 _callee18(payment) {
         var hasPaymentNumber, devicePrefix;
-        return _regeneratorRuntime().wrap(function _callee15$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        return _regeneratorRuntime().wrap(function _callee18$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
               hasPaymentNumber = String(payment.payment_number || '').trim() !== '';
               if (!hasPaymentNumber) {
-                _context17.next = 5;
+                _context20.next = 5;
                 break;
               }
-              _context17.t0 = 'LOCAL';
-              _context17.next = 8;
+              _context20.t0 = 'LOCAL';
+              _context20.next = 8;
               break;
             case 5:
-              _context17.next = 7;
+              _context20.next = 7;
               return this.getPaymentNumberDevicePrefixAsync();
             case 7:
-              _context17.t0 = _context17.sent;
+              _context20.t0 = _context20.sent;
             case 8:
-              devicePrefix = _context17.t0;
-              return _context17.abrupt("return", this.addOrderPaymentWithDevicePrefix(payment, devicePrefix));
+              devicePrefix = _context20.t0;
+              return _context20.abrupt("return", this.addOrderPaymentWithDevicePrefix(payment, devicePrefix));
             case 10:
             case "end":
-              return _context17.stop();
+              return _context20.stop();
           }
-        }, _callee15, this);
+        }, _callee18, this);
       }));
-      function addOrderPaymentAsync(_x14) {
+      function addOrderPaymentAsync(_x16) {
         return _addOrderPaymentAsync.apply(this, arguments);
       }
       return addOrderPaymentAsync;
@@ -3578,7 +3897,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addOrderPaymentWithDevicePrefix",
     value: function addOrderPaymentWithDevicePrefix(payment, devicePrefix) {
-      var _this23 = this;
+      var _this25 = this;
       this.logInfo('addOrderPayment', {
         payment: payment
       });
@@ -3596,7 +3915,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this23.logError('recalculate summary after addOrderPayment failed', {
+        _this25.logError('recalculate summary after addOrderPayment failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -3610,7 +3929,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 _callee19(paymentIdentity, updates) {
         var options,
           tempOrder,
           identity,
@@ -3619,17 +3938,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) {
+          _args21 = arguments;
+        return _regeneratorRuntime().wrap(function _callee19$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
-              options = _args18.length > 2 && _args18[2] !== undefined ? _args18[2] : {};
+              options = _args21.length > 2 && _args21[2] !== undefined ? _args21[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;
+                _context21.next = 7;
                 break;
               }
               throw new Error("\u672A\u627E\u5230\u652F\u4ED8\u9879: ".concat(identity));
@@ -3644,15 +3963,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return nextPayment;
               });
               this.persistTempOrder();
-              _context18.next = 12;
+              _context21.next = 12;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 12:
-              summary = _context18.sent;
+              summary = _context21.sent;
               this.persistTempOrder();
               payments = tempOrder.payments;
-              return _context18.abrupt("return", {
+              return _context21.abrupt("return", {
                 updated: true,
                 payment: payments[matchedPayment.index] || updatedPayment,
                 payments: payments,
@@ -3660,11 +3979,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 16:
             case "end":
-              return _context18.stop();
+              return _context21.stop();
           }
-        }, _callee16, this);
+        }, _callee19, this);
       }));
-      function updateOrderPayment(_x15, _x16) {
+      function updateOrderPayment(_x17, _x18) {
         return _updateOrderPayment.apply(this, arguments);
       }
       return updateOrderPayment;
@@ -3709,7 +4028,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyPaymentLifecycleChange",
     value: function applyPaymentLifecycleChange(tempOrder, options) {
-      var _this24 = this;
+      var _this26 = this;
       this.updateTempOrderPaymentStatus(tempOrder);
       if ((options === null || options === void 0 ? void 0 : options.persist) !== false) {
         this.persistTempOrder();
@@ -3719,7 +4038,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this24.logError("recalculate summary after ".concat(logContext, " failed"), {
+        _this26.logError("recalculate summary after ".concat(logContext, " failed"), {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -3763,7 +4082,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateVoucherOrderPayments",
     value: function updateVoucherOrderPayments(payments, options) {
-      var _this25 = this;
+      var _this27 = this;
       var tempOrder = this.ensureTempOrder();
       var isOrderPaymentType = function isOrderPaymentType(value) {
         return value === 'normal' || value === 'deposit';
@@ -3798,7 +4117,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         });
       };
       var mappedVouchers = mapPaymentItemsToOrderPayments(payments.map(function (payment) {
-        return _this25.normalizePaymentSource(normalizeVoucherPaymentStatus(withVoucherPaymentType(payment)), {
+        return _this27.normalizePaymentSource(normalizeVoucherPaymentStatus(withVoucherPaymentType(payment)), {
           defaultPaid: false,
           devicePrefix: options === null || options === void 0 ? void 0 : options.devicePrefix
         });
@@ -3851,7 +4170,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this25.logError('recalculate summary after updateVoucherOrderPayments failed', {
+        _this27.logError('recalculate summary after updateVoucherOrderPayments failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -3860,38 +4179,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 _callee20(payments, options) {
         var needsPaymentNumber, devicePrefix;
-        return _regeneratorRuntime().wrap(function _callee17$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+        return _regeneratorRuntime().wrap(function _callee20$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
               needsPaymentNumber = (payments || []).some(function (payment) {
                 return String(payment.payment_number || '').trim() === '';
               });
               if (!needsPaymentNumber) {
-                _context19.next = 7;
+                _context22.next = 7;
                 break;
               }
-              _context19.next = 4;
+              _context22.next = 4;
               return this.getPaymentNumberDevicePrefixAsync();
             case 4:
-              _context19.t0 = _context19.sent;
-              _context19.next = 8;
+              _context22.t0 = _context22.sent;
+              _context22.next = 8;
               break;
             case 7:
-              _context19.t0 = 'LOCAL';
+              _context22.t0 = 'LOCAL';
             case 8:
-              devicePrefix = _context19.t0;
-              return _context19.abrupt("return", this.updateVoucherOrderPayments(payments, _objectSpread(_objectSpread({}, options), {}, {
+              devicePrefix = _context22.t0;
+              return _context22.abrupt("return", this.updateVoucherOrderPayments(payments, _objectSpread(_objectSpread({}, options), {}, {
                 devicePrefix: devicePrefix
               })));
             case 10:
             case "end":
-              return _context19.stop();
+              return _context22.stop();
           }
-        }, _callee17, this);
+        }, _callee20, this);
       }));
-      function updateVoucherOrderPaymentsAsync(_x17, _x18) {
+      function updateVoucherOrderPaymentsAsync(_x19, _x20) {
         return _updateVoucherOrderPaymentsAsync.apply(this, arguments);
       }
       return updateVoucherOrderPaymentsAsync;
@@ -3909,7 +4228,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "shouldMergeProductToOrder",
     value: function shouldMergeProductToOrder(params) {
       var _this$orderHooks,
-        _this26 = this;
+        _this28 = 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), {}, {
@@ -3917,7 +4236,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 _this28.normalizeShouldMergeProductResult(resolved);
         });
       }
       return this.normalizeShouldMergeProductResult(result);
@@ -3937,8 +4256,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) !== '';
     }
 
@@ -3953,30 +4272,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "finalizeProductOrderMutation",
     value: function () {
-      var _finalizeProductOrderMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(tempOrder, options) {
-        return _regeneratorRuntime().wrap(function _callee18$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+      var _finalizeProductOrderMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(tempOrder, options) {
+        return _regeneratorRuntime().wrap(function _callee21$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
               this.syncTempOrderHolderFromBookings(tempOrder);
               if (options !== null && options !== void 0 && options.skipEditDiscountConfigRefresh) {
-                _context20.next = 4;
+                _context23.next = 4;
                 break;
               }
-              _context20.next = 4;
+              _context23.next = 4;
               return this.ensureEditDiscountConfigForProductChange(tempOrder);
             case 4:
               if (options !== null && options !== void 0 && options.skipDiscountRecalculation) {
-                _context20.next = 7;
+                _context23.next = 7;
                 break;
               }
-              _context20.next = 7;
+              _context23.next = 7;
               return this.applyPromotion();
             case 7:
               if (!(options !== null && options !== void 0 && options.skipDiscountRecalculation)) {
                 this.applyDiscount();
               }
               this.sanitizeTempOrderProducts(tempOrder);
-              _context20.next = 11;
+              _context23.next = 11;
               return this.recalculateSummary({
                 createIfMissing: true
               });
@@ -3984,11 +4303,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.persistTempOrder();
             case 12:
             case "end":
-              return _context20.stop();
+              return _context23.stop();
           }
-        }, _callee18, this);
+        }, _callee21, this);
       }));
-      function finalizeProductOrderMutation(_x19, _x20) {
+      function finalizeProductOrderMutation(_x21, _x22) {
         return _finalizeProductOrderMutation.apply(this, arguments);
       }
       return finalizeProductOrderMutation;
@@ -4014,7 +4333,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _metadata,
         _productToAdd$metadat,
         _origin,
-        _this27 = this;
+        _this29 = this;
       var linked = booking ? this.createLinkedProductAndBooking({
         product: product,
         booking: booking
@@ -4047,8 +4366,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var shouldForceNewLine = disableMerge || !!booking || hasIncomingProductNote || hasIncomingManualProductDiscount || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
       var matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
         var _item$metadata3;
-        if (_this27.hasGoodPassDiscount(item)) return false;
-        if (_this27.hasOrderProductLineNote(item)) return false;
+        if (_this29.hasGoodPassDiscount(item)) return false;
+        if (_this29.hasOrderProductLineNote(item)) return false;
         if (isManualProductDiscountProduct(item)) return false;
         if (item.order_detail_id !== undefined && item.order_detail_id !== null) return false;
         if ((_item$metadata3 = item.metadata) !== null && _item$metadata3 !== void 0 && _item$metadata3.is_edit_for_runtime) return false;
@@ -4060,8 +4379,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);
+          _this29.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
           if (linked) {
             normalizedIncoming.booking_uid = linked.bookingUid;
             normalizedIncoming.metadata = _objectSpread(_objectSpread({}, normalizedIncoming.metadata || {}), {}, {
@@ -4074,6 +4394,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           } else {
             tempOrder.products = [].concat(_toConsumableArray(tempOrder.products), [normalizedIncoming]);
           }
+          committedProduct = normalizedIncoming;
         } else {
           var _targetProduct$metada;
           var targetProduct = matchedProduct;
@@ -4101,7 +4422,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             order_detail_id: targetProduct.order_detail_id,
             num: nextNum
           });
-          _this27.captureProductRuntime(tempOrder, productToAdd, tempOrder.products[matchedIndex], targetUid);
+          _this29.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]);
@@ -4110,10 +4432,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,
@@ -4128,7 +4450,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);
     }
 
     /**
@@ -4141,12 +4463,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, _ref60, _productRecord$num, productRecord, splitCount, i, singleLine, _appendResult, appendResult;
-        return _regeneratorRuntime().wrap(function _callee19$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+      var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(product, booking, options) {
+        var _this30 = this;
+        var tempOrder, salesNoteDrafts, mutationSnapshot, attachSalesNoteDrafts, rollbackProductAndNotesMutation, insertAfterProductUid, anchorIndex, insertAtIndex, _ref60, _productRecord$num, productRecord, splitCount, i, singleLine, singleBooking, committedProduct, _committedProduct, _committedProduct2;
+        return _regeneratorRuntime().wrap(function _callee22$(_context24) {
+          while (1) switch (_context24.prev = _context24.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) {
+                  _this30.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;
@@ -4154,73 +4517,102 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return uid !== undefined && uid !== null && String(uid) === String(insertAfterProductUid);
               }) : -1;
               insertAtIndex = anchorIndex >= 0 ? anchorIndex + 1 : undefined;
+              _context24.prev = 8;
               if (!booking) {
-                _context21.next = 24;
+                _context24.next = 36;
                 break;
               }
               productRecord = product;
               splitCount = getSafeProductNum((_ref60 = (_productRecord$num = productRecord.num) !== null && _productRecord$num !== void 0 ? _productRecord$num : productRecord.product_quantity) !== null && _ref60 !== void 0 ? _ref60 : 1);
               if (!(splitCount > 1)) {
-                _context21.next = 24;
+                _context24.next = 30;
                 break;
               }
               i = 0;
-            case 9:
+            case 14:
               if (!(i < splitCount)) {
-                _context21.next = 21;
+                _context24.next = 28;
                 break;
               }
               singleLine = cloneDeep(productRecord);
+              singleBooking = cloneDeep(booking);
               singleLine.num = 1;
               delete singleLine.product_quantity;
-              _appendResult = this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking), {
+              if (i > 0) {
+                delete singleLine.unique_identification_number;
+                delete singleLine.identity_key;
+                if (singleLine.metadata) {
+                  singleLine.metadata = _objectSpread({}, singleLine.metadata);
+                  delete singleLine.metadata.unique_identification_number;
+                  delete singleLine.metadata.identity_key;
+                }
+                delete singleBooking.booking_uid;
+                if (singleBooking.metadata) {
+                  singleBooking.metadata = _objectSpread({}, singleBooking.metadata);
+                  delete singleBooking.metadata.unique_identification_number;
+                }
+              }
+              _context24.next = 22;
+              return this.appendProductLineToTempOrder(tempOrder, singleLine, singleBooking, {
                 insertAtIndex: insertAtIndex,
                 disableMerge: options === null || options === void 0 ? void 0 : options.disableMerge
               });
-              if (!_appendResult) {
-                _context21.next = 17;
-                break;
-              }
-              _context21.next = 17;
-              return _appendResult;
-            case 17:
+            case 22:
+              committedProduct = _context24.sent;
+              attachSalesNoteDrafts(committedProduct);
               if (insertAtIndex !== undefined) insertAtIndex += 1;
-            case 18:
+            case 25:
               i += 1;
-              _context21.next = 9;
+              _context24.next = 14;
               break;
-            case 21:
-              _context21.next = 23;
-              return this.finalizeProductOrderMutation(tempOrder);
-            case 23:
-              return _context21.abrupt("return", tempOrder.products);
-            case 24:
-              appendResult = this.appendProductLineToTempOrder(tempOrder, product, booking, {
+            case 28:
+              _context24.next = 34;
+              break;
+            case 30:
+              _context24.next = 32;
+              return this.appendProductLineToTempOrder(tempOrder, product, cloneDeep(booking), {
                 insertAtIndex: insertAtIndex,
                 disableMerge: options === null || options === void 0 ? void 0 : options.disableMerge
               });
-              if (!appendResult) {
-                _context21.next = 28;
-                break;
-              }
-              _context21.next = 28;
-              return appendResult;
-            case 28:
-              _context21.next = 30;
+            case 32:
+              _committedProduct = _context24.sent;
+              attachSalesNoteDrafts(_committedProduct);
+            case 34:
+              _context24.next = 40;
+              break;
+            case 36:
+              _context24.next = 38;
+              return this.appendProductLineToTempOrder(tempOrder, product, undefined, {
+                insertAtIndex: insertAtIndex,
+                disableMerge: options === null || options === void 0 ? void 0 : options.disableMerge
+              });
+            case 38:
+              _committedProduct2 = _context24.sent;
+              attachSalesNoteDrafts(_committedProduct2);
+            case 40:
+              _context24.next = 46;
+              break;
+            case 42:
+              _context24.prev = 42;
+              _context24.t0 = _context24["catch"](8);
+              rollbackProductAndNotesMutation();
+              throw _context24.t0;
+            case 46:
+              _context24.next = 48;
               return this.finalizeProductOrderMutation(tempOrder);
-            case 30:
+            case 48:
               this.logInfo('addProductToOrder success', {
                 product_id: product.product_id,
                 with_booking: !!booking
               });
-              return _context21.abrupt("return", tempOrder.products);
-            case 32:
+              return _context24.abrupt("return", tempOrder.products);
+            case 50:
             case "end":
-              return _context21.stop();
+              return _context24.stop();
           }
-        }, _callee19, this);
+        }, _callee22, this, [[8, 42]]);
       }));
-      function addProductToOrder(_x21, _x22, _x23) {
+      function addProductToOrder(_x23, _x24, _x25) {
         return _addProductToOrder.apply(this, arguments);
       }
       return addProductToOrder;
@@ -4238,103 +4630,103 @@ 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, _ref61, _productRecord$num2, productRecord, splitCount, i, singleLine, _appendResult2, appendResult;
-        return _regeneratorRuntime().wrap(function _callee20$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+      var _addProductsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(items, options) {
+        var tempOrder, _iterator20, _step20, item, product, booking, _ref61, _productRecord$num2, productRecord, splitCount, i, singleLine, _appendResult, appendResult;
+        return _regeneratorRuntime().wrap(function _callee23$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (!(!Array.isArray(items) || items.length === 0)) {
-                _context22.next = 3;
+                _context25.next = 3;
                 break;
               }
-              return _context22.abrupt("return", tempOrder.products);
+              return _context25.abrupt("return", tempOrder.products);
             case 3:
               _iterator20 = _createForOfIteratorHelper(items || []);
-              _context22.prev = 4;
+              _context25.prev = 4;
               _iterator20.s();
             case 6:
               if ((_step20 = _iterator20.n()).done) {
-                _context22.next = 34;
+                _context25.next = 34;
                 break;
               }
               item = _step20.value;
               product = item.product, booking = item.booking;
               if (product) {
-                _context22.next = 11;
+                _context25.next = 11;
                 break;
               }
-              return _context22.abrupt("continue", 32);
+              return _context25.abrupt("continue", 32);
             case 11:
               if (!booking) {
-                _context22.next = 28;
+                _context25.next = 28;
                 break;
               }
               productRecord = product;
               splitCount = getSafeProductNum((_ref61 = (_productRecord$num2 = productRecord.num) !== null && _productRecord$num2 !== void 0 ? _productRecord$num2 : productRecord.product_quantity) !== null && _ref61 !== void 0 ? _ref61 : 1);
               if (!(splitCount > 1)) {
-                _context22.next = 28;
+                _context25.next = 28;
                 break;
               }
               i = 0;
             case 16:
               if (!(i < splitCount)) {
-                _context22.next = 27;
+                _context25.next = 27;
                 break;
               }
               singleLine = cloneDeep(productRecord);
               singleLine.num = 1;
               delete singleLine.product_quantity;
-              _appendResult2 = this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking));
-              if (!_appendResult2) {
-                _context22.next = 24;
+              _appendResult = this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking));
+              if (!_appendResult) {
+                _context25.next = 24;
                 break;
               }
-              _context22.next = 24;
-              return _appendResult2;
+              _context25.next = 24;
+              return _appendResult;
             case 24:
               i += 1;
-              _context22.next = 16;
+              _context25.next = 16;
               break;
             case 27:
-              return _context22.abrupt("continue", 32);
+              return _context25.abrupt("continue", 32);
             case 28:
               appendResult = this.appendProductLineToTempOrder(tempOrder, product, booking);
               if (!appendResult) {
-                _context22.next = 32;
+                _context25.next = 32;
                 break;
               }
-              _context22.next = 32;
+              _context25.next = 32;
               return appendResult;
             case 32:
-              _context22.next = 6;
+              _context25.next = 6;
               break;
             case 34:
-              _context22.next = 39;
+              _context25.next = 39;
               break;
             case 36:
-              _context22.prev = 36;
-              _context22.t0 = _context22["catch"](4);
-              _iterator20.e(_context22.t0);
+              _context25.prev = 36;
+              _context25.t0 = _context25["catch"](4);
+              _iterator20.e(_context25.t0);
             case 39:
-              _context22.prev = 39;
+              _context25.prev = 39;
               _iterator20.f();
-              return _context22.finish(39);
+              return _context25.finish(39);
             case 42:
-              _context22.next = 44;
+              _context25.next = 44;
               return this.finalizeProductOrderMutation(tempOrder, options);
             case 44:
               this.logInfo('addProductsToOrder success', {
                 itemsCount: items.length
               });
-              return _context22.abrupt("return", tempOrder.products);
+              return _context25.abrupt("return", tempOrder.products);
             case 46:
             case "end":
-              return _context22.stop();
+              return _context25.stop();
           }
-        }, _callee20, this, [[4, 36, 39, 42]]);
+        }, _callee23, this, [[4, 36, 39, 42]]);
       }));
-      function addProductsToOrder(_x24, _x25) {
+      function addProductsToOrder(_x26, _x27) {
         return _addProductsToOrder.apply(this, arguments);
       }
       return addProductsToOrder;
@@ -4368,17 +4760,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "preservePersistedBundlePriceFields",
     value: function preservePersistedBundlePriceFields(previousBundles, nextBundles) {
-      var _this28 = this;
+      var _this31 = 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 = _this28.getBundleRuntimeIdentity(bundle);
+        var identity = _this31.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(_this28.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
+        var previous = previousByIdentity.get(_this31.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
@@ -4579,21 +4971,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProduct",
     value: function () {
-      var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(params) {
+      var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(params) {
         var tempOrder, updatedProductUid;
-        return _regeneratorRuntime().wrap(function _callee21$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+        return _regeneratorRuntime().wrap(function _callee24$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params);
-              _context23.next = 4;
+              _context26.next = 4;
               return this.applyPromotion();
             case 4:
               this.applyDiscount({
                 reapplyBookingDiscountProductUids: params.allow_booking_discount_reapply && updatedProductUid ? [String(updatedProductUid)] : undefined
               });
               this.sanitizeTempOrderProducts(tempOrder);
-              _context23.next = 8;
+              _context26.next = 8;
               return this.recalculateSummary({
                 createIfMissing: true
               });
@@ -4602,14 +4994,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('updateOrderProduct success', {
                 params: params
               });
-              return _context23.abrupt("return", tempOrder.products);
+              return _context26.abrupt("return", tempOrder.products);
             case 11:
             case "end":
-              return _context23.stop();
+              return _context26.stop();
           }
-        }, _callee21, this);
+        }, _callee24, this);
       }));
-      function updateOrderProduct(_x26) {
+      function updateOrderProduct(_x28) {
         return _updateOrderProduct.apply(this, arguments);
       }
       return updateOrderProduct;
@@ -4617,28 +5009,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProducts",
     value: function () {
-      var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(paramsList) {
-        var _this29 = this;
+      var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(paramsList) {
+        var _this32 = this;
         var tempOrder, reapplyBookingDiscountProductUids;
-        return _regeneratorRuntime().wrap(function _callee22$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+        return _regeneratorRuntime().wrap(function _callee25$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (paramsList.length) {
-                _context24.next = 3;
+                _context27.next = 3;
                 break;
               }
-              return _context24.abrupt("return", tempOrder.products);
+              return _context27.abrupt("return", tempOrder.products);
             case 3:
               reapplyBookingDiscountProductUids = paramsList.reduce(function (acc, params) {
-                var updatedProductUid = _this29.applyOrderProductUpdateToTempOrder(tempOrder, params);
+                var updatedProductUid = _this32.applyOrderProductUpdateToTempOrder(tempOrder, params);
                 // 批量改预约时间时，延迟到最后一次折扣计算里统一恢复已选预约折扣卡。
                 if (params.allow_booking_discount_reapply && updatedProductUid) {
                   acc.push(String(updatedProductUid));
                 }
                 return acc;
               }, []);
-              _context24.next = 6;
+              _context27.next = 6;
               return this.finalizeAfterProductsMutation(tempOrder, {
                 reapplyBookingDiscountProductUids: reapplyBookingDiscountProductUids.length ? reapplyBookingDiscountProductUids : undefined
               });
@@ -4646,14 +5038,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('updateOrderProduct success', {
                 paramsList: paramsList
               });
-              return _context24.abrupt("return", tempOrder.products);
+              return _context27.abrupt("return", tempOrder.products);
             case 8:
             case "end":
-              return _context24.stop();
+              return _context27.stop();
           }
-        }, _callee22, this);
+        }, _callee25, this);
       }));
-      function updateOrderProducts(_x27) {
+      function updateOrderProducts(_x29) {
         return _updateOrderProducts.apply(this, arguments);
       }
       return updateOrderProducts;
@@ -4661,11 +5053,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 _callee26(params) {
         var _targetProduct$metada17;
         var product_id, product_variant_id, num, unique_identification_number, identity_key, product_sku, product_bundle, tempOrder, identityLookup, productIndex, targetUid, targetProduct, normalizedProduct;
-        return _regeneratorRuntime().wrap(function _callee23$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+        return _regeneratorRuntime().wrap(function _callee26$(_context28) {
+          while (1) switch (_context28.prev = _context28.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();
@@ -4695,7 +5087,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 productIndex = getProductIdentityIndex(tempOrder.products, identityLookup);
               }
               if (!(productIndex === -1)) {
-                _context25.next = 13;
+                _context28.next = 13;
                 break;
               }
               throw new Error('[Order] 目标商品不存在，无法更新数量');
@@ -4709,12 +5101,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }));
               normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
               tempOrder.products[productIndex] = normalizedProduct;
-              _context25.next = 19;
+              _context28.next = 19;
               return this.applyPromotion();
             case 19:
               this.applyDiscount();
               this.sanitizeTempOrderProducts(tempOrder);
-              _context25.next = 23;
+              _context28.next = 23;
               return this.recalculateSummary({
                 createIfMissing: true
               });
@@ -4723,14 +5115,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('updateOrderProductQuantity success', {
                 params: params
               });
-              return _context25.abrupt("return", tempOrder.products);
+              return _context28.abrupt("return", tempOrder.products);
             case 26:
             case "end":
-              return _context25.stop();
+              return _context28.stop();
           }
-        }, _callee23, this);
+        }, _callee26, this);
       }));
-      function updateOrderProductQuantity(_x28) {
+      function updateOrderProductQuantity(_x30) {
         return _updateOrderProductQuantity.apply(this, arguments);
       }
       return updateOrderProductQuantity;
@@ -4771,19 +5163,19 @@ 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 _callee27(tempOrder, options) {
+        return _regeneratorRuntime().wrap(function _callee27$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
               this.syncTempOrderHolderFromBookings(tempOrder);
-              _context26.next = 3;
+              _context29.next = 3;
               return this.applyPromotion();
             case 3:
               this.applyDiscount({
                 reapplyBookingDiscountProductUids: options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids
               });
               this.sanitizeTempOrderProducts(tempOrder);
-              _context26.next = 7;
+              _context29.next = 7;
               return this.recalculateSummary({
                 createIfMissing: true
               });
@@ -4791,11 +5183,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.persistTempOrder();
             case 8:
             case "end":
-              return _context26.stop();
+              return _context29.stop();
           }
-        }, _callee24, this);
+        }, _callee27, this);
       }));
-      function finalizeAfterProductsMutation(_x29, _x30) {
+      function finalizeAfterProductsMutation(_x31, _x32) {
         return _finalizeAfterProductsMutation.apply(this, arguments);
       }
       return finalizeAfterProductsMutation;
@@ -4810,20 +5202,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeProductsFromOrder",
     value: (function () {
-      var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(identities, options) {
-        var _this30 = this;
+      var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(identities, options) {
+        var _this33 = 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 _callee28$(_context31) {
+          while (1) switch (_context31.prev = _context31.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
-              this.repairDuplicateProductLineIdentities(tempOrder);
               if (identities.length) {
-                _context28.next = 4;
+                _context31.next = 3;
                 break;
               }
-              return _context28.abrupt("return", tempOrder.products);
-            case 4:
+              return _context31.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;
@@ -4852,29 +5246,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               linkedBookingUidsToRemove = new Set();
               _iterator21 = _createForOfIteratorHelper(matchedProducts);
-              _context28.prev = 15;
+              _context31.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$(_context30) {
+                  while (1) switch (_context30.prev = _context30.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;
+                        _context30.next = 6;
                         break;
                       }
-                      return _context27.abrupt("return", 1);
+                      return _context30.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 = _this30.getBookingUniqueIdentificationNumber(booking);
+                          var bookingUid = _this33.getBookingUniqueIdentificationNumber(booking);
                           if (bookingUid && String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === String(productUid)) {
                             linkedBookingUidsToRemove.add(bookingUid);
                           }
@@ -4882,38 +5276,38 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }
                     case 8:
                     case "end":
-                      return _context27.stop();
+                      return _context30.stop();
                   }
                 }, _loop3);
               });
               _iterator21.s();
-            case 18:
+            case 19:
               if ((_step21 = _iterator21.n()).done) {
-                _context28.next = 24;
+                _context31.next = 25;
                 break;
               }
-              return _context28.delegateYield(_loop3(), "t0", 20);
-            case 20:
-              if (!_context28.t0) {
-                _context28.next = 22;
+              return _context31.delegateYield(_loop3(), "t0", 21);
+            case 21:
+              if (!_context31.t0) {
+                _context31.next = 23;
                 break;
               }
-              return _context28.abrupt("continue", 22);
-            case 22:
-              _context28.next = 18;
+              return _context31.abrupt("continue", 23);
+            case 23:
+              _context31.next = 19;
               break;
-            case 24:
-              _context28.next = 29;
+            case 25:
+              _context31.next = 30;
               break;
-            case 26:
-              _context28.prev = 26;
-              _context28.t1 = _context28["catch"](15);
-              _iterator21.e(_context28.t1);
-            case 29:
-              _context28.prev = 29;
+            case 27:
+              _context31.prev = 27;
+              _context31.t1 = _context31["catch"](16);
+              _iterator21.e(_context31.t1);
+            case 30:
+              _context31.prev = 30;
               _iterator21.f();
-              return _context28.finish(29);
-            case 32:
+              return _context31.finish(30);
+            case 33:
               if (linkedBookingUidsToRemove.size > 0) {
                 // 删除主预约商品时，同步移除挂在同一 booking_uid 下的加时商品，避免残留孤儿行。
                 tempOrder.products = (tempOrder.products || []).filter(function (line) {
@@ -4939,20 +5333,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);
+              _context31.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 _context31.abrupt("return", tempOrder.products);
+            case 40:
             case "end":
-              return _context28.stop();
+              return _context31.stop();
           }
-        }, _callee25, this, [[15, 26, 29, 32]]);
+        }, _callee28, this, [[16, 27, 30, 33]]);
       }));
-      function removeProductsFromOrder(_x31, _x32) {
+      function removeProductsFromOrder(_x33, _x34) {
         return _removeProductsFromOrder.apply(this, arguments);
       }
       return removeProductsFromOrder;
@@ -4960,61 +5355,63 @@ 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 _callee29(identity, options) {
+        return _regeneratorRuntime().wrap(function _callee29$(_context32) {
+          while (1) switch (_context32.prev = _context32.next) {
             case 0:
-              return _context29.abrupt("return", this.removeProductsFromOrder([identity], options));
+              return _context32.abrupt("return", this.removeProductsFromOrder([identity], options));
             case 1:
             case "end":
-              return _context29.stop();
+              return _context32.stop();
           }
-        }, _callee26, this);
+        }, _callee29, 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 _clearOrderCartLines = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30() {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee27$(_context30) {
-          while (1) switch (_context30.prev = _context30.next) {
+        return _regeneratorRuntime().wrap(function _callee30$(_context33) {
+          while (1) switch (_context33.prev = _context33.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
+              this.ensureSalesNotesLoadedForMutation(tempOrder);
               tempOrder.products = [];
               tempOrder.bookings = [];
+              this.removeSalesNotesForMissingProductLines(tempOrder);
               this.syncTempOrderHolderFromBookings(tempOrder);
               if (tempOrder._extend && _typeof(tempOrder._extend) === 'object') {
                 tempOrder._extend = _objectSpread(_objectSpread({}, tempOrder._extend), {}, {
                   productsByUid: {}
                 });
               }
-              _context30.next = 7;
+              _context33.next = 9;
               return this.applyPromotion();
-            case 7:
+            case 9:
               this.applyDiscount();
               this.sanitizeTempOrderProducts(tempOrder);
-              _context30.next = 11;
+              _context33.next = 13;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 11:
+            case 13:
               this.persistTempOrder();
               this.logInfo('clearOrderCartLines success', {});
-              return _context30.abrupt("return", tempOrder);
-            case 14:
+              return _context33.abrupt("return", tempOrder);
+            case 16:
             case "end":
-              return _context30.stop();
+              return _context33.stop();
           }
-        }, _callee27, this);
+        }, _callee30, this);
       }));
       function clearOrderCartLines() {
         return _clearOrderCartLines.apply(this, arguments);
@@ -5037,10 +5434,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         type: params === null || params === void 0 ? void 0 : params.type,
         summary: this.store.summary || createEmptySummary(),
         enhance: function enhance(nextPayload) {
-          var _ref70, _tempOrder$order_numb, _ref71, _tempOrder$shop_order, _ref72, _tempOrder$shop_full_;
+          var _ref70, _tempOrder$order_numb, _ref71, _tempOrder$shop_order2, _ref72, _tempOrder$shop_full_;
           return _objectSpread(_objectSpread({}, nextPayload), {}, {
             order_number: (_ref70 = (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : nextPayload.order_number) !== null && _ref70 !== void 0 ? _ref70 : null,
-            shop_order_number: (_ref71 = (_tempOrder$shop_order = tempOrder.shop_order_number) !== null && _tempOrder$shop_order !== void 0 ? _tempOrder$shop_order : nextPayload.shop_order_number) !== null && _ref71 !== void 0 ? _ref71 : null,
+            shop_order_number: (_ref71 = (_tempOrder$shop_order2 = tempOrder.shop_order_number) !== null && _tempOrder$shop_order2 !== void 0 ? _tempOrder$shop_order2 : nextPayload.shop_order_number) !== null && _ref71 !== void 0 ? _ref71 : null,
             shop_full_order_number: (_ref72 = (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : nextPayload.shop_full_order_number) !== null && _ref72 !== void 0 ? _ref72 : null,
             small_ticket_data_flag: 1
           });
@@ -5052,17 +5449,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyLocalPrintOrderNumbers",
     value: function () {
-      var _applyLocalPrintOrderNumbers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(order) {
+      var _applyLocalPrintOrderNumbers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(order) {
         var tempOrder, shopOrderNumber, shopFullOrderNumber;
-        return _regeneratorRuntime().wrap(function _callee28$(_context31) {
-          while (1) switch (_context31.prev = _context31.next) {
+        return _regeneratorRuntime().wrap(function _callee31$(_context34) {
+          while (1) switch (_context34.prev = _context34.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (!(!order || _typeof(order) !== 'object')) {
-                _context31.next = 3;
+                _context34.next = 3;
                 break;
               }
-              return _context31.abrupt("return", tempOrder);
+              return _context34.abrupt("return", tempOrder);
             case 3:
               shopOrderNumber = order.shop_order_number;
               shopFullOrderNumber = order.shop_full_order_number;
@@ -5073,17 +5470,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.shop_full_order_number = String(shopFullOrderNumber);
               }
               this.persistTempOrder();
-              _context31.next = 10;
+              _context34.next = 10;
               return this.saveDraft();
             case 10:
-              return _context31.abrupt("return", tempOrder);
+              return _context34.abrupt("return", tempOrder);
             case 11:
             case "end":
-              return _context31.stop();
+              return _context34.stop();
           }
-        }, _callee28, this);
+        }, _callee31, this);
       }));
-      function applyLocalPrintOrderNumbers(_x35) {
+      function applyLocalPrintOrderNumbers(_x37) {
         return _applyLocalPrintOrderNumbers.apply(this, arguments);
       }
       return applyLocalPrintOrderNumbers;
@@ -5091,35 +5488,35 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "saveTempOrderAsDraft",
     value: function () {
-      var _saveTempOrderAsDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(params) {
+      var _saveTempOrderAsDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(params) {
         var _params$cacheId2, _this$otherParams6, _this$otherParams7, _this$otherParams8, _params$type, _this$otherParams9, _payload$products;
         var tempOrder, latestSummary, payload;
-        return _regeneratorRuntime().wrap(function _callee29$(_context32) {
-          while (1) switch (_context32.prev = _context32.next) {
+        return _regeneratorRuntime().wrap(function _callee32$(_context35) {
+          while (1) switch (_context35.prev = _context35.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               this.ensureExternalSaleNumber(tempOrder);
               this.persistTempOrder();
-              _context32.next = 5;
+              _context35.next = 5;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 5:
-              _context32.t1 = _context32.sent;
-              if (_context32.t1) {
-                _context32.next = 8;
+              _context35.t1 = _context35.sent;
+              if (_context35.t1) {
+                _context35.next = 8;
                 break;
               }
-              _context32.t1 = this.store.summary;
+              _context35.t1 = this.store.summary;
             case 8:
-              _context32.t0 = _context32.t1;
-              if (_context32.t0) {
-                _context32.next = 11;
+              _context35.t0 = _context35.t1;
+              if (_context35.t0) {
+                _context35.next = 11;
                 break;
               }
-              _context32.t0 = createEmptySummary();
+              _context35.t0 = createEmptySummary();
             case 11:
-              latestSummary = _context32.t0;
+              latestSummary = _context35.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,
@@ -5140,17 +5537,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 _context32.abrupt("return", this.request.post('/order/sales/draft', payload, {
+              return _context35.abrupt("return", this.request.post('/order/sales/draft', payload, {
                 osServer: true,
                 customToast: function customToast() {}
               }));
             case 18:
             case "end":
-              return _context32.stop();
+              return _context35.stop();
           }
-        }, _callee29, this);
+        }, _callee32, this);
       }));
-      function saveTempOrderAsDraft(_x36) {
+      function saveTempOrderAsDraft(_x38) {
         return _saveTempOrderAsDraft.apply(this, arguments);
       }
       return saveTempOrderAsDraft;
@@ -5164,18 +5561,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitTempOrder",
     value: (function () {
-      var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(params) {
-        return _regeneratorRuntime().wrap(function _callee30$(_context33) {
-          while (1) switch (_context33.prev = _context33.next) {
+      var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(params) {
+        return _regeneratorRuntime().wrap(function _callee33$(_context36) {
+          while (1) switch (_context36.prev = _context36.next) {
             case 0:
-              return _context33.abrupt("return", this.runSubmitTempOrder(params));
+              return _context36.abrupt("return", this.runSubmitTempOrder(params));
             case 1:
             case "end":
-              return _context33.stop();
+              return _context36.stop();
           }
-        }, _callee30, this);
+        }, _callee33, this);
       }));
-      function submitTempOrder(_x37) {
+      function submitTempOrder(_x39) {
         return _submitTempOrder.apply(this, arguments);
       }
       return submitTempOrder;
@@ -5183,20 +5580,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitTempOrderAsync",
     value: function () {
-      var _submitTempOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(params) {
-        return _regeneratorRuntime().wrap(function _callee31$(_context34) {
-          while (1) switch (_context34.prev = _context34.next) {
+      var _submitTempOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(params) {
+        return _regeneratorRuntime().wrap(function _callee34$(_context37) {
+          while (1) switch (_context37.prev = _context37.next) {
             case 0:
-              return _context34.abrupt("return", this.runSubmitTempOrder(_objectSpread(_objectSpread({}, params), {}, {
+              return _context37.abrupt("return", this.runSubmitTempOrder(_objectSpread(_objectSpread({}, params), {}, {
                 syncMode: true
               })));
             case 1:
             case "end":
-              return _context34.stop();
+              return _context37.stop();
           }
-        }, _callee31, this);
+        }, _callee34, this);
       }));
-      function submitTempOrderAsync(_x38) {
+      function submitTempOrderAsync(_x40) {
         return _submitTempOrderAsync.apply(this, arguments);
       }
       return submitTempOrderAsync;
@@ -5204,11 +5601,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "runSubmitTempOrder",
     value: function () {
-      var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(params) {
+      var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35(params) {
         var _params$cacheId3, _this$otherParams10, _ref73, _ref74, _submitSnapshot$busin, _this$otherParams11, _this$otherParams12, _submitSnapshot$type;
-        var tempOrder, shouldConfirmPendingVoucherPayments, hasPaymentOverride, preparedPaymentOverride, latestSummary, effectiveCacheId, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, submitSnapshot, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
-        return _regeneratorRuntime().wrap(function _callee32$(_context35) {
-          while (1) switch (_context35.prev = _context35.next) {
+        var tempOrder, shouldConfirmPendingVoucherPayments, hasPaymentOverride, preparedPaymentOverride, latestSummary, effectiveCacheId, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, submitSnapshot, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, isLocalPendingSubmit, salesNotesState, submittedOrderId, resultRecord;
+        return _regeneratorRuntime().wrap(function _callee35$(_context38) {
+          while (1) switch (_context38.prev = _context38.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               shouldConfirmPendingVoucherPayments = (params === null || params === void 0 ? void 0 : params.confirmPendingVoucherPayments) !== false;
@@ -5228,26 +5625,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               this.persistTempOrder();
-              _context35.next = 8;
+              _context38.next = 8;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 8:
-              _context35.t1 = _context35.sent;
-              if (_context35.t1) {
-                _context35.next = 11;
+              _context38.t1 = _context38.sent;
+              if (_context38.t1) {
+                _context38.next = 11;
                 break;
               }
-              _context35.t1 = this.store.summary;
+              _context38.t1 = this.store.summary;
             case 11:
-              _context35.t0 = _context35.t1;
-              if (_context35.t0) {
-                _context35.next = 14;
+              _context38.t0 = _context38.t1;
+              if (_context38.t0) {
+                _context38.next = 14;
                 break;
               }
-              _context35.t0 = createEmptySummary();
+              _context38.t0 = createEmptySummary();
             case 14:
-              latestSummary = _context35.t0;
+              latestSummary = _context38.t0;
               effectiveCacheId = (_params$cacheId3 = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId3 !== void 0 ? _params$cacheId3 : this.cacheId;
               hasPaymentStatusOverride = (params === null || params === void 0 ? void 0 : params.paymentStatus) !== undefined;
               hasSmallTicketDataFlagOverride = (params === null || params === void 0 ? void 0 : params.smallTicketDataFlag) !== undefined;
@@ -5281,10 +5678,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!payload.created_at) {
                 payload.created_at = dayjs().format('YYYY-MM-DD HH:mm:ss');
               }
-              _context35.next = 25;
+              _context38.next = 25;
               return this.saveDraft();
             case 25:
-              _context35.prev = 25;
+              _context38.prev = 25;
               this.logInfo('submitTempOrder calling sales checkout', {
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
@@ -5294,44 +5691,49 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 smallTicketDataFlag: payload.small_ticket_data_flag,
                 syncMode: payload.sync_mode
               });
-              _context35.next = 29;
+              _context38.next = 29;
               return this.submitSalesOrder({
                 query: payload
               });
             case 29:
-              result = _context35.sent;
-              _context35.next = 42;
+              result = _context38.sent;
+              _context38.next = 42;
               break;
             case 32:
-              _context35.prev = 32;
-              _context35.t2 = _context35["catch"](25);
-              backendErrorResponse = this.extractSubmitErrorResponse(_context35.t2);
+              _context38.prev = 32;
+              _context38.t2 = _context38["catch"](25);
+              backendErrorResponse = this.extractSubmitErrorResponse(_context38.t2);
               if (!backendErrorResponse) {
-                _context35.next = 39;
+                _context38.next = 39;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
-              return _context35.abrupt("return", backendErrorResponse);
+              return _context38.abrupt("return", backendErrorResponse);
             case 39:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
-                error: _context35.t2 instanceof Error ? _context35.t2.message : String(_context35.t2),
+                error: _context38.t2 instanceof Error ? _context38.t2.message : String(_context38.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 _context35.t2;
+              throw _context38.t2;
             case 42:
               if (!this.isSubmitResponseRejected(result)) {
-                _context35.next = 46;
+                _context38.next = 46;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
-              return _context35.abrupt("return", result);
+              return _context38.abrupt("return", result);
             case 46:
+              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,
@@ -5341,31 +5743,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 })
               });
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
-                _context35.next = 55;
+                _context38.next = 55;
                 break;
               }
               tempOrder.order_id = submittedOrderId;
               resultRecord = result;
-              _context35.next = 53;
+              _context38.next = 55;
               return this.markLocalOrderSynced(submittedOrderId, (resultRecord === null || resultRecord === void 0 ? void 0 : resultRecord.data) || resultRecord || {});
-            case 53:
-              _context35.next = 56;
-              break;
             case 55:
-              if (this.isLocalPendingSubmitResult(result)) {
+              if (isLocalPendingSubmit) {
                 this.store.syncState = 'local';
-              } else {
+              } else if (submittedOrderId === null || submittedOrderId === undefined) {
                 this.store.syncState = 'submitted';
               }
-            case 56:
-              return _context35.abrupt("return", result);
+              return _context38.abrupt("return", result);
             case 57:
             case "end":
-              return _context35.stop();
+              return _context38.stop();
           }
-        }, _callee32, this, [[25, 32]]);
+        }, _callee35, this, [[25, 32]]);
       }));
-      function runSubmitTempOrder(_x39) {
+      function runSubmitTempOrder(_x41) {
         return _runSubmitTempOrder.apply(this, arguments);
       }
       return runSubmitTempOrder;
@@ -5373,10 +5771,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "markLocalOrderSynced",
     value: function () {
-      var _markLocalOrderSynced = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(orderId, remoteOrder) {
+      var _markLocalOrderSynced = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(orderId, remoteOrder) {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee33$(_context36) {
-          while (1) switch (_context36.prev = _context36.next) {
+        return _regeneratorRuntime().wrap(function _callee36$(_context39) {
+          while (1) switch (_context39.prev = _context39.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               tempOrder.order_id = orderId;
@@ -5384,15 +5782,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.store.lastOrderInfo = remoteOrder;
               this.store.syncState = 'submitted';
               this.persistTempOrder();
-              _context36.next = 8;
+              _context39.next = 8;
               return this.saveDraft();
             case 8:
             case "end":
-              return _context36.stop();
+              return _context39.stop();
           }
-        }, _callee33, this);
+        }, _callee36, this);
       }));
-      function markLocalOrderSynced(_x40, _x41) {
+      function markLocalOrderSynced(_x42, _x43) {
         return _markLocalOrderSynced.apply(this, arguments);
       }
       return markLocalOrderSynced;
@@ -5435,10 +5833,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function extractSubmitErrorResponse(error) {
       var _error$response,
         _error$response2,
-        _this31 = this;
+        _this34 = 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 _this31.isSubmitErrorResponse(candidate);
+        return _this34.isSubmitErrorResponse(candidate);
       }) || null;
     }
   }, {
@@ -5465,33 +5863,33 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncPaymentsToOrder",
     value: function () {
-      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(params) {
-        var _this32 = this,
+      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(params) {
+        var _this35 = this,
           _params$confirmPendin;
         var tempOrder, needsPaymentNumber, devicePrefix, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, orderPaidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, enhancePayload, submitParams, submitResult;
-        return _regeneratorRuntime().wrap(function _callee34$(_context37) {
-          while (1) switch (_context37.prev = _context37.next) {
+        return _regeneratorRuntime().wrap(function _callee37$(_context40) {
+          while (1) switch (_context40.prev = _context40.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               needsPaymentNumber = (params.payments || []).some(function (payment) {
                 return String(payment.payment_number || '').trim() === '';
               });
               if (!needsPaymentNumber) {
-                _context37.next = 8;
+                _context40.next = 8;
                 break;
               }
-              _context37.next = 5;
+              _context40.next = 5;
               return this.getPaymentNumberDevicePrefixAsync();
             case 5:
-              _context37.t0 = _context37.sent;
-              _context37.next = 9;
+              _context40.t0 = _context40.sent;
+              _context40.next = 9;
               break;
             case 8:
-              _context37.t0 = 'LOCAL';
+              _context40.t0 = 'LOCAL';
             case 9:
-              devicePrefix = _context37.t0;
+              devicePrefix = _context40.t0;
               mappedPayments = mapPaymentItemsToOrderPayments((params.payments || []).map(function (payment) {
-                return _this32.normalizePaymentSource(payment, {
+                return _this35.normalizePaymentSource(payment, {
                   defaultPaid: false,
                   devicePrefix: devicePrefix
                 });
@@ -5504,20 +5902,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               tempOrder.payments = effectivePayments;
               tempOrder.payment_status = paymentStatus;
               this.persistTempOrder();
-              _context37.next = 21;
+              _context40.next = 21;
               return this.saveDraft();
             case 21:
               if (params.submitWhenPaid) {
-                _context37.next = 23;
+                _context40.next = 23;
                 break;
               }
-              return _context37.abrupt("return", completion);
+              return _context40.abrupt("return", completion);
             case 23:
               if (!(this.store.syncState === 'submitting')) {
-                _context37.next = 25;
+                _context40.next = 25;
                 break;
               }
-              return _context37.abrupt("return", completion);
+              return _context40.abrupt("return", completion);
             case 25:
               this.store.syncState = 'submitting';
               paymentSyncIdempotencyToken = this.buildPaymentSyncIdempotencyToken(tempOrder, effectivePayments);
@@ -5537,32 +5935,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 enhancePayload: enhancePayload
               };
               if (!(params.checkoutSyncTaskEnabled === false)) {
-                _context37.next = 35;
+                _context40.next = 35;
                 break;
               }
-              _context37.next = 32;
+              _context40.next = 32;
               return this.submitTempOrderAsync(submitParams);
             case 32:
-              _context37.t1 = _context37.sent;
-              _context37.next = 38;
+              _context40.t1 = _context40.sent;
+              _context40.next = 38;
               break;
             case 35:
-              _context37.next = 37;
+              _context40.next = 37;
               return this.submitTempOrder(submitParams);
             case 37:
-              _context37.t1 = _context37.sent;
+              _context40.t1 = _context40.sent;
             case 38:
-              submitResult = _context37.t1;
-              return _context37.abrupt("return", _objectSpread(_objectSpread({}, completion), {}, {
+              submitResult = _context40.t1;
+              return _context40.abrupt("return", _objectSpread(_objectSpread({}, completion), {}, {
                 submitResult: submitResult
               }));
             case 40:
             case "end":
-              return _context37.stop();
+              return _context40.stop();
           }
-        }, _callee34, this);
+        }, _callee37, this);
       }));
-      function syncPaymentsToOrder(_x42) {
+      function syncPaymentsToOrder(_x44) {
         return _syncPaymentsToOrder.apply(this, arguments);
       }
       return syncPaymentsToOrder;
@@ -5570,7 +5968,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createOrder",
     value: function createOrder(params) {
-      var _this33 = this;
+      var _this36 = this;
       var order = _objectSpread({
         type: (params === null || params === void 0 ? void 0 : params.type) || 'appointment_booking',
         // 要从外面拿，virtual
@@ -5602,7 +6000,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, _this33.window);
+            ensureCartItemOriginHolder(item, _this36.window);
           }
 
           // 购物车是否为普通商品
@@ -5659,11 +6057,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitOrder",
     value: function () {
-      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35(order) {
+      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(order) {
         var _order$query$cartItem, _params$bookings, _params$relation_prod;
         var url, query, fetchUrl, params;
-        return _regeneratorRuntime().wrap(function _callee35$(_context38) {
-          while (1) switch (_context38.prev = _context38.next) {
+        return _regeneratorRuntime().wrap(function _callee38$(_context41) {
+          while (1) switch (_context41.prev = _context41.next) {
             case 0:
               this.logInfo('submitOrder called', {
                 url: order.url,
@@ -5683,14 +6081,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 _context38.abrupt("return", this.request.post(fetchUrl, params));
+              return _context41.abrupt("return", this.request.post(fetchUrl, params));
             case 6:
             case "end":
-              return _context38.stop();
+              return _context41.stop();
           }
-        }, _callee35, this);
+        }, _callee38, this);
       }));
-      function submitOrder(_x43) {
+      function submitOrder(_x45) {
         return _submitOrder.apply(this, arguments);
       }
       return submitOrder;
@@ -5698,13 +6096,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "cancelOrder",
     value: function () {
-      var _cancelOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
+      var _cancelOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(params) {
         var payload;
-        return _regeneratorRuntime().wrap(function _callee36$(_context39) {
-          while (1) switch (_context39.prev = _context39.next) {
+        return _regeneratorRuntime().wrap(function _callee39$(_context42) {
+          while (1) switch (_context42.prev = _context42.next) {
             case 0:
               if (!(!Array.isArray(params.order_ids) || params.order_ids.length === 0)) {
-                _context39.next = 2;
+                _context42.next = 2;
                 break;
               }
               throw new Error('取消订单失败：order_ids 不能为空');
@@ -5720,16 +6118,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 method: 'PUT',
                 orderIdsCount: params.order_ids.length
               });
-              return _context39.abrupt("return", this.request.put('/order/update-status', payload, {
+              return _context42.abrupt("return", this.request.put('/order/update-status', payload, {
                 isShopApi: true
               }));
             case 5:
             case "end":
-              return _context39.stop();
+              return _context42.stop();
           }
-        }, _callee36, this);
+        }, _callee39, this);
       }));
-      function cancelOrder(_x44) {
+      function cancelOrder(_x46) {
         return _cancelOrder.apply(this, arguments);
       }
       return cancelOrder;
@@ -5737,19 +6135,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "changeBookingStatus",
     value: function () {
-      var _changeBookingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(params) {
+      var _changeBookingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(params) {
         var url, payload;
-        return _regeneratorRuntime().wrap(function _callee37$(_context40) {
-          while (1) switch (_context40.prev = _context40.next) {
+        return _regeneratorRuntime().wrap(function _callee40$(_context43) {
+          while (1) switch (_context43.prev = _context43.next) {
             case 0:
               if (params.booking_id) {
-                _context40.next = 2;
+                _context43.next = 2;
                 break;
               }
               throw new Error('变更预约状态失败：booking_id 不能为空');
             case 2:
               if (params.appointment_status) {
-                _context40.next = 4;
+                _context43.next = 4;
                 break;
               }
               throw new Error('变更预约状态失败：appointment_status 不能为空');
@@ -5764,16 +6162,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 bookingId: params.booking_id,
                 appointmentStatus: params.appointment_status
               });
-              return _context40.abrupt("return", this.request.put(url, payload, {
+              return _context43.abrupt("return", this.request.put(url, payload, {
                 isShopApi: true
               }));
             case 8:
             case "end":
-              return _context40.stop();
+              return _context43.stop();
           }
-        }, _callee37, this);
+        }, _callee40, this);
       }));
-      function changeBookingStatus(_x45) {
+      function changeBookingStatus(_x47) {
         return _changeBookingStatus.apply(this, arguments);
       }
       return changeBookingStatus;
@@ -5791,11 +6189,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createOrderByCheckout",
     value: (function () {
-      var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(params) {
+      var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41(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 _callee38$(_context41) {
-          while (1) switch (_context41.prev = _context41.next) {
+        return _regeneratorRuntime().wrap(function _callee41$(_context44) {
+          while (1) switch (_context44.prev = _context44.next) {
             case 0:
               // 过滤掉由在线店铺下单的 payment 支付数据
               onlineStorePaymentCodeList = ['WXPAY', 'WECHAT', 'ALIPAY', 'APPLE_PAY', 'CREDIT_CARD_3DS', 'CREDIT_CARD_TOKEN', 'GOOGLE_PAY', 'GOOGLE_PAY_3DS', 'CREDIT_CARD'];
@@ -5820,7 +6218,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   return p.code;
                 })) || []
               });
-              _context41.prev = 3;
+              _context44.prev = 3;
               // 构建订单数据，设置默认值并允许 params 覆盖
               orderData = _objectSpread({
                 sales_channel: 'my_pisel',
@@ -5868,32 +6266,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 hasOrderId: !!orderData.order_id,
                 smallTicketDataFlag: orderData.small_ticket_data_flag
               });
-              _context41.next = 10;
+              _context44.next = 10;
               return this.request.post('/order/checkout', orderData, {
                 osServer: true,
                 customToast: function customToast() {}
               });
             case 10:
-              response = _context41.sent;
+              response = _context44.sent;
               this.logInfo('Order API called successfully', {
                 response: response
               });
-              return _context41.abrupt("return", response);
+              return _context44.abrupt("return", response);
             case 15:
-              _context41.prev = 15;
-              _context41.t0 = _context41["catch"](3);
-              console.error('[Order] createOrderByCheckout 创建订单失败:', _context41.t0);
+              _context44.prev = 15;
+              _context44.t0 = _context44["catch"](3);
+              console.error('[Order] createOrderByCheckout 创建订单失败:', _context44.t0);
               this.logInfo('Order API called failed', {
-                error: _context41.t0 instanceof Error ? _context41.t0.message : String(_context41.t0)
+                error: _context44.t0 instanceof Error ? _context44.t0.message : String(_context44.t0)
               });
-              throw _context41.t0;
+              throw _context44.t0;
             case 20:
             case "end":
-              return _context41.stop();
+              return _context44.stop();
           }
-        }, _callee38, this, [[3, 15]]);
+        }, _callee41, this, [[3, 15]]);
       }));
-      function createOrderByCheckout(_x46) {
+      function createOrderByCheckout(_x48) {
         return _createOrderByCheckout.apply(this, arguments);
       }
       return createOrderByCheckout;
@@ -5901,24 +6299,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitSalesOrder",
     value: function () {
-      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(params) {
+      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee42(params) {
         var url, query, fetchUrl;
-        return _regeneratorRuntime().wrap(function _callee39$(_context42) {
-          while (1) switch (_context42.prev = _context42.next) {
+        return _regeneratorRuntime().wrap(function _callee42$(_context45) {
+          while (1) switch (_context45.prev = _context45.next) {
             case 0:
               url = params.url, query = params.query;
               fetchUrl = url || '/order/sales/checkout';
-              return _context42.abrupt("return", this.request.post(fetchUrl, query, {
+              return _context45.abrupt("return", this.request.post(fetchUrl, query, {
                 osServer: true,
                 customToast: function customToast() {}
               }));
             case 3:
             case "end":
-              return _context42.stop();
+              return _context45.stop();
           }
-        }, _callee39, this);
+        }, _callee42, this);
       }));
-      function submitSalesOrder(_x47) {
+      function submitSalesOrder(_x49) {
         return _submitSalesOrder.apply(this, arguments);
       }
       return submitSalesOrder;
@@ -5932,37 +6330,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sendCustomerPayLink",
     value: (function () {
-      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(params) {
+      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43(params) {
         var _params$emails;
         var orderIds;
-        return _regeneratorRuntime().wrap(function _callee40$(_context43) {
-          while (1) switch (_context43.prev = _context43.next) {
+        return _regeneratorRuntime().wrap(function _callee43$(_context46) {
+          while (1) switch (_context46.prev = _context46.next) {
             case 0:
               orderIds = params.order_ids || params.orderIds || [];
               if (orderIds.length) {
-                _context43.next = 3;
+                _context46.next = 3;
                 break;
               }
               throw new Error('发送支付链接前必须先提交本地订单并取得订单 ID');
             case 3:
               if ((_params$emails = params.emails) !== null && _params$emails !== void 0 && _params$emails.length) {
-                _context43.next = 5;
+                _context46.next = 5;
                 break;
               }
               throw new Error('发送支付链接需要至少一个邮箱');
             case 5:
-              return _context43.abrupt("return", this.request.post('/order/batch-email', {
+              return _context46.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 _context43.stop();
+              return _context46.stop();
           }
-        }, _callee40, this);
+        }, _callee43, this);
       }));
-      function sendCustomerPayLink(_x48) {
+      function sendCustomerPayLink(_x50) {
         return _sendCustomerPayLink.apply(this, arguments);
       }
       return sendCustomerPayLink;
@@ -5970,14 +6368,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getSalesOrderByLookup",
     value: function () {
-      var _getSalesOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41(params) {
+      var _getSalesOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee44(params) {
         var lookup, res;
-        return _regeneratorRuntime().wrap(function _callee41$(_context44) {
-          while (1) switch (_context44.prev = _context44.next) {
+        return _regeneratorRuntime().wrap(function _callee44$(_context47) {
+          while (1) switch (_context47.prev = _context47.next) {
             case 0:
               lookup = params.lookup === undefined || params.lookup === null ? '' : String(params.lookup).trim();
               if (lookup) {
-                _context44.next = 3;
+                _context47.next = 3;
                 break;
               }
               throw new Error('加载销售详情需要 lookup');
@@ -5986,27 +6384,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (lookup.startsWith('LOCAL_')) {
                 params.forceRemote = false;
               }
-              _context44.next = 6;
+              _context47.next = 6;
               return this.request.get("/order/sales/".concat(encodeURIComponent(lookup)), _objectSpread({
-                with: ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info', 'refunds']
+                with: ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info', 'refunds', 'notes']
               }, params.forceRemote ? {
                 forceRemote: true
               } : {}), {
                 osServer: true
               });
             case 6:
-              res = _context44.sent;
+              res = _context47.sent;
               if (res.code === 200) {
                 this.store.lastOrderInfo = res.data;
               }
-              return _context44.abrupt("return", res);
+              return _context47.abrupt("return", res);
             case 9:
             case "end":
-              return _context44.stop();
+              return _context47.stop();
           }
-        }, _callee41, this);
+        }, _callee44, this);
       }));
-      function getSalesOrderByLookup(_x49) {
+      function getSalesOrderByLookup(_x51) {
         return _getSalesOrderByLookup.apply(this, arguments);
       }
       return getSalesOrderByLookup;
@@ -6020,11 +6418,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hydrateTempOrderFromRecord",
     value: (function () {
-      var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee42(record, options) {
+      var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee45(record, options) {
         var _sourceRaw$_extend, _this$store$discount22;
-        var sourceRaw, duplicateProductIdentityRepair, duplicateIdentityReadySource, identityReadySource, normalizedCollections, raw, hasIdentityChanges, identityLogMetadata, hasIdentityWarnings, isSessionStorageHydrate, isMergedSalesDetailHydrate, nextTempOrder, _this$store$discount20, _this$store$discount21, restoredSessionDiscounts, nextExtend, sourceLastOrderInfo, isDraftOrder, syntheticIdentityOptions, rawSummary, summarySurcharges, hadSyntheticDraftOrderId, hydratedEditDiscounts, currentDiscounts, currentScanDiscounts, hydratedDiscountIds, retainedScanDiscounts, nextDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount23, _this$store$discount24;
-        return _regeneratorRuntime().wrap(function _callee42$(_context45) {
-          while (1) switch (_context45.prev = _context45.next) {
+        var sourceRaw, duplicateProductIdentityRepair, duplicateIdentityReadySource, identityReadySource, normalizedCollections, raw, hasIdentityChanges, identityLogMetadata, hasIdentityWarnings, isSessionStorageHydrate, isMergedSalesDetailHydrate, nextTempOrder, _this$store$discount20, _this$store$discount21, restoredSessionDiscounts, nextExtend, sourceLastOrderInfo, isDraftOrder, syntheticIdentityOptions, rawSummary, historicalDepositSnapshot, summarySurcharges, hadSyntheticDraftOrderId, hydratedEditDiscounts, currentDiscounts, currentScanDiscounts, hydratedDiscountIds, retainedScanDiscounts, nextDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount23, _this$store$discount24;
+        return _regeneratorRuntime().wrap(function _callee45$(_context48) {
+          while (1) switch (_context48.prev = _context48.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);
@@ -6060,11 +6458,12 @@ 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;
               if (!isSessionStorageHydrate) {
-                _context45.next = 30;
+                _context48.next = 30;
                 break;
               }
               // 会话快照是未提交购物车，不应获得编辑订单的 saved/edit 标记与服务端基线。
@@ -6080,23 +6479,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               nextTempOrder.discount_list = restoredSessionDiscounts;
               this.store.summary = createEmptySummary();
               this.store.lastOrderInfo = undefined;
-              _context45.next = 23;
+              _context48.next = 23;
               return (_this$store$discount20 = this.store.discount) === null || _this$store$discount20 === void 0 ? void 0 : _this$store$discount20.setOriginalDiscountList(cloneDeep(restoredSessionDiscounts));
             case 23:
-              _context45.next = 25;
+              _context48.next = 25;
               return (_this$store$discount21 = this.store.discount) === null || _this$store$discount21 === void 0 ? void 0 : _this$store$discount21.setDiscountList(cloneDeep(restoredSessionDiscounts));
             case 25:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context45.next = 28;
+                _context48.next = 28;
                 break;
               }
-              _context45.next = 28;
+              _context48.next = 28;
               return this.recalculateSummary({
                 createIfMissing: false
               });
             case 28:
               this.persistTempOrder();
-              return _context45.abrupt("return", nextTempOrder);
+              return _context48.abrupt("return", nextTempOrder);
             case 30:
               // Server list compatibility may synthesize order_id from external_sale_number; tempOrder must not.
               sourceLastOrderInfo = sourceRaw.lastOrderInfo || sourceRaw;
@@ -6106,6 +6505,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 externalSaleNumber: nextTempOrder.external_sale_number
               };
               rawSummary = raw.summary && _typeof(raw.summary) === 'object' ? raw.summary : {};
+              historicalDepositSnapshot = this.getHistoricalDepositSnapshot(sourceLastOrderInfo);
               summarySurcharges = Array.isArray(rawSummary.surcharges) ? rawSummary.surcharges.map(function (s) {
                 return _objectSpread({}, s || {});
               }) : cloneDeep(nextTempOrder.surcharges || []);
@@ -6113,7 +6513,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 surcharges: summarySurcharges
               });
               nextTempOrder._extend = _objectSpread(_objectSpread({}, nextTempOrder._extend || {}), {}, {
-                originalSalesSnapshot: _objectSpread({
+                originalSalesSnapshot: _objectSpread(_objectSpread({
                   summary: cloneDeep(this.store.summary),
                   products: cloneDeep(nextTempOrder.products || []),
                   bookings: cloneDeep(nextTempOrder.bookings || []),
@@ -6121,7 +6521,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   surcharges: cloneDeep(nextTempOrder.surcharges || []),
                   shop_discount: nextTempOrder.shop_discount || '0.00',
                   productFingerprint: this.buildOrderProductsFingerprint(nextTempOrder.products || [])
-                }, isMergedSalesDetailHydrate ? {
+                }, historicalDepositSnapshot ? {
+                  is_deposit: historicalDepositSnapshot.isDeposit,
+                  deposit_amount: historicalDepositSnapshot.depositAmount
+                } : {}), isMergedSalesDetailHydrate ? {
                   requiresFullSummaryRecalculation: true
                 } : {})
               });
@@ -6144,34 +6547,34 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               nextDiscounts = [].concat(_toConsumableArray(hydratedEditDiscounts), _toConsumableArray(retainedScanDiscounts));
               shouldSkipEmptyDiscountSync = nextDiscounts.length === 0 && currentDiscounts.length === 0;
               if (shouldSkipEmptyDiscountSync) {
-                _context45.next = 53;
+                _context48.next = 54;
                 break;
               }
               OrderModule.populateSavedAmounts(nextTempOrder.products, nextDiscounts);
-              _context45.next = 51;
+              _context48.next = 52;
               return (_this$store$discount23 = this.store.discount) === null || _this$store$discount23 === void 0 ? void 0 : _this$store$discount23.setOriginalDiscountList(nextDiscounts);
-            case 51:
-              _context45.next = 53;
+            case 52:
+              _context48.next = 54;
               return (_this$store$discount24 = this.store.discount) === null || _this$store$discount24 === void 0 ? void 0 : _this$store$discount24.setDiscountList(nextDiscounts);
-            case 53:
+            case 54:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context45.next = 56;
+                _context48.next = 57;
                 break;
               }
-              _context45.next = 56;
+              _context48.next = 57;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 56:
+            case 57:
               this.persistTempOrder();
-              return _context45.abrupt("return", nextTempOrder);
-            case 58:
+              return _context48.abrupt("return", nextTempOrder);
+            case 59:
             case "end":
-              return _context45.stop();
+              return _context48.stop();
           }
-        }, _callee42, this);
+        }, _callee45, this);
       }));
-      function hydrateTempOrderFromRecord(_x50, _x51) {
+      function hydrateTempOrderFromRecord(_x52, _x53) {
         return _hydrateTempOrderFromRecord.apply(this, arguments);
       }
       return hydrateTempOrderFromRecord;
@@ -6224,10 +6627,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _step22;
       try {
         for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
-          var _product$metadata8;
+          var _product$metadata10;
           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$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.booking_uid);
+          var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.booking_uid);
           if (!productUid || bookingUid === undefined || bookingUid === null || bookingUid === '') {
             continue;
           }
@@ -6285,7 +6688,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeTempOrderForRuntime",
     value: function normalizeTempOrderForRuntime(raw, options) {
-      var _this34 = this;
+      var _this37 = this,
+        _raw$_extend;
       var runtimeRaw = this.withoutSyntheticDraftOrderIdForRuntime(raw);
       var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), runtimeRaw || {});
       // ES 列表详情使用 id 表示订单主键；OS 详情态统一依赖 order_id 驱动操作按钮。
@@ -6309,12 +6713,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 _this34.normalizeHydratedOrderProduct(p, {
+        return _this37.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 = _this34.normalizeHydratedBookingHolder(b || {});
+        var booking = _this37.normalizeHydratedBookingHolder(b || {});
         return _objectSpread(_objectSpread({}, booking), {}, {
           is_all: normalizeBookingIsAll(booking),
           sub_type: normalizeBookingSubType(booking)
@@ -6323,6 +6727,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 || {});
       }) : [];
@@ -6339,16 +6758,20 @@ 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$metadata9, _ref75, _ref76, _existed$origin, _rawProduct$metadata;
+          var _product$metadata11, _ref75, _ref76, _existed$origin, _rawProduct$metadata;
           var _step24$value = _slicedToArray(_step24.value, 2),
             index = _step24$value[0],
             product = _step24$value[1];
-          var uid = (_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.unique_identification_number;
+          var uid = (_product$metadata11 = product.metadata) === null || _product$metadata11 === void 0 ? void 0 : _product$metadata11.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;
@@ -6403,8 +6826,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var bookingUidByProductUid = new Map();
       var productByUid = new Map();
       (tempOrder.products || []).forEach(function (product) {
-        var _product$metadata10;
-        var productUid = (product === null || product === void 0 || (_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+        var _product$metadata12;
+        var productUid = (product === null || product === void 0 || (_product$metadata12 = product.metadata) === null || _product$metadata12 === void 0 ? void 0 : _product$metadata12.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);
         }
@@ -6425,8 +6848,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         bookingUidByProductUid.set(String(productUid), bookingUid);
       });
       (tempOrder.products || []).forEach(function (product) {
-        var _product$metadata11;
-        var productUid = (product === null || product === void 0 || (_product$metadata11 = product.metadata) === null || _product$metadata11 === void 0 ? void 0 : _product$metadata11.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+        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);
         if (productUid === undefined || productUid === null || String(productUid) === '') return;
         var bookingUid = bookingUidByProductUid.get(String(productUid));
         if (!bookingUid) return;
@@ -6501,7 +6924,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedOrderProduct",
     value: function normalizeHydratedOrderProduct(product, options) {
-      var _this35 = this;
+      var _this38 = this;
       var row = _objectSpread({}, product || {});
       if (row.num === undefined && row.product_quantity !== undefined) {
         row.num = row.product_quantity;
@@ -6509,7 +6932,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 _this35.normalizeHydratedProductOptionItem(optionItem || {});
+          return _this38.normalizeHydratedProductOptionItem(optionItem || {});
         }))
       });
       delete row["product_".concat('option', "_item")];
@@ -6549,27 +6972,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderInfo",
     value: function () {
-      var _getOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43(order_id) {
+      var _getOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee46(order_id) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee43$(_context46) {
-          while (1) switch (_context46.prev = _context46.next) {
+        return _regeneratorRuntime().wrap(function _callee46$(_context49) {
+          while (1) switch (_context49.prev = _context49.next) {
             case 0:
-              _context46.next = 2;
+              _context49.next = 2;
               return this.request.get("/order/sales/".concat(order_id), {
-                with: ['products', 'bookings']
+                with: ['products', 'bookings', 'notes']
               }, {
                 osServer: true
               });
             case 2:
-              res = _context46.sent;
-              return _context46.abrupt("return", res);
+              res = _context49.sent;
+              return _context49.abrupt("return", res);
             case 4:
             case "end":
-              return _context46.stop();
+              return _context49.stop();
           }
-        }, _callee43, this);
+        }, _callee46, this);
       }));
-      function getOrderInfo(_x52) {
+      function getOrderInfo(_x54) {
         return _getOrderInfo.apply(this, arguments);
       }
       return getOrderInfo;