@pisell/pisellos 2.2.261 → 2.2.263

package/dist/solution/BaseSales/index.js

@@ -1,10 +1,7 @@
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -20,15 +17,18 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 import { BaseModule } from "../../modules/BaseModule";
 import { BaseSalesHookNames } from "./types";
@@ -37,6 +37,7 @@ import Decimal from 'decimal.js';
 import { cloneDeep, mergeWith } from 'lodash-es';
 import { createModule } from "../BookingByStep/types";
 import { composeLinePrice, createUuidV4, ensureProductSku, getProductSkuOptions, resolveIsFormSubject, sumOptionUnitPrice } from "../../modules/Order/utils";
+import { applyOrderCollectionUidRemaps, getOrderCollectionPersistentId, getOrderCollectionReferenceUid, getOrderCollectionUid, isSameOrderCollectionItem, mergeOrderCollectionItems, normalizeOrderCollection, normalizeOrderCollections, setOrderCollectionUid } from "../../modules/Order/utils/orderCollectionIdentity";
 import dayjs from 'dayjs';
 export * from "./types";
 import { QuotationModule } from "../../modules/Quotation";
@@ -71,9 +72,15 @@ function preserveManualProductDiscountProducts(previousProducts, nextProducts) {
 function isBaseSalesHistoricalDiscountEntry(discount) {
   return Boolean((discount === null || discount === void 0 ? void 0 : discount.isEditMode) || (discount === null || discount === void 0 ? void 0 : discount.isDisabled) || (discount === null || discount === void 0 ? void 0 : discount.order_discount_id) != null);
 }
-function getBaseSalesUniqueArrayMetadataKey(key) {
-  if (key === 'products' || key === 'bookings') return 'unique_identification_number';
-  if (key === 'payments' || key === 'payment') return 'unique_payment_number';
+var BASE_SALES_PERSISTENT_ID_FIELD_BY_KIND = {
+  product: 'order_detail_id',
+  booking: 'schedule_event_id',
+  payment: 'order_payment_id'
+};
+function getBaseSalesOrderCollectionKind(key) {
+  if (key === 'products') return 'product';
+  if (key === 'bookings') return 'booking';
+  if (key === 'payments' || key === 'payment') return 'payment';
   return null;
 }
 function isSameBaseSalesOrderRecord(left, right) {
@@ -86,42 +93,119 @@ function isSameBaseSalesOrderRecord(left, right) {
     return value !== undefined && value !== null && value !== '' && leftIdentities.has(String(value));
   });
 }
-function getBaseSalesMetadataUid(item, metadataKey) {
-  var _item$metadata$metada, _item$metadata;
-  var uid = (_item$metadata$metada = item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata[metadataKey]) !== null && _item$metadata$metada !== void 0 ? _item$metadata$metada : item === null || item === void 0 ? void 0 : item[metadataKey];
-  if (uid === undefined || uid === null || uid === '') return null;
-  return String(uid);
+function isBaseSalesBlankValue(value) {
+  return value === undefined || value === null || value === '';
 }
-function mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey) {
-  var result = [];
-  var indexByUid = new Map();
-  var appendOrReplaceByUid = function appendOrReplaceByUid(item) {
-    var clonedItem = cloneDeep(item);
-    var uid = getBaseSalesMetadataUid(clonedItem, metadataKey);
-    if (!uid) {
-      result.push(clonedItem);
-      return;
+function mergeBaseSalesProductSnapshotFields(currentItem, loadedItem) {
+  var _currentItem$metadata, _mergedItem$metadata, _mergedItem$metadata2;
+  var mergedItem = cloneDeep(loadedItem);
+  if (isBaseSalesBlankValue(mergedItem.product_cover) && !isBaseSalesBlankValue(currentItem === null || currentItem === void 0 ? void 0 : currentItem.product_cover)) {
+    mergedItem.product_cover = currentItem.product_cover;
+  }
+  var currentHolderConfig = currentItem === null || currentItem === void 0 || (_currentItem$metadata = currentItem.metadata) === null || _currentItem$metadata === void 0 ? void 0 : _currentItem$metadata.holder_config;
+  if ((((_mergedItem$metadata = mergedItem.metadata) === null || _mergedItem$metadata === void 0 ? void 0 : _mergedItem$metadata.holder_config) === undefined || ((_mergedItem$metadata2 = mergedItem.metadata) === null || _mergedItem$metadata2 === void 0 ? void 0 : _mergedItem$metadata2.holder_config) === null) && currentHolderConfig !== undefined && currentHolderConfig !== null) {
+    mergedItem.metadata = _objectSpread(_objectSpread({}, mergedItem.metadata || {}), {}, {
+      holder_config: currentHolderConfig
+    });
+  }
+  return mergedItem;
+}
+function mergeBaseSalesCollectionItem(kind, currentItem, incomingItem, uidRemaps) {
+  var currentReferenceUid = getOrderCollectionReferenceUid(kind, currentItem);
+  var incomingReferenceUid = getOrderCollectionReferenceUid(kind, incomingItem);
+  var identityMergedItem = mergeOrderCollectionItems(kind, currentItem, incomingItem);
+  var mergedUid = getOrderCollectionUid(kind, identityMergedItem);
+  if (mergedUid) {
+    var _iterator = _createForOfIteratorHelper(new Set([currentReferenceUid, incomingReferenceUid])),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var from = _step.value;
+        if (!from || from === mergedUid) continue;
+        uidRemaps.push({
+          kind: kind,
+          from: from,
+          to: mergedUid,
+          persistentId: getOrderCollectionPersistentId(kind, incomingItem) || getOrderCollectionPersistentId(kind, currentItem)
+        });
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
     }
-    var existingIndex = indexByUid.get(uid);
-    if (existingIndex !== undefined) {
-      result[existingIndex] = clonedItem;
+  }
+  var mergedItem = mergedUid ? setOrderCollectionUid(kind, incomingItem, mergedUid) : cloneDeep(incomingItem);
+  var persistentIdField = BASE_SALES_PERSISTENT_ID_FIELD_BY_KIND[kind];
+  if (isBaseSalesBlankValue(mergedItem[persistentIdField]) && !isBaseSalesBlankValue(identityMergedItem[persistentIdField])) {
+    mergedItem[persistentIdField] = identityMergedItem[persistentIdField];
+  }
+  return kind === 'product' ? mergeBaseSalesProductSnapshotFields(currentItem, mergedItem) : mergedItem;
+}
+function mergeBaseSalesOrderCollection(kind, currentValue, incomingValue, strategy, uidRemaps) {
+  var currentItems = normalizeOrderCollection(kind, currentValue, {
+    ensureUid: false
+  }).items;
+  var incomingItems = normalizeOrderCollection(kind, incomingValue, {
+    ensureUid: false
+  }).items;
+  if (strategy === 'authoritative-incoming') {
+    var _result = cloneDeep(incomingItems);
+    currentItems.forEach(function (currentItem) {
+      var incomingIndex = _result.findIndex(function (incomingItem) {
+        return isSameOrderCollectionItem(kind, currentItem, incomingItem);
+      });
+      if (incomingIndex !== -1) {
+        _result[incomingIndex] = mergeBaseSalesCollectionItem(kind, currentItem, _result[incomingIndex], uidRemaps);
+        return;
+      }
+
+      // 完整服务端快照负责已落库行；仅保留尚未提交的本地新行。
+      if (!getOrderCollectionPersistentId(kind, currentItem)) {
+        _result.push(cloneDeep(currentItem));
+      }
+    });
+    return _result;
+  }
+  var result = cloneDeep(currentItems);
+  incomingItems.forEach(function (incomingItem) {
+    var currentIndex = result.findIndex(function (currentItem) {
+      return isSameOrderCollectionItem(kind, currentItem, incomingItem);
+    });
+    if (currentIndex !== -1) {
+      result[currentIndex] = mergeBaseSalesCollectionItem(kind, result[currentIndex], incomingItem, uidRemaps);
       return;
     }
-    indexByUid.set(uid, result.length);
-    result.push(clonedItem);
-  };
-  currentValue.forEach(appendOrReplaceByUid);
-  loadedValue.forEach(appendOrReplaceByUid);
+    result.push(cloneDeep(incomingItem));
+  });
   return result;
 }
-function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord) {
-  if (!currentTempOrder) return loadedRecord;
-  var mergedRecord = mergeWith(cloneDeep(currentTempOrder), cloneDeep(loadedRecord || {}), function (currentValue, loadedValue, key) {
+function normalizeBaseSalesRecordCollections(sourceRecord, options) {
+  var normalizedRecord = normalizeOrderCollections(cloneDeep(sourceRecord || {}), options).order;
+
+  // 兼容旧调用方偶尔使用的单数 payment 字段。
+  if (Array.isArray(normalizedRecord.payment)) {
+    normalizedRecord.payment = normalizeOrderCollection('payment', normalizedRecord.payment, options).items;
+  }
+  return normalizedRecord;
+}
+function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, strategy) {
+  var normalizedLoadedRecord = normalizeBaseSalesRecordCollections(loadedRecord || {}, {
+    ensureUid: false
+  });
+  if (!currentTempOrder) {
+    return normalizeBaseSalesRecordCollections(normalizedLoadedRecord);
+  }
+  var normalizedCurrentTempOrder = normalizeBaseSalesRecordCollections(currentTempOrder, {
+    ensureUid: false
+  });
+  var uidRemaps = [];
+  var mergedRecord = mergeWith(normalizedCurrentTempOrder, normalizedLoadedRecord, function (currentValue, loadedValue, key) {
+    var collectionKind = getBaseSalesOrderCollectionKind(key);
+    if (collectionKind && Array.isArray(loadedValue)) {
+      return mergeBaseSalesOrderCollection(collectionKind, Array.isArray(currentValue) ? currentValue : [], loadedValue, strategy, uidRemaps);
+    }
     if (Array.isArray(currentValue) && Array.isArray(loadedValue)) {
-      var metadataKey = getBaseSalesUniqueArrayMetadataKey(key);
-      if (metadataKey) {
-        return mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey);
-      }
       return [].concat(_toConsumableArray(cloneDeep(currentValue)), _toConsumableArray(cloneDeep(loadedValue)));
     }
     if (Array.isArray(loadedValue)) return cloneDeep(loadedValue);
@@ -131,7 +215,7 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord) {
     return undefined;
   });
   delete mergedRecord.request_unique_idempotency_token;
-  return mergedRecord;
+  return normalizeBaseSalesRecordCollections(applyOrderCollectionUidRemaps(mergedRecord, uidRemaps));
 }
 export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(BaseSalesImpl, _BaseModule);
@@ -167,9 +251,13 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "queuedAutoPaymentSync", false);
     _defineProperty(_assertThisInitialized(_this), "autoPaymentSyncFlushing", false);
     _defineProperty(_assertThisInitialized(_this), "autoPaymentSyncTimer", null);
-    _defineProperty(_assertThisInitialized(_this), "salesDetailLoadInFlight", false);
+    _defineProperty(_assertThisInitialized(_this), "salesDetailLoadInFlightCount", 0);
+    _defineProperty(_assertThisInitialized(_this), "salesDetailLoadSequence", 0);
+    _defineProperty(_assertThisInitialized(_this), "salesDetailHydrateQueue", Promise.resolve());
     _defineProperty(_assertThisInitialized(_this), "serverOrderChangeUnsubscribe", null);
     _defineProperty(_assertThisInitialized(_this), "serverOrderChangeHydrateInFlight", null);
+    _defineProperty(_assertThisInitialized(_this), "queuedServerOrderChanges", []);
+    _defineProperty(_assertThisInitialized(_this), "serverOrderChangeSyncEnabled", false);
     return _this;
   }
 
@@ -259,71 +347,143 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
         return isSameBaseSalesOrderRecord(record, order);
       });
     }
+  }, {
+    key: "setServerOrderChangeSyncEnabled",
+    value: function setServerOrderChangeSyncEnabled(enabled) {
+      this.serverOrderChangeSyncEnabled = enabled;
+      if (!enabled) this.queuedServerOrderChanges = [];
+    }
+  }, {
+    key: "queueLatestServerOrderChange",
+    value: function queueLatestServerOrderChange(order) {
+      var snapshot = cloneDeep(order);
+      var existingIndex = this.queuedServerOrderChanges.findIndex(function (queued) {
+        return isSameBaseSalesOrderRecord(queued, snapshot);
+      });
+      if (existingIndex >= 0) {
+        this.queuedServerOrderChanges[existingIndex] = snapshot;
+        return;
+      }
+      this.queuedServerOrderChanges.push(snapshot);
+    }
+  }, {
+    key: "drainQueuedServerOrderChanges",
+    value: function () {
+      var _drainQueuedServerOrderChanges = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var changedOrders;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (!(!this.serverOrderChangeSyncEnabled || this.salesDetailLoadInFlightCount > 0 || this.serverOrderChangeHydrateInFlight || this.queuedServerOrderChanges.length === 0)) {
+                _context.next = 2;
+                break;
+              }
+              return _context.abrupt("return");
+            case 2:
+              changedOrders = this.queuedServerOrderChanges;
+              this.queuedServerOrderChanges = [];
+              _context.next = 6;
+              return this.syncCurrentSalesDetailFromServerOrderChange({
+                changedOrders: changedOrders
+              });
+            case 6:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function drainQueuedServerOrderChanges() {
+        return _drainQueuedServerOrderChanges.apply(this, arguments);
+      }
+      return drainQueuedServerOrderChanges;
+    }()
   }, {
     key: "syncCurrentSalesDetailFromServerOrderChange",
     value: function () {
-      var _syncCurrentSalesDetailFromServerOrderChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(payload) {
+      var _syncCurrentSalesDetailFromServerOrderChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(payload) {
         var _this2 = this;
         var changedOrders, changedOrder;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               changedOrders = Array.isArray(payload) ? payload : Array.isArray(payload === null || payload === void 0 ? void 0 : payload.changedOrders) ? payload.changedOrders : payload !== null && payload !== void 0 && payload.data && _typeof(payload.data) === 'object' ? [payload.data] : [];
-              if (!(this.salesDetailLoadInFlight || this.serverOrderChangeHydrateInFlight)) {
-                _context2.next = 3;
+              if (this.serverOrderChangeSyncEnabled) {
+                _context3.next = 3;
                 break;
               }
-              return _context2.abrupt("return");
+              return _context3.abrupt("return");
             case 3:
+              if (!(this.salesDetailLoadInFlightCount > 0)) {
+                _context3.next = 6;
+                break;
+              }
+              changedOrders.forEach(function (order) {
+                return _this2.queueLatestServerOrderChange(order);
+              });
+              return _context3.abrupt("return");
+            case 6:
               changedOrder = changedOrders.find(function (order) {
                 return _this2.isCurrentSalesOrderRecord(order);
               });
               if (changedOrder) {
-                _context2.next = 6;
+                _context3.next = 9;
                 break;
               }
-              return _context2.abrupt("return");
-            case 6:
+              return _context3.abrupt("return");
+            case 9:
+              if (!this.serverOrderChangeHydrateInFlight) {
+                _context3.next = 12;
+                break;
+              }
+              this.queueLatestServerOrderChange(changedOrder);
+              return _context3.abrupt("return");
+            case 12:
               if (this.store.order) {
-                _context2.next = 8;
+                _context3.next = 14;
                 break;
               }
-              return _context2.abrupt("return");
-            case 8:
-              this.serverOrderChangeHydrateInFlight = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-                var sales;
-                return _regeneratorRuntime().wrap(function _callee$(_context) {
-                  while (1) switch (_context.prev = _context.next) {
+              return _context3.abrupt("return");
+            case 14:
+              this.serverOrderChangeHydrateInFlight = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+                var _getTempOrder, _ref2;
+                var currentTempOrder, record, sales;
+                return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                  while (1) switch (_context2.prev = _context2.next) {
                     case 0:
-                      _context.next = 2;
-                      return _this2.store.order.hydrateTempOrderFromRecord(changedOrder, {
+                      currentTempOrder = (_getTempOrder = (_ref2 = _this2.store.order).getTempOrder) === null || _getTempOrder === void 0 ? void 0 : _getTempOrder.call(_ref2);
+                      record = mergeSalesDetailRecordWithTempOrder(currentTempOrder, changedOrder, 'authoritative-incoming');
+                      _context2.next = 4;
+                      return _this2.store.order.hydrateTempOrderFromRecord(record, {
                         recalcOnHydrate: false
                       });
-                    case 2:
-                      sales = _context.sent;
+                    case 4:
+                      sales = _context2.sent;
                       _this2.currentSalesDetail = sales;
-                      _context.next = 6;
+                      _context2.next = 8;
                       return _this2.core.effects.emit("".concat(_this2.name, ":onSalesOrderLoaded"), {
                         sales: sales
                       });
-                    case 6:
+                    case 8:
                     case "end":
-                      return _context.stop();
+                      return _context2.stop();
                   }
-                }, _callee);
+                }, _callee2);
               }))();
-              _context2.prev = 9;
-              _context2.next = 12;
+              _context3.prev = 15;
+              _context3.next = 18;
               return this.serverOrderChangeHydrateInFlight;
-            case 12:
-              _context2.prev = 12;
+            case 18:
+              _context3.prev = 18;
               this.serverOrderChangeHydrateInFlight = null;
-              return _context2.finish(12);
-            case 15:
+              _context3.next = 22;
+              return this.drainQueuedServerOrderChanges();
+            case 22:
+              return _context3.finish(18);
+            case 23:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this, [[9,, 12, 15]]);
+        }, _callee3, this, [[15,, 18, 23]]);
       }));
       function syncCurrentSalesDetailFromServerOrderChange(_x) {
         return _syncCurrentSalesDetailFromServerOrderChange.apply(this, arguments);
@@ -340,13 +500,100 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       var effects = (_this$core2 = this.core) === null || _this$core2 === void 0 ? void 0 : _this$core2.effects;
       if (!effects || typeof effects.on !== 'function') return;
       this.serverOrderChangeUnsubscribe = effects.on(SERVER_ORDER_CHANGED_EVENT, function (payload) {
-        void _this3.syncCurrentSalesDetailFromServerOrderChange(payload).catch(function (error) {
+        return _this3.syncCurrentSalesDetailFromServerOrderChange(payload).catch(function (error) {
           _this3.logError('sync sales detail from server order change failed', {
             error: error instanceof Error ? error.message : String(error)
           });
         });
       });
     }
+  }, {
+    key: "hydrateLatestLoadedSalesDetail",
+    value: function () {
+      var _hydrateLatestLoadedSalesDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(record, loadSequence) {
+        var _this4 = this;
+        var hydratedSales, skippedBeforeHydrate, hydrateTask, queuedTask;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              hydratedSales = null;
+              skippedBeforeHydrate = false;
+              hydrateTask = /*#__PURE__*/function () {
+                var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+                  var sales;
+                  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+                    while (1) switch (_context4.prev = _context4.next) {
+                      case 0:
+                        if (!(loadSequence !== _this4.salesDetailLoadSequence)) {
+                          _context4.next = 3;
+                          break;
+                        }
+                        skippedBeforeHydrate = true;
+                        return _context4.abrupt("return");
+                      case 3:
+                        if (_this4.store.order) {
+                          _context4.next = 5;
+                          break;
+                        }
+                        throw new Error('order 模块未初始化');
+                      case 5:
+                        _context4.next = 7;
+                        return _this4.store.order.hydrateTempOrderFromRecord(record, {
+                          recalcOnHydrate: false
+                        });
+                      case 7:
+                        sales = _context4.sent;
+                        hydratedSales = sales;
+
+                        // hydrate 期间可能又发起了更新请求；后续任务已串行排队，将负责最终状态。
+                        if (!(loadSequence !== _this4.salesDetailLoadSequence)) {
+                          _context4.next = 11;
+                          break;
+                        }
+                        return _context4.abrupt("return");
+                      case 11:
+                        _this4.currentSalesDetail = sales;
+                        _context4.next = 14;
+                        return _this4.core.effects.emit("".concat(_this4.name, ":onSalesOrderLoaded"), {
+                          sales: sales
+                        });
+                      case 14:
+                      case "end":
+                        return _context4.stop();
+                    }
+                  }, _callee4);
+                }));
+                return function hydrateTask() {
+                  return _ref3.apply(this, arguments);
+                };
+              }();
+              queuedTask = this.salesDetailHydrateQueue.then(hydrateTask, hydrateTask);
+              this.salesDetailHydrateQueue = queuedTask.then(function () {
+                return undefined;
+              }, function () {
+                return undefined;
+              });
+              _context5.next = 7;
+              return queuedTask;
+            case 7:
+              if (!skippedBeforeHydrate) {
+                _context5.next = 9;
+                break;
+              }
+              return _context5.abrupt("return", record);
+            case 9:
+              return _context5.abrupt("return", hydratedSales || this.currentSalesDetail || record);
+            case 10:
+            case "end":
+              return _context5.stop();
+          }
+        }, _callee5, this);
+      }));
+      function hydrateLatestLoadedSalesDetail(_x2, _x3) {
+        return _hydrateLatestLoadedSalesDetail.apply(this, arguments);
+      }
+      return hydrateLatestLoadedSalesDetail;
+    }()
   }, {
     key: "hydrateOrderPaymentNames",
     value: function hydrateOrderPaymentNames(payments) {
@@ -411,10 +658,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
         });
       }
       quotation.setScheduleResolver(function (id) {
-        var _scheduleModule$getSc, _getScheduleByIds, _ref2;
+        var _scheduleModule$getSc, _getScheduleByIds, _ref4;
         var scheduleId = String(id);
         if (scheduleById.has(scheduleId)) return scheduleById.get(scheduleId);
-        var schedules = ((_scheduleModule$getSc = scheduleModule.getScheduleListByIds) === null || _scheduleModule$getSc === void 0 ? void 0 : _scheduleModule$getSc.call(scheduleModule, [id])) || ((_getScheduleByIds = (_ref2 = scheduleModule).getScheduleByIds) === null || _getScheduleByIds === void 0 ? void 0 : _getScheduleByIds.call(_ref2, [id])) || [];
+        var schedules = ((_scheduleModule$getSc = scheduleModule.getScheduleListByIds) === null || _scheduleModule$getSc === void 0 ? void 0 : _scheduleModule$getSc.call(scheduleModule, [id])) || ((_getScheduleByIds = (_ref4 = scheduleModule).getScheduleByIds) === null || _getScheduleByIds === void 0 ? void 0 : _getScheduleByIds.call(_ref4, [id])) || [];
         if (schedules[0]) scheduleById.set(scheduleId, schedules[0]);
         return schedules[0];
       });
@@ -422,30 +669,30 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadQuotationForPriceQuery",
     value: function () {
-      var _loadQuotationForPriceQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+      var _loadQuotationForPriceQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
         var _this$otherParams;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               if (params.quotation) {
-                _context3.next = 2;
+                _context6.next = 2;
                 break;
               }
-              return _context3.abrupt("return");
+              return _context6.abrupt("return");
             case 2:
               this.applyQuotationScheduleResolver(params.quotation);
-              _context3.next = 5;
+              _context6.next = 5;
               return params.quotation.loadQuotations({
                 channel: params.channel || ((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel),
                 customer_id: params.customer_id
               });
             case 5:
             case "end":
-              return _context3.stop();
+              return _context6.stop();
           }
-        }, _callee3, this);
+        }, _callee6, this);
       }));
-      function loadQuotationForPriceQuery(_x2) {
+      function loadQuotationForPriceQuery(_x4) {
         return _loadQuotationForPriceQuery.apply(this, arguments);
       }
       return loadQuotationForPriceQuery;
@@ -489,23 +736,23 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadProductsForPriceQuery",
     value: function () {
-      var _loadProductsForPriceQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
+      var _loadProductsForPriceQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(params) {
         var ids, productsById, _this$otherParams2, _response$data, response, list;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               ids = Array.from(new Set(params.ids.filter(function (id) {
                 return Number.isFinite(id);
               })));
               productsById = new Map();
               if (!(!ids.length || !this.request)) {
-                _context4.next = 4;
+                _context7.next = 4;
                 break;
               }
-              return _context4.abrupt("return", productsById);
+              return _context7.abrupt("return", productsById);
             case 4:
-              _context4.prev = 4;
-              _context4.next = 7;
+              _context7.prev = 4;
+              _context7.next = 7;
               return this.request.post('/product/query', {
                 ids: ids,
                 open_quotation: 1,
@@ -522,35 +769,35 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 customToast: function customToast() {}
               });
             case 7:
-              response = _context4.sent;
+              response = _context7.sent;
               list = (response === null || response === void 0 || (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.list) || (response === null || response === void 0 ? void 0 : response.list) || [];
               if (Array.isArray(list)) {
-                _context4.next = 11;
+                _context7.next = 11;
                 break;
               }
-              return _context4.abrupt("return", productsById);
+              return _context7.abrupt("return", productsById);
             case 11:
               list.forEach(function (item) {
                 var _item$id;
                 var productId = Number((_item$id = item === null || item === void 0 ? void 0 : item.id) !== null && _item$id !== void 0 ? _item$id : item === null || item === void 0 ? void 0 : item.product_id);
                 if (Number.isFinite(productId)) productsById.set(productId, item);
               });
-              return _context4.abrupt("return", productsById);
+              return _context7.abrupt("return", productsById);
             case 15:
-              _context4.prev = 15;
-              _context4.t0 = _context4["catch"](4);
+              _context7.prev = 15;
+              _context7.t0 = _context7["catch"](4);
               this.logWarning('loadProductsForPriceQuery: 商品批量重查失败，使用入参 fallback', {
                 ids: ids,
-                error: _context4.t0 instanceof Error ? _context4.t0.message : String(_context4.t0)
+                error: _context7.t0 instanceof Error ? _context7.t0.message : String(_context7.t0)
               });
-              return _context4.abrupt("return", productsById);
+              return _context7.abrupt("return", productsById);
             case 19:
             case "end":
-              return _context4.stop();
+              return _context7.stop();
           }
-        }, _callee4, this, [[4, 15]]);
+        }, _callee7, this, [[4, 15]]);
       }));
-      function loadProductsForPriceQuery(_x3) {
+      function loadProductsForPriceQuery(_x5) {
         return _loadProductsForPriceQuery.apply(this, arguments);
       }
       return loadProductsForPriceQuery;
@@ -558,21 +805,21 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadProductForPriceQuery",
     value: function () {
-      var _loadProductForPriceQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params, customerId) {
+      var _loadProductForPriceQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params, customerId) {
         var product, productId, schedule, productsById;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               product = params.product || {};
               productId = this.getPriceQueryProductId(product);
               if (!(productId === null || !this.request)) {
-                _context5.next = 4;
+                _context8.next = 4;
                 break;
               }
-              return _context5.abrupt("return", null);
+              return _context8.abrupt("return", null);
             case 4:
               schedule = this.getPriceQuerySchedule(params);
-              _context5.next = 7;
+              _context8.next = 7;
               return this.loadProductsForPriceQuery({
                 ids: [productId],
                 schedule: schedule,
@@ -580,15 +827,15 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 channel: params.channel
               });
             case 7:
-              productsById = _context5.sent;
-              return _context5.abrupt("return", productsById.get(productId) || null);
+              productsById = _context8.sent;
+              return _context8.abrupt("return", productsById.get(productId) || null);
             case 9:
             case "end":
-              return _context5.stop();
+              return _context8.stop();
           }
-        }, _callee5, this);
+        }, _callee8, this);
       }));
-      function loadProductForPriceQuery(_x4, _x5) {
+      function loadProductForPriceQuery(_x6, _x7) {
         return _loadProductForPriceQuery.apply(this, arguments);
       }
       return loadProductForPriceQuery;
@@ -601,10 +848,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       return groups.flatMap(function (group) {
         var items = Array.isArray(group === null || group === void 0 ? void 0 : group.bundle_item) ? group.bundle_item : Array.isArray(group === null || group === void 0 ? void 0 : group.bundleItem) ? group.bundleItem : [];
         return items.map(function (item) {
-          var _item$group_id, _ref3, _item$bundle_group_id;
+          var _item$group_id, _ref5, _item$bundle_group_id;
           return _objectSpread(_objectSpread({}, item), {}, {
             group_id: (_item$group_id = item === null || item === void 0 ? void 0 : item.group_id) !== null && _item$group_id !== void 0 ? _item$group_id : group === null || group === void 0 ? void 0 : group.id,
-            bundle_group_id: (_ref3 = (_item$bundle_group_id = item === null || item === void 0 ? void 0 : item.bundle_group_id) !== null && _item$bundle_group_id !== void 0 ? _item$bundle_group_id : item === null || item === void 0 ? void 0 : item.group_id) !== null && _ref3 !== void 0 ? _ref3 : group === null || group === void 0 ? void 0 : group.id
+            bundle_group_id: (_ref5 = (_item$bundle_group_id = item === null || item === void 0 ? void 0 : item.bundle_group_id) !== null && _item$bundle_group_id !== void 0 ? _item$bundle_group_id : item === null || item === void 0 ? void 0 : item.group_id) !== null && _ref5 !== void 0 ? _ref5 : group === null || group === void 0 ? void 0 : group.id
           });
         });
       });
@@ -635,21 +882,21 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getAuthoritativeBundleUnitPrice",
     value: function getAuthoritativeBundleUnitPrice(bundle) {
-      var _ref4, _ref5, _ref6, _bundle$price;
-      return (_ref4 = (_ref5 = (_ref6 = (_bundle$price = bundle.price) !== null && _bundle$price !== void 0 ? _bundle$price : bundle.bundle_selling_price) !== null && _ref6 !== void 0 ? _ref6 : bundle.custom_price) !== null && _ref5 !== void 0 ? _ref5 : bundle.product_price) !== null && _ref4 !== void 0 ? _ref4 : bundle.base_price;
+      var _ref6, _ref7, _ref8, _bundle$price;
+      return (_ref6 = (_ref7 = (_ref8 = (_bundle$price = bundle.price) !== null && _bundle$price !== void 0 ? _bundle$price : bundle.bundle_selling_price) !== null && _ref8 !== void 0 ? _ref8 : bundle.custom_price) !== null && _ref7 !== void 0 ? _ref7 : bundle.product_price) !== null && _ref6 !== void 0 ? _ref6 : bundle.base_price;
     }
   }, {
     key: "mergeProductForPriceQuery",
     value: function mergeProductForPriceQuery(product, authoritativeProduct) {
-      var _this4 = this,
+      var _this5 = this,
         _product$id,
-        _ref7,
+        _ref9,
         _product$product_id2,
-        _ref8,
+        _ref10,
         _product$product_vari,
-        _ref9,
+        _ref11,
         _product$num,
-        _ref10,
+        _ref12,
         _product$quantity,
         _product$metadata4;
       if (!authoritativeProduct) return product;
@@ -657,8 +904,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       var authoritativeBundles = this.getAuthoritativeBundleItems(authoritativeProduct);
       var productBundle = selectedBundles.map(function (bundle) {
         var _authoritativeBundle$, _authoritativeBundle$2;
-        var authoritativeBundle = _this4.findAuthoritativeBundleItem(bundle, authoritativeBundles);
-        var unitPrice = authoritativeBundle ? _this4.getAuthoritativeBundleUnitPrice(authoritativeBundle) : undefined;
+        var authoritativeBundle = _this5.findAuthoritativeBundleItem(bundle, authoritativeBundles);
+        var unitPrice = authoritativeBundle ? _this5.getAuthoritativeBundleUnitPrice(authoritativeBundle) : undefined;
         if (unitPrice === undefined || unitPrice === null || unitPrice === '') return bundle;
         return _objectSpread(_objectSpread({}, bundle), {}, {
           price: unitPrice,
@@ -669,10 +916,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       });
       return _objectSpread(_objectSpread(_objectSpread({}, product), authoritativeProduct), {}, {
         id: (_product$id = product.id) !== null && _product$id !== void 0 ? _product$id : authoritativeProduct.id,
-        product_id: (_ref7 = (_product$product_id2 = product.product_id) !== null && _product$product_id2 !== void 0 ? _product$product_id2 : authoritativeProduct.product_id) !== null && _ref7 !== void 0 ? _ref7 : authoritativeProduct.id,
-        product_variant_id: (_ref8 = (_product$product_vari = product.product_variant_id) !== null && _product$product_vari !== void 0 ? _product$product_vari : authoritativeProduct.product_variant_id) !== null && _ref8 !== void 0 ? _ref8 : 0,
-        num: (_ref9 = (_product$num = product.num) !== null && _product$num !== void 0 ? _product$num : product.quantity) !== null && _ref9 !== void 0 ? _ref9 : authoritativeProduct.num,
-        quantity: (_ref10 = (_product$quantity = product.quantity) !== null && _product$quantity !== void 0 ? _product$quantity : product.num) !== null && _ref10 !== void 0 ? _ref10 : authoritativeProduct.quantity,
+        product_id: (_ref9 = (_product$product_id2 = product.product_id) !== null && _product$product_id2 !== void 0 ? _product$product_id2 : authoritativeProduct.product_id) !== null && _ref9 !== void 0 ? _ref9 : authoritativeProduct.id,
+        product_variant_id: (_ref10 = (_product$product_vari = product.product_variant_id) !== null && _product$product_vari !== void 0 ? _product$product_vari : authoritativeProduct.product_variant_id) !== null && _ref10 !== void 0 ? _ref10 : 0,
+        num: (_ref11 = (_product$num = product.num) !== null && _product$num !== void 0 ? _product$num : product.quantity) !== null && _ref11 !== void 0 ? _ref11 : authoritativeProduct.num,
+        quantity: (_ref12 = (_product$quantity = product.quantity) !== null && _product$quantity !== void 0 ? _product$quantity : product.num) !== null && _ref12 !== void 0 ? _ref12 : authoritativeProduct.quantity,
         product_sku: function () {
           var authoritativeSku = ensureProductSku(authoritativeProduct);
           var productSku = ensureProductSku(product);
@@ -746,61 +993,61 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncOtherParamsToSubModules",
     value: (function () {
-      var _syncOtherParamsToSubModules = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(changedParams) {
-        var _this5 = this;
-        var _ref11,
-          _ref11$cover,
+      var _syncOtherParamsToSubModules = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(changedParams) {
+        var _this6 = this;
+        var _ref13,
+          _ref13$cover,
           cover,
           nextSubModuleOtherParams,
-          _args7 = arguments;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+          _args10 = arguments;
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              _ref11 = _args7.length > 1 && _args7[1] !== undefined ? _args7[1] : {}, _ref11$cover = _ref11.cover, cover = _ref11$cover === void 0 ? false : _ref11$cover;
+              _ref13 = _args10.length > 1 && _args10[1] !== undefined ? _args10[1] : {}, _ref13$cover = _ref13.cover, cover = _ref13$cover === void 0 ? false : _ref13$cover;
               nextSubModuleOtherParams = this.buildSubModuleOtherParams();
-              _context7.next = 4;
+              _context10.next = 4;
               return Promise.all(Object.entries(this.store).map( /*#__PURE__*/function () {
-                var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref12) {
-                  var _ref14, moduleName, subModule, targetModule;
-                  return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-                    while (1) switch (_context6.prev = _context6.next) {
+                var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(_ref14) {
+                  var _ref16, moduleName, subModule, targetModule;
+                  return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+                    while (1) switch (_context9.prev = _context9.next) {
                       case 0:
-                        _ref14 = _slicedToArray(_ref12, 2), moduleName = _ref14[0], subModule = _ref14[1];
-                        if (!_this5.reusedSharedSubModuleNames.has(moduleName)) {
-                          _context6.next = 3;
+                        _ref16 = _slicedToArray(_ref14, 2), moduleName = _ref16[0], subModule = _ref16[1];
+                        if (!_this6.reusedSharedSubModuleNames.has(moduleName)) {
+                          _context9.next = 3;
                           break;
                         }
-                        return _context6.abrupt("return");
+                        return _context9.abrupt("return");
                       case 3:
                         targetModule = subModule;
                         if (!(!targetModule || typeof targetModule.updateOtherParams !== 'function')) {
-                          _context6.next = 6;
+                          _context9.next = 6;
                           break;
                         }
-                        return _context6.abrupt("return");
+                        return _context9.abrupt("return");
                       case 6:
-                        _context6.next = 8;
+                        _context9.next = 8;
                         return targetModule.updateOtherParams(nextSubModuleOtherParams, {
                           changedParams: changedParams,
                           cover: cover
                         });
                       case 8:
                       case "end":
-                        return _context6.stop();
+                        return _context9.stop();
                     }
-                  }, _callee6);
+                  }, _callee9);
                 }));
-                return function (_x7) {
-                  return _ref13.apply(this, arguments);
+                return function (_x9) {
+                  return _ref15.apply(this, arguments);
                 };
               }()));
             case 4:
             case "end":
-              return _context7.stop();
+              return _context10.stop();
           }
-        }, _callee7, this);
+        }, _callee10, this);
       }));
-      function syncOtherParamsToSubModules(_x6) {
+      function syncOtherParamsToSubModules(_x8) {
         return _syncOtherParamsToSubModules.apply(this, arguments);
       }
       return syncOtherParamsToSubModules;
@@ -874,19 +1121,19 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "initialize",
     value: function () {
-      var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(core) {
+      var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(core) {
         var _this$otherParams4,
-          _this6 = this,
+          _this7 = this,
           _this$otherParams5;
         var options,
           app,
           targetCacheData,
           moduleNames,
-          _args8 = arguments;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+          _args11 = arguments;
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              options = _args8.length > 1 && _args8[1] !== undefined ? _args8[1] : {};
+              options = _args11.length > 1 && _args11[1] !== undefined ? _args11[1] : {};
               this.core = core;
               this.initializeOptions = options || {};
               // this.store = { ...this.store, ...(options.store as Partial<BaseSalesState>) };
@@ -899,7 +1146,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               // 获取 logger 实例
               this.appPlugin = core.getPlugin('app');
               if (this.appPlugin) {
-                _context8.next = 11;
+                _context11.next = 11;
                 break;
               }
               throw new Error('Checkout 解决方案需要 app 插件支持');
@@ -909,48 +1156,48 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               targetCacheData = this.readSessionCacheData();
               moduleNames = this.getRegisteredModuleNames();
               moduleNames.forEach(function (step) {
-                var reusedModule = _this6.getReusableSharedSubModule(step);
+                var reusedModule = _this7.getReusableSharedSubModule(step);
                 if (reusedModule) {
-                  _this6.store[step] = reusedModule;
-                  _this6.reusedSharedSubModuleNames.add(step);
+                  _this7.store[step] = reusedModule;
+                  _this7.reusedSharedSubModuleNames.add(step);
                   return;
                 }
-                var targetModule = _this6.createSubModule(step);
+                var targetModule = _this7.createSubModule(step);
                 if (!targetModule) {
                   throw new Error("\u6A21\u5757 ".concat(step, " \u4E0D\u5B58\u5728"));
                 }
-                var hooks = _this6.getSubModuleHooks(step);
-                _this6.store[step] = targetModule;
-                _this6.core.registerModule(targetModule, _objectSpread(_objectSpread({
+                var hooks = _this7.getSubModuleHooks(step);
+                _this7.store[step] = targetModule;
+                _this7.core.registerModule(targetModule, _objectSpread(_objectSpread({
                   initialState: (targetCacheData === null || targetCacheData === void 0 ? void 0 : targetCacheData[targetModule.name]) || {}
                 }, hooks ? {
                   hooks: hooks
                 } : {}), {}, {
-                  otherParams: _this6.buildSubModuleOtherParams()
+                  otherParams: _this7.buildSubModuleOtherParams()
                 }));
               });
               if (!(this.store.schedule && !this.isScheduleListLoaded(this.store.schedule))) {
-                _context8.next = 19;
+                _context11.next = 19;
                 break;
               }
-              _context8.next = 19;
+              _context11.next = 19;
               return this.store.schedule.loadAllSchedule();
             case 19:
               if (this.store.order && typeof ((_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.enableTempOrderPersist) === 'boolean') {
                 this.store.order.setEnableTempOrderPersist(this.otherParams.enableTempOrderPersist);
               }
-              _context8.next = 22;
+              _context11.next = 22;
               return this.getPaymentMethodsAsync();
             case 22:
               this.registerServerOrderChangeSync();
               this.core.effects.emit("".concat(this.name, ":onInited"), {});
             case 24:
             case "end":
-              return _context8.stop();
+              return _context11.stop();
           }
-        }, _callee8, this);
+        }, _callee11, this);
       }));
-      function initialize(_x8) {
+      function initialize(_x10) {
         return _initialize.apply(this, arguments);
       }
       return initialize;
@@ -958,17 +1205,17 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "destroy",
     value: function () {
-      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
         var _this$serverOrderChan2,
-          _this7 = this;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+          _this8 = this;
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
               (_this$serverOrderChan2 = this.serverOrderChangeUnsubscribe) === null || _this$serverOrderChan2 === void 0 || _this$serverOrderChan2.call(this);
               this.serverOrderChangeUnsubscribe = null;
               Object.keys(this.store).forEach(function (key) {
-                if (_this7.reusedSharedSubModuleNames.has(key)) return;
-                var sub = _this7.store[key];
+                if (_this8.reusedSharedSubModuleNames.has(key)) return;
+                var sub = _this8.store[key];
                 if (sub && typeof sub.destroy === 'function') {
                   try {
                     sub.destroy();
@@ -978,15 +1225,17 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
               this.currentSalesDetail = null;
-              _context9.next = 6;
+              this.queuedServerOrderChanges = [];
+              this.salesDetailLoadSequence += 1;
+              _context12.next = 8;
               return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
-            case 6:
+            case 8:
               _get(_getPrototypeOf(BaseSalesImpl.prototype), "destroy", this).call(this);
-            case 7:
+            case 9:
             case "end":
-              return _context9.stop();
+              return _context12.stop();
           }
-        }, _callee9, this);
+        }, _callee12, this);
       }));
       function destroy() {
         return _destroy.apply(this, arguments);
@@ -1003,82 +1252,91 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadSalesDetail",
     value: (function () {
-      var _loadSalesDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(orderIdOrParams) {
-        var _ref15, _ref16, _ref17, _ref18, _params$orderId, params, externalSaleNumber, preloadedSalesDetail, lookup, loadedRecord, message, remoteRecord, currentTempOrder, record, sales;
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+      var _loadSalesDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(orderIdOrParams) {
+        var loadSequence, _ref17, _ref18, _ref19, _ref20, _params$orderId, params, externalSaleNumber, preloadedSalesDetail, lookup, loadedRecord, message, remoteRecord, currentTempOrder, record;
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               if (this.store.order) {
-                _context10.next = 2;
+                _context13.next = 2;
                 break;
               }
               throw new Error('order 模块未初始化');
             case 2:
-              this.salesDetailLoadInFlight = true;
-              _context10.prev = 3;
+              loadSequence = ++this.salesDetailLoadSequence;
+              this.salesDetailLoadInFlightCount += 1;
+              _context13.prev = 4;
               params = _typeof(orderIdOrParams) === 'object' ? orderIdOrParams : {
                 orderId: orderIdOrParams
               };
               externalSaleNumber = params.externalSaleNumber || params.external_sale_number;
               preloadedSalesDetail = params.preloadedSalesDetail;
-              lookup = (_ref15 = (_ref16 = (_ref17 = (_ref18 = (_params$orderId = params.orderId) !== null && _params$orderId !== void 0 ? _params$orderId : externalSaleNumber) !== null && _ref18 !== void 0 ? _ref18 : params.orderNumber) !== null && _ref17 !== void 0 ? _ref17 : preloadedSalesDetail === null || preloadedSalesDetail === void 0 ? void 0 : preloadedSalesDetail.order_id) !== null && _ref16 !== void 0 ? _ref16 : preloadedSalesDetail === null || preloadedSalesDetail === void 0 ? void 0 : preloadedSalesDetail.external_sale_number) !== null && _ref15 !== void 0 ? _ref15 : preloadedSalesDetail === null || preloadedSalesDetail === void 0 ? void 0 : preloadedSalesDetail.order_number;
+              lookup = (_ref17 = (_ref18 = (_ref19 = (_ref20 = (_params$orderId = params.orderId) !== null && _params$orderId !== void 0 ? _params$orderId : externalSaleNumber) !== null && _ref20 !== void 0 ? _ref20 : params.orderNumber) !== null && _ref19 !== void 0 ? _ref19 : preloadedSalesDetail === null || preloadedSalesDetail === void 0 ? void 0 : preloadedSalesDetail.order_id) !== null && _ref18 !== void 0 ? _ref18 : preloadedSalesDetail === null || preloadedSalesDetail === void 0 ? void 0 : preloadedSalesDetail.external_sale_number) !== null && _ref17 !== void 0 ? _ref17 : preloadedSalesDetail === null || preloadedSalesDetail === void 0 ? void 0 : preloadedSalesDetail.order_number;
               if (!(!preloadedSalesDetail && (lookup === undefined || lookup === null || lookup === ''))) {
-                _context10.next = 10;
+                _context13.next = 11;
                 break;
               }
               throw new Error('加载销售详情需要 orderId、externalSaleNumber 或 orderNumber');
-            case 10:
+            case 11:
               if (!(preloadedSalesDetail !== null && preloadedSalesDetail !== void 0)) {
-                _context10.next = 14;
+                _context13.next = 15;
                 break;
               }
-              _context10.t0 = preloadedSalesDetail;
-              _context10.next = 17;
+              _context13.t0 = preloadedSalesDetail;
+              _context13.next = 18;
               break;
-            case 14:
-              _context10.next = 16;
+            case 15:
+              _context13.next = 17;
               return this.store.order.getSalesOrderByLookup({
                 lookup: lookup,
                 forceRemote: params.forceRemote
               });
-            case 16:
-              _context10.t0 = _context10.sent;
             case 17:
-              loadedRecord = _context10.t0;
+              _context13.t0 = _context13.sent;
+            case 18:
+              loadedRecord = _context13.t0;
               if (!(!preloadedSalesDetail && (!loadedRecord || loadedRecord.code !== 200))) {
-                _context10.next = 21;
+                _context13.next = 22;
                 break;
               }
               message = loadedRecord && (loadedRecord.message || loadedRecord.msg) || "\u52A0\u8F7D\u9500\u552E\u8BE6\u60C5\u5931\u8D25: ".concat(lookup);
               throw new Error(message);
-            case 21:
+            case 22:
               remoteRecord = preloadedSalesDetail !== null && preloadedSalesDetail !== void 0 ? preloadedSalesDetail : loadedRecord.data;
               currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
-              record = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, remoteRecord) : remoteRecord;
-              _context10.next = 26;
-              return this.store.order.hydrateTempOrderFromRecord(record, {
-                recalcOnHydrate: false
-              });
-            case 26:
-              sales = _context10.sent;
-              this.currentSalesDetail = sales;
-              _context10.next = 30;
-              return this.core.effects.emit("".concat(this.name, ":onSalesOrderLoaded"), {
-                sales: sales
-              });
-            case 30:
-              return _context10.abrupt("return", sales);
-            case 31:
-              _context10.prev = 31;
-              this.salesDetailLoadInFlight = false;
-              return _context10.finish(31);
+              record = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, remoteRecord, 'preserve-local') : remoteRecord;
+              _context13.next = 27;
+              return this.hydrateLatestLoadedSalesDetail(record, loadSequence);
+            case 27:
+              return _context13.abrupt("return", _context13.sent);
+            case 28:
+              _context13.prev = 28;
+              this.salesDetailLoadInFlightCount = Math.max(0, this.salesDetailLoadInFlightCount - 1);
+              if (!(this.salesDetailLoadInFlightCount === 0)) {
+                _context13.next = 39;
+                break;
+              }
+              _context13.prev = 31;
+              _context13.next = 34;
+              return this.drainQueuedServerOrderChanges();
             case 34:
+              _context13.next = 39;
+              break;
+            case 36:
+              _context13.prev = 36;
+              _context13.t1 = _context13["catch"](31);
+              this.logError('drain queued server order changes failed', {
+                error: _context13.t1 instanceof Error ? _context13.t1.message : String(_context13.t1)
+              });
+            case 39:
+              return _context13.finish(28);
+            case 40:
             case "end":
-              return _context10.stop();
+              return _context13.stop();
           }
-        }, _callee10, this, [[3,, 31, 34]]);
+        }, _callee13, this, [[4,, 28, 40], [31, 36]]);
       }));
-      function loadSalesDetail(_x9) {
+      function loadSalesDetail(_x11) {
         return _loadSalesDetail.apply(this, arguments);
       }
       return loadSalesDetail;
@@ -1158,34 +1416,34 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "replaceTempOrder",
     value: function () {
-      var _replaceTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(tempOrder) {
+      var _replaceTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(tempOrder) {
         var nextTempOrder;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               if (this.store.order) {
-                _context11.next = 2;
+                _context14.next = 2;
                 break;
               }
               throw new Error('order 模块未初始化');
             case 2:
-              _context11.next = 4;
+              _context14.next = 4;
               return this.store.order.replaceTempOrder(tempOrder);
             case 4:
-              nextTempOrder = _context11.sent;
-              _context11.next = 7;
+              nextTempOrder = _context14.sent;
+              _context14.next = 7;
               return this.effectsEmit('onTempOrderReplaced', {
                 tempOrder: nextTempOrder
               });
             case 7:
-              return _context11.abrupt("return", nextTempOrder);
+              return _context14.abrupt("return", nextTempOrder);
             case 8:
             case "end":
-              return _context11.stop();
+              return _context14.stop();
           }
-        }, _callee11, this);
+        }, _callee14, this);
       }));
-      function replaceTempOrder(_x10) {
+      function replaceTempOrder(_x12) {
         return _replaceTempOrder.apply(this, arguments);
       }
       return replaceTempOrder;
@@ -1283,40 +1541,40 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addNewOrder",
     value: function () {
-      var _addNewOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+      var _addNewOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              _context12.prev = 0;
+              _context15.prev = 0;
               if (this.store.order) {
-                _context12.next = 3;
+                _context15.next = 3;
                 break;
               }
               throw new Error('order 模块未初始化');
             case 3:
-              _context12.next = 5;
+              _context15.next = 5;
               return this.store.order.addNewOrder();
             case 5:
-              tempOrder = _context12.sent;
+              tempOrder = _context15.sent;
               if (!(this.syncAppDataToTempOrder(tempOrder) && this.isTempOrderPersistEnabled())) {
-                _context12.next = 10;
+                _context15.next = 10;
                 break;
               }
               this.store.order.persistTempOrder();
-              _context12.next = 10;
+              _context15.next = 10;
               return this.store.order.saveDraft();
             case 10:
-              return _context12.abrupt("return", tempOrder);
+              return _context15.abrupt("return", tempOrder);
             case 13:
-              _context12.prev = 13;
-              _context12.t0 = _context12["catch"](0);
-              throw _context12.t0;
+              _context15.prev = 13;
+              _context15.t0 = _context15["catch"](0);
+              throw _context15.t0;
             case 16:
             case "end":
-              return _context12.stop();
+              return _context15.stop();
           }
-        }, _callee12, this, [[0, 13]]);
+        }, _callee15, this, [[0, 13]]);
       }));
       function addNewOrder() {
         return _addNewOrder.apply(this, arguments);
@@ -1326,22 +1584,22 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "saveDraft",
     value: function () {
-      var _saveDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+      var _saveDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               if (this.store.order) {
-                _context13.next = 2;
+                _context16.next = 2;
                 break;
               }
               throw new Error('order 模块未初始化');
             case 2:
-              return _context13.abrupt("return", this.store.order.saveDraft());
+              return _context16.abrupt("return", this.store.order.saveDraft());
             case 3:
             case "end":
-              return _context13.stop();
+              return _context16.stop();
           }
-        }, _callee13, this);
+        }, _callee16, this);
       }));
       function saveDraft() {
         return _saveDraft.apply(this, arguments);
@@ -1352,14 +1610,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "restoreOrder",
     value: function () {
-      var _restoreOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
+      var _restoreOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
-              _context14.prev = 0;
+              _context17.prev = 0;
               if (this.store.order) {
-                _context14.next = 3;
+                _context17.next = 3;
                 break;
               }
               throw new Error('scanOrder 解决方案需要 order 模块支持');
@@ -1369,29 +1627,29 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               this.currentSalesDetail = null;
               this.discountConfigCacheKey = null;
               this.hasManualDiscountSelection = false;
-              _context14.next = 9;
+              _context17.next = 9;
               return this.effectsEmit('onTempOrderReplaced', {
                 tempOrder: tempOrder
               });
             case 9:
               if (!(this.syncAppDataToTempOrder(tempOrder) && this.isTempOrderPersistEnabled())) {
-                _context14.next = 13;
+                _context17.next = 13;
                 break;
               }
               this.store.order.persistTempOrder();
-              _context14.next = 13;
+              _context17.next = 13;
               return this.store.order.saveDraft();
             case 13:
-              return _context14.abrupt("return", tempOrder);
+              return _context17.abrupt("return", tempOrder);
             case 16:
-              _context14.prev = 16;
-              _context14.t0 = _context14["catch"](0);
-              throw _context14.t0;
+              _context17.prev = 16;
+              _context17.t0 = _context17["catch"](0);
+              throw _context17.t0;
             case 19:
             case "end":
-              return _context14.stop();
+              return _context17.stop();
           }
-        }, _callee14, this, [[0, 16]]);
+        }, _callee17, this, [[0, 16]]);
       }));
       function restoreOrder() {
         return _restoreOrder.apply(this, arguments);
@@ -1405,22 +1663,22 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clearOrderCartLines",
     value: (function () {
-      var _clearOrderCartLines = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
+      var _clearOrderCartLines = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              _context15.prev = 0;
+              _context18.prev = 0;
               if (this.store.order) {
-                _context15.next = 3;
+                _context18.next = 3;
                 break;
               }
               throw new Error('order 模块未初始化');
             case 3:
-              _context15.next = 5;
+              _context18.next = 5;
               return this.store.order.clearOrderCartLines();
             case 5:
-              tempOrder = _context15.sent;
+              tempOrder = _context18.sent;
               if (this.currentSalesDetail) {
                 this.currentSalesDetail = _objectSpread(_objectSpread({}, this.currentSalesDetail), {}, {
                   products: [],
@@ -1430,29 +1688,29 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                   discount_list: []
                 });
               }
-              _context15.next = 9;
+              _context18.next = 9;
               return this.effectsEmit('onTempOrderReplaced', {
                 tempOrder: tempOrder
               });
             case 9:
               if (!(this.syncAppDataToTempOrder(tempOrder) && this.isTempOrderPersistEnabled())) {
-                _context15.next = 13;
+                _context18.next = 13;
                 break;
               }
               this.store.order.persistTempOrder();
-              _context15.next = 13;
+              _context18.next = 13;
               return this.store.order.saveDraft();
             case 13:
-              return _context15.abrupt("return", tempOrder);
+              return _context18.abrupt("return", tempOrder);
             case 16:
-              _context15.prev = 16;
-              _context15.t0 = _context15["catch"](0);
-              throw _context15.t0;
+              _context18.prev = 16;
+              _context18.t0 = _context18["catch"](0);
+              throw _context18.t0;
             case 19:
             case "end":
-              return _context15.stop();
+              return _context18.stop();
           }
-        }, _callee15, this, [[0, 16]]);
+        }, _callee18, this, [[0, 16]]);
       }));
       function clearOrderCartLines() {
         return _clearOrderCartLines.apply(this, arguments);
@@ -1469,32 +1727,32 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getSummary",
     value: function () {
-      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
+      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
         var summary;
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
-              _context16.prev = 0;
+              _context19.prev = 0;
               if (this.store.order) {
-                _context16.next = 3;
+                _context19.next = 3;
                 break;
               }
               throw new Error('order 模块未初始化');
             case 3:
-              _context16.next = 5;
+              _context19.next = 5;
               return this.store.order.getOrderSummary();
             case 5:
-              summary = _context16.sent;
-              return _context16.abrupt("return", summary);
+              summary = _context19.sent;
+              return _context19.abrupt("return", summary);
             case 9:
-              _context16.prev = 9;
-              _context16.t0 = _context16["catch"](0);
-              throw _context16.t0;
+              _context19.prev = 9;
+              _context19.t0 = _context19["catch"](0);
+              throw _context19.t0;
             case 12:
             case "end":
-              return _context16.stop();
+              return _context19.stop();
           }
-        }, _callee16, this, [[0, 9]]);
+        }, _callee19, this, [[0, 9]]);
       }));
       function getSummary() {
         return _getSummary.apply(this, arguments);
@@ -1504,10 +1762,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getHistoricalProductDiscountList",
     value: function getHistoricalProductDiscountList(products) {
-      var _this8 = this;
+      var _this9 = this;
       var historyDiscountList = [];
       products.forEach(function (item) {
-        if (!_this8.isPersistedOrderProduct(item)) return;
+        if (!_this9.isPersistedOrderProduct(item)) return;
         (item.discount_list || []).forEach(function (discount) {
           var _discount$discount, _discount$metadata, _discount$discount2, _discount$discount3, _discount$discount4;
           var discountId = ((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) || discount.id;
@@ -1567,11 +1825,11 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "shouldSkipAutoApplyFetchedDiscountsInEditMode",
     value: function shouldSkipAutoApplyFetchedDiscountsInEditMode(params) {
-      var _this9 = this;
+      var _this10 = this;
       if (params.discountAction !== 'edit') return false;
       if (!params.products.length) return false;
       var hasDraftProduct = params.products.some(function (product) {
-        return !_this9.isPersistedOrderProduct(product);
+        return !_this10.isPersistedOrderProduct(product);
       });
       if (hasDraftProduct) return false;
       var hasSelectedDiscount = params.currentDiscountList.some(function (discount) {
@@ -1611,14 +1869,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadDiscountConfig",
     value: function () {
-      var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(params) {
+      var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(params) {
         var _this$getOrderIdentit, _tempOrder$customer, _tempOrder$_extend, _tempOrder$_extend2, _discountModule$getDi, _discountModule$getOr, _discountModule$getDi2;
-        var tempOrder, orderStore, discountModule, rulesModule, orderId, customerId, currentDiscountList, originalDiscountList, hasManualDiscountSelection, discountAction, discountConfigCacheKey, preparedDiscountList, _discountModule$setOr, nextDiscountList, shouldSkipAutoApplyFetchedDiscounts, _summary, _tempOrder$holder, _orderStore$summary, holders, orderTotalAmount, result, _iterator, _step, _product$metadata5, _tempOrder$_extend3, _product$metadata$sou, _product$metadata6, _product$metadata7, _product$original_pri, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice, summary;
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        var tempOrder, orderStore, discountModule, rulesModule, orderId, customerId, currentDiscountList, originalDiscountList, hasManualDiscountSelection, discountAction, discountConfigCacheKey, preparedDiscountList, _discountModule$setOr, nextDiscountList, shouldSkipAutoApplyFetchedDiscounts, _summary, _orderStore$summary, orderTotalAmount, result, _iterator2, _step2, _product$metadata5, _tempOrder$_extend3, _product$metadata$sou, _product$metadata6, _product$metadata7, _product$original_pri, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice, summary;
+        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
               if (this.store.order) {
-                _context17.next = 2;
+                _context20.next = 2;
                 break;
               }
               throw new Error('order 模块未初始化');
@@ -1638,18 +1896,18 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               discountConfigCacheKey = [customerId, discountAction, Number(orderId) || 0].join(':');
               preparedDiscountList = [];
               if (!(customerId && customerId !== 1)) {
-                _context17.next = 25;
+                _context20.next = 25;
                 break;
               }
               if (!(this.discountConfigCacheKey === discountConfigCacheKey)) {
-                _context17.next = 19;
+                _context20.next = 19;
                 break;
               }
               preparedDiscountList = originalDiscountList;
-              _context17.next = 25;
+              _context20.next = 25;
               break;
             case 19:
-              _context17.next = 21;
+              _context20.next = 21;
               return this.store.order.loadDiscountConfig({
                 customerId: customerId,
                 action: discountAction,
@@ -1657,23 +1915,24 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 apply: false
               });
             case 21:
-              preparedDiscountList = _context17.sent;
+              preparedDiscountList = _context20.sent;
               this.discountConfigCacheKey = discountConfigCacheKey;
-              _context17.next = 25;
+              _context20.next = 25;
               return discountModule === null || discountModule === void 0 || (_discountModule$setOr = discountModule.setOriginalDiscountList) === null || _discountModule$setOr === void 0 ? void 0 : _discountModule$setOr.call(discountModule, preparedDiscountList);
             case 25:
               if (!(hasManualDiscountSelection && currentDiscountList.length)) {
-                _context17.next = 27;
+                _context20.next = 27;
                 break;
               }
-              return _context17.abrupt("return", {
+              return _context20.abrupt("return", {
                 productList: tempOrder.products || [],
-                discountList: currentDiscountList
+                discountList: currentDiscountList,
+                availableWalletIds: this.getAvailableWalletIds()
               });
             case 27:
               nextDiscountList = this.mergeHistoricalDiscountList(preparedDiscountList || (discountModule === null || discountModule === void 0 || (_discountModule$getDi2 = discountModule.getDiscountList) === null || _discountModule$getDi2 === void 0 ? void 0 : _discountModule$getDi2.call(discountModule)) || [], tempOrder.products || []);
               nextDiscountList = this.mergeCurrentDiscountSelectionState(nextDiscountList, currentDiscountList);
-              _context17.next = 31;
+              _context20.next = 31;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
             case 31:
               shouldSkipAutoApplyFetchedDiscounts = this.shouldSkipAutoApplyFetchedDiscountsInEditMode({
@@ -1683,17 +1942,17 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 nextDiscountList: nextDiscountList
               });
               if (!shouldSkipAutoApplyFetchedDiscounts) {
-                _context17.next = 40;
+                _context20.next = 40;
                 break;
               }
-              _context17.next = 35;
+              _context20.next = 35;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
             case 35:
-              _summary = _context17.sent;
+              _summary = _context20.sent;
               this.store.order.persistTempOrder();
-              _context17.next = 39;
+              _context20.next = 39;
               return this.effectsEmit('onDiscountApplied', {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList,
@@ -1701,22 +1960,22 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder
               });
             case 39:
-              return _context17.abrupt("return", {
+              return _context20.abrupt("return", {
                 productList: tempOrder.products || [],
-                discountList: nextDiscountList
+                discountList: nextDiscountList,
+                availableWalletIds: this.getAvailableWalletIds()
               });
             case 40:
               if (!rulesModule) {
-                _context17.next = 78;
+                _context20.next = 77;
                 break;
               }
-              holders = ((_tempOrder$holder = tempOrder.holder) === null || _tempOrder$holder === void 0 ? void 0 : _tempOrder$holder.form_record) || [];
               orderTotalAmount = Number(((_orderStore$summary = orderStore.summary) === null || _orderStore$summary === void 0 ? void 0 : _orderStore$summary.total_amount) || 0);
               console.log('[BaseSales.applyDiscountConfig.calcDiscount]');
               result = rulesModule.calcDiscount({
                 productList: tempOrder.products,
                 discountList: nextDiscountList,
-                holders: holders,
+                holders: [],
                 isFormSubject: function isFormSubject(product) {
                   return resolveIsFormSubject(tempOrder, product);
                 },
@@ -1728,23 +1987,23 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               if (result.productList) {
                 tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
               }
-              _iterator = _createForOfIteratorHelper(tempOrder.products || []);
-              _context17.prev = 47;
-              _iterator.s();
-            case 49:
-              if ((_step = _iterator.n()).done) {
-                _context17.next = 64;
+              _iterator2 = _createForOfIteratorHelper(tempOrder.products || []);
+              _context20.prev = 46;
+              _iterator2.s();
+            case 48:
+              if ((_step2 = _iterator2.n()).done) {
+                _context20.next = 63;
                 break;
               }
-              product = _step.value;
+              product = _step2.value;
               productUid = (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number;
               runtimeOrigin = productUid ? (_tempOrder$_extend3 = tempOrder._extend) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3.productsByUid) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3[productUid]) === null || _tempOrder$_extend3 === void 0 ? void 0 : _tempOrder$_extend3.origin : undefined;
               if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || isBaseSalesManualProductDiscountProduct(product))) {
-                _context17.next = 55;
+                _context20.next = 54;
                 break;
               }
-              return _context17.abrupt("continue", 62);
-            case 55:
+              return _context20.abrupt("continue", 61);
+            case 54:
               totalPerUnitDiscount = (product.discount_list || []).reduce(function (sum, pd) {
                 return sum + Number(pd.amount || 0);
               }, 0);
@@ -1760,75 +2019,83 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 mainPrice: newMainSellingPrice,
                 bundle: product.product_bundle
               });
-            case 62:
-              _context17.next = 49;
+            case 61:
+              _context20.next = 48;
               break;
-            case 64:
-              _context17.next = 69;
+            case 63:
+              _context20.next = 68;
               break;
-            case 66:
-              _context17.prev = 66;
-              _context17.t0 = _context17["catch"](47);
-              _iterator.e(_context17.t0);
-            case 69:
-              _context17.prev = 69;
-              _iterator.f();
-              return _context17.finish(69);
-            case 72:
+            case 65:
+              _context20.prev = 65;
+              _context20.t0 = _context20["catch"](46);
+              _iterator2.e(_context20.t0);
+            case 68:
+              _context20.prev = 68;
+              _iterator2.f();
+              return _context20.finish(68);
+            case 71:
               if (!result.discountList) {
-                _context17.next = 78;
+                _context20.next = 77;
                 break;
               }
               nextDiscountList = this.mergeHistoricalDiscountList(result.discountList, tempOrder.products || []);
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context17.next = 77;
+              _context20.next = 76;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 77:
+            case 76:
               tempOrder.discount_list = nextDiscountList.filter(function (discount) {
                 return discount.isSelected;
               });
-            case 78:
-              _context17.next = 80;
+            case 77:
+              _context20.next = 79;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 80:
-              summary = _context17.sent;
+            case 79:
+              summary = _context20.sent;
               this.store.order.persistTempOrder();
-              _context17.next = 84;
+              _context20.next = 83;
               return this.effectsEmit('onDiscountApplied', {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList,
                 selectedDiscountList: tempOrder.discount_list || [],
                 tempOrder: tempOrder
               });
-            case 84:
-              return _context17.abrupt("return", {
+            case 83:
+              return _context20.abrupt("return", {
                 productList: tempOrder.products || [],
-                discountList: nextDiscountList
+                discountList: nextDiscountList,
+                availableWalletIds: this.getAvailableWalletIds()
               });
-            case 85:
+            case 84:
             case "end":
-              return _context17.stop();
+              return _context20.stop();
           }
-        }, _callee17, this, [[47, 66, 69, 72]]);
+        }, _callee20, this, [[46, 65, 68, 71]]);
       }));
-      function loadDiscountConfig(_x11) {
+      function loadDiscountConfig(_x13) {
         return _loadDiscountConfig.apply(this, arguments);
       }
       return loadDiscountConfig;
     }()
+  }, {
+    key: "getAvailableWalletIds",
+    value: function getAvailableWalletIds() {
+      var _this$store$order4;
+      if (!((_this$store$order4 = this.store.order) !== null && _this$store$order4 !== void 0 && _this$store$order4.getAvailableWalletIds)) return [];
+      return this.store.order.getAvailableWalletIds();
+    }
   }, {
     key: "bestDiscount",
     value: function () {
-      var _bestDiscount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(cb) {
+      var _bestDiscount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(cb) {
         var _discountModule$getOr2, _discountModule$getDi3;
-        var tempOrder, orderStore, discountModule, rulesModule, originalDiscountList, currentDiscountList, nextDiscountList, result, _tempOrder$holder2, _orderStore$summary2, holders, orderTotalAmount;
-        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        var tempOrder, orderStore, discountModule, rulesModule, originalDiscountList, currentDiscountList, nextDiscountList, result, _orderStore$summary2, orderTotalAmount;
+        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
               if (this.store.order) {
-                _context18.next = 2;
+                _context21.next = 2;
                 break;
               }
               throw new Error('order 模块未初始化');
@@ -1844,20 +2111,19 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList
               };
-              _context18.next = 12;
+              _context21.next = 12;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
             case 12:
               if (!rulesModule) {
-                _context18.next = 25;
+                _context21.next = 24;
                 break;
               }
-              holders = ((_tempOrder$holder2 = tempOrder.holder) === null || _tempOrder$holder2 === void 0 ? void 0 : _tempOrder$holder2.form_record) || [];
               orderTotalAmount = Number(((_orderStore$summary2 = orderStore.summary) === null || _orderStore$summary2 === void 0 ? void 0 : _orderStore$summary2.total_amount) || 0);
               console.log('[BaseSales.bestDiscount.calcDiscount]');
               result = rulesModule.calcDiscount({
                 productList: tempOrder.products,
                 discountList: nextDiscountList,
-                holders: holders,
+                holders: [],
                 isFormSubject: function isFormSubject(product) {
                   return resolveIsFormSubject(tempOrder, product);
                 },
@@ -1867,14 +2133,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
               }
               if (!result.discountList) {
-                _context18.next = 25;
+                _context21.next = 24;
                 break;
               }
               nextDiscountList = this.mergeHistoricalDiscountList(result.discountList, tempOrder.products || []);
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context18.next = 23;
+              _context21.next = 22;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 23:
+            case 22:
               tempOrder.discount_list = nextDiscountList.filter(function (discount) {
                 return discount.isSelected;
               });
@@ -1882,22 +2148,30 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 productList: tempOrder.products,
                 discountList: nextDiscountList
               };
-            case 25:
-              _context18.next = 27;
+            case 24:
+              _context21.next = 26;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 27:
+            case 26:
               this.store.order.persistTempOrder();
+              _context21.next = 29;
+              return this.effectsEmit('onDiscountApplied', {
+                productList: tempOrder.products || [],
+                discountList: nextDiscountList,
+                selectedDiscountList: tempOrder.discount_list || [],
+                tempOrder: tempOrder
+              });
+            case 29:
               cb === null || cb === void 0 || cb(result);
-              return _context18.abrupt("return", result);
-            case 30:
+              return _context21.abrupt("return", result);
+            case 31:
             case "end":
-              return _context18.stop();
+              return _context21.stop();
           }
-        }, _callee18, this);
+        }, _callee21, this);
       }));
-      function bestDiscount(_x12) {
+      function bestDiscount(_x14) {
         return _bestDiscount.apply(this, arguments);
       }
       return bestDiscount;
@@ -1908,52 +2182,118 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       if (!this.store.order) return [];
       return this.store.order.getDiscountList();
     }
+
+    /** 读取 Discount 模块原始券列表（未经过 bookingTime 等过滤）。 */
+  }, {
+    key: "getOriginalDiscountList",
+    value: function getOriginalDiscountList() {
+      var _store, _discountModule$getOr3;
+      if (!this.store.order) return [];
+      var discountModule = (_store = this.store.order.store) === null || _store === void 0 ? void 0 : _store.discount;
+      return (discountModule === null || discountModule === void 0 || (_discountModule$getOr3 = discountModule.getOriginalDiscountList) === null || _discountModule$getOr3 === void 0 ? void 0 : _discountModule$getOr3.call(discountModule)) || [];
+    }
+
+    /**
+     * 同步写入 Discount 模块的 discountList / originalDiscountList。
+     * 供 Holder 补全等场景在 OS store 层更新 machinecode holder 字段。
+     */
+  }, {
+    key: "replaceDiscountStoreLists",
+    value: (function () {
+      var _replaceDiscountStoreLists = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(params) {
+        var _store2;
+        var discountModule;
+        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
+            case 0:
+              if (this.store.order) {
+                _context22.next = 2;
+                break;
+              }
+              throw new Error('order 模块未初始化');
+            case 2:
+              discountModule = (_store2 = this.store.order.store) === null || _store2 === void 0 ? void 0 : _store2.discount;
+              if (discountModule) {
+                _context22.next = 5;
+                break;
+              }
+              return _context22.abrupt("return");
+            case 5:
+              if (!params.originalDiscountList) {
+                _context22.next = 8;
+                break;
+              }
+              _context22.next = 8;
+              return discountModule.setOriginalDiscountList(params.originalDiscountList);
+            case 8:
+              _context22.next = 10;
+              return discountModule.setDiscountList(params.discountList);
+            case 10:
+            case "end":
+              return _context22.stop();
+          }
+        }, _callee22, this);
+      }));
+      function replaceDiscountStoreLists(_x15) {
+        return _replaceDiscountStoreLists.apply(this, arguments);
+      }
+      return replaceDiscountStoreLists;
+    }())
   }, {
     key: "scanPromotionCode",
     value: function () {
-      var _scanPromotionCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(code, customerId) {
-        var raw;
-        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+      var _scanPromotionCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(code, customerId) {
+        var raw, tempOrder;
+        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
-              _context19.prev = 0;
+              _context23.prev = 0;
               if (this.store.order) {
-                _context19.next = 3;
+                _context23.next = 3;
                 break;
               }
               throw new Error('order 模块未初始化');
             case 3:
-              _context19.next = 5;
+              _context23.next = 5;
               return this.store.order.scanCode(code, customerId);
             case 5:
-              raw = _context19.sent;
+              raw = _context23.sent;
               if (!raw.isAvailable) {
-                _context19.next = 10;
+                _context23.next = 13;
                 break;
               }
-              _context19.next = 9;
+              _context23.next = 9;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
             case 9:
               this.store.order.persistTempOrder();
-            case 10:
-              return _context19.abrupt("return", {
+              tempOrder = this.store.order.ensureTempOrder();
+              _context23.next = 13;
+              return this.effectsEmit('onDiscountApplied', {
+                productList: tempOrder.products || [],
+                discountList: this.store.order.getDiscountList(),
+                selectedDiscountList: tempOrder.discount_list || [],
+                tempOrder: tempOrder
+              });
+            case 13:
+              return _context23.abrupt("return", {
                 isAvailable: raw.isAvailable,
                 type: raw.type,
-                unavailableReason: raw.unavailableReason
+                unavailableReason: raw.unavailableReason,
+                scannedDiscountList: raw.scannedDiscountList
               });
-            case 13:
-              _context19.prev = 13;
-              _context19.t0 = _context19["catch"](0);
-              throw _context19.t0;
             case 16:
+              _context23.prev = 16;
+              _context23.t0 = _context23["catch"](0);
+              throw _context23.t0;
+            case 19:
             case "end":
-              return _context19.stop();
+              return _context23.stop();
           }
-        }, _callee19, this, [[0, 13]]);
+        }, _callee23, this, [[0, 16]]);
       }));
-      function scanPromotionCode(_x13, _x14) {
+      function scanPromotionCode(_x16, _x17) {
         return _scanPromotionCode.apply(this, arguments);
       }
       return scanPromotionCode;
@@ -1961,14 +2301,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setDiscountSelected",
     value: function () {
-      var _setDiscountSelected = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(params) {
-        var _tempOrder$holder3, list, updated, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _orderStore$summary3, orderTotalAmount, result, beforeSelectedIds, _iterator2, _step2, d, selectedResourceIds, filterSelectedDiscountDetails, _iterator3, _step3, _product$metadata8, _tempOrder$_extend4, _product$metadata$sou2, _product$metadata9, _product$metadata10, _product$original_pri2, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice;
-        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+      var _setDiscountSelected = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(params) {
+        var list, updated, tempOrder, orderStore, discountModule, rulesModule, nextDiscountList, _orderStore$summary3, orderTotalAmount, result, beforeSelectedIds, _iterator3, _step3, d, selectedResourceIds, filterSelectedDiscountDetails, _iterator4, _step4, _product$metadata8, _tempOrder$_extend4, _product$metadata$sou2, _product$metadata9, _product$metadata10, _product$original_pri2, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice;
+        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
-              _context20.prev = 0;
+              _context24.prev = 0;
               if (this.store.order) {
-                _context20.next = 3;
+                _context24.next = 3;
                 break;
               }
               throw new Error('order 模块未初始化');
@@ -1985,18 +2325,17 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               orderStore = this.store.order.store || {};
               discountModule = orderStore.discount;
               rulesModule = orderStore.rules;
-              holders = ((_tempOrder$holder3 = tempOrder.holder) === null || _tempOrder$holder3 === void 0 ? void 0 : _tempOrder$holder3.form_record) || [];
               nextDiscountList = updated;
-              _context20.next = 14;
+              _context24.next = 13;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(updated);
-            case 14:
+            case 13:
               if (rulesModule) {
                 orderTotalAmount = Number(((_orderStore$summary3 = orderStore.summary) === null || _orderStore$summary3 === void 0 ? void 0 : _orderStore$summary3.total_amount) || 0);
                 console.log('[BaseSales.setDiscountSelected.calcDiscount]');
                 result = rulesModule.calcDiscount({
                   productList: tempOrder.products,
                   discountList: updated,
-                  holders: holders,
+                  holders: [],
                   isFormSubject: function isFormSubject(product) {
                     return resolveIsFormSubject(tempOrder, product);
                   },
@@ -2019,10 +2358,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                     }).map(function (d) {
                       return d.id;
                     }));
-                    _iterator2 = _createForOfIteratorHelper(nextDiscountList);
+                    _iterator3 = _createForOfIteratorHelper(nextDiscountList);
                     try {
-                      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-                        d = _step2.value;
+                      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                        d = _step3.value;
                         if (d.isSelected && !beforeSelectedIds.has(d.id)) {
                           d.isSelected = false;
                           d.isManualSelect = true;
@@ -2030,9 +2369,9 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                         }
                       }
                     } catch (err) {
-                      _iterator2.e(err);
+                      _iterator3.e(err);
                     } finally {
-                      _iterator2.f();
+                      _iterator3.f();
                     }
                   }
                 }
@@ -2049,30 +2388,30 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                   return rid != null && selectedResourceIds.has(rid);
                 });
               };
-              _iterator3 = _createForOfIteratorHelper(tempOrder.products);
-              _context20.prev = 18;
-              _iterator3.s();
-            case 20:
-              if ((_step3 = _iterator3.n()).done) {
-                _context20.next = 37;
+              _iterator4 = _createForOfIteratorHelper(tempOrder.products);
+              _context24.prev = 17;
+              _iterator4.s();
+            case 19:
+              if ((_step4 = _iterator4.n()).done) {
+                _context24.next = 36;
                 break;
               }
-              product = _step3.value;
+              product = _step4.value;
               productUid = (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.unique_identification_number;
               runtimeOrigin = productUid ? (_tempOrder$_extend4 = tempOrder._extend) === null || _tempOrder$_extend4 === void 0 || (_tempOrder$_extend4 = _tempOrder$_extend4.productsByUid) === null || _tempOrder$_extend4 === void 0 || (_tempOrder$_extend4 = _tempOrder$_extend4[productUid]) === null || _tempOrder$_extend4 === void 0 ? void 0 : _tempOrder$_extend4.origin : undefined;
               if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || isBaseSalesManualProductDiscountProduct(product))) {
-                _context20.next = 26;
+                _context24.next = 25;
                 break;
               }
-              return _context20.abrupt("continue", 35);
-            case 26:
+              return _context24.abrupt("continue", 34);
+            case 25:
               product.discount_list = filterSelectedDiscountDetails(product.discount_list);
               if (Array.isArray(product.product_bundle)) {
                 product.product_bundle = product.product_bundle.map(function (bundle) {
-                  var _ref19, _bundle$original_pric;
+                  var _ref21, _bundle$original_pric;
                   var nextBundleDiscountList = filterSelectedDiscountDetails(bundle === null || bundle === void 0 ? void 0 : bundle.discount_list);
                   var shouldRestoreBundlePrice = nextBundleDiscountList.length === 0;
-                  var restoredBundlePrice = (_ref19 = (_bundle$original_pric = bundle === null || bundle === void 0 ? void 0 : bundle.original_price) !== null && _bundle$original_pric !== void 0 ? _bundle$original_pric : bundle === null || bundle === void 0 ? void 0 : bundle.product_price) !== null && _ref19 !== void 0 ? _ref19 : bundle === null || bundle === void 0 ? void 0 : bundle.price;
+                  var restoredBundlePrice = (_ref21 = (_bundle$original_pric = bundle === null || bundle === void 0 ? void 0 : bundle.original_price) !== null && _bundle$original_pric !== void 0 ? _bundle$original_pric : bundle === null || bundle === void 0 ? void 0 : bundle.product_price) !== null && _ref21 !== void 0 ? _ref21 : bundle === null || bundle === void 0 ? void 0 : bundle.price;
                   return _objectSpread(_objectSpread(_objectSpread({}, bundle), shouldRestoreBundlePrice ? {
                     price: restoredBundlePrice,
                     bundle_selling_price: restoredBundlePrice
@@ -2099,33 +2438,33 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 mainPrice: newMainSellingPrice,
                 bundle: product.product_bundle
               });
-            case 35:
-              _context20.next = 20;
+            case 34:
+              _context24.next = 19;
               break;
-            case 37:
-              _context20.next = 42;
+            case 36:
+              _context24.next = 41;
               break;
-            case 39:
-              _context20.prev = 39;
-              _context20.t0 = _context20["catch"](18);
-              _iterator3.e(_context20.t0);
-            case 42:
-              _context20.prev = 42;
-              _iterator3.f();
-              return _context20.finish(42);
-            case 45:
+            case 38:
+              _context24.prev = 38;
+              _context24.t0 = _context24["catch"](17);
+              _iterator4.e(_context24.t0);
+            case 41:
+              _context24.prev = 41;
+              _iterator4.f();
+              return _context24.finish(41);
+            case 44:
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context20.next = 48;
+              _context24.next = 47;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 48:
+            case 47:
               tempOrder.discount_list = (nextDiscountList || []).filter(function (d) {
                 return d.isSelected;
               });
-              _context20.next = 51;
+              _context24.next = 50;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 51:
+            case 50:
               this.store.order.persistTempOrder();
               this.effectsEmit('onDiscountApplied', {
                 productList: tempOrder.products,
@@ -2133,19 +2472,19 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 selectedDiscountList: tempOrder.discount_list,
                 tempOrder: tempOrder
               });
-              _context20.next = 58;
+              _context24.next = 57;
               break;
-            case 55:
-              _context20.prev = 55;
-              _context20.t1 = _context20["catch"](0);
-              throw _context20.t1;
-            case 58:
+            case 54:
+              _context24.prev = 54;
+              _context24.t1 = _context24["catch"](0);
+              throw _context24.t1;
+            case 57:
             case "end":
-              return _context20.stop();
+              return _context24.stop();
           }
-        }, _callee20, this, [[0, 55], [18, 39, 42, 45]]);
+        }, _callee24, this, [[0, 54], [17, 38, 41, 44]]);
       }));
-      function setDiscountSelected(_x15) {
+      function setDiscountSelected(_x18) {
         return _setDiscountSelected.apply(this, arguments);
       }
       return setDiscountSelected;
@@ -2153,23 +2492,23 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyDiscountCalculationResult",
     value: function () {
-      var _applyDiscountCalculationResult = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(result) {
+      var _applyDiscountCalculationResult = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(result) {
         var tempOrder, orderStore, discountModule;
-        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
-              _context21.prev = 0;
+              _context25.prev = 0;
               if (this.store.order) {
-                _context21.next = 3;
+                _context25.next = 3;
                 break;
               }
               throw new Error('order 模块未初始化');
             case 3:
               if (result) {
-                _context21.next = 5;
+                _context25.next = 5;
                 break;
               }
-              return _context21.abrupt("return");
+              return _context25.abrupt("return");
             case 5:
               tempOrder = this.store.order.ensureTempOrder();
               orderStore = this.store.order.store || {};
@@ -2178,36 +2517,44 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
               }
               if (!result.discountList) {
-                _context21.next = 14;
+                _context25.next = 14;
                 break;
               }
               OrderModule.populateSavedAmounts(tempOrder.products, result.discountList);
-              _context21.next = 13;
+              _context25.next = 13;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(result.discountList);
             case 13:
               tempOrder.discount_list = result.discountList.filter(function (discount) {
                 return discount.isSelected;
               });
             case 14:
-              _context21.next = 16;
+              _context25.next = 16;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
             case 16:
               this.store.order.persistTempOrder();
-              _context21.next = 22;
-              break;
+              _context25.next = 19;
+              return this.effectsEmit('onDiscountApplied', {
+                productList: tempOrder.products || [],
+                discountList: result.discountList || [],
+                selectedDiscountList: tempOrder.discount_list || [],
+                tempOrder: tempOrder
+              });
             case 19:
-              _context21.prev = 19;
-              _context21.t0 = _context21["catch"](0);
-              throw _context21.t0;
-            case 22:
+              _context25.next = 24;
+              break;
+            case 21:
+              _context25.prev = 21;
+              _context25.t0 = _context25["catch"](0);
+              throw _context25.t0;
+            case 24:
             case "end":
-              return _context21.stop();
+              return _context25.stop();
           }
-        }, _callee21, this, [[0, 19]]);
+        }, _callee25, this, [[0, 21]]);
       }));
-      function applyDiscountCalculationResult(_x16) {
+      function applyDiscountCalculationResult(_x19) {
         return _applyDiscountCalculationResult.apply(this, arguments);
       }
       return applyDiscountCalculationResult;
@@ -2215,18 +2562,18 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitScanOrder",
     value: function () {
-      var _submitScanOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(params) {
-        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+      var _submitScanOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(params) {
+        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
-              return _context22.abrupt("return", this.submitSalesOrder(params));
+              return _context26.abrupt("return", this.submitSalesOrder(params));
             case 1:
             case "end":
-              return _context22.stop();
+              return _context26.stop();
           }
-        }, _callee22, this);
+        }, _callee26, this);
       }));
-      function submitScanOrder(_x17) {
+      function submitScanOrder(_x20) {
         return _submitScanOrder.apply(this, arguments);
       }
       return submitScanOrder;
@@ -2240,14 +2587,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitSalesOrder",
     value: (function () {
-      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(params) {
+      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(params) {
         var _this$otherParams6, _this$otherParams7, _this$otherParams8, _this$otherParams9;
         var inferredPaymentStatus, submitParams;
-        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+        return _regeneratorRuntime().wrap(function _callee27$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
               if (this.store.order) {
-                _context23.next = 2;
+                _context27.next = 2;
                 break;
               }
               throw new Error('BaseSales 解决方案需要 order 模块支持');
@@ -2272,14 +2619,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               } : {}), (params === null || params === void 0 ? void 0 : params.enhancePayload) !== undefined ? {
                 enhancePayload: params.enhancePayload
               } : {});
-              return _context23.abrupt("return", this.store.order.submitTempOrder(submitParams));
+              return _context27.abrupt("return", this.store.order.submitTempOrder(submitParams));
             case 5:
             case "end":
-              return _context23.stop();
+              return _context27.stop();
           }
-        }, _callee23, this);
+        }, _callee27, this);
       }));
-      function submitSalesOrder(_x18) {
+      function submitSalesOrder(_x21) {
         return _submitSalesOrder.apply(this, arguments);
       }
       return submitSalesOrder;
@@ -2287,14 +2634,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitTempOrderAsync",
     value: function () {
-      var _submitTempOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(params) {
+      var _submitTempOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(params) {
         var _this$otherParams10, _this$otherParams11, _this$otherParams12, _this$otherParams13;
         var inferredPaymentStatus, submitParams;
-        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+        return _regeneratorRuntime().wrap(function _callee28$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
               if (this.store.order) {
-                _context24.next = 2;
+                _context28.next = 2;
                 break;
               }
               throw new Error('BaseSales 解决方案需要 order 模块支持');
@@ -2317,14 +2664,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               } : {}), (params === null || params === void 0 ? void 0 : params.enhancePayload) !== undefined ? {
                 enhancePayload: params.enhancePayload
               } : {});
-              return _context24.abrupt("return", this.store.order.submitTempOrderAsync(submitParams));
+              return _context28.abrupt("return", this.store.order.submitTempOrderAsync(submitParams));
             case 5:
             case "end":
-              return _context24.stop();
+              return _context28.stop();
           }
-        }, _callee24, this);
+        }, _callee28, this);
       }));
-      function submitTempOrderAsync(_x19) {
+      function submitTempOrderAsync(_x22) {
         return _submitTempOrderAsync.apply(this, arguments);
       }
       return submitTempOrderAsync;
@@ -2332,14 +2679,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "printLocalOrderReceipt",
     value: function () {
-      var _printLocalOrderReceipt = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(lookup) {
+      var _printLocalOrderReceipt = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(lookup) {
         var _this$otherParams14, _this$otherParams15, _this$otherParams16, _this$otherParams17;
-        var hasLookup, lookupPayload, context, payload, response, _this$store$order$app, _this$store$order4, _data;
-        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+        var hasLookup, lookupPayload, context, payload, response, _this$store$order$app, _this$store$order5, _data;
+        return _regeneratorRuntime().wrap(function _callee29$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
               if (this.store.order) {
-                _context25.next = 2;
+                _context29.next = 2;
                 break;
               }
               throw new Error('BaseSales 解决方案需要 order 模块支持');
@@ -2370,28 +2717,28 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 channel: context.channel,
                 type: context.type
               });
-              _context25.next = 8;
+              _context29.next = 8;
               return this.request.post('/local/print-order', payload, {
                 osServer: true,
                 customToast: function customToast() {}
               });
             case 8:
-              response = _context25.sent;
+              response = _context29.sent;
               if (hasLookup) {
-                _context25.next = 12;
+                _context29.next = 12;
                 break;
               }
-              _context25.next = 12;
-              return (_this$store$order$app = (_this$store$order4 = this.store.order).applyLocalPrintOrderNumbers) === null || _this$store$order$app === void 0 ? void 0 : _this$store$order$app.call(_this$store$order4, response === null || response === void 0 || (_data = response.data) === null || _data === void 0 ? void 0 : _data.order);
+              _context29.next = 12;
+              return (_this$store$order$app = (_this$store$order5 = this.store.order).applyLocalPrintOrderNumbers) === null || _this$store$order$app === void 0 ? void 0 : _this$store$order$app.call(_this$store$order5, response === null || response === void 0 || (_data = response.data) === null || _data === void 0 ? void 0 : _data.order);
             case 12:
-              return _context25.abrupt("return", response);
+              return _context29.abrupt("return", response);
             case 13:
             case "end":
-              return _context25.stop();
+              return _context29.stop();
           }
-        }, _callee25, this);
+        }, _callee29, this);
       }));
-      function printLocalOrderReceipt(_x20) {
+      function printLocalOrderReceipt(_x23) {
         return _printLocalOrderReceipt.apply(this, arguments);
       }
       return printLocalOrderReceipt;
@@ -2399,9 +2746,9 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getSubmitPaymentStatus",
     value: function getSubmitPaymentStatus(paymentStatus) {
-      var _this$store$order5, _this$store$order5$ge;
+      var _this$store$order6, _this$store$order6$ge;
       if (paymentStatus !== undefined) return paymentStatus;
-      var amountSnapshot = (_this$store$order5 = this.store.order) === null || _this$store$order5 === void 0 || (_this$store$order5$ge = _this$store$order5.getOrderAmountSnapshot) === null || _this$store$order5$ge === void 0 ? void 0 : _this$store$order5$ge.call(_this$store$order5);
+      var amountSnapshot = (_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 || (_this$store$order6$ge = _this$store$order6.getOrderAmountSnapshot) === null || _this$store$order6$ge === void 0 ? void 0 : _this$store$order6$ge.call(_this$store$order6);
       if (!amountSnapshot) return undefined;
       try {
         return new Decimal(amountSnapshot.amountGap || 0).lte(0) ? 'paid' : undefined;
@@ -2412,19 +2759,19 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncPaymentsToOrder",
     value: function () {
-      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(params) {
-        var _ref20, _params$businessCode, _this$otherParams18, _this$otherParams19, _params$channel;
+      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(params) {
+        var _ref22, _params$businessCode, _this$otherParams18, _this$otherParams19, _params$channel;
         var businessCode, channel, syncParams, syncState, payments, syncResult, latestPayments, amountSnapshot, orderSnapshot, syncPayload;
-        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+        return _regeneratorRuntime().wrap(function _callee30$(_context30) {
+          while (1) switch (_context30.prev = _context30.next) {
             case 0:
               if (this.store.order) {
-                _context26.next = 2;
+                _context30.next = 2;
                 break;
               }
               throw new Error('order 模块未初始化');
             case 2:
-              businessCode = (_ref20 = (_params$businessCode = params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.businessCode) !== null && _ref20 !== void 0 ? _ref20 : (_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.business_code;
+              businessCode = (_ref22 = (_params$businessCode = params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.businessCode) !== null && _ref22 !== void 0 ? _ref22 : (_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.business_code;
               channel = (_params$channel = params.channel) !== null && _params$channel !== void 0 ? _params$channel : this.getSubmitOrderSalesChannel();
               syncParams = _objectSpread(_objectSpread(_objectSpread({}, params), businessCode !== undefined ? {
                 businessCode: businessCode
@@ -2433,14 +2780,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               } : {});
               syncState = this.store.order.getOrderSyncState();
               if (!(params.submitWhenPaid && syncState === 'submitting')) {
-                _context26.next = 9;
+                _context30.next = 9;
                 break;
               }
               this.queueLatestAutoPaymentSync();
-              return _context26.abrupt("return", this.store.order.syncPaymentsToOrder(syncParams));
+              return _context30.abrupt("return", this.store.order.syncPaymentsToOrder(syncParams));
             case 9:
               payments = params.payments || [];
-              _context26.next = 12;
+              _context30.next = 12;
               return this.effectsEmit(BaseSalesHookNames.onPaymentSyncStart, {
                 payments: payments,
                 params: syncParams,
@@ -2448,11 +2795,11 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 orderSnapshot: this.store.order.getOrderSnapshot()
               });
             case 12:
-              _context26.prev = 12;
-              _context26.next = 15;
+              _context30.prev = 12;
+              _context30.next = 15;
               return this.store.order.syncPaymentsToOrder(syncParams);
             case 15:
-              syncResult = _context26.sent;
+              syncResult = _context30.sent;
               latestPayments = this.store.order.getOrderPayments();
               amountSnapshot = this.store.order.getOrderAmountSnapshot();
               orderSnapshot = this.store.order.getOrderSnapshot();
@@ -2470,25 +2817,25 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 depositAmount: syncResult.depositAmount,
                 orderExpectedAmount: syncResult.orderExpectedAmount
               };
-              _context26.next = 22;
+              _context30.next = 22;
               return this.effectsEmit(BaseSalesHookNames.onPaymentSyncEnd, syncPayload);
             case 22:
               if (!(syncResult.isDepositFullyPaid && !syncResult.isOrderFullyPaid)) {
-                _context26.next = 25;
+                _context30.next = 25;
                 break;
               }
-              _context26.next = 25;
+              _context30.next = 25;
               return this.effectsEmit(BaseSalesHookNames.onDepositPaymentSyncEnd, syncPayload);
             case 25:
               this.scheduleQueuedAutoPaymentSyncFlush(0);
-              return _context26.abrupt("return", syncResult);
+              return _context30.abrupt("return", syncResult);
             case 29:
-              _context26.prev = 29;
-              _context26.t0 = _context26["catch"](12);
-              _context26.next = 33;
+              _context30.prev = 29;
+              _context30.t0 = _context30["catch"](12);
+              _context30.next = 33;
               return this.effectsEmit(BaseSalesHookNames.onPaymentSyncEnd, {
                 ok: false,
-                error: _context26.t0,
+                error: _context30.t0,
                 payments: this.store.order.getOrderPayments(),
                 params: syncParams,
                 amountSnapshot: this.store.order.getOrderAmountSnapshot(),
@@ -2496,14 +2843,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 33:
               this.scheduleQueuedAutoPaymentSyncFlush(0);
-              throw _context26.t0;
+              throw _context30.t0;
             case 35:
             case "end":
-              return _context26.stop();
+              return _context30.stop();
           }
-        }, _callee26, this, [[12, 29]]);
+        }, _callee30, this, [[12, 29]]);
       }));
-      function syncPaymentsToOrder(_x21) {
+      function syncPaymentsToOrder(_x24) {
         return _syncPaymentsToOrder.apply(this, arguments);
       }
       return syncPaymentsToOrder;
@@ -2540,58 +2887,58 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "scheduleQueuedAutoPaymentSyncFlush",
     value: function scheduleQueuedAutoPaymentSyncFlush() {
-      var _this10 = this;
+      var _this11 = this;
       var delay = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 100;
       if (!this.queuedAutoPaymentSync) return;
       if (this.autoPaymentSyncTimer) return;
       this.autoPaymentSyncTimer = setTimeout(function () {
-        _this10.autoPaymentSyncTimer = null;
-        void _this10.flushQueuedAutoPaymentSync();
+        _this11.autoPaymentSyncTimer = null;
+        void _this11.flushQueuedAutoPaymentSync();
       }, delay);
     }
   }, {
     key: "flushQueuedAutoPaymentSync",
     value: function () {
-      var _flushQueuedAutoPaymentSync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27() {
+      var _flushQueuedAutoPaymentSync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31() {
         var payments;
-        return _regeneratorRuntime().wrap(function _callee27$(_context27) {
-          while (1) switch (_context27.prev = _context27.next) {
+        return _regeneratorRuntime().wrap(function _callee31$(_context31) {
+          while (1) switch (_context31.prev = _context31.next) {
             case 0:
               if (this.store.order) {
-                _context27.next = 2;
+                _context31.next = 2;
                 break;
               }
-              return _context27.abrupt("return");
+              return _context31.abrupt("return");
             case 2:
               if (!(!this.queuedAutoPaymentSync || this.autoPaymentSyncFlushing)) {
-                _context27.next = 4;
+                _context31.next = 4;
                 break;
               }
-              return _context27.abrupt("return");
+              return _context31.abrupt("return");
             case 4:
               if (!(this.store.order.getOrderSyncState() === 'submitting')) {
-                _context27.next = 7;
+                _context31.next = 7;
                 break;
               }
               this.scheduleQueuedAutoPaymentSyncFlush();
-              return _context27.abrupt("return");
+              return _context31.abrupt("return");
             case 7:
               this.autoPaymentSyncFlushing = true;
-              _context27.prev = 8;
+              _context31.prev = 8;
             case 9:
               if (!this.queuedAutoPaymentSync) {
-                _context27.next = 18;
+                _context31.next = 18;
                 break;
               }
               this.queuedAutoPaymentSync = false;
               payments = this.store.order.getOrderPayments();
               if (payments.length) {
-                _context27.next = 14;
+                _context31.next = 14;
                 break;
               }
-              return _context27.abrupt("continue", 9);
+              return _context31.abrupt("continue", 9);
             case 14:
-              _context27.next = 16;
+              _context31.next = 16;
               return this.syncPaymentsToOrder({
                 payments: payments,
                 paymentStatus: this.getPaymentStatusForSync(payments),
@@ -2599,29 +2946,29 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 smallTicketDataFlag: 1
               });
             case 16:
-              _context27.next = 9;
+              _context31.next = 9;
               break;
             case 18:
-              _context27.next = 23;
+              _context31.next = 23;
               break;
             case 20:
-              _context27.prev = 20;
-              _context27.t0 = _context27["catch"](8);
+              _context31.prev = 20;
+              _context31.t0 = _context31["catch"](8);
               this.logError('queued auto sync payments failed', {
-                error: _context27.t0 instanceof Error ? _context27.t0.message : String(_context27.t0)
+                error: _context31.t0 instanceof Error ? _context31.t0.message : String(_context31.t0)
               });
             case 23:
-              _context27.prev = 23;
+              _context31.prev = 23;
               this.autoPaymentSyncFlushing = false;
               if (this.queuedAutoPaymentSync) {
                 this.scheduleQueuedAutoPaymentSyncFlush(0);
               }
-              return _context27.finish(23);
+              return _context31.finish(23);
             case 27:
             case "end":
-              return _context27.stop();
+              return _context31.stop();
           }
-        }, _callee27, this, [[8, 20, 23, 27]]);
+        }, _callee31, this, [[8, 20, 23, 27]]);
       }));
       function flushQueuedAutoPaymentSync() {
         return _flushQueuedAutoPaymentSync.apply(this, arguments);
@@ -2634,9 +2981,9 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _this$otherParams20,
         _paymentRecord$paymen,
         _paymentRecord$create,
-        _ref21,
+        _ref23,
         _paymentRecord$origin,
-        _this11 = this;
+        _this12 = this;
       if (!this.store.order) throw new Error('order 模块未初始化');
       var paymentRecord = payment;
       var paymentAmount = new Decimal(paymentRecord.amount || 0);
@@ -2658,7 +3005,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       var paymentTime = (_paymentRecord$paymen = paymentRecord.payment_time) !== null && _paymentRecord$paymen !== void 0 ? _paymentRecord$paymen : paymentTimestamp;
       var createdAt = (_paymentRecord$create = paymentRecord.created_at) !== null && _paymentRecord$create !== void 0 ? _paymentRecord$create : paymentTimestamp;
       var serviceCharge = paymentRecord.service_charge && _typeof(paymentRecord.service_charge) === 'object' ? paymentRecord.service_charge : null;
-      var calculatedServiceFee = serviceCharge ? new Decimal((_ref21 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref21 !== void 0 ? _ref21 : 0).times(serviceCharge.percentage || 0).plus(serviceCharge.amount || 0).toDecimalPlaces(2).toFixed(2) : undefined;
+      var calculatedServiceFee = serviceCharge ? new Decimal((_ref23 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref23 !== void 0 ? _ref23 : 0).times(serviceCharge.percentage || 0).plus(serviceCharge.amount || 0).toDecimalPlaces(2).toFixed(2) : undefined;
       var payments = this.store.order.addOrderPayment(_objectSpread(_objectSpread(_objectSpread({}, paymentRecord), calculatedServiceFee !== undefined ? {
         service_fee: calculatedServiceFee
       } : {}), {}, {
@@ -2679,7 +3026,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           submitWhenPaid: true,
           smallTicketDataFlag: 1
         }).catch(function (error) {
-          _this11.logError('auto sync payments failed', {
+          _this12.logError('auto sync payments failed', {
             error: error instanceof Error ? error.message : String(error)
           });
         });
@@ -2725,8 +3072,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getWalletProductList",
     value: function getWalletProductList() {
-      var _this$store$order6, _tempOrder$products;
-      var tempOrder = (_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 ? void 0 : _this$store$order6.getTempOrder();
+      var _this$store$order7, _tempOrder$products;
+      var tempOrder = (_this$store$order7 = this.store.order) === null || _this$store$order7 === void 0 ? void 0 : _this$store$order7.getTempOrder();
       if (!(tempOrder !== null && tempOrder !== void 0 && (_tempOrder$products = tempOrder.products) !== null && _tempOrder$products !== void 0 && _tempOrder$products.length)) return [];
       // 过滤出有 product_id的商品来，如果没有代表他是自定义商品，不需要参与 wallet
       // debugger
@@ -2786,20 +3133,20 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "initWalletData",
     value: function () {
-      var _initWalletData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(params) {
-        var _params$order_wait_pa, _ref22, _tempOrder$is_price_i;
+      var _initWalletData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(params) {
+        var _params$order_wait_pa, _ref24, _tempOrder$is_price_i;
         var snapshot, tempOrder, amount, walletBusinessData, result;
-        return _regeneratorRuntime().wrap(function _callee28$(_context28) {
-          while (1) switch (_context28.prev = _context28.next) {
+        return _regeneratorRuntime().wrap(function _callee32$(_context32) {
+          while (1) switch (_context32.prev = _context32.next) {
             case 0:
               if (this.store.order) {
-                _context28.next = 2;
+                _context32.next = 2;
                 break;
               }
               throw new Error('order 模块未初始化');
             case 2:
               if (this.store.payment) {
-                _context28.next = 4;
+                _context32.next = 4;
                 break;
               }
               throw new Error('payment 模块未初始化');
@@ -2808,10 +3155,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               tempOrder = snapshot === null || snapshot === void 0 ? void 0 : snapshot.tempOrder;
               amount = snapshot === null || snapshot === void 0 ? void 0 : snapshot.amount;
               if (!(!tempOrder || !amount)) {
-                _context28.next = 9;
+                _context32.next = 9;
                 break;
               }
-              return _context28.abrupt("return", {
+              return _context32.abrupt("return", {
                 walletRecommendList: [],
                 userIdentificationCodes: [],
                 transformList: [],
@@ -2830,15 +3177,15 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 },
                 products: this.getWalletProductList(),
                 order_wait_pay_amount: (_params$order_wait_pa = params === null || params === void 0 ? void 0 : params.order_wait_pay_amount) !== null && _params$order_wait_pa !== void 0 ? _params$order_wait_pa : Number(amount.amountGap || 0),
-                is_price_include_tax: (_ref22 = (_tempOrder$is_price_i = tempOrder.is_price_include_tax) !== null && _tempOrder$is_price_i !== void 0 ? _tempOrder$is_price_i : this.otherParams.is_price_include_tax) !== null && _ref22 !== void 0 ? _ref22 : 1
+                is_price_include_tax: (_ref24 = (_tempOrder$is_price_i = tempOrder.is_price_include_tax) !== null && _tempOrder$is_price_i !== void 0 ? _tempOrder$is_price_i : this.otherParams.is_price_include_tax) !== null && _ref24 !== void 0 ? _ref24 : 1
               }, snapshot.identity.orderId ? {
                 payment_order_id: String(snapshot.identity.orderId)
               } : {});
-              _context28.next = 12;
+              _context32.next = 12;
               return this.store.payment.wallet.initializeWalletDataFromBusinessAsync(walletBusinessData);
             case 12:
-              result = _context28.sent;
-              _context28.next = 15;
+              result = _context32.sent;
+              _context32.next = 15;
               return this.core.effects.emit("".concat(this.name, ":onWalletDataInitialized"), {
                 orderId: snapshot.identity.orderId,
                 customerId: walletBusinessData.customer_id,
@@ -2850,14 +3197,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 timestamp: Date.now()
               });
             case 15:
-              return _context28.abrupt("return", result);
+              return _context32.abrupt("return", result);
             case 16:
             case "end":
-              return _context28.stop();
+              return _context32.stop();
           }
-        }, _callee28, this);
+        }, _callee32, this);
       }));
-      function initWalletData(_x22) {
+      function initWalletData(_x25) {
         return _initWalletData.apply(this, arguments);
       }
       return initWalletData;
@@ -2884,35 +3231,35 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getPaymentMethodsAsync",
     value: (function () {
-      var _getPaymentMethodsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
+      var _getPaymentMethodsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33() {
         var response, paymentMethods;
-        return _regeneratorRuntime().wrap(function _callee29$(_context29) {
-          while (1) switch (_context29.prev = _context29.next) {
+        return _regeneratorRuntime().wrap(function _callee33$(_context33) {
+          while (1) switch (_context33.prev = _context33.next) {
             case 0:
-              _context29.prev = 0;
-              _context29.next = 3;
+              _context33.prev = 0;
+              _context33.next = 3;
               return this.request.get('/pay/custom-payment/all', {
                 filterPaymentMethods: true
               }, {
                 osServer: true
               });
             case 3:
-              response = _context29.sent;
+              response = _context33.sent;
               paymentMethods = (response === null || response === void 0 ? void 0 : response.data) || [];
               this.paymentMethodsCache = Array.isArray(paymentMethods) ? _toConsumableArray(paymentMethods) : [];
-              return _context29.abrupt("return", this.getPaymentMethods());
+              return _context33.abrupt("return", this.getPaymentMethods());
             case 9:
-              _context29.prev = 9;
-              _context29.t0 = _context29["catch"](0);
+              _context33.prev = 9;
+              _context33.t0 = _context33["catch"](0);
               this.logWarning('getPaymentMethodsAsync: 获取支付方式列表失败，使用缓存列表', {
-                error: _context29.t0 instanceof Error ? _context29.t0.message : String(_context29.t0)
+                error: _context33.t0 instanceof Error ? _context33.t0.message : String(_context33.t0)
               });
-              return _context29.abrupt("return", this.getPaymentMethods());
+              return _context33.abrupt("return", this.getPaymentMethods());
             case 13:
             case "end":
-              return _context29.stop();
+              return _context33.stop();
           }
-        }, _callee29, this, [[0, 9]]);
+        }, _callee33, this, [[0, 9]]);
       }));
       function getPaymentMethodsAsync() {
         return _getPaymentMethodsAsync.apply(this, arguments);
@@ -2960,49 +3307,49 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sendCustomerPayLink",
     value: (function () {
-      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(params) {
-        var orderIds, _ref23, _ref24, _submitResult$data$or, _submitResult$data, _submitResult$data2, submitResult, orderId;
-        return _regeneratorRuntime().wrap(function _callee30$(_context30) {
-          while (1) switch (_context30.prev = _context30.next) {
+      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(params) {
+        var orderIds, _ref25, _ref26, _submitResult$data$or, _submitResult$data, _submitResult$data2, submitResult, orderId;
+        return _regeneratorRuntime().wrap(function _callee34$(_context34) {
+          while (1) switch (_context34.prev = _context34.next) {
             case 0:
               if (this.store.order) {
-                _context30.next = 2;
+                _context34.next = 2;
                 break;
               }
               throw new Error('order 模块未初始化');
             case 2:
               orderIds = params.order_ids || params.orderIds || [];
               if (!(!orderIds.length || params.submitBeforeSend)) {
-                _context30.next = 11;
+                _context34.next = 11;
                 break;
               }
-              _context30.next = 6;
+              _context34.next = 6;
               return this.submitSalesOrder({
                 smallTicketDataFlag: 1
               });
             case 6:
-              submitResult = _context30.sent;
-              orderId = (_ref23 = (_ref24 = (_submitResult$data$or = submitResult === null || submitResult === void 0 || (_submitResult$data = submitResult.data) === null || _submitResult$data === void 0 ? void 0 : _submitResult$data.order_id) !== null && _submitResult$data$or !== void 0 ? _submitResult$data$or : submitResult === null || submitResult === void 0 ? void 0 : submitResult.order_id) !== null && _ref24 !== void 0 ? _ref24 : submitResult === null || submitResult === void 0 || (_submitResult$data2 = submitResult.data) === null || _submitResult$data2 === void 0 ? void 0 : _submitResult$data2.id) !== null && _ref23 !== void 0 ? _ref23 : submitResult === null || submitResult === void 0 ? void 0 : submitResult.id;
+              submitResult = _context34.sent;
+              orderId = (_ref25 = (_ref26 = (_submitResult$data$or = submitResult === null || submitResult === void 0 || (_submitResult$data = submitResult.data) === null || _submitResult$data === void 0 ? void 0 : _submitResult$data.order_id) !== null && _submitResult$data$or !== void 0 ? _submitResult$data$or : submitResult === null || submitResult === void 0 ? void 0 : submitResult.order_id) !== null && _ref26 !== void 0 ? _ref26 : submitResult === null || submitResult === void 0 || (_submitResult$data2 = submitResult.data) === null || _submitResult$data2 === void 0 ? void 0 : _submitResult$data2.id) !== null && _ref25 !== void 0 ? _ref25 : submitResult === null || submitResult === void 0 ? void 0 : submitResult.id;
               if (orderId) {
-                _context30.next = 10;
+                _context34.next = 10;
                 break;
               }
               throw new Error('本地订单提交云端失败，无法发送支付链接');
             case 10:
               orderIds = [orderId];
             case 11:
-              return _context30.abrupt("return", this.store.order.sendCustomerPayLink({
+              return _context34.abrupt("return", this.store.order.sendCustomerPayLink({
                 emails: params.emails,
                 notify_action: params.notify_action,
                 order_ids: orderIds
               }));
             case 12:
             case "end":
-              return _context30.stop();
+              return _context34.stop();
           }
-        }, _callee30, this);
+        }, _callee34, this);
       }));
-      function sendCustomerPayLink(_x23) {
+      function sendCustomerPayLink(_x26) {
         return _sendCustomerPayLink.apply(this, arguments);
       }
       return sendCustomerPayLink;
@@ -3015,27 +3362,27 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculateProductBookingPrice",
     value: function () {
-      var _calculateProductBookingPrice = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(params) {
+      var _calculateProductBookingPrice = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35(params) {
         var _params$customer_id;
         var quotation, customerId, authoritativeProduct, product;
-        return _regeneratorRuntime().wrap(function _callee31$(_context31) {
-          while (1) switch (_context31.prev = _context31.next) {
+        return _regeneratorRuntime().wrap(function _callee35$(_context35) {
+          while (1) switch (_context35.prev = _context35.next) {
             case 0:
               quotation = this.store.quotation;
               customerId = (_params$customer_id = params.customer_id) !== null && _params$customer_id !== void 0 ? _params$customer_id : this.getCurrentOrderCustomerId();
-              _context31.next = 4;
+              _context35.next = 4;
               return this.loadProductForPriceQuery(params, customerId);
             case 4:
-              authoritativeProduct = _context31.sent;
+              authoritativeProduct = _context35.sent;
               product = this.mergeProductForPriceQuery(params.product, authoritativeProduct);
-              _context31.next = 8;
+              _context35.next = 8;
               return this.loadQuotationForPriceQuery({
                 quotation: quotation,
                 customer_id: customerId,
                 channel: params.channel
               });
             case 8:
-              return _context31.abrupt("return", calculateBaseSalesProductBookingPrice(_objectSpread(_objectSpread({}, params), {}, {
+              return _context35.abrupt("return", calculateBaseSalesProductBookingPrice(_objectSpread(_objectSpread({}, params), {}, {
                 product: product,
                 fallback_price: authoritativeProduct ? undefined : params.fallback_price,
                 customer_id: customerId,
@@ -3043,11 +3390,11 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               })));
             case 9:
             case "end":
-              return _context31.stop();
+              return _context35.stop();
           }
-        }, _callee31, this);
+        }, _callee35, this);
       }));
-      function calculateProductBookingPrice(_x24) {
+      function calculateProductBookingPrice(_x27) {
         return _calculateProductBookingPrice.apply(this, arguments);
       }
       return calculateProductBookingPrice;
@@ -3055,7 +3402,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getQuotationCustomerScopeInfo",
     value: function getQuotationCustomerScopeInfo() {
-      var _this12 = this;
+      var _this13 = this;
       var quotation = this.store.quotation;
       if (quotation && typeof quotation.getQuotationCustomerScopeInfo === 'function') {
         return quotation.getQuotationCustomerScopeInfo();
@@ -3067,7 +3414,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       }).map(function (item) {
         var localSeen = new Set();
         var customers = item.customer.filter(function (customer) {
-          var customerId = _this12.normalizePriceContextCustomerId(customer === null || customer === void 0 ? void 0 : customer.id);
+          var customerId = _this13.normalizePriceContextCustomerId(customer === null || customer === void 0 ? void 0 : customer.id);
           if (!customerId || localSeen.has(customerId)) return false;
           localSeen.add(customerId);
           if (!customerById.has(customerId)) customerById.set(customerId, customer);
@@ -3117,32 +3464,32 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculateProductBookingPrices",
     value: function () {
-      var _calculateProductBookingPrices = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(paramsList) {
+      var _calculateProductBookingPrices = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(paramsList) {
         var _paramsList$0$custome,
           _paramsList$,
-          _this13 = this,
+          _this14 = this,
           _paramsList$2;
         var quotation, customerId, productMapsByGroup, groups;
-        return _regeneratorRuntime().wrap(function _callee33$(_context33) {
-          while (1) switch (_context33.prev = _context33.next) {
+        return _regeneratorRuntime().wrap(function _callee37$(_context37) {
+          while (1) switch (_context37.prev = _context37.next) {
             case 0:
               if (paramsList.length) {
-                _context33.next = 2;
+                _context37.next = 2;
                 break;
               }
-              return _context33.abrupt("return", []);
+              return _context37.abrupt("return", []);
             case 2:
               quotation = this.store.quotation;
               customerId = (_paramsList$0$custome = (_paramsList$ = paramsList[0]) === null || _paramsList$ === void 0 ? void 0 : _paramsList$.customer_id) !== null && _paramsList$0$custome !== void 0 ? _paramsList$0$custome : this.getCurrentOrderCustomerId();
               productMapsByGroup = new Map();
               groups = new Map();
               paramsList.forEach(function (params) {
-                var _this13$otherParams;
+                var _this14$otherParams;
                 var product = params.product || {};
-                var productId = _this13.getPriceQueryProductId(product);
+                var productId = _this14.getPriceQueryProductId(product);
                 if (productId === null) return;
-                var schedule = _this13.getPriceQuerySchedule(params);
-                var channel = params.channel || ((_this13$otherParams = _this13.otherParams) === null || _this13$otherParams === void 0 ? void 0 : _this13$otherParams.channel);
+                var schedule = _this14.getPriceQuerySchedule(params);
+                var channel = params.channel || ((_this14$otherParams = _this14.otherParams) === null || _this14$otherParams === void 0 ? void 0 : _this14$otherParams.channel);
                 var groupKey = [schedule.schedule_date, schedule.schedule_datetime, channel || ''].join('|');
                 var group = groups.get(groupKey) || {
                   ids: new Set(),
@@ -3152,51 +3499,51 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 group.ids.add(productId);
                 groups.set(groupKey, group);
               });
-              _context33.next = 9;
+              _context37.next = 9;
               return Promise.all(Array.from(groups.entries()).map( /*#__PURE__*/function () {
-                var _ref26 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(_ref25) {
-                  var _ref27, groupKey, group, productsById;
-                  return _regeneratorRuntime().wrap(function _callee32$(_context32) {
-                    while (1) switch (_context32.prev = _context32.next) {
+                var _ref28 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(_ref27) {
+                  var _ref29, groupKey, group, productsById;
+                  return _regeneratorRuntime().wrap(function _callee36$(_context36) {
+                    while (1) switch (_context36.prev = _context36.next) {
                       case 0:
-                        _ref27 = _slicedToArray(_ref25, 2), groupKey = _ref27[0], group = _ref27[1];
-                        _context32.next = 3;
-                        return _this13.loadProductsForPriceQuery({
+                        _ref29 = _slicedToArray(_ref27, 2), groupKey = _ref29[0], group = _ref29[1];
+                        _context36.next = 3;
+                        return _this14.loadProductsForPriceQuery({
                           ids: Array.from(group.ids),
                           schedule: group.schedule,
                           customerId: customerId,
                           channel: group.channel
                         });
                       case 3:
-                        productsById = _context32.sent;
+                        productsById = _context36.sent;
                         productMapsByGroup.set(groupKey, productsById);
                       case 5:
                       case "end":
-                        return _context32.stop();
+                        return _context36.stop();
                     }
-                  }, _callee32);
+                  }, _callee36);
                 }));
-                return function (_x26) {
-                  return _ref26.apply(this, arguments);
+                return function (_x29) {
+                  return _ref28.apply(this, arguments);
                 };
               }()));
             case 9:
-              _context33.next = 11;
+              _context37.next = 11;
               return this.loadQuotationForPriceQuery({
                 quotation: quotation,
                 customer_id: customerId,
                 channel: (_paramsList$2 = paramsList[0]) === null || _paramsList$2 === void 0 ? void 0 : _paramsList$2.channel
               });
             case 11:
-              return _context33.abrupt("return", paramsList.map(function (params) {
-                var _this13$otherParams2, _productMapsByGroup$g;
+              return _context37.abrupt("return", paramsList.map(function (params) {
+                var _this14$otherParams2, _productMapsByGroup$g;
                 var productInput = params.product || {};
-                var productId = _this13.getPriceQueryProductId(productInput);
-                var schedule = _this13.getPriceQuerySchedule(params);
-                var channel = params.channel || ((_this13$otherParams2 = _this13.otherParams) === null || _this13$otherParams2 === void 0 ? void 0 : _this13$otherParams2.channel);
+                var productId = _this14.getPriceQueryProductId(productInput);
+                var schedule = _this14.getPriceQuerySchedule(params);
+                var channel = params.channel || ((_this14$otherParams2 = _this14.otherParams) === null || _this14$otherParams2 === void 0 ? void 0 : _this14$otherParams2.channel);
                 var groupKey = [schedule.schedule_date, schedule.schedule_datetime, channel || ''].join('|');
                 var authoritativeProduct = productId === null ? null : ((_productMapsByGroup$g = productMapsByGroup.get(groupKey)) === null || _productMapsByGroup$g === void 0 ? void 0 : _productMapsByGroup$g.get(productId)) || null;
-                var product = _this13.mergeProductForPriceQuery(productInput, authoritativeProduct);
+                var product = _this14.mergeProductForPriceQuery(productInput, authoritativeProduct);
                 return calculateBaseSalesProductBookingPrice(_objectSpread(_objectSpread({}, params), {}, {
                   product: product,
                   fallback_price: authoritativeProduct ? undefined : params.fallback_price,
@@ -3206,11 +3553,11 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               }));
             case 12:
             case "end":
-              return _context33.stop();
+              return _context37.stop();
           }
-        }, _callee33, this);
+        }, _callee37, this);
       }));
-      function calculateProductBookingPrices(_x25) {
+      function calculateProductBookingPrices(_x28) {
         return _calculateProductBookingPrices.apply(this, arguments);
       }
       return calculateProductBookingPrices;
@@ -3218,34 +3565,34 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProductToOrder",
     value: function () {
-      var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(product, booking) {
+      var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(product, booking) {
         var products;
-        return _regeneratorRuntime().wrap(function _callee34$(_context34) {
-          while (1) switch (_context34.prev = _context34.next) {
+        return _regeneratorRuntime().wrap(function _callee38$(_context38) {
+          while (1) switch (_context38.prev = _context38.next) {
             case 0:
-              _context34.prev = 0;
+              _context38.prev = 0;
               if (this.store.order) {
-                _context34.next = 3;
+                _context38.next = 3;
                 break;
               }
               throw new Error('order 模块未初始化');
             case 3:
-              _context34.next = 5;
+              _context38.next = 5;
               return this.store.order.addProductToOrder(product, booking);
             case 5:
-              products = _context34.sent;
-              return _context34.abrupt("return", products);
+              products = _context38.sent;
+              return _context38.abrupt("return", products);
             case 9:
-              _context34.prev = 9;
-              _context34.t0 = _context34["catch"](0);
-              throw _context34.t0;
+              _context38.prev = 9;
+              _context38.t0 = _context38["catch"](0);
+              throw _context38.t0;
             case 12:
             case "end":
-              return _context34.stop();
+              return _context38.stop();
           }
-        }, _callee34, this, [[0, 9]]);
+        }, _callee38, this, [[0, 9]]);
       }));
-      function addProductToOrder(_x27, _x28) {
+      function addProductToOrder(_x30, _x31) {
         return _addProductToOrder.apply(this, arguments);
       }
       return addProductToOrder;
@@ -3253,34 +3600,34 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProduct",
     value: function () {
-      var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35(params) {
+      var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(params) {
         var products;
-        return _regeneratorRuntime().wrap(function _callee35$(_context35) {
-          while (1) switch (_context35.prev = _context35.next) {
+        return _regeneratorRuntime().wrap(function _callee39$(_context39) {
+          while (1) switch (_context39.prev = _context39.next) {
             case 0:
-              _context35.prev = 0;
+              _context39.prev = 0;
               if (this.store.order) {
-                _context35.next = 3;
+                _context39.next = 3;
                 break;
               }
               throw new Error('order 模块未初始化');
             case 3:
-              _context35.next = 5;
+              _context39.next = 5;
               return this.store.order.updateOrderProduct(params);
             case 5:
-              products = _context35.sent;
-              return _context35.abrupt("return", products);
+              products = _context39.sent;
+              return _context39.abrupt("return", products);
             case 9:
-              _context35.prev = 9;
-              _context35.t0 = _context35["catch"](0);
-              throw _context35.t0;
+              _context39.prev = 9;
+              _context39.t0 = _context39["catch"](0);
+              throw _context39.t0;
             case 12:
             case "end":
-              return _context35.stop();
+              return _context39.stop();
           }
-        }, _callee35, this, [[0, 9]]);
+        }, _callee39, this, [[0, 9]]);
       }));
-      function updateOrderProduct(_x29) {
+      function updateOrderProduct(_x32) {
         return _updateOrderProduct.apply(this, arguments);
       }
       return updateOrderProduct;
@@ -3288,34 +3635,34 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProducts",
     value: function () {
-      var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(paramsList) {
+      var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(paramsList) {
         var products;
-        return _regeneratorRuntime().wrap(function _callee36$(_context36) {
-          while (1) switch (_context36.prev = _context36.next) {
+        return _regeneratorRuntime().wrap(function _callee40$(_context40) {
+          while (1) switch (_context40.prev = _context40.next) {
             case 0:
-              _context36.prev = 0;
+              _context40.prev = 0;
               if (this.store.order) {
-                _context36.next = 3;
+                _context40.next = 3;
                 break;
               }
               throw new Error('order 模块未初始化');
             case 3:
-              _context36.next = 5;
+              _context40.next = 5;
               return this.store.order.updateOrderProducts(paramsList);
             case 5:
-              products = _context36.sent;
-              return _context36.abrupt("return", products);
+              products = _context40.sent;
+              return _context40.abrupt("return", products);
             case 9:
-              _context36.prev = 9;
-              _context36.t0 = _context36["catch"](0);
-              throw _context36.t0;
+              _context40.prev = 9;
+              _context40.t0 = _context40["catch"](0);
+              throw _context40.t0;
             case 12:
             case "end":
-              return _context36.stop();
+              return _context40.stop();
           }
-        }, _callee36, this, [[0, 9]]);
+        }, _callee40, this, [[0, 9]]);
       }));
-      function updateOrderProducts(_x30) {
+      function updateOrderProducts(_x33) {
         return _updateOrderProducts.apply(this, arguments);
       }
       return updateOrderProducts;
@@ -3323,34 +3670,34 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProductQuantity",
     value: function () {
-      var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(params) {
+      var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41(params) {
         var products;
-        return _regeneratorRuntime().wrap(function _callee37$(_context37) {
-          while (1) switch (_context37.prev = _context37.next) {
+        return _regeneratorRuntime().wrap(function _callee41$(_context41) {
+          while (1) switch (_context41.prev = _context41.next) {
             case 0:
-              _context37.prev = 0;
+              _context41.prev = 0;
               if (this.store.order) {
-                _context37.next = 3;
+                _context41.next = 3;
                 break;
               }
               throw new Error('order 模块未初始化');
             case 3:
-              _context37.next = 5;
+              _context41.next = 5;
               return this.store.order.updateOrderProductQuantity(params);
             case 5:
-              products = _context37.sent;
-              return _context37.abrupt("return", products);
+              products = _context41.sent;
+              return _context41.abrupt("return", products);
             case 9:
-              _context37.prev = 9;
-              _context37.t0 = _context37["catch"](0);
-              throw _context37.t0;
+              _context41.prev = 9;
+              _context41.t0 = _context41["catch"](0);
+              throw _context41.t0;
             case 12:
             case "end":
-              return _context37.stop();
+              return _context41.stop();
           }
-        }, _callee37, this, [[0, 9]]);
+        }, _callee41, this, [[0, 9]]);
       }));
-      function updateOrderProductQuantity(_x31) {
+      function updateOrderProductQuantity(_x34) {
         return _updateOrderProductQuantity.apply(this, arguments);
       }
       return updateOrderProductQuantity;
@@ -3373,12 +3720,12 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setOrderProductLineNote",
     value: (function () {
-      var _setOrderProductLineNote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(identity, note) {
+      var _setOrderProductLineNote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee42(identity, note) {
         var params, products;
-        return _regeneratorRuntime().wrap(function _callee38$(_context38) {
-          while (1) switch (_context38.prev = _context38.next) {
+        return _regeneratorRuntime().wrap(function _callee42$(_context42) {
+          while (1) switch (_context42.prev = _context42.next) {
             case 0:
-              _context38.prev = 0;
+              _context42.prev = 0;
               params = {
                 product_id: identity.product_id,
                 product_variant_id: identity.product_variant_id,
@@ -3393,22 +3740,22 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 params.product_sku = identity.product_sku;
               }
               if (identity.product_bundle !== undefined) params.product_bundle = identity.product_bundle;
-              _context38.next = 7;
+              _context42.next = 7;
               return this.updateOrderProduct(params);
             case 7:
-              products = _context38.sent;
-              return _context38.abrupt("return", products);
+              products = _context42.sent;
+              return _context42.abrupt("return", products);
             case 11:
-              _context38.prev = 11;
-              _context38.t0 = _context38["catch"](0);
-              throw _context38.t0;
+              _context42.prev = 11;
+              _context42.t0 = _context42["catch"](0);
+              throw _context42.t0;
             case 14:
             case "end":
-              return _context38.stop();
+              return _context42.stop();
           }
-        }, _callee38, this, [[0, 11]]);
+        }, _callee42, this, [[0, 11]]);
       }));
-      function setOrderProductLineNote(_x32, _x33) {
+      function setOrderProductLineNote(_x35, _x36) {
         return _setOrderProductLineNote.apply(this, arguments);
       }
       return setOrderProductLineNote;
@@ -3423,32 +3770,32 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeProductsFromOrder",
     value: (function () {
-      var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(identities) {
-        return _regeneratorRuntime().wrap(function _callee39$(_context39) {
-          while (1) switch (_context39.prev = _context39.next) {
+      var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43(identities) {
+        return _regeneratorRuntime().wrap(function _callee43$(_context43) {
+          while (1) switch (_context43.prev = _context43.next) {
             case 0:
-              _context39.prev = 0;
+              _context43.prev = 0;
               if (this.store.order) {
-                _context39.next = 3;
+                _context43.next = 3;
                 break;
               }
               throw new Error('order 模块未初始化');
             case 3:
-              _context39.next = 5;
+              _context43.next = 5;
               return this.store.order.removeProductsFromOrder(identities);
             case 5:
-              return _context39.abrupt("return", _context39.sent);
+              return _context43.abrupt("return", _context43.sent);
             case 8:
-              _context39.prev = 8;
-              _context39.t0 = _context39["catch"](0);
-              throw _context39.t0;
+              _context43.prev = 8;
+              _context43.t0 = _context43["catch"](0);
+              throw _context43.t0;
             case 11:
             case "end":
-              return _context39.stop();
+              return _context43.stop();
           }
-        }, _callee39, this, [[0, 8]]);
+        }, _callee43, this, [[0, 8]]);
       }));
-      function removeProductsFromOrder(_x34) {
+      function removeProductsFromOrder(_x37) {
         return _removeProductsFromOrder.apply(this, arguments);
       }
       return removeProductsFromOrder;
@@ -3456,18 +3803,18 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeProductFromOrder",
     value: function () {
-      var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(identity) {
-        return _regeneratorRuntime().wrap(function _callee40$(_context40) {
-          while (1) switch (_context40.prev = _context40.next) {
+      var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee44(identity) {
+        return _regeneratorRuntime().wrap(function _callee44$(_context44) {
+          while (1) switch (_context44.prev = _context44.next) {
             case 0:
-              return _context40.abrupt("return", this.removeProductsFromOrder([identity]));
+              return _context44.abrupt("return", this.removeProductsFromOrder([identity]));
             case 1:
             case "end":
-              return _context40.stop();
+              return _context44.stop();
           }
-        }, _callee40, this);
+        }, _callee44, this);
       }));
-      function removeProductFromOrder(_x35) {
+      function removeProductFromOrder(_x38) {
         return _removeProductFromOrder.apply(this, arguments);
       }
       return removeProductFromOrder;
@@ -3517,23 +3864,23 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyPromotion",
     value: (function () {
-      var _applyPromotion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41() {
-        return _regeneratorRuntime().wrap(function _callee41$(_context41) {
-          while (1) switch (_context41.prev = _context41.next) {
+      var _applyPromotion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee45() {
+        return _regeneratorRuntime().wrap(function _callee45$(_context45) {
+          while (1) switch (_context45.prev = _context45.next) {
             case 0:
               if (this.store.order) {
-                _context41.next = 2;
+                _context45.next = 2;
                 break;
               }
               throw new Error('order 模块未初始化');
             case 2:
-              _context41.next = 4;
+              _context45.next = 4;
               return this.store.order.applyPromotion();
             case 4:
             case "end":
-              return _context41.stop();
+              return _context45.stop();
           }
-        }, _callee41, this);
+        }, _callee45, this);
       }));
       function applyPromotion() {
         return _applyPromotion.apply(this, arguments);
@@ -3543,16 +3890,16 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getUnfulfilledPromotions",
     value: function getUnfulfilledPromotions() {
-      var _this$store$order7;
-      return ((_this$store$order7 = this.store.order) === null || _this$store$order7 === void 0 ? void 0 : _this$store$order7.getUnfulfilledPromotions()) || [];
+      var _this$store$order8;
+      return ((_this$store$order8 = this.store.order) === null || _this$store$order8 === void 0 ? void 0 : _this$store$order8.getUnfulfilledPromotions()) || [];
     }
 
     /** 最近一次促销计算输出的赠品操作 diff。 */
   }, {
     key: "getLastGiftActions",
     value: function getLastGiftActions() {
-      var _this$store$order8;
-      return ((_this$store$order8 = this.store.order) === null || _this$store$order8 === void 0 ? void 0 : _this$store$order8.getLastGiftActions()) || null;
+      var _this$store$order9;
+      return ((_this$store$order9 = this.store.order) === null || _this$store$order9 === void 0 ? void 0 : _this$store$order9.getLastGiftActions()) || null;
     }
 
     // 获取商品列表
@@ -3560,18 +3907,18 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProductList",
     value: function () {
-      var _getProductList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee42() {
+      var _getProductList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee46() {
         var _this$otherParams21;
         var menu_list_ids, _this$store$products, res;
-        return _regeneratorRuntime().wrap(function _callee42$(_context42) {
-          while (1) switch (_context42.prev = _context42.next) {
+        return _regeneratorRuntime().wrap(function _callee46$(_context46) {
+          while (1) switch (_context46.prev = _context46.next) {
             case 0:
               // 可以直接通过配置里的 menu 读取
               menu_list_ids = ((_this$otherParams21 = this.otherParams) === null || _this$otherParams21 === void 0 || (_this$otherParams21 = _this$otherParams21.dineInConfig) === null || _this$otherParams21 === void 0 ? void 0 : _this$otherParams21['menu.associated_menus'].map(function (n) {
                 return Number(n.value);
               })) || [];
-              _context42.prev = 1;
-              _context42.next = 4;
+              _context46.prev = 1;
+              _context46.next = 4;
               return (_this$store$products = this.store.products) === null || _this$store$products === void 0 ? void 0 : _this$store$products.loadProducts({
                 menu_list_ids: menu_list_ids,
                 cacheId: this.cacheId,
@@ -3579,17 +3926,17 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 schedule_datetime: dayjs().format('YYYY-MM-DD HH:mm:ss')
               });
             case 4:
-              res = _context42.sent;
-              return _context42.abrupt("return", res);
+              res = _context46.sent;
+              return _context46.abrupt("return", res);
             case 8:
-              _context42.prev = 8;
-              _context42.t0 = _context42["catch"](1);
-              throw _context42.t0;
+              _context46.prev = 8;
+              _context46.t0 = _context46["catch"](1);
+              throw _context46.t0;
             case 11:
             case "end":
-              return _context42.stop();
+              return _context46.stop();
           }
-        }, _callee42, this, [[1, 8]]);
+        }, _callee46, this, [[1, 8]]);
       }));
       function getProductList() {
         return _getProductList.apply(this, arguments);
@@ -3604,33 +3951,33 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setOtherParams",
     value: function () {
-      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43(params) {
+      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee47(params) {
         var _this$otherParams22;
-        var _ref28,
-          _ref28$cover,
+        var _ref30,
+          _ref30$cover,
           cover,
-          _args43 = arguments;
-        return _regeneratorRuntime().wrap(function _callee43$(_context43) {
-          while (1) switch (_context43.prev = _context43.next) {
+          _args47 = arguments;
+        return _regeneratorRuntime().wrap(function _callee47$(_context47) {
+          while (1) switch (_context47.prev = _context47.next) {
             case 0:
-              _ref28 = _args43.length > 1 && _args43[1] !== undefined ? _args43[1] : {}, _ref28$cover = _ref28.cover, cover = _ref28$cover === void 0 ? false : _ref28$cover;
+              _ref30 = _args47.length > 1 && _args47[1] !== undefined ? _args47[1] : {}, _ref30$cover = _ref30.cover, cover = _ref30$cover === void 0 ? false : _ref30$cover;
               if (cover) {
                 this.otherParams = _objectSpread({}, params);
               } else {
                 this.otherParams = _objectSpread(_objectSpread({}, this.otherParams), params);
               }
               this.cacheId = (_this$otherParams22 = this.otherParams) === null || _this$otherParams22 === void 0 ? void 0 : _this$otherParams22.cacheId;
-              _context43.next = 5;
+              _context47.next = 5;
               return this.syncOtherParamsToSubModules(params, {
                 cover: cover
               });
             case 5:
             case "end":
-              return _context43.stop();
+              return _context47.stop();
           }
-        }, _callee43, this);
+        }, _callee47, this);
       }));
-      function setOtherParams(_x36) {
+      function setOtherParams(_x39) {
         return _setOtherParams.apply(this, arguments);
       }
       return setOtherParams;