@pisell/pisellos 2.2.260 → 2.2.262

package/dist/modules/Order/index.js

@@ -3,13 +3,13 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 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 _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); }); }; }
 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 _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 _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); }); }; }
 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 _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; } } }; }
@@ -32,12 +32,14 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
 import { OrderHooks } from "./types";
-import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, mergeOrderProductDisplayFields } from "./utils";
+import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, mergeOrderProductDisplayFields, resolveIsFormSubject } from "./utils";
 import { isNormalProduct } from "../Product/utils";
 import dayjs from 'dayjs';
 import { processCartPromotion, appendPromotionTags as _appendPromotionTags, getOrderProductUid as getPromotionUid } from "../../solution/BaseSales/utils/cartPromotion";
 import { buildProductLineFingerprint, getProductIdentityIndex, getSafeProductNum, isIdentityMatch, normalizeOrderProduct } from "../../solution/ScanOrder/utils";
 import { syncManualProductDiscountProductNum } from "./utils/manualProductDiscount";
+import { expandHydratedProductsForDiscountCollection, restoreHydratedBundleDiscounts } from "./utils/bundleDiscountHydration";
+import { getOrderCollectionPersistentId, getOrderCollectionUid, normalizeOrderCollections, setOrderCollectionUid } from "./utils/orderCollectionIdentity";
 import { DiscountModule } from "../Discount";
 import { RulesModule } from "../Rules";
 import { UnavailableReason } from "../Rules/types";
@@ -64,6 +66,23 @@ function isManualProductDiscountProduct(product) {
     return (item === null || item === void 0 ? void 0 : item.type) === 'product';
   });
 }
+var ORDER_PAYMENT_STATUS_PAID = 'paid';
+var ORDER_PAYMENT_STATUS_PENDING = 'payment_pending';
+function isVoucherPaymentRecord(payment) {
+  return (payment === null || payment === void 0 ? void 0 : payment.voucher_id) !== undefined && Number(payment.voucher_id) !== 0;
+}
+function hasSyncedOrderPaymentRecord(payment) {
+  return (payment === null || payment === void 0 ? void 0 : payment.order_payment_id) !== undefined && payment.order_payment_id !== null;
+}
+function isPendingVoucherPaymentRecord(payment) {
+  return isVoucherPaymentRecord(payment) && (payment === null || payment === void 0 ? void 0 : payment.status) === ORDER_PAYMENT_STATUS_PENDING;
+}
+function isPaidPaymentRecord(payment) {
+  return (payment === null || payment === void 0 ? void 0 : payment.status) === ORDER_PAYMENT_STATUS_PAID;
+}
+function isCommittedVoucherPaymentRecord(payment) {
+  return isVoucherPaymentRecord(payment) && (payment === null || payment === void 0 ? void 0 : payment.status) !== 'voided' && (hasSyncedOrderPaymentRecord(payment) || isPaidPaymentRecord(payment));
+}
 export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(OrderModule, _BaseModule);
   var _super = _createSuper(OrderModule);
@@ -108,7 +127,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "collectHydratedEditDiscounts",
     value: function collectHydratedEditDiscounts(products) {
       var discountMap = new Map();
-      var _iterator = _createForOfIteratorHelper(products || []),
+      var _iterator = _createForOfIteratorHelper(expandHydratedProductsForDiscountCollection(products)),
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -138,6 +157,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 discount: item === null || item === void 0 ? void 0 : item.discount,
                 _num: Number((_ref6 = (_ref7 = (_item$metadata$num2 = item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.num) !== null && _item$metadata$num2 !== void 0 ? _item$metadata$num2 : product === null || product === void 0 ? void 0 : product.num) !== null && _ref7 !== void 0 ? _ref7 : product === null || product === void 0 ? void 0 : product.product_quantity) !== null && _ref6 !== void 0 ? _ref6 : 1) || 1
               };
+              var existed = discountMap.get(key);
+              if (existed) {
+                var _existed$limited_rela;
+                existed.amount = Number(existed.amount || 0) + amount;
+                existed.used_par_value = String(Number(existed.used_par_value || 0) + amount);
+                existed.balance = String(Number(existed.balance || 0) + amount);
+                var productIds = Array.isArray((_existed$limited_rela = existed.limited_relation_product_data) === null || _existed$limited_rela === void 0 ? void 0 : _existed$limited_rela.product_ids) ? existed.limited_relation_product_data.product_ids : [];
+                if ((product === null || product === void 0 ? void 0 : product.product_id) !== undefined && (product === null || product === void 0 ? void 0 : product.product_id) !== null && !productIds.includes(product.product_id)) {
+                  existed.limited_relation_product_data = _objectSpread(_objectSpread({}, existed.limited_relation_product_data || {}), {}, {
+                    product_ids: [].concat(_toConsumableArray(productIds), [product.product_id])
+                  });
+                }
+                existed.applicableProductDetails = [].concat(_toConsumableArray(existed.applicableProductDetails || []), [detail]);
+                existed.appliedProductDetails = [].concat(_toConsumableArray(existed.appliedProductDetails || []), [detail]);
+                continue;
+              }
               discountMap.set(key, {
                 id: key,
                 product_name: '',
@@ -224,6 +259,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           product.metadata.main_product_selling_price = newMainSellingPrice;
           product.metadata.price_schema_version = 2;
         }
+        if (Array.isArray(product.product_bundle)) {
+          product.product_bundle = product.product_bundle.map(function (bundle) {
+            var _ref12, _bundle$original_pric;
+            var hasBundleDiscount = Array.isArray(bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) && bundle.discount_list.length > 0;
+            if (hasBundleDiscount) return bundle;
+            var restoredPrice = (_ref12 = (_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 && _ref12 !== void 0 ? _ref12 : bundle === null || bundle === void 0 ? void 0 : bundle.price;
+            if (restoredPrice === undefined || restoredPrice === null || restoredPrice === '') return bundle;
+            return _objectSpread(_objectSpread({}, bundle), {}, {
+              price: restoredPrice,
+              bundle_selling_price: restoredPrice
+            });
+          });
+        }
         product.selling_price = composeLinePrice({
           mainPrice: newMainSellingPrice,
           bundle: product.product_bundle
@@ -248,14 +296,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!this.store.summary) {
                 this.store.summary = createEmptySummary();
               }
+              if (!Array.isArray(this.store.availableWalletIds)) {
+                this.store.availableWalletIds = [];
+              }
               this.request = this.core.getPlugin('request');
               appPlugin = this.core.getPlugin('app');
               if (appPlugin) {
-                _context.next = 8;
+                _context.next = 9;
                 break;
               }
               throw new Error('Order 模块需要 app 插件支持');
-            case 8:
+            case 9:
               app = appPlugin.getApp();
               this.logger = app.logger;
               this.window = this.core.getPlugin('window');
@@ -268,7 +319,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.otherParams = otherParams;
               this.registerDiscountModules(options);
               this.logInfo('OrderModule initialized successfully');
-            case 20:
+            case 21:
             case "end":
               return _context.stop();
           }
@@ -445,7 +496,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
         var _this$store$tempOrder, _this$store$discount, _this$store$tempOrder2;
-        var orderId, discountList, _this$store$discount2, _this$store$discount3, _this$store$discount4, currentEditDiscounts, runtimeDiscountIds, runtimeDiscounts, mergedDiscountList;
+        var orderId, prepareConfigResult, discountList, _this$store$discount2, _this$store$discount3, _this$store$discount4, currentDiscountList, currentEditDiscounts, currentScanDiscounts, currentScanDiscountIds, runtimeDiscountIds, runtimeDiscounts, mergedDiscountList;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -457,37 +508,49 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 with_good_pass: 1,
                 with_discount_card: 1,
                 with_wallet_pass_holder: 1,
+                with_available_wallet_flag: 1,
+                with_available_wallet_pass_flag: 1,
                 request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
               }, orderId ? {
                 order_id: orderId
               } : {}));
             case 3:
-              discountList = _context3.sent;
+              prepareConfigResult = _context3.sent;
+              discountList = prepareConfigResult === null || prepareConfigResult === void 0 ? void 0 : prepareConfigResult.discountList;
+              this.store.availableWalletIds = (prepareConfigResult === null || prepareConfigResult === void 0 ? void 0 : prepareConfigResult.availableWalletIds) || [];
               if (!discountList) {
-                _context3.next = 13;
+                _context3.next = 18;
                 break;
               }
-              currentEditDiscounts = (((_this$store$discount2 = this.store.discount) === null || _this$store$discount2 === void 0 ? void 0 : _this$store$discount2.getDiscountList()) || []).filter(function (discount) {
+              currentDiscountList = ((_this$store$discount2 = this.store.discount) === null || _this$store$discount2 === void 0 ? void 0 : _this$store$discount2.getDiscountList()) || [];
+              currentEditDiscounts = currentDiscountList.filter(function (discount) {
                 return discount === null || discount === void 0 ? void 0 : discount.isEditMode;
               });
+              currentScanDiscounts = currentDiscountList.filter(function (discount) {
+                return discount === null || discount === void 0 ? void 0 : discount.isScan;
+              });
+              currentScanDiscountIds = new Set(currentScanDiscounts.map(function (discount) {
+                return discount === null || discount === void 0 ? void 0 : discount.id;
+              }));
               runtimeDiscountIds = new Set();
               runtimeDiscounts = discountList.filter(function (discount) {
+                if (currentScanDiscountIds.has(discount === null || discount === void 0 ? void 0 : discount.id)) return false;
                 if (runtimeDiscountIds.has(discount === null || discount === void 0 ? void 0 : discount.id)) return false;
                 runtimeDiscountIds.add(discount === null || discount === void 0 ? void 0 : discount.id);
                 return true;
               });
-              mergedDiscountList = [].concat(_toConsumableArray(currentEditDiscounts), _toConsumableArray(runtimeDiscounts));
-              _context3.next = 11;
+              mergedDiscountList = [].concat(_toConsumableArray(currentEditDiscounts), _toConsumableArray(currentScanDiscounts), _toConsumableArray(runtimeDiscounts));
+              _context3.next = 16;
               return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.setOriginalDiscountList(mergedDiscountList);
-            case 11:
-              _context3.next = 13;
+            case 16:
+              _context3.next = 18;
               return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.setDiscountList(mergedDiscountList);
-            case 13:
+            case 18:
               if (params.apply !== false && (_this$store$tempOrder2 = this.store.tempOrder) !== null && _this$store$tempOrder2 !== void 0 && (_this$store$tempOrder2 = _this$store$tempOrder2.products) !== null && _this$store$tempOrder2 !== void 0 && _this$store$tempOrder2.length) {
                 this.applyDiscount();
               }
               return _context3.abrupt("return", this.getDiscountList());
-            case 15:
+            case 20:
             case "end":
               return _context3.stop();
           }
@@ -505,33 +568,76 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return ((_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 ? void 0 : _this$store$discount5.getDiscountList()) || [];
     }
   }, {
-    key: "ensureEditDiscountConfigForProductChange",
+    key: "getAvailableWalletIds",
+    value: function getAvailableWalletIds() {
+      return Array.isArray(this.store.availableWalletIds) ? _toConsumableArray(this.store.availableWalletIds) : [];
+    }
+  }, {
+    key: "syncScannedDiscountsToOriginalDiscountList",
     value: function () {
-      var _ensureEditDiscountConfigForProductChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(tempOrder) {
-        var _tempOrder$customer, _tempOrder$_extend, _tempOrder$_extend2, _this$store$discount6;
-        var orderId, customerId, currentDiscountList, hasRuntimeDiscounts;
+      var _syncScannedDiscountsToOriginalDiscountList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(discountList) {
+        var _this$store$discount6, _this$store$discount7, _this$store$discount8, _this$store$discount9;
+        var scanDiscounts, scanDiscountIds, originalDiscounts, nextOriginalDiscounts;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              scanDiscounts = (discountList || []).filter(function (discount) {
+                return discount === null || discount === void 0 ? void 0 : discount.isScan;
+              });
+              if (scanDiscounts.length) {
+                _context4.next = 3;
+                break;
+              }
+              return _context4.abrupt("return");
+            case 3:
+              scanDiscountIds = new Set(scanDiscounts.map(function (discount) {
+                return discount === null || discount === void 0 ? void 0 : discount.id;
+              }));
+              originalDiscounts = ((_this$store$discount6 = this.store.discount) === null || _this$store$discount6 === void 0 || (_this$store$discount7 = _this$store$discount6.getOriginalDiscountList) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.call(_this$store$discount6)) || [];
+              nextOriginalDiscounts = [].concat(_toConsumableArray(scanDiscounts), _toConsumableArray(originalDiscounts.filter(function (discount) {
+                return !scanDiscountIds.has(discount === null || discount === void 0 ? void 0 : discount.id);
+              })));
+              _context4.next = 8;
+              return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 || (_this$store$discount9 = _this$store$discount8.setOriginalDiscountList) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.call(_this$store$discount8, nextOriginalDiscounts);
+            case 8:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this);
+      }));
+      function syncScannedDiscountsToOriginalDiscountList(_x4) {
+        return _syncScannedDiscountsToOriginalDiscountList.apply(this, arguments);
+      }
+      return syncScannedDiscountsToOriginalDiscountList;
+    }()
+  }, {
+    key: "ensureEditDiscountConfigForProductChange",
+    value: function () {
+      var _ensureEditDiscountConfigForProductChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(tempOrder) {
+        var _tempOrder$customer, _tempOrder$_extend, _tempOrder$_extend2, _this$store$discount10;
+        var orderId, customerId, currentDiscountList, hasRuntimeDiscounts;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               orderId = tempOrder.order_id;
               customerId = Number(tempOrder.customer_id || ((_tempOrder$customer = tempOrder.customer) === null || _tempOrder$customer === void 0 ? void 0 : _tempOrder$customer.id) || ((_tempOrder$_extend = tempOrder._extend) === null || _tempOrder$_extend === void 0 || (_tempOrder$_extend = _tempOrder$_extend.customerSnapshot) === null || _tempOrder$_extend === void 0 ? void 0 : _tempOrder$_extend.id) || ((_tempOrder$_extend2 = tempOrder._extend) === null || _tempOrder$_extend2 === void 0 || (_tempOrder$_extend2 = _tempOrder$_extend2.customerSnapshot) === null || _tempOrder$_extend2 === void 0 ? void 0 : _tempOrder$_extend2.customer_id) || 0);
               if (!(!orderId || !customerId || customerId === 1)) {
-                _context4.next = 4;
+                _context5.next = 4;
                 break;
               }
-              return _context4.abrupt("return");
+              return _context5.abrupt("return");
             case 4:
-              currentDiscountList = ((_this$store$discount6 = this.store.discount) === null || _this$store$discount6 === void 0 ? void 0 : _this$store$discount6.getDiscountList()) || [];
+              currentDiscountList = ((_this$store$discount10 = this.store.discount) === null || _this$store$discount10 === void 0 ? void 0 : _this$store$discount10.getDiscountList()) || [];
               hasRuntimeDiscounts = currentDiscountList.some(function (discount) {
                 return !(discount !== null && discount !== void 0 && discount.isEditMode);
               });
               if (!hasRuntimeDiscounts) {
-                _context4.next = 8;
+                _context5.next = 8;
                 break;
               }
-              return _context4.abrupt("return");
+              return _context5.abrupt("return");
             case 8:
-              _context4.next = 10;
+              _context5.next = 10;
               return this.loadDiscountConfig({
                 customerId: customerId,
                 action: 'edit',
@@ -540,11 +646,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 10:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
-      function ensureEditDiscountConfigForProductChange(_x4) {
+      function ensureEditDiscountConfigForProductChange(_x5) {
         return _ensureEditDiscountConfigForProductChange.apply(this, arguments);
       }
       return ensureEditDiscountConfigForProductChange;
@@ -552,35 +658,35 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "scanCode",
     value: function () {
-      var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, customerId) {
-        var _this$store$discount7, _tempOrder$holder, _this$store$summary, _tempOrder$holder2;
-        var resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelected, tempOrder, holders, _ref12, isAvailable, newDiscountList, unavailableReason, _this$store$discount8;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(code, customerId) {
+        var _this$store$discount11, _tempOrder$holder, _this$store$summary;
+        var resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelected, tempOrder, holders, _ref13, isAvailable, newDiscountList, unavailableReason, _this$store$discount12;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              _context5.next = 2;
-              return (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.batchSearch(code, {
+              _context6.next = 2;
+              return (_this$store$discount11 = this.store.discount) === null || _this$store$discount11 === void 0 ? void 0 : _this$store$discount11.batchSearch(code, {
                 customerId: customerId
               });
             case 2:
-              _context5.t0 = _context5.sent;
-              if (_context5.t0) {
-                _context5.next = 5;
+              _context6.t0 = _context6.sent;
+              if (_context6.t0) {
+                _context6.next = 5;
                 break;
               }
-              _context5.t0 = {
+              _context6.t0 = {
                 discountList: [],
                 unavailableReasonKey: null
               };
             case 5:
-              resultDiscountWithReason = _context5.t0;
+              resultDiscountWithReason = _context6.t0;
               resultDiscountList = resultDiscountWithReason.discountList, unavailableReasonKey = resultDiscountWithReason.unavailableReasonKey;
               rulesModule = this.store.rules;
               if (rulesModule) {
-                _context5.next = 10;
+                _context6.next = 10;
                 break;
               }
-              return _context5.abrupt("return", {
+              return _context6.abrupt("return", {
                 type: 'clientCalc',
                 isAvailable: false,
                 discountList: this.getDiscountList(),
@@ -589,10 +695,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 10:
               if (resultDiscountList.length) {
-                _context5.next = 12;
+                _context6.next = 12;
                 break;
               }
-              return _context5.abrupt("return", {
+              return _context6.abrupt("return", {
                 type: 'server',
                 isAvailable: false,
                 discountList: this.getDiscountList(),
@@ -613,59 +719,65 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   return m.id === n.id;
                 });
               }))) {
-                _context5.next = 16;
+                _context6.next = 18;
                 break;
               }
-              return _context5.abrupt("return", {
+              _context6.next = 17;
+              return this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
+            case 17:
+              return _context6.abrupt("return", {
                 type: 'clientCalc',
                 isAvailable: true,
                 discountList: this.getDiscountList(),
                 scannedDiscountList: resultDiscountList
               });
-            case 16:
+            case 18:
               tempOrder = this.store.tempOrder;
-              holders = tempOrder !== null && tempOrder !== void 0 && (_tempOrder$holder = tempOrder.holder) !== null && _tempOrder$holder !== void 0 && _tempOrder$holder.form_record_id ? [{
-                form_record_id: tempOrder.holder.form_record_id
-              }] : [];
-              _ref12 = rulesModule.isDiscountListAvailable({
+              holders = (tempOrder === null || tempOrder === void 0 || (_tempOrder$holder = tempOrder.holder) === null || _tempOrder$holder === void 0 ? void 0 : _tempOrder$holder.form_record) || [];
+              _ref13 = rulesModule.isDiscountListAvailable({
                 productList: (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.products) || [],
                 oldDiscountList: this.getDiscountList(),
                 newDiscountList: withScanList,
                 orderTotalAmount: Number(((_this$store$summary = this.store.summary) === null || _this$store$summary === void 0 ? void 0 : _this$store$summary.total_amount) || 0),
                 holders: holders,
-                isFormSubject: !!(tempOrder !== null && tempOrder !== void 0 && (_tempOrder$holder2 = tempOrder.holder) !== null && _tempOrder$holder2 !== void 0 && _tempOrder$holder2.type) && tempOrder.holder.type === 'form'
+                isFormSubject: function isFormSubject(product) {
+                  return resolveIsFormSubject(tempOrder, product);
+                }
               }) || {
                 isAvailable: false,
                 discountList: this.getDiscountList()
-              }, isAvailable = _ref12.isAvailable, newDiscountList = _ref12.discountList, unavailableReason = _ref12.unavailableReason;
-              if (isAvailable && newDiscountList) {
-                (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 || _this$store$discount8.setDiscountList(newDiscountList);
-                this.applyDiscount();
+              }, isAvailable = _ref13.isAvailable, newDiscountList = _ref13.discountList, unavailableReason = _ref13.unavailableReason;
+              if (!(isAvailable && newDiscountList)) {
+                _context6.next = 26;
+                break;
               }
-              return _context5.abrupt("return", {
+              (_this$store$discount12 = this.store.discount) === null || _this$store$discount12 === void 0 || _this$store$discount12.setDiscountList(newDiscountList);
+              this.applyDiscount();
+              _context6.next = 26;
+              return this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
+            case 26:
+              return _context6.abrupt("return", {
                 type: 'clientCalc',
                 isAvailable: isAvailable || false,
                 discountList: newDiscountList || this.getDiscountList(),
                 scannedDiscountList: resultDiscountList,
                 unavailableReason: unavailableReason
               });
-            case 21:
+            case 27:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, this);
+        }, _callee6, this);
       }));
-      function scanCode(_x5, _x6) {
+      function scanCode(_x6, _x7) {
         return _scanCode.apply(this, arguments);
       }
       return scanCode;
     }()
   }, {
     key: "applyDiscount",
-    value: function applyDiscount() {
-      var _this$store$discount9,
-        _tempOrder$holder3,
-        _tempOrder$holder4,
+    value: function applyDiscount(options) {
+      var _this$store$discount13,
         _this$store$summary2,
         _this2 = this;
       var tempOrder = this.store.tempOrder;
@@ -673,27 +785,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       // 也需要让 Rules.calcDiscount 把 DiscountModule 的 isSelected / isAvailable /
       // appliedProductDetails / savedAmount 复位。
       if (!tempOrder) return;
+      this.syncLinkedBookingHoldersToProducts(tempOrder);
       delete tempOrder.discount_list;
-      if (this.shouldSkipDiscountCalculation(tempOrder)) return;
+      var discountList = ((_this$store$discount13 = this.store.discount) === null || _this$store$discount13 === void 0 ? void 0 : _this$store$discount13.getDiscountList()) || [];
+      var shouldSkipDiscountCalculation = this.shouldSkipDiscountCalculation(tempOrder);
+      if (shouldSkipDiscountCalculation) return;
       var rulesModule = this.store.rules;
       if (!rulesModule) return;
-      var discountList = ((_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.getDiscountList()) || [];
-      var holders = (_tempOrder$holder3 = tempOrder.holder) !== null && _tempOrder$holder3 !== void 0 && _tempOrder$holder3.form_record_id ? [{
-        form_record_id: tempOrder.holder.form_record_id
-      }] : [];
       var result = rulesModule.calcDiscount({
         productList: tempOrder.products,
         discountList: discountList,
-        holders: holders,
-        isFormSubject: !!((_tempOrder$holder4 = tempOrder.holder) !== null && _tempOrder$holder4 !== void 0 && _tempOrder$holder4.type) && tempOrder.holder.type === 'form',
+        holders: [],
+        isFormSubject: function isFormSubject(product) {
+          return resolveIsFormSubject(tempOrder, product);
+        },
         orderTotalAmount: Number(((_this$store$summary2 = this.store.summary) === null || _this$store$summary2 === void 0 ? void 0 : _this$store$summary2.total_amount) || 0)
+      }, {
+        reapplyBookingDiscountProductUids: options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids
       });
       if (result !== null && result !== void 0 && result.productList) {
         var previousProductsByUid = indexOrderProductsByUid(tempOrder.products);
         tempOrder.products = this.applyProductDiscountPrices((result.productList || []).map(function (product, index) {
-          var _ref13;
+          var _ref14;
           var uid = getOrderProductLineUid(product);
-          var previous = (_ref13 = uid ? previousProductsByUid.get(uid) : undefined) !== null && _ref13 !== void 0 ? _ref13 : previousProductsByUid.get("__index__:".concat(index));
+          var previous = (_ref14 = uid ? previousProductsByUid.get(uid) : undefined) !== null && _ref14 !== void 0 ? _ref14 : previousProductsByUid.get("__index__:".concat(index));
           if (isManualProductDiscountProduct(previous)) {
             return previous;
           }
@@ -704,9 +819,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         }));
       }
       if (result !== null && result !== void 0 && result.discountList) {
-        var _this$store$discount10;
+        var _this$store$discount14;
         OrderModule.populateSavedAmounts(result.productList || tempOrder.products, result.discountList);
-        (_this$store$discount10 = this.store.discount) === null || _this$store$discount10 === void 0 || _this$store$discount10.setDiscountList(result.discountList);
+        (_this$store$discount14 = this.store.discount) === null || _this$store$discount14 === void 0 || _this$store$discount14.setDiscountList(result.discountList);
       }
       this.hasActiveCustomerBoundDiscount = (tempOrder.products || []).some(function (product) {
         return _this2.productHasCustomerBoundDiscount(product);
@@ -768,42 +883,42 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyPromotion",
     value: (function () {
-      var _applyPromotion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+      var _applyPromotion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
         var _this$promotionEvalua,
           _this$promotionEvalua2,
           _this3 = this;
         var tempOrder, strategyConfigs, result, removeSet, _iterator3, _step3, reduce, _iterator6, _step6, _loop2, _iterator4, _step4, _loop, payload;
-        return _regeneratorRuntime().wrap(function _callee6$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               if (!this.isApplyingPromotion) {
-                _context8.next = 2;
+                _context9.next = 2;
                 break;
               }
-              return _context8.abrupt("return");
+              return _context9.abrupt("return");
             case 2:
               if (this.promotionEvaluator) {
-                _context8.next = 4;
+                _context9.next = 4;
                 break;
               }
-              return _context8.abrupt("return");
+              return _context9.abrupt("return");
             case 4:
               tempOrder = this.store.tempOrder;
               if (tempOrder) {
-                _context8.next = 7;
+                _context9.next = 7;
                 break;
               }
-              return _context8.abrupt("return");
+              return _context9.abrupt("return");
             case 7:
               strategyConfigs = (_this$promotionEvalua = (_this$promotionEvalua2 = this.promotionEvaluator).getStrategyConfigs) === null || _this$promotionEvalua === void 0 ? void 0 : _this$promotionEvalua.call(_this$promotionEvalua2);
               if (!(Array.isArray(strategyConfigs) && strategyConfigs.length === 0)) {
-                _context8.next = 10;
+                _context9.next = 10;
                 break;
               }
-              return _context8.abrupt("return");
+              return _context9.abrupt("return");
             case 10:
               this.isApplyingPromotion = true;
-              _context8.prev = 11;
+              _context9.prev = 11;
               result = processCartPromotion(tempOrder.products, this.promotionEvaluator); // step 1: toRemove —— 直接过滤
               if (result.giftActions.toRemove.length > 0) {
                 removeSet = new Set(result.giftActions.toRemove.map(String));
@@ -815,20 +930,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
 
               // step 2: toReduce —— 调整数量
               _iterator3 = _createForOfIteratorHelper(result.giftActions.toReduce);
-              _context8.prev = 15;
+              _context9.prev = 15;
               _iterator3.s();
             case 17:
               if ((_step3 = _iterator3.n()).done) {
-                _context8.next = 37;
+                _context9.next = 37;
                 break;
               }
               reduce = _step3.value;
               _iterator6 = _createForOfIteratorHelper(reduce.items);
-              _context8.prev = 20;
+              _context9.prev = 20;
               _loop2 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop2() {
                 var item, product;
-                return _regeneratorRuntime().wrap(function _loop2$(_context7) {
-                  while (1) switch (_context7.prev = _context7.next) {
+                return _regeneratorRuntime().wrap(function _loop2$(_context8) {
+                  while (1) switch (_context8.prev = _context8.next) {
                     case 0:
                       item = _step6.value;
                       product = result.products.find(function (p) {
@@ -839,52 +954,52 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }
                     case 3:
                     case "end":
-                      return _context7.stop();
+                      return _context8.stop();
                   }
                 }, _loop2);
               });
               _iterator6.s();
             case 23:
               if ((_step6 = _iterator6.n()).done) {
-                _context8.next = 27;
+                _context9.next = 27;
                 break;
               }
-              return _context8.delegateYield(_loop2(), "t0", 25);
+              return _context9.delegateYield(_loop2(), "t0", 25);
             case 25:
-              _context8.next = 23;
+              _context9.next = 23;
               break;
             case 27:
-              _context8.next = 32;
+              _context9.next = 32;
               break;
             case 29:
-              _context8.prev = 29;
-              _context8.t1 = _context8["catch"](20);
-              _iterator6.e(_context8.t1);
+              _context9.prev = 29;
+              _context9.t1 = _context9["catch"](20);
+              _iterator6.e(_context9.t1);
             case 32:
-              _context8.prev = 32;
+              _context9.prev = 32;
               _iterator6.f();
-              return _context8.finish(32);
+              return _context9.finish(32);
             case 35:
-              _context8.next = 17;
+              _context9.next = 17;
               break;
             case 37:
-              _context8.next = 42;
+              _context9.next = 42;
               break;
             case 39:
-              _context8.prev = 39;
-              _context8.t2 = _context8["catch"](15);
-              _iterator3.e(_context8.t2);
+              _context9.prev = 39;
+              _context9.t2 = _context9["catch"](15);
+              _iterator3.e(_context9.t2);
             case 42:
-              _context8.prev = 42;
+              _context9.prev = 42;
               _iterator3.f();
-              return _context8.finish(42);
+              return _context9.finish(42);
             case 45:
               if (!(result.giftActions.toAdd.length > 0)) {
-                _context8.next = 68;
+                _context9.next = 68;
                 break;
               }
               if (this.giftSelectResolver) {
-                _context8.next = 50;
+                _context9.next = 50;
                 break;
               }
               if (result.giftActions.toAdd.some(function (g) {
@@ -895,19 +1010,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               } else {
                 console.warn('[OrderModule] giftSelectResolver not set, skip applying single-option gifts', result.giftActions.toAdd);
               }
-              _context8.next = 68;
+              _context9.next = 68;
               break;
             case 50:
               _iterator4 = _createForOfIteratorHelper(result.giftActions.toAdd);
-              _context8.prev = 51;
+              _context9.prev = 51;
               _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
                 var addAction, _sameStrategy$metadat, sameStrategy, giftResult, giftProducts, giftBookings, _iterator5, _step5, _step5$value, index, gp, booking, linked;
-                return _regeneratorRuntime().wrap(function _loop$(_context6) {
-                  while (1) switch (_context6.prev = _context6.next) {
+                return _regeneratorRuntime().wrap(function _loop$(_context7) {
+                  while (1) switch (_context7.prev = _context7.next) {
                     case 0:
                       addAction = _step4.value;
                       if (!(addAction.giftOptions.length === 1)) {
-                        _context6.next = 6;
+                        _context7.next = 6;
                         break;
                       }
                       sameStrategy = result.products.find(function (p) {
@@ -915,14 +1030,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                         return ((_p$metadata = p.metadata) === null || _p$metadata === void 0 || (_p$metadata = _p$metadata._giftInfo) === null || _p$metadata === void 0 ? void 0 : _p$metadata.strategyId) === addAction.strategyId;
                       });
                       if (!(sameStrategy && !sameStrategy.booking_uid && !((_sameStrategy$metadat = sameStrategy.metadata) !== null && _sameStrategy$metadat !== void 0 && _sameStrategy$metadat.booking_uid))) {
-                        _context6.next = 6;
+                        _context7.next = 6;
                         break;
                       }
                       sameStrategy.num = (Number(sameStrategy.num) || 0) + (addAction.giftCount || 1);
-                      return _context6.abrupt("return", 1);
+                      return _context7.abrupt("return", 1);
                     case 6:
-                      _context6.prev = 6;
-                      _context6.next = 9;
+                      _context7.prev = 6;
+                      _context7.next = 9;
                       return _this3.giftSelectResolver({
                         strategyId: addAction.strategyId,
                         strategyName: addAction.strategyName,
@@ -931,31 +1046,31 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                         sourceProductIds: addAction.sourceProductIds
                       });
                     case 9:
-                      giftResult = _context6.sent;
+                      giftResult = _context7.sent;
                       giftProducts = Array.isArray(giftResult) ? giftResult : giftResult === null || giftResult === void 0 ? void 0 : giftResult.products;
                       giftBookings = Array.isArray(giftResult) ? [] : (giftResult === null || giftResult === void 0 ? void 0 : giftResult.bookings) || [];
                       if (!(Array.isArray(giftProducts) && giftProducts.length > 0)) {
-                        _context6.next = 37;
+                        _context7.next = 37;
                         break;
                       }
                       _iterator5 = _createForOfIteratorHelper(giftProducts.entries());
-                      _context6.prev = 14;
+                      _context7.prev = 14;
                       _iterator5.s();
                     case 16:
                       if ((_step5 = _iterator5.n()).done) {
-                        _context6.next = 29;
+                        _context7.next = 29;
                         break;
                       }
                       _step5$value = _slicedToArray(_step5.value, 2), index = _step5$value[0], gp = _step5$value[1];
                       if (gp) {
-                        _context6.next = 20;
+                        _context7.next = 20;
                         break;
                       }
-                      return _context6.abrupt("continue", 27);
+                      return _context7.abrupt("continue", 27);
                     case 20:
                       booking = giftBookings[index];
                       if (!booking) {
-                        _context6.next = 26;
+                        _context7.next = 26;
                         break;
                       }
                       linked = _this3.createLinkedProductAndBooking({
@@ -964,65 +1079,65 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       });
                       result.products.push(linked.product);
                       tempOrder.bookings = [].concat(_toConsumableArray(tempOrder.bookings || []), [linked.booking]);
-                      return _context6.abrupt("continue", 27);
+                      return _context7.abrupt("continue", 27);
                     case 26:
                       // normalize 略过：调用方应保证返回完整 OrderProduct。
                       result.products.push(gp);
                     case 27:
-                      _context6.next = 16;
+                      _context7.next = 16;
                       break;
                     case 29:
-                      _context6.next = 34;
+                      _context7.next = 34;
                       break;
                     case 31:
-                      _context6.prev = 31;
-                      _context6.t0 = _context6["catch"](14);
-                      _iterator5.e(_context6.t0);
+                      _context7.prev = 31;
+                      _context7.t0 = _context7["catch"](14);
+                      _iterator5.e(_context7.t0);
                     case 34:
-                      _context6.prev = 34;
+                      _context7.prev = 34;
                       _iterator5.f();
-                      return _context6.finish(34);
+                      return _context7.finish(34);
                     case 37:
-                      _context6.next = 42;
+                      _context7.next = 42;
                       break;
                     case 39:
-                      _context6.prev = 39;
-                      _context6.t1 = _context6["catch"](6);
+                      _context7.prev = 39;
+                      _context7.t1 = _context7["catch"](6);
                       // 用户取消 / 选择失败 → 视为放弃本次新增
-                      console.warn('[OrderModule] giftSelectResolver rejected, skip add gift', addAction.strategyId, _context6.t1);
+                      console.warn('[OrderModule] giftSelectResolver rejected, skip add gift', addAction.strategyId, _context7.t1);
                     case 42:
                     case "end":
-                      return _context6.stop();
+                      return _context7.stop();
                   }
                 }, _loop, null, [[6, 39], [14, 31, 34, 37]]);
               });
               _iterator4.s();
             case 54:
               if ((_step4 = _iterator4.n()).done) {
-                _context8.next = 60;
+                _context9.next = 60;
                 break;
               }
-              return _context8.delegateYield(_loop(), "t3", 56);
+              return _context9.delegateYield(_loop(), "t3", 56);
             case 56:
-              if (!_context8.t3) {
-                _context8.next = 58;
+              if (!_context9.t3) {
+                _context9.next = 58;
                 break;
               }
-              return _context8.abrupt("continue", 58);
+              return _context9.abrupt("continue", 58);
             case 58:
-              _context8.next = 54;
+              _context9.next = 54;
               break;
             case 60:
-              _context8.next = 65;
+              _context9.next = 65;
               break;
             case 62:
-              _context8.prev = 62;
-              _context8.t4 = _context8["catch"](51);
-              _iterator4.e(_context8.t4);
+              _context9.prev = 62;
+              _context9.t4 = _context9["catch"](51);
+              _iterator4.e(_context9.t4);
             case 65:
-              _context8.prev = 65;
+              _context9.prev = 65;
               _iterator4.f();
-              return _context8.finish(65);
+              return _context9.finish(65);
             case 68:
               tempOrder.products = result.products;
               this.lastUnfulfilledPromotions = result.unfulfilledPromotions;
@@ -1041,21 +1156,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 products: tempOrder.products
               };
               this.effectsEmit('onPromotionApplied', payload);
-              _context8.next = 78;
+              _context9.next = 78;
               break;
             case 75:
-              _context8.prev = 75;
-              _context8.t5 = _context8["catch"](11);
-              console.error('[OrderModule] applyPromotion failed', _context8.t5);
+              _context9.prev = 75;
+              _context9.t5 = _context9["catch"](11);
+              console.error('[OrderModule] applyPromotion failed', _context9.t5);
             case 78:
-              _context8.prev = 78;
+              _context9.prev = 78;
               this.isApplyingPromotion = false;
-              return _context8.finish(78);
+              return _context9.finish(78);
             case 81:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
-        }, _callee6, this, [[11, 75, 78, 81], [15, 39, 42, 45], [20, 29, 32, 35], [51, 62, 65, 68]]);
+        }, _callee7, this, [[11, 75, 78, 81], [15, 39, 42, 45], [20, 29, 32, 35], [51, 62, 65, 68]]);
       }));
       function applyPromotion() {
         return _applyPromotion.apply(this, arguments);
@@ -1177,14 +1292,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "saveDraft",
     value: function () {
-      var _saveDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-        return _regeneratorRuntime().wrap(function _callee7$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+      var _saveDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+        return _regeneratorRuntime().wrap(function _callee8$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
-        }, _callee7);
+        }, _callee8);
       }));
       function saveDraft() {
         return _saveDraft.apply(this, arguments);
@@ -1199,18 +1314,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hydrateTempOrderFromLocalRecord",
     value: function () {
-      var _hydrateTempOrderFromLocalRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(record) {
-        return _regeneratorRuntime().wrap(function _callee8$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+      var _hydrateTempOrderFromLocalRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(record) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              return _context10.abrupt("return", this.hydrateTempOrderFromRecord(record));
+              return _context11.abrupt("return", this.hydrateTempOrderFromRecord(record));
             case 1:
             case "end":
-              return _context10.stop();
+              return _context11.stop();
           }
-        }, _callee8, this);
+        }, _callee9, this);
       }));
-      function hydrateTempOrderFromLocalRecord(_x7) {
+      function hydrateTempOrderFromLocalRecord(_x8) {
         return _hydrateTempOrderFromLocalRecord.apply(this, arguments);
       }
       return hydrateTempOrderFromLocalRecord;
@@ -1218,15 +1333,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "extractOrderIdFromSubmitResult",
     value: function extractOrderIdFromSubmitResult(result) {
-      var _ref14, _ref15, _ref16, _result$data$order_id, _result$data, _result$data2;
-      return (_ref14 = (_ref15 = (_ref16 = (_result$data$order_id = result === null || result === void 0 || (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.order_id) !== null && _result$data$order_id !== void 0 ? _result$data$order_id : result === null || result === void 0 ? void 0 : result.order_id) !== null && _ref16 !== void 0 ? _ref16 : result === null || result === void 0 || (_result$data2 = result.data) === null || _result$data2 === void 0 ? void 0 : _result$data2.id) !== null && _ref15 !== void 0 ? _ref15 : result === null || result === void 0 ? void 0 : result.id) !== null && _ref14 !== void 0 ? _ref14 : null;
+      var _ref15, _ref16, _ref17, _result$data$order_id, _result$data, _result$data2;
+      return (_ref15 = (_ref16 = (_ref17 = (_result$data$order_id = result === null || result === void 0 || (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.order_id) !== null && _result$data$order_id !== void 0 ? _result$data$order_id : result === null || result === void 0 ? void 0 : result.order_id) !== null && _ref17 !== void 0 ? _ref17 : result === null || result === void 0 || (_result$data2 = result.data) === null || _result$data2 === void 0 ? void 0 : _result$data2.id) !== null && _ref16 !== void 0 ? _ref16 : result === null || result === void 0 ? void 0 : result.id) !== null && _ref15 !== void 0 ? _ref15 : null;
     }
   }, {
     key: "calculatePaymentEffectiveAmount",
     value: function calculatePaymentEffectiveAmount(payment) {
-      var _ref17, _payment$origin_amoun;
+      var _ref18, _payment$origin_amoun;
       var amount = new Decimal(payment.amount || 0);
-      var originAmount = new Decimal((_ref17 = (_payment$origin_amoun = payment.origin_amount) !== null && _payment$origin_amoun !== void 0 ? _payment$origin_amoun : payment.amount) !== null && _ref17 !== void 0 ? _ref17 : 0);
+      var originAmount = new Decimal((_ref18 = (_payment$origin_amoun = payment.origin_amount) !== null && _payment$origin_amoun !== void 0 ? _payment$origin_amoun : payment.amount) !== null && _ref18 !== void 0 ? _ref18 : 0);
       var serviceFee = new Decimal(payment.service_fee || 0);
       // TODO: 后端允许 amount 表示顾客实际支付总额后，移除这个兼容分支。
       var effectiveAmount = serviceFee.gt(0) && amount.eq(originAmount) ? amount.plus(serviceFee) : amount;
@@ -1240,9 +1355,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return mapPaymentItemsToOrderPayments(payments, {
         includeVoided: false
       }).reduce(function (sum, payment) {
+        if (!isPaidPaymentRecord(payment)) return sum;
         return sum.plus(_this4.calculatePaymentEffectiveAmount(payment));
       }, new Decimal(0));
     }
+  }, {
+    key: "calculateOrderPaidPaymentTotal",
+    value: function calculateOrderPaidPaymentTotal(payments) {
+      var _this5 = this;
+      return mapPaymentItemsToOrderPayments(payments, {
+        includeVoided: false
+      }).reduce(function (sum, payment) {
+        if (!isPaidPaymentRecord(payment)) return sum;
+        return sum.plus(_this5.calculatePaymentGapAmount(payment));
+      }, new Decimal(0));
+    }
   }, {
     key: "getDepositAmount",
     value: function getDepositAmount(tempOrder, summary) {
@@ -1253,6 +1380,35 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function normalizeDepositAmount(amount) {
       return Decimal.max(new Decimal(Number(amount) || 0), 0).toDecimalPlaces(2).toFixed(2);
     }
+  }, {
+    key: "getLastOrderDepositSnapshot",
+    value: function getLastOrderDepositSnapshot() {
+      var _lastOrderInfo$deposi, _lastOrderInfo$summar;
+      var lastOrderInfo = this.store.lastOrderInfo;
+      if (!lastOrderInfo || _typeof(lastOrderInfo) !== 'object') return null;
+      var rawDepositAmount = (_lastOrderInfo$deposi = lastOrderInfo.deposit_amount) !== null && _lastOrderInfo$deposi !== void 0 ? _lastOrderInfo$deposi : (_lastOrderInfo$summar = lastOrderInfo.summary) === null || _lastOrderInfo$summar === void 0 ? void 0 : _lastOrderInfo$summar.deposit_amount;
+      var depositAmount = this.normalizeDepositAmount(rawDepositAmount !== null && rawDepositAmount !== void 0 ? rawDepositAmount : 0);
+      var hasDepositAmount = new Decimal(depositAmount).gt(0);
+      var isDeposit = Number(lastOrderInfo.is_deposit) === 1 || hasDepositAmount;
+      if (!isDeposit || !hasDepositAmount) return null;
+      return {
+        isDeposit: 1,
+        depositAmount: depositAmount
+      };
+    }
+  }, {
+    key: "getLastOrderSubmitSnapshot",
+    value: function getLastOrderSubmitSnapshot() {
+      var lastOrderInfo = this.store.lastOrderInfo;
+      if (!lastOrderInfo || _typeof(lastOrderInfo) !== 'object') return {};
+      var businessCode = lastOrderInfo.business_code;
+      var type = lastOrderInfo.type;
+      return _objectSpread(_objectSpread({}, typeof businessCode === 'string' && businessCode ? {
+        businessCode: businessCode
+      } : {}), typeof type === 'string' && type ? {
+        type: type
+      } : {});
+    }
   }, {
     key: "applyDepositAmountToSummary",
     value: function applyDepositAmountToSummary(tempOrder, summary, amount) {
@@ -1271,10 +1427,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       tempOrder.is_deposit = hasDepositAmount ? 1 : 0;
       return nextSummary;
     }
+  }, {
+    key: "applyLastOrderDepositSnapshot",
+    value: function applyLastOrderDepositSnapshot(tempOrder, summary) {
+      var snapshot = this.getLastOrderDepositSnapshot();
+      if (!snapshot) return summary;
+      var existedDeposit = summary.deposit && _typeof(summary.deposit) === 'object' ? summary.deposit : undefined;
+      var nextSummary = _objectSpread(_objectSpread({}, summary), {}, {
+        deposit_amount: snapshot.depositAmount,
+        deposit: _objectSpread(_objectSpread({}, existedDeposit || {}), {}, {
+          total: snapshot.depositAmount,
+          deposit_policy_ids: (existedDeposit === null || existedDeposit === void 0 ? void 0 : existedDeposit.deposit_policy_ids) || [],
+          hasDeposit: true
+        })
+      });
+      tempOrder.deposit_amount = snapshot.depositAmount;
+      tempOrder.is_deposit = tempOrder.is_deposit === 0 && new Decimal(tempOrder.deposit_amount || 0).gt(0) ? 0 : snapshot.isDeposit;
+      return nextSummary;
+    }
   }, {
     key: "isDepositOrder",
     value: function isDepositOrder(tempOrder, depositAmount) {
-      return tempOrder.is_deposit === 1 || depositAmount.gt(0);
+      return tempOrder.is_deposit === 1 && depositAmount.gt(0);
     }
   }, {
     key: "getOrderExpectedAmount",
@@ -1289,20 +1463,42 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (depositAmount.lte(0)) return false;
       return params.paidAmount.gte(depositAmount);
     }
+  }, {
+    key: "getPaymentCompletion",
+    value: function getPaymentCompletion(payments) {
+      var tempOrder = this.ensureTempOrder();
+      var summary = this.store.summary || createEmptySummary();
+      var paymentList = payments || tempOrder.payments || [];
+      var refundAmount = this.getSummaryRefundAmount(summary);
+      var netPaidAmount = Decimal.max(this.calculateOrderPaidPaymentTotal(paymentList).minus(refundAmount), 0);
+      var depositAmount = this.getDepositAmount(tempOrder, summary);
+      var orderExpectedAmount = this.getOrderExpectedAmount(summary);
+      var isDepositFullyPaid = this.isDepositCovered({
+        tempOrder: tempOrder,
+        summary: summary,
+        paidAmount: netPaidAmount
+      });
+      var isOrderFullyPaid = orderExpectedAmount.lte(0) ? true : netPaidAmount.gte(orderExpectedAmount);
+      var paymentStage = this.isDepositOrder(tempOrder, depositAmount) && !isDepositFullyPaid ? 'deposit' : 'normal';
+      return {
+        isFullyPaid: isOrderFullyPaid,
+        isOrderFullyPaid: isOrderFullyPaid,
+        isDepositFullyPaid: isDepositFullyPaid,
+        paymentStage: paymentStage,
+        depositAmount: depositAmount.toFixed(2),
+        orderExpectedAmount: orderExpectedAmount.toFixed(2)
+      };
+    }
   }, {
     key: "calculateDepositPaidAmount",
     value: function calculateDepositPaidAmount(payments) {
-      var _this5 = this;
+      var _this6 = this;
       return (payments || []).reduce(function (sum, payment) {
         var paymentRecord = payment;
-        if ((paymentRecord === null || paymentRecord === void 0 ? void 0 : paymentRecord.status) !== 'paid') return sum;
+        if (!isPaidPaymentRecord(paymentRecord)) return sum;
         var isDepositPayment = paymentRecord.type === 'deposit' || paymentRecord.order_payment_type === 'deposit';
         if (!isDepositPayment) return sum;
-        if (paymentRecord.origin_amount !== undefined && paymentRecord.origin_amount !== null && paymentRecord.origin_amount !== '') {
-          return sum.plus(_this5.calculatePaymentGapAmount(paymentRecord));
-        }
-        var rounding = new Decimal(paymentRecord.rounding_amount || 0);
-        return sum.plus(new Decimal(paymentRecord.amount || 0).minus(rounding));
+        return sum.plus(_this6.calculatePaymentGapAmount(paymentRecord));
       }, new Decimal(0));
     }
   }, {
@@ -1317,7 +1513,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizePaymentSource",
     value: function normalizePaymentSource(payment, options) {
-      var _ref18, _paymentRecord$origin;
+      var _ref19, _paymentRecord$origin;
       var paymentRecord = payment;
       var metadata = paymentRecord.metadata && _typeof(paymentRecord.metadata) === 'object' ? _objectSpread({}, paymentRecord.metadata) : {};
       if (!metadata.unique_payment_number) {
@@ -1325,7 +1521,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       var normalized = _objectSpread(_objectSpread({}, paymentRecord), {}, {
         metadata: metadata,
-        origin_amount: (_ref18 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref18 !== void 0 ? _ref18 : '0.00'
+        origin_amount: (_ref19 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref19 !== void 0 ? _ref19 : '0.00'
       });
       if (paymentRecord.status !== undefined) {
         normalized.status = paymentRecord.status;
@@ -1339,8 +1535,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function updateTempOrderPaymentStatus(tempOrder, options) {
       var summary = (options === null || options === void 0 ? void 0 : options.summary) || this.store.summary || createEmptySummary();
       var paymentTotal = this.calculatePaymentTotal(tempOrder.payments || []);
+      var orderPaymentTotal = this.calculateOrderPaidPaymentTotal(tempOrder.payments || []);
       var refundAmount = this.getSummaryRefundAmount(summary);
-      var netPaymentTotal = Decimal.max(paymentTotal.minus(refundAmount), 0);
+      var netPaymentTotal = Decimal.max(orderPaymentTotal.minus(refundAmount), 0);
       var targetAmount = this.calculatePaymentTargetAmount(tempOrder, summary, netPaymentTotal);
       if (this.shouldKeepPaymentStatusAfterAmountRecalc(tempOrder.payment_status, {
         netPaymentTotal: netPaymentTotal,
@@ -1406,7 +1603,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "capVoucherPaymentsByRemainingAmount",
     value: function capVoucherPaymentsByRemainingAmount(params) {
       var targetAmount = this.getPaymentTargetAmount();
-      var nonVoucherTotal = this.calculatePaymentTotal(params.nonVoucherPayments);
+      var nonVoucherTotal = this.calculateOrderPaidPaymentTotal(params.nonVoucherPayments);
       if (targetAmount.lte(0)) return [];
       var remainingAmount = Decimal.max(targetAmount.minus(nonVoucherTotal), 0);
       var cappedVouchers = [];
@@ -1443,16 +1640,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculatePaidPaymentSummary",
     value: function calculatePaidPaymentSummary(payments) {
-      var _this6 = this;
+      var _this7 = this;
       return (payments || []).reduce(function (summary, payment) {
         var paymentRecord = payment;
-        if ((paymentRecord === null || paymentRecord === void 0 ? void 0 : paymentRecord.status) !== 'paid') return summary;
+        if (!isPaidPaymentRecord(paymentRecord)) return summary;
         return {
           customerPaidAmount: summary.customerPaidAmount.plus(paymentRecord.amount || 0),
-          orderPaidAmount: summary.orderPaidAmount.plus(paymentRecord.origin_amount || 0),
-          gapPaidAmount: summary.gapPaidAmount.plus(_this6.calculatePaymentGapAmount(paymentRecord)),
-          payServiceChargeAmount: summary.payServiceChargeAmount.plus(_this6.calculatePaymentServiceFee(paymentRecord)),
-          roundingAmount: summary.roundingAmount.plus(_this6.calculatePaymentRoundingAmount(paymentRecord))
+          orderPaidAmount: summary.orderPaidAmount.plus(_this7.calculatePaymentOrderAmount(paymentRecord)),
+          gapPaidAmount: summary.gapPaidAmount.plus(_this7.calculatePaymentGapAmount(paymentRecord)),
+          payServiceChargeAmount: summary.payServiceChargeAmount.plus(_this7.calculatePaymentServiceFee(paymentRecord)),
+          roundingAmount: summary.roundingAmount.plus(_this7.calculatePaymentRoundingAmount(paymentRecord))
         };
       }, {
         customerPaidAmount: new Decimal(0),
@@ -1476,11 +1673,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculatePaymentGapAmount",
     value: function calculatePaymentGapAmount(payment) {
-      if (payment.origin_amount === undefined || payment.origin_amount === null || payment.origin_amount === '') {
-        return new Decimal(0);
+      if (payment.origin_amount !== undefined && payment.origin_amount !== null && payment.origin_amount !== '') {
+        var _rounding = new Decimal(payment.rounding_amount || 0);
+        return new Decimal(payment.origin_amount || 0).minus(_rounding);
       }
       var rounding = new Decimal(payment.rounding_amount || 0);
-      return new Decimal(payment.origin_amount || 0).minus(rounding);
+      var amount = new Decimal(payment.amount || 0);
+      var serviceFee = this.calculatePaymentServiceFee(payment);
+      if (serviceFee.lte(0)) return amount.minus(rounding);
+      if (!hasSyncedOrderPaymentRecord(payment)) return new Decimal(0);
+      return Decimal.max(amount.minus(serviceFee), 0).minus(rounding);
+    }
+  }, {
+    key: "calculatePaymentOrderAmount",
+    value: function calculatePaymentOrderAmount(payment) {
+      if (payment.origin_amount !== undefined && payment.origin_amount !== null && payment.origin_amount !== '') {
+        return new Decimal(payment.origin_amount || 0);
+      }
+      var amount = new Decimal(payment.amount || 0);
+      var serviceFee = this.calculatePaymentServiceFee(payment);
+      if (serviceFee.lte(0)) return amount;
+      if (!hasSyncedOrderPaymentRecord(payment)) return new Decimal(0);
+      return Decimal.max(amount.minus(serviceFee), 0);
     }
   }, {
     key: "calculatePaymentRoundingAmount",
@@ -1637,15 +1851,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeFingerprintValue",
     value: function normalizeFingerprintValue(value) {
-      var _this7 = this;
+      var _this8 = this;
       if (Array.isArray(value)) {
         return value.map(function (item) {
-          return _this7.normalizeFingerprintValue(item);
+          return _this8.normalizeFingerprintValue(item);
         });
       }
       if (!value || _typeof(value) !== 'object') return value !== null && value !== void 0 ? value : '';
       return Object.keys(value).sort().reduce(function (result, key) {
-        result[key] = _this7.normalizeFingerprintValue(value[key]);
+        result[key] = _this8.normalizeFingerprintValue(value[key]);
         return result;
       }, {});
     }
@@ -1658,9 +1872,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _product$payment_pric,
         _sku$code,
         _sku$barcode,
-        _ref19,
+        _ref20,
         _sku$variant_id,
-        _this8 = this;
+        _this9 = this;
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
       var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
       var discountTypes = ((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
@@ -1685,37 +1899,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         product_sku: this.normalizeFingerprintValue({
           code: (_sku$code = sku.code) !== null && _sku$code !== void 0 ? _sku$code : '',
           barcode: (_sku$barcode = sku.barcode) !== null && _sku$barcode !== void 0 ? _sku$barcode : '',
-          variant_id: (_ref19 = (_sku$variant_id = sku.variant_id) !== null && _sku$variant_id !== void 0 ? _sku$variant_id : product === null || product === void 0 ? void 0 : product.product_variant_id) !== null && _ref19 !== void 0 ? _ref19 : 0,
+          variant_id: (_ref20 = (_sku$variant_id = sku.variant_id) !== null && _sku$variant_id !== void 0 ? _sku$variant_id : product === null || product === void 0 ? void 0 : product.product_variant_id) !== null && _ref20 !== void 0 ? _ref20 : 0,
           variant: sku.variant || [],
           option: getProductSkuOptions(product || {}).map(function (option) {
-            var _ref20, _option$id, _option$option_group_, _ref21, _option$option_group_2, _option$num, _option$add_price;
+            var _ref21, _option$id, _option$option_group_, _ref22, _option$option_group_2, _option$num, _option$add_price;
             return {
-              id: (_ref20 = (_option$id = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id !== void 0 ? _option$id : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref20 !== void 0 ? _ref20 : null,
+              id: (_ref21 = (_option$id = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id !== void 0 ? _option$id : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref21 !== void 0 ? _ref21 : null,
               option_group_id: (_option$option_group_ = option === null || option === void 0 ? void 0 : option.option_group_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : null,
-              option_group_item_id: (_ref21 = (_option$option_group_2 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_2 !== void 0 ? _option$option_group_2 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref21 !== void 0 ? _ref21 : null,
+              option_group_item_id: (_ref22 = (_option$option_group_2 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_2 !== void 0 ? _option$option_group_2 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref22 !== void 0 ? _ref22 : null,
               num: Number((_option$num = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num !== void 0 ? _option$num : 1) || 1,
-              add_price: _this8.normalizeFingerprintMoney((_option$add_price = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price !== void 0 ? _option$add_price : option === null || option === void 0 ? void 0 : option.price)
+              add_price: _this9.normalizeFingerprintMoney((_option$add_price = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price !== void 0 ? _option$add_price : option === null || option === void 0 ? void 0 : option.price)
             };
           })
         }),
         product_bundle: this.normalizeFingerprintValue(((product === null || product === void 0 ? void 0 : product.product_bundle) || []).map(function (bundle) {
-          var _ref22, _ref23, _bundle$bundle_produc, _ref24, _bundle$bundle_varian, _bundle$num, _bundle$price_type, _bundle$price_type_ex;
+          var _ref23, _ref24, _bundle$bundle_produc, _ref25, _bundle$bundle_varian, _bundle$num, _bundle$price_type, _bundle$price_type_ex;
           return {
-            bundle_product_id: (_ref22 = (_ref23 = (_bundle$bundle_produc = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref23 !== void 0 ? _ref23 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref22 !== void 0 ? _ref22 : null,
-            bundle_variant_id: (_ref24 = (_bundle$bundle_varian = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle === null || bundle === void 0 ? void 0 : bundle.product_variant_id) !== null && _ref24 !== void 0 ? _ref24 : 0,
+            bundle_product_id: (_ref23 = (_ref24 = (_bundle$bundle_produc = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref24 !== void 0 ? _ref24 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref23 !== void 0 ? _ref23 : null,
+            bundle_variant_id: (_ref25 = (_bundle$bundle_varian = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle === null || bundle === void 0 ? void 0 : bundle.product_variant_id) !== null && _ref25 !== void 0 ? _ref25 : 0,
             num: getSafeProductNum((_bundle$num = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle === null || bundle === void 0 ? void 0 : bundle.quantity),
-            price: _this8.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.price),
-            bundle_selling_price: _this8.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price),
+            price: _this9.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.price),
+            bundle_selling_price: _this9.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price),
             price_type: (_bundle$price_type = bundle === null || bundle === void 0 ? void 0 : bundle.price_type) !== null && _bundle$price_type !== void 0 ? _bundle$price_type : '',
             price_type_ext: (_bundle$price_type_ex = bundle === null || bundle === void 0 ? void 0 : bundle.price_type_ext) !== null && _bundle$price_type_ex !== void 0 ? _bundle$price_type_ex : ''
           };
         })),
         discount_list: this.normalizeFingerprintValue(((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
-          var _ref25, _discount$type2, _ref26, _ref27, _discount$discount_id, _discount$discount;
+          var _ref26, _discount$type2, _ref27, _ref28, _discount$discount_id, _discount$discount;
           return {
-            type: (_ref25 = (_discount$type2 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type2 !== void 0 ? _discount$type2 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref25 !== void 0 ? _ref25 : '',
-            discount_id: (_ref26 = (_ref27 = (_discount$discount_id = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id !== void 0 ? _discount$discount_id : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref27 !== void 0 ? _ref27 : discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) !== null && _ref26 !== void 0 ? _ref26 : null,
-            amount: _this8.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
+            type: (_ref26 = (_discount$type2 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type2 !== void 0 ? _discount$type2 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref26 !== void 0 ? _ref26 : '',
+            discount_id: (_ref27 = (_ref28 = (_discount$discount_id = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id !== void 0 ? _discount$discount_id : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref28 !== void 0 ? _ref28 : discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) !== null && _ref27 !== void 0 ? _ref27 : null,
+            amount: _this9.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
           };
         }))
       };
@@ -1723,9 +1937,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildOrderProductsFingerprint",
     value: function buildOrderProductsFingerprint(products) {
-      var _this9 = this;
+      var _this10 = this;
       var items = (products || []).map(function (product) {
-        return _this9.buildProductFingerprintItem(product);
+        return _this10.buildProductFingerprintItem(product);
       });
       items.sort(function (left, right) {
         return JSON.stringify(left).localeCompare(JSON.stringify(right));
@@ -1738,16 +1952,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _product$product_id3,
         _product$product_vari2,
         _product$num2,
-        _ref28,
+        _ref29,
         _metadata$unique_iden,
         _metadata$price_overr,
         _metadata$is_manual_d,
         _metadata$product_dis,
         _sku$code2,
         _sku$barcode2,
-        _ref29,
+        _ref30,
         _sku$variant_id2,
-        _this10 = this;
+        _this11 = this;
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
       var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
       var discountTypes = ((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
@@ -1761,7 +1975,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         extension_type: extensionType,
         num: getSafeProductNum((_product$num2 = product === null || product === void 0 ? void 0 : product.num) !== null && _product$num2 !== void 0 ? _product$num2 : product === null || product === void 0 ? void 0 : product.product_quantity),
         metadata: {
-          unique_identification_number: (_ref28 = (_metadata$unique_iden = metadata.unique_identification_number) !== null && _metadata$unique_iden !== void 0 ? _metadata$unique_iden : product === null || product === void 0 ? void 0 : product.unique_identification_number) !== null && _ref28 !== void 0 ? _ref28 : '',
+          unique_identification_number: (_ref29 = (_metadata$unique_iden = metadata.unique_identification_number) !== null && _metadata$unique_iden !== void 0 ? _metadata$unique_iden : product === null || product === void 0 ? void 0 : product.unique_identification_number) !== null && _ref29 !== void 0 ? _ref29 : '',
           price_override: (_metadata$price_overr = metadata.price_override) !== null && _metadata$price_overr !== void 0 ? _metadata$price_overr : '',
           is_manual_discount: (_metadata$is_manual_d = metadata.is_manual_discount) !== null && _metadata$is_manual_d !== void 0 ? _metadata$is_manual_d : '',
           product_discount_reason: (_metadata$product_dis = metadata.product_discount_reason) !== null && _metadata$product_dis !== void 0 ? _metadata$product_dis : ''
@@ -1769,47 +1983,47 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         product_sku: this.normalizeFingerprintValue({
           code: (_sku$code2 = sku.code) !== null && _sku$code2 !== void 0 ? _sku$code2 : '',
           barcode: (_sku$barcode2 = sku.barcode) !== null && _sku$barcode2 !== void 0 ? _sku$barcode2 : '',
-          variant_id: (_ref29 = (_sku$variant_id2 = sku.variant_id) !== null && _sku$variant_id2 !== void 0 ? _sku$variant_id2 : product === null || product === void 0 ? void 0 : product.product_variant_id) !== null && _ref29 !== void 0 ? _ref29 : 0,
+          variant_id: (_ref30 = (_sku$variant_id2 = sku.variant_id) !== null && _sku$variant_id2 !== void 0 ? _sku$variant_id2 : product === null || product === void 0 ? void 0 : product.product_variant_id) !== null && _ref30 !== void 0 ? _ref30 : 0,
           variant: sku.variant || [],
           option: getProductSkuOptions(product || {}).map(function (option) {
-            var _ref30, _option$id2, _option$option_group_3, _ref31, _option$option_group_4, _option$num2, _option$add_price2;
+            var _ref31, _option$id2, _option$option_group_3, _ref32, _option$option_group_4, _option$num2, _option$add_price2;
             return {
-              id: (_ref30 = (_option$id2 = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id2 !== void 0 ? _option$id2 : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref30 !== void 0 ? _ref30 : null,
+              id: (_ref31 = (_option$id2 = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id2 !== void 0 ? _option$id2 : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref31 !== void 0 ? _ref31 : null,
               option_group_id: (_option$option_group_3 = option === null || option === void 0 ? void 0 : option.option_group_id) !== null && _option$option_group_3 !== void 0 ? _option$option_group_3 : null,
-              option_group_item_id: (_ref31 = (_option$option_group_4 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_4 !== void 0 ? _option$option_group_4 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref31 !== void 0 ? _ref31 : null,
+              option_group_item_id: (_ref32 = (_option$option_group_4 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_4 !== void 0 ? _option$option_group_4 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref32 !== void 0 ? _ref32 : null,
               num: Number((_option$num2 = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num2 !== void 0 ? _option$num2 : 1) || 1,
-              add_price: _this10.normalizeFingerprintMoney((_option$add_price2 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price2 !== void 0 ? _option$add_price2 : option === null || option === void 0 ? void 0 : option.price)
+              add_price: _this11.normalizeFingerprintMoney((_option$add_price2 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price2 !== void 0 ? _option$add_price2 : option === null || option === void 0 ? void 0 : option.price)
             };
           })
         }),
         product_bundle: this.normalizeFingerprintValue(((product === null || product === void 0 ? void 0 : product.product_bundle) || []).map(function (bundle) {
-          var _ref32, _bundle$bundle_id, _ref33, _bundle$bundle_group_, _ref34, _ref35, _bundle$bundle_produc2, _ref36, _bundle$bundle_varian2, _bundle$num2, _bundle$price_type2, _bundle$price_type_ex2;
+          var _ref33, _bundle$bundle_id, _ref34, _bundle$bundle_group_, _ref35, _ref36, _bundle$bundle_produc2, _ref37, _bundle$bundle_varian2, _bundle$num2, _bundle$price_type2, _bundle$price_type_ex2;
           return {
-            bundle_id: (_ref32 = (_bundle$bundle_id = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_id) !== null && _bundle$bundle_id !== void 0 ? _bundle$bundle_id : bundle === null || bundle === void 0 ? void 0 : bundle.id) !== null && _ref32 !== void 0 ? _ref32 : null,
-            bundle_group_id: (_ref33 = (_bundle$bundle_group_ = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle === null || bundle === void 0 ? void 0 : bundle.group_id) !== null && _ref33 !== void 0 ? _ref33 : null,
-            bundle_product_id: (_ref34 = (_ref35 = (_bundle$bundle_produc2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref35 !== void 0 ? _ref35 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref34 !== void 0 ? _ref34 : null,
-            bundle_variant_id: (_ref36 = (_bundle$bundle_varian2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_variant_id) !== null && _bundle$bundle_varian2 !== void 0 ? _bundle$bundle_varian2 : bundle === null || bundle === void 0 ? void 0 : bundle.product_variant_id) !== null && _ref36 !== void 0 ? _ref36 : 0,
+            bundle_id: (_ref33 = (_bundle$bundle_id = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_id) !== null && _bundle$bundle_id !== void 0 ? _bundle$bundle_id : bundle === null || bundle === void 0 ? void 0 : bundle.id) !== null && _ref33 !== void 0 ? _ref33 : null,
+            bundle_group_id: (_ref34 = (_bundle$bundle_group_ = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle === null || bundle === void 0 ? void 0 : bundle.group_id) !== null && _ref34 !== void 0 ? _ref34 : null,
+            bundle_product_id: (_ref35 = (_ref36 = (_bundle$bundle_produc2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref36 !== void 0 ? _ref36 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref35 !== void 0 ? _ref35 : null,
+            bundle_variant_id: (_ref37 = (_bundle$bundle_varian2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_variant_id) !== null && _bundle$bundle_varian2 !== void 0 ? _bundle$bundle_varian2 : bundle === null || bundle === void 0 ? void 0 : bundle.product_variant_id) !== null && _ref37 !== void 0 ? _ref37 : 0,
             num: getSafeProductNum((_bundle$num2 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num2 !== void 0 ? _bundle$num2 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity),
             price_type: (_bundle$price_type2 = bundle === null || bundle === void 0 ? void 0 : bundle.price_type) !== null && _bundle$price_type2 !== void 0 ? _bundle$price_type2 : '',
             price_type_ext: (_bundle$price_type_ex2 = bundle === null || bundle === void 0 ? void 0 : bundle.price_type_ext) !== null && _bundle$price_type_ex2 !== void 0 ? _bundle$price_type_ex2 : '',
-            option: _this10.normalizeFingerprintValue(((bundle === null || bundle === void 0 ? void 0 : bundle.option) || []).map(function (option) {
-              var _ref37, _option$id3, _option$option_group_5, _ref38, _option$option_group_6, _option$num3, _option$add_price3;
+            option: _this11.normalizeFingerprintValue(((bundle === null || bundle === void 0 ? void 0 : bundle.option) || []).map(function (option) {
+              var _ref38, _option$id3, _option$option_group_5, _ref39, _option$option_group_6, _option$num3, _option$add_price3;
               return {
-                id: (_ref37 = (_option$id3 = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id3 !== void 0 ? _option$id3 : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref37 !== void 0 ? _ref37 : null,
+                id: (_ref38 = (_option$id3 = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id3 !== void 0 ? _option$id3 : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref38 !== void 0 ? _ref38 : null,
                 option_group_id: (_option$option_group_5 = option === null || option === void 0 ? void 0 : option.option_group_id) !== null && _option$option_group_5 !== void 0 ? _option$option_group_5 : null,
-                option_group_item_id: (_ref38 = (_option$option_group_6 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_6 !== void 0 ? _option$option_group_6 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref38 !== void 0 ? _ref38 : null,
+                option_group_item_id: (_ref39 = (_option$option_group_6 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_6 !== void 0 ? _option$option_group_6 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref39 !== void 0 ? _ref39 : null,
                 num: Number((_option$num3 = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num3 !== void 0 ? _option$num3 : 1) || 1,
-                add_price: _this10.normalizeFingerprintMoney((_option$add_price3 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price3 !== void 0 ? _option$add_price3 : option === null || option === void 0 ? void 0 : option.price)
+                add_price: _this11.normalizeFingerprintMoney((_option$add_price3 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price3 !== void 0 ? _option$add_price3 : option === null || option === void 0 ? void 0 : option.price)
               };
             }))
           };
         })),
         discount_list: this.normalizeFingerprintValue(((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
-          var _ref39, _discount$type4, _ref40, _ref41, _discount$discount_id2, _discount$discount2;
+          var _ref40, _discount$type4, _ref41, _ref42, _discount$discount_id2, _discount$discount2;
           return {
-            type: (_ref39 = (_discount$type4 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type4 !== void 0 ? _discount$type4 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref39 !== void 0 ? _ref39 : '',
-            discount_id: (_ref40 = (_ref41 = (_discount$discount_id2 = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id2 !== void 0 ? _discount$discount_id2 : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref41 !== void 0 ? _ref41 : discount === null || discount === void 0 || (_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) !== null && _ref40 !== void 0 ? _ref40 : null,
-            amount: _this10.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
+            type: (_ref40 = (_discount$type4 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type4 !== void 0 ? _discount$type4 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref40 !== void 0 ? _ref40 : '',
+            discount_id: (_ref41 = (_ref42 = (_discount$discount_id2 = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id2 !== void 0 ? _discount$discount_id2 : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref42 !== void 0 ? _ref42 : discount === null || discount === void 0 || (_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) !== null && _ref41 !== void 0 ? _ref41 : null,
+            amount: _this11.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
           };
         }))
       };
@@ -1817,9 +2031,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildOrderProductsStructuralFingerprint",
     value: function buildOrderProductsStructuralFingerprint(products) {
-      var _this11 = this;
+      var _this12 = this;
       var items = (products || []).map(function (product) {
-        return _this11.buildProductStructuralFingerprintItem(product);
+        return _this12.buildProductStructuralFingerprintItem(product);
       });
       items.sort(function (left, right) {
         return JSON.stringify(left).localeCompare(JSON.stringify(right));
@@ -1880,19 +2094,36 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       });
       return currentAmountGap === snapshotAmountGap;
     }
+  }, {
+    key: "hasShopDiscountChangedFromSnapshot",
+    value: function hasShopDiscountChangedFromSnapshot(tempOrder, snapshot) {
+      var _snapshot$shop_discou;
+      var snapshotSummary = snapshot.summary && _typeof(snapshot.summary) === 'object' ? snapshot.summary : {};
+      var snapshotShopDiscount = (_snapshot$shop_discou = snapshot.shop_discount) !== null && _snapshot$shop_discou !== void 0 ? _snapshot$shop_discou : snapshotSummary.shop_discount;
+      if (snapshotShopDiscount === undefined || snapshotShopDiscount === null || snapshotShopDiscount === '') {
+        return !new Decimal(tempOrder.shop_discount || 0).equals(0);
+      }
+      return !new Decimal(tempOrder.shop_discount || 0).equals(snapshotShopDiscount || 0);
+    }
   }, {
     key: "restoreOriginalSnapshotIfProductsUnchanged",
-    value: function restoreOriginalSnapshotIfProductsUnchanged(tempOrder) {
-      var snapshot = this.getOriginalSalesSnapshot(tempOrder);
-      if (!snapshot) return null;
+    value: function restoreOriginalSnapshotIfProductsUnchanged(tempOrder, snapshot) {
       var currentFingerprint = this.buildOrderProductsFingerprint(tempOrder.products);
+      var manualDepositOverride = this.getManualDepositOverride(tempOrder);
       if (currentFingerprint !== snapshot.productFingerprint) {
         var currentStructuralFingerprint = this.buildOrderProductsStructuralFingerprint(tempOrder.products);
         var snapshotStructuralFingerprint = this.buildOrderProductsStructuralFingerprint(Array.isArray(snapshot.products) ? snapshot.products : []);
         if (currentStructuralFingerprint !== snapshotStructuralFingerprint) return null;
       }
       var summary = _objectSpread(_objectSpread({}, createEmptySummary()), cloneDeep(snapshot.summary || {}));
-      if (!this.isSnapshotPayableAmountUnchanged(tempOrder, snapshot, summary)) return null;
+      var shouldUseManualDepositOverride = Boolean(manualDepositOverride && manualDepositOverride.productStructuralFingerprint === this.buildOrderProductsStructuralFingerprint(tempOrder.products));
+      if (shouldUseManualDepositOverride) {
+        summary = this.applyDepositAmountToSummary(tempOrder, summary, manualDepositOverride.amount);
+      } else if (manualDepositOverride) {
+        this.clearManualDepositOverride(tempOrder);
+      }
+      var isPayableAmountUnchanged = this.isSnapshotPayableAmountUnchanged(tempOrder, snapshot, summary);
+      if (!isPayableAmountUnchanged) return null;
       if (Array.isArray(snapshot.products)) {
         tempOrder.products = cloneDeep(snapshot.products);
       }
@@ -1902,7 +2133,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       tempOrder.surcharge_fee = summary.surcharge_fee || tempOrder.surcharge_fee;
       tempOrder.deposit_amount = summary.deposit_amount || '0.00';
       tempOrder.is_deposit = summary.deposit_amount !== '0.00' ? 1 : 0;
+      var previousSummary = this.store.summary;
       this.store.summary = summary;
+      this.updateTempOrderPaymentStatus(tempOrder, {
+        previousSummary: previousSummary,
+        summary: summary
+      });
       return summary;
     }
   }, {
@@ -2014,15 +2250,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "restoreOrder",
     value: function restoreOrder() {
-      var _this$store$discount11, _this$store$discount12;
+      var _this$store$discount15, _this$store$discount16;
+      this.logInfo('restoreOrder start', {});
       var freshTempOrder = this.createDefaultTempOrderInstance();
       this.ensureExternalSaleNumber(freshTempOrder);
       this.store.tempOrder = freshTempOrder;
       this.store.summary = createEmptySummary();
       this.store.lastOrderInfo = undefined;
       this.store.syncState = undefined;
-      void ((_this$store$discount11 = this.store.discount) === null || _this$store$discount11 === void 0 ? void 0 : _this$store$discount11.setOriginalDiscountList([]));
-      void ((_this$store$discount12 = this.store.discount) === null || _this$store$discount12 === void 0 ? void 0 : _this$store$discount12.setDiscountList([]));
+      void ((_this$store$discount15 = this.store.discount) === null || _this$store$discount15 === void 0 ? void 0 : _this$store$discount15.setOriginalDiscountList([]));
+      void ((_this$store$discount16 = this.store.discount) === null || _this$store$discount16 === void 0 ? void 0 : _this$store$discount16.setDiscountList([]));
       this.persistTempOrder();
       return freshTempOrder;
     }
@@ -2034,13 +2271,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "replaceTempOrder",
     value: function () {
-      var _replaceTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(tempOrder, options) {
+      var _replaceTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(tempOrder, options) {
         var nextTempOrder;
-        return _regeneratorRuntime().wrap(function _callee9$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return _regeneratorRuntime().wrap(function _callee10$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
               if (isTempOrder(tempOrder)) {
-                _context11.next = 2;
+                _context12.next = 2;
                 break;
               }
               throw new Error('无效的 tempOrder 数据');
@@ -2050,15 +2287,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               this.store.tempOrder = nextTempOrder;
               if (!((options === null || options === void 0 ? void 0 : options.recalculateSummary) !== false)) {
-                _context11.next = 9;
+                _context12.next = 9;
                 break;
               }
-              _context11.next = 7;
+              _context12.next = 7;
               return this.recalculateSummary({
                 createIfMissing: false
               });
             case 7:
-              _context11.next = 10;
+              _context12.next = 10;
               break;
             case 9:
               this.store.summary = createEmptySummary();
@@ -2067,20 +2304,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 this.persistTempOrder();
               }
               if (!(options !== null && options !== void 0 && options.saveDraft)) {
-                _context11.next = 14;
+                _context12.next = 14;
                 break;
               }
-              _context11.next = 14;
+              _context12.next = 14;
               return this.saveDraft();
             case 14:
-              return _context11.abrupt("return", nextTempOrder);
+              return _context12.abrupt("return", nextTempOrder);
             case 15:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
-        }, _callee9, this);
+        }, _callee10, this);
       }));
-      function replaceTempOrder(_x8, _x9) {
+      function replaceTempOrder(_x9, _x10) {
         return _replaceTempOrder.apply(this, arguments);
       }
       return replaceTempOrder;
@@ -2088,11 +2325,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderIdentity",
     value: function getOrderIdentity() {
-      var _ref42, _ref43, _tempOrder$order_id, _tempOrder$_extend6;
+      var _ref43, _ref44, _tempOrder$order_id, _tempOrder$_extend6;
       var tempOrder = this.store.tempOrder;
       if (!tempOrder) return null;
       var lastOrderInfo = this.store.lastOrderInfo || {};
-      var orderId = (_ref42 = (_ref43 = (_tempOrder$order_id = tempOrder.order_id) !== null && _tempOrder$order_id !== void 0 ? _tempOrder$order_id : lastOrderInfo.order_id) !== null && _ref43 !== void 0 ? _ref43 : lastOrderInfo.id) !== null && _ref42 !== void 0 ? _ref42 : null;
+      var orderId = (_ref43 = (_ref44 = (_tempOrder$order_id = tempOrder.order_id) !== null && _tempOrder$order_id !== void 0 ? _tempOrder$order_id : lastOrderInfo.order_id) !== null && _ref44 !== void 0 ? _ref44 : lastOrderInfo.id) !== null && _ref43 !== void 0 ? _ref43 : null;
       return {
         localId: this.cacheId || ((_tempOrder$_extend6 = tempOrder._extend) === null || _tempOrder$_extend6 === void 0 ? void 0 : _tempOrder$_extend6.localId),
         orderId: orderId,
@@ -2127,7 +2364,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         orderPaidAmount: paidPaymentSummary.gapPaidAmount
       });
       return {
-        isDeposit: tempOrder.is_deposit === 1 || depositAmount !== '0.00',
+        isDeposit: tempOrder.is_deposit === 1,
         depositAmount: depositAmount,
         expectAmount: summary.expect_amount || '0.00',
         totalAmount: summary.total_amount || '0.00',
@@ -2166,32 +2403,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addNewOrder",
     value: function () {
-      var _addNewOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+      var _addNewOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee10$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+        return _regeneratorRuntime().wrap(function _callee11$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               this.ensureExternalSaleNumber(tempOrder);
-              _context12.next = 4;
+              _context13.next = 4;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 4:
               this.persistTempOrder();
               if (!this.draftPersistEnabled) {
-                _context12.next = 8;
+                _context13.next = 8;
                 break;
               }
-              _context12.next = 8;
+              _context13.next = 8;
               return this.saveDraft();
             case 8:
-              return _context12.abrupt("return", tempOrder);
+              return _context13.abrupt("return", tempOrder);
             case 9:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
-        }, _callee10, this);
+        }, _callee11, this);
       }));
       function addNewOrder() {
         return _addNewOrder.apply(this, arguments);
@@ -2224,9 +2461,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sanitizeTempOrderProducts",
     value: function sanitizeTempOrderProducts(tempOrder) {
-      var _this12 = this;
+      var _this13 = this;
       tempOrder.products = (tempOrder.products || []).map(function (product) {
-        return _this12.sanitizeOrderProductForTempOrder(product);
+        return _this13.sanitizeOrderProductForTempOrder(product);
       });
     }
   }, {
@@ -2245,11 +2482,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "captureProductRuntime",
     value: function captureProductRuntime(tempOrder, rawProduct, normalizedProduct, existedUid) {
-      var _extend$productsByUid, _ref44, _rawProduct$_origin;
+      var _extend$productsByUid, _ref45, _rawProduct$_origin;
       var uid = existedUid || this.getProductUid(normalizedProduct);
       var extend = this.ensureExtend(tempOrder);
       var existed = ((_extend$productsByUid = extend.productsByUid) === null || _extend$productsByUid === void 0 ? void 0 : _extend$productsByUid[uid]) || {};
-      var origin = (_ref44 = (_rawProduct$_origin = rawProduct._origin) !== null && _rawProduct$_origin !== void 0 ? _rawProduct$_origin : normalizedProduct._origin) !== null && _ref44 !== void 0 ? _ref44 : existed.origin;
+      var origin = (_ref45 = (_rawProduct$_origin = rawProduct._origin) !== null && _rawProduct$_origin !== void 0 ? _rawProduct$_origin : normalizedProduct._origin) !== null && _ref45 !== void 0 ? _ref45 : existed.origin;
       extend.productsByUid[uid] = _objectSpread(_objectSpread({}, existed), origin !== undefined ? {
         origin: origin
       } : {});
@@ -2316,6 +2553,48 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         return record !== undefined && record !== null && record !== '';
       });
     }
+  }, {
+    key: "setProductHolderFromBooking",
+    value: function setProductHolderFromBooking(product, booking) {
+      if (!product || !booking) return;
+      var holderRecords = this.collectBookingHolderRecords(booking);
+      if (!product.metadata || _typeof(product.metadata) !== 'object') {
+        product.metadata = {};
+      }
+      product.metadata.holder_id = holderRecords.length > 0 ? holderRecords : null;
+    }
+  }, {
+    key: "syncLinkedBookingHoldersToProducts",
+    value: function syncLinkedBookingHoldersToProducts(tempOrder) {
+      var _this14 = this;
+      var bookings = tempOrder.bookings || [];
+      var products = tempOrder.products || [];
+      if (!bookings.length || !products.length) return;
+      var bookingByProductUid = new Map();
+      var bookingByBookingUid = new Map();
+      bookings.forEach(function (booking) {
+        var _booking$metadata2, _booking$metadata3;
+        if (!booking || _typeof(booking) !== 'object') return;
+        var productUid = booking.product_uid || ((_booking$metadata2 = booking.metadata) === null || _booking$metadata2 === void 0 ? void 0 : _booking$metadata2.product_uid);
+        if (productUid !== undefined && productUid !== null && String(productUid) !== '') {
+          bookingByProductUid.set(String(productUid), booking);
+        }
+        var bookingUid = ((_booking$metadata3 = booking.metadata) === null || _booking$metadata3 === void 0 ? void 0 : _booking$metadata3.unique_identification_number) || booking.booking_uid;
+        if (bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '') {
+          bookingByBookingUid.set(String(bookingUid), booking);
+        }
+      });
+      products.forEach(function (product) {
+        var _product$metadata5, _product$metadata6;
+        if (!product || _typeof(product) !== 'object') return;
+        var productUid = ((_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number) || product.unique_identification_number;
+        var bookingUid = product.booking_uid || ((_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.booking_uid);
+        var linkedBooking = (productUid !== undefined && productUid !== null && String(productUid) !== '' ? bookingByProductUid.get(String(productUid)) : undefined) || (bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '' ? bookingByBookingUid.get(String(bookingUid)) : undefined);
+        if (linkedBooking) {
+          _this14.setProductHolderFromBooking(product, linkedBooking);
+        }
+      });
+    }
 
     /**
      * 按 form_record 顺序读取 booking holder 的主字段名称。
@@ -2350,7 +2629,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildTempOrderHolderFromBookings",
     value: function buildTempOrderHolderFromBookings(tempOrder) {
-      var _baseHolder$customer_, _baseHolder, _ref45, _baseHolder$form_id, _baseHolder2, _tempOrder$holder5, _baseHolder3, _this$otherParams;
+      var _baseHolder$customer_, _baseHolder, _ref46, _baseHolder$form_id, _baseHolder2, _tempOrder$holder2, _baseHolder3, _this$otherParams;
       var holderRecords = [];
       var holderNames = [];
       var baseHolder = null;
@@ -2397,7 +2676,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       var nextHolder = {
         customer_id: (_baseHolder$customer_ = (_baseHolder = baseHolder) === null || _baseHolder === void 0 ? void 0 : _baseHolder.customer_id) !== null && _baseHolder$customer_ !== void 0 ? _baseHolder$customer_ : tempOrder.customer_id,
-        form_id: (_ref45 = (_baseHolder$form_id = (_baseHolder2 = baseHolder) === null || _baseHolder2 === void 0 ? void 0 : _baseHolder2.form_id) !== null && _baseHolder$form_id !== void 0 ? _baseHolder$form_id : (_tempOrder$holder5 = tempOrder.holder) === null || _tempOrder$holder5 === void 0 ? void 0 : _tempOrder$holder5.form_id) !== null && _ref45 !== void 0 ? _ref45 : 0,
+        form_id: (_ref46 = (_baseHolder$form_id = (_baseHolder2 = baseHolder) === null || _baseHolder2 === void 0 ? void 0 : _baseHolder2.form_id) !== null && _baseHolder$form_id !== void 0 ? _baseHolder$form_id : (_tempOrder$holder2 = tempOrder.holder) === null || _tempOrder$holder2 === void 0 ? void 0 : _tempOrder$holder2.form_id) !== null && _ref46 !== void 0 ? _ref46 : 0,
         form_record: holderRecords
       };
       if (holderNames.length) {
@@ -2420,41 +2699,42 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function syncTempOrderHolderFromBookings(tempOrder) {
       var bookings = tempOrder.bookings || [];
       var hasHolderSource = bookings.some(function (booking) {
-        var _booking$metadata2;
-        return (booking === null || booking === void 0 ? void 0 : booking.holder) !== undefined || (booking === null || booking === void 0 || (_booking$metadata2 = booking.metadata) === null || _booking$metadata2 === void 0 ? void 0 : _booking$metadata2.holder_id) !== undefined;
+        var _booking$metadata4;
+        return (booking === null || booking === void 0 ? void 0 : booking.holder) !== undefined || (booking === null || booking === void 0 || (_booking$metadata4 = booking.metadata) === null || _booking$metadata4 === void 0 ? void 0 : _booking$metadata4.holder_id) !== undefined;
       });
       var nextHolder = this.buildTempOrderHolderFromBookings(tempOrder);
       if (nextHolder || hasHolderSource || bookings.length === 0) {
         tempOrder.holder = nextHolder;
       }
+      this.syncLinkedBookingHoldersToProducts(tempOrder);
     }
   }, {
     key: "getBookingUniqueIdentificationNumber",
     value: function getBookingUniqueIdentificationNumber(booking) {
-      var _booking$metadata3;
-      var uid = booking === null || booking === void 0 || (_booking$metadata3 = booking.metadata) === null || _booking$metadata3 === void 0 ? void 0 : _booking$metadata3.unique_identification_number;
+      var _booking$metadata5;
+      var uid = booking === null || booking === void 0 || (_booking$metadata5 = booking.metadata) === null || _booking$metadata5 === void 0 ? void 0 : _booking$metadata5.unique_identification_number;
       if (uid === undefined || uid === null || uid === '') return null;
       return String(uid);
     }
   }, {
     key: "findBookingIndexByUniqueIdentificationNumber",
     value: function findBookingIndexByUniqueIdentificationNumber(tempOrder, uniqueIdentificationNumber) {
-      var _this13 = this;
+      var _this15 = this;
       return (tempOrder.bookings || []).findIndex(function (booking) {
-        return _this13.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
+        return _this15.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
       });
     }
   }, {
     key: "removeLinkedBookingsForProduct",
     value: function removeLinkedBookingsForProduct(tempOrder, product) {
-      var _product$metadata5,
-        _product$metadata6,
-        _this14 = this;
-      var productUid = (product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
-      var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.booking_uid);
+      var _product$metadata7,
+        _product$metadata8,
+        _this16 = this;
+      var productUid = (product === null || product === void 0 || (_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+      var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.booking_uid);
       if (!productUid && !bookingUid) return;
       tempOrder.bookings = (tempOrder.bookings || []).filter(function (booking) {
-        var currentBookingUid = _this14.getBookingUniqueIdentificationNumber(booking);
+        var currentBookingUid = _this16.getBookingUniqueIdentificationNumber(booking);
         if (bookingUid && currentBookingUid === String(bookingUid)) return false;
         if (productUid && String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === String(productUid)) return false;
         return true;
@@ -2492,35 +2772,39 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           hasDeposit: true
         } : undefined
       });
+      var isExistingDepositDisabled = tempOrder.is_deposit === 0 && new Decimal(tempOrder.deposit_amount || 0).gt(0);
       tempOrder.deposit_amount = depositAmount;
-      tempOrder.is_deposit = hasDepositAmount ? 1 : 0;
-      return nextSummary;
+      tempOrder.is_deposit = hasDepositAmount && !isExistingDepositDisabled ? 1 : 0;
+      return this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
     }
   }, {
     key: "recalculateSummary",
     value: function () {
-      var _recalculateSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(options) {
-        var _ref46, _salesSummaryResult$e;
-        var tempOrder, snapshotSummary, shouldFullRecalculateFromSnapshot, summaryProducts, salesSummary, existedSummary, totalRefundAmount, paidPaymentSummary, emptyBaseSummary, emptySummaryBase, emptySummaryWithDeposit, emptySummary, salesSummaryResult, roundingAmount, payServiceChargeAmount, hasSalesSummaryAmount, expectAmount, amountPaymentPatch, normalizedExpectAmountPatch, summaryForGap, summary;
-        return _regeneratorRuntime().wrap(function _callee11$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+      var _recalculateSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(options) {
+        var _this$otherParams2, _ref47, _salesSummaryResult$e;
+        var tempOrder, originalSnapshot, hasShopDiscountChanged, shouldReuseOriginalSnapshot, snapshotSummary, shouldFullRecalculateFromSnapshot, summaryProducts, salesSummary, existedSummary, totalRefundAmount, paidPaymentSummary, emptyBaseSummary, emptySummaryBase, emptySummaryWithDeposit, emptySummary, salesSummaryResult, roundingAmount, payServiceChargeAmount, hasSalesSummaryAmount, expectAmount, amountPaymentPatch, normalizedExpectAmountPatch, summaryForGap, summary;
+        return _regeneratorRuntime().wrap(function _callee12$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               tempOrder = options !== null && options !== void 0 && options.createIfMissing ? this.ensureTempOrder() : this.store.tempOrder;
               if (tempOrder) {
-                _context13.next = 3;
+                _context14.next = 3;
                 break;
               }
-              return _context13.abrupt("return", null);
+              return _context14.abrupt("return", null);
             case 3:
               this.sanitizeTempOrderProducts(tempOrder);
-              snapshotSummary = this.restoreOriginalSnapshotIfProductsUnchanged(tempOrder);
+              originalSnapshot = this.getOriginalSalesSnapshot(tempOrder);
+              hasShopDiscountChanged = originalSnapshot ? this.hasShopDiscountChangedFromSnapshot(tempOrder, originalSnapshot) : false;
+              shouldReuseOriginalSnapshot = originalSnapshot && !hasShopDiscountChanged;
+              snapshotSummary = shouldReuseOriginalSnapshot ? this.restoreOriginalSnapshotIfProductsUnchanged(tempOrder, originalSnapshot) : null;
               if (!snapshotSummary) {
-                _context13.next = 7;
+                _context14.next = 10;
                 break;
               }
-              return _context13.abrupt("return", snapshotSummary);
-            case 7:
-              shouldFullRecalculateFromSnapshot = Boolean(this.getOriginalSalesSnapshot(tempOrder));
+              return _context14.abrupt("return", snapshotSummary);
+            case 10:
+              shouldFullRecalculateFromSnapshot = Boolean(originalSnapshot);
               summaryProducts = shouldFullRecalculateFromSnapshot ? cloneDeep(tempOrder.products || []) : tempOrder.products;
               if (shouldFullRecalculateFromSnapshot) {
                 this.clearPersistedAmountFieldsForFullRecalc(summaryProducts || []);
@@ -2530,7 +2814,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               totalRefundAmount = existedSummary.total_refund_amount || '0.00';
               paidPaymentSummary = this.calculatePaidPaymentSummary(tempOrder.payments || []);
               if (salesSummary) {
-                _context13.next = 23;
+                _context14.next = 26;
                 break;
               }
               emptyBaseSummary = _objectSpread(_objectSpread(_objectSpread({}, createEmptySummary()), existedSummary), {}, {
@@ -2556,16 +2840,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 previousSummary: existedSummary,
                 summary: emptySummary
               });
-              return _context13.abrupt("return", this.store.summary);
-            case 23:
-              _context13.next = 25;
-              return salesSummary.getSummary({
+              return _context14.abrupt("return", this.store.summary);
+            case 26:
+              _context14.next = 28;
+              return salesSummary.getSummary(_objectSpread({
                 products: summaryProducts,
                 isPriceIncludeTax: tempOrder.is_price_include_tax,
                 shopDiscount: tempOrder.shop_discount
-              });
-            case 25:
-              salesSummaryResult = _context13.sent;
+              }, (_this$otherParams2 = this.otherParams) !== null && _this$otherParams2 !== void 0 && _this$otherParams2.channel ? {
+                channel: this.otherParams.channel
+              } : {}));
+            case 28:
+              salesSummaryResult = _context14.sent;
               if (shouldFullRecalculateFromSnapshot) {
                 tempOrder.products = summaryProducts;
               }
@@ -2573,7 +2859,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               roundingAmount = paidPaymentSummary.roundingAmount;
               payServiceChargeAmount = paidPaymentSummary.payServiceChargeAmount;
               hasSalesSummaryAmount = salesSummaryResult.expect_amount !== undefined || salesSummaryResult.total_amount !== undefined;
-              expectAmount = hasSalesSummaryAmount ? new Decimal((_ref46 = (_salesSummaryResult$e = salesSummaryResult.expect_amount) !== null && _salesSummaryResult$e !== void 0 ? _salesSummaryResult$e : salesSummaryResult.total_amount) !== null && _ref46 !== void 0 ? _ref46 : 0) : null;
+              expectAmount = hasSalesSummaryAmount ? new Decimal((_ref47 = (_salesSummaryResult$e = salesSummaryResult.expect_amount) !== null && _salesSummaryResult$e !== void 0 ? _salesSummaryResult$e : salesSummaryResult.total_amount) !== null && _ref47 !== void 0 ? _ref47 : 0) : null;
               amountPaymentPatch = hasSalesSummaryAmount || !roundingAmount.eq(0) || !payServiceChargeAmount.eq(0) ? _objectSpread({
                 rounding_amount: roundingAmount.toFixed(2)
               }, expectAmount ? {
@@ -2610,14 +2896,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 previousSummary: existedSummary,
                 summary: summary
               });
-              return _context13.abrupt("return", this.store.summary);
-            case 43:
+              return _context14.abrupt("return", this.store.summary);
+            case 46:
             case "end":
-              return _context13.stop();
+              return _context14.stop();
           }
-        }, _callee11, this);
+        }, _callee12, this);
       }));
-      function recalculateSummary(_x10) {
+      function recalculateSummary(_x11) {
         return _recalculateSummary.apply(this, arguments);
       }
       return recalculateSummary;
@@ -2625,30 +2911,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderSummary",
     value: function () {
-      var _getOrderSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+      var _getOrderSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
         var summary;
-        return _regeneratorRuntime().wrap(function _callee12$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regeneratorRuntime().wrap(function _callee13$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              _context14.next = 2;
+              _context15.next = 2;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 2:
-              summary = _context14.sent;
+              summary = _context15.sent;
               if (summary) {
-                _context14.next = 5;
+                _context15.next = 5;
                 break;
               }
-              return _context14.abrupt("return", createEmptySummary());
+              return _context15.abrupt("return", createEmptySummary());
             case 5:
               this.persistTempOrder();
-              return _context14.abrupt("return", summary);
+              return _context15.abrupt("return", summary);
             case 7:
             case "end":
-              return _context14.stop();
+              return _context15.stop();
           }
-        }, _callee12, this);
+        }, _callee13, this);
       }));
       function getOrderSummary() {
         return _getOrderSummary.apply(this, arguments);
@@ -2672,23 +2958,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncTempOrderNoteToRemote",
     value: function () {
-      var _syncTempOrderNoteToRemote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(orderId, note) {
-        return _regeneratorRuntime().wrap(function _callee13$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+      var _syncTempOrderNoteToRemote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(orderId, note) {
+        return _regeneratorRuntime().wrap(function _callee14$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              _context15.next = 2;
+              _context16.next = 2;
               return this.request.put("/order/order/".concat(orderId, "/note"), {
                 note: note
               });
             case 2:
-              return _context15.abrupt("return", note);
+              return _context16.abrupt("return", note);
             case 3:
             case "end":
-              return _context15.stop();
+              return _context16.stop();
           }
-        }, _callee13, this);
+        }, _callee14, this);
       }));
-      function syncTempOrderNoteToRemote(_x11, _x12) {
+      function syncTempOrderNoteToRemote(_x12, _x13) {
         return _syncTempOrderNoteToRemote.apply(this, arguments);
       }
       return syncTempOrderNoteToRemote;
@@ -2751,17 +3037,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildTempOrderCustomer",
     value: function buildTempOrderCustomer(params) {
-      var _ref47, _ref48, _ref49, _source$name, _ref50, _ref51, _ref52, _source$customer_name, _source$id, _source$customer_id, _ref53, _source$country_calli, _source$phone, _source$email;
+      var _ref48, _ref49, _ref50, _source$name, _ref51, _ref52, _ref53, _source$customer_name, _source$id, _source$customer_id, _ref54, _source$country_calli, _source$phone, _source$email;
       if (!params.customerId) return null;
       var source = params.source ? cloneDeep(params.source) : {};
-      var name = (_ref47 = (_ref48 = (_ref49 = (_source$name = source.name) !== null && _source$name !== void 0 ? _source$name : source.display_name) !== null && _ref49 !== void 0 ? _ref49 : source.customerName) !== null && _ref48 !== void 0 ? _ref48 : source.customer_name) !== null && _ref47 !== void 0 ? _ref47 : params.customerName;
-      var customerName = (_ref50 = (_ref51 = (_ref52 = (_source$customer_name = source.customer_name) !== null && _source$customer_name !== void 0 ? _source$customer_name : source.customerName) !== null && _ref52 !== void 0 ? _ref52 : source.display_name) !== null && _ref51 !== void 0 ? _ref51 : source.name) !== null && _ref50 !== void 0 ? _ref50 : params.customerName;
+      var name = (_ref48 = (_ref49 = (_ref50 = (_source$name = source.name) !== null && _source$name !== void 0 ? _source$name : source.display_name) !== null && _ref50 !== void 0 ? _ref50 : source.customerName) !== null && _ref49 !== void 0 ? _ref49 : source.customer_name) !== null && _ref48 !== void 0 ? _ref48 : params.customerName;
+      var customerName = (_ref51 = (_ref52 = (_ref53 = (_source$customer_name = source.customer_name) !== null && _source$customer_name !== void 0 ? _source$customer_name : source.customerName) !== null && _ref53 !== void 0 ? _ref53 : source.display_name) !== null && _ref52 !== void 0 ? _ref52 : source.name) !== null && _ref51 !== void 0 ? _ref51 : params.customerName;
       return _objectSpread(_objectSpread({}, source), {}, {
         id: (_source$id = source.id) !== null && _source$id !== void 0 ? _source$id : params.customerId,
         customer_id: (_source$customer_id = source.customer_id) !== null && _source$customer_id !== void 0 ? _source$customer_id : params.customerId,
         name: String(name || ''),
         customer_name: String(customerName || ''),
-        country_calling_code: String((_ref53 = (_source$country_calli = source.country_calling_code) !== null && _source$country_calli !== void 0 ? _source$country_calli : source.countryCallingCode) !== null && _ref53 !== void 0 ? _ref53 : params.countryCallingCode),
+        country_calling_code: String((_ref54 = (_source$country_calli = source.country_calling_code) !== null && _source$country_calli !== void 0 ? _source$country_calli : source.countryCallingCode) !== null && _ref54 !== void 0 ? _ref54 : params.countryCallingCode),
         phone: String((_source$phone = source.phone) !== null && _source$phone !== void 0 ? _source$phone : params.phone),
         email: String((_source$email = source.email) !== null && _source$email !== void 0 ? _source$email : params.email)
       });
@@ -2773,38 +3059,43 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var type = (_discount$type5 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type5 !== void 0 ? _discount$type5 : discount === null || discount === void 0 ? void 0 : discount.tag;
       return type === 'good_pass' || type === 'discount_card' || type === 'product_discount_card';
     }
+  }, {
+    key: "shouldKeepCustomerBoundDiscountAfterCustomerChange",
+    value: function shouldKeepCustomerBoundDiscountAfterCustomerChange(discount) {
+      return Boolean((discount === null || discount === void 0 ? void 0 : discount.isScan) || (discount === null || discount === void 0 ? void 0 : discount.isEditMode));
+    }
   }, {
     key: "productHasCustomerBoundDiscount",
     value: function productHasCustomerBoundDiscount(product) {
-      var _this15 = this;
+      var _this17 = this;
       if (((product === null || product === void 0 ? void 0 : product.discount_list) || []).some(function (discount) {
-        return _this15.isCustomerBoundDiscount(discount);
+        return _this17.isCustomerBoundDiscount(discount);
       })) {
         return true;
       }
       return ((product === null || product === void 0 ? void 0 : product.product_bundle) || []).some(function (bundle) {
         return ((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []).some(function (discount) {
-          return _this15.isCustomerBoundDiscount(discount);
+          return _this17.isCustomerBoundDiscount(discount);
         });
       });
     }
   }, {
     key: "shouldSkipDiscountCalculation",
     value: function shouldSkipDiscountCalculation(tempOrder) {
-      var _this$store$discount13,
-        _this$store$discount14,
-        _this16 = this;
+      var _this$store$discount17,
+        _this$store$discount18,
+        _this18 = this;
       if (this.hasActiveCustomerBoundDiscount) return false;
-      var discountList = ((_this$store$discount13 = this.store.discount) === null || _this$store$discount13 === void 0 || (_this$store$discount14 = _this$store$discount13.getDiscountList) === null || _this$store$discount14 === void 0 ? void 0 : _this$store$discount14.call(_this$store$discount13)) || [];
+      var discountList = ((_this$store$discount17 = this.store.discount) === null || _this$store$discount17 === void 0 || (_this$store$discount18 = _this$store$discount17.getDiscountList) === null || _this$store$discount18 === void 0 ? void 0 : _this$store$discount18.call(_this$store$discount17)) || [];
       if (discountList.length > 0) return false;
       return !(tempOrder.products || []).some(function (product) {
-        return _this16.productHasCustomerBoundDiscount(product);
+        return _this18.productHasCustomerBoundDiscount(product);
       });
     }
   }, {
     key: "clearCustomerBoundDiscounts",
     value: function clearCustomerBoundDiscounts(tempOrder) {
-      var _this17 = this,
+      var _this19 = this,
         _discountModule$getDi,
         _discountModule$getOr,
         _discountModule$setDi,
@@ -2813,7 +3104,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var filterDiscountList = function filterDiscountList(discountList) {
         if (!Array.isArray(discountList)) return [];
         return discountList.filter(function (discount) {
-          var shouldRemove = _this17.isCustomerBoundDiscount(discount);
+          var shouldRemove = _this19.isCustomerBoundDiscount(discount);
           if (shouldRemove) didRemoveCustomerBoundDiscount = true;
           return !shouldRemove;
         });
@@ -2840,12 +3131,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var currentDiscounts = ((_discountModule$getDi = discountModule.getDiscountList) === null || _discountModule$getDi === void 0 ? void 0 : _discountModule$getDi.call(discountModule)) || [];
       var currentOriginalDiscounts = ((_discountModule$getOr = discountModule.getOriginalDiscountList) === null || _discountModule$getOr === void 0 ? void 0 : _discountModule$getOr.call(discountModule)) || [];
       var nextDiscounts = currentDiscounts.filter(function (discount) {
-        if (discount !== null && discount !== void 0 && discount.isEditMode) return true;
-        return !_this17.isCustomerBoundDiscount(discount);
+        if (_this19.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
+        return !_this19.isCustomerBoundDiscount(discount);
       });
       var nextOriginalDiscounts = currentOriginalDiscounts.filter(function (discount) {
-        if (discount !== null && discount !== void 0 && discount.isEditMode) return true;
-        return !_this17.isCustomerBoundDiscount(discount);
+        if (_this19.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
+        return !_this19.isCustomerBoundDiscount(discount);
       });
       void ((_discountModule$setDi = discountModule.setDiscountList) === null || _discountModule$setDi === void 0 ? void 0 : _discountModule$setDi.call(discountModule, nextDiscounts));
       void ((_discountModule$setOr = discountModule.setOriginalDiscountList) === null || _discountModule$setOr === void 0 ? void 0 : _discountModule$setOr.call(discountModule, nextOriginalDiscounts));
@@ -2860,14 +3151,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateTempOrderCustomer",
     value: function updateTempOrderCustomer(customer) {
-      var _tempOrder$customer_i2, _ref54, _ref55, _customer$customer_id, _ref56, _ref57, _ref58, _customer$customer_na, _ref59, _customer$country_cal, _tempOrder$customer_i3;
+      var _tempOrder$customer_i2, _ref55, _ref56, _customer$customer_id, _ref57, _ref58, _ref59, _customer$customer_na, _ref60, _customer$country_cal, _tempOrder$customer_i3;
       var tempOrder = this.ensureTempOrder();
       var previousCustomerId = (_tempOrder$customer_i2 = tempOrder.customer_id) !== null && _tempOrder$customer_i2 !== void 0 ? _tempOrder$customer_i2 : null;
-      var customerId = (_ref54 = (_ref55 = (_customer$customer_id = customer.customer_id) !== null && _customer$customer_id !== void 0 ? _customer$customer_id : customer.customerId) !== null && _ref55 !== void 0 ? _ref55 : customer.id) !== null && _ref54 !== void 0 ? _ref54 : null;
-      var customerName = (_ref56 = (_ref57 = (_ref58 = (_customer$customer_na = customer.customer_name) !== null && _customer$customer_na !== void 0 ? _customer$customer_na : customer.customerName) !== null && _ref58 !== void 0 ? _ref58 : customer.display_name) !== null && _ref57 !== void 0 ? _ref57 : customer.name) !== null && _ref56 !== void 0 ? _ref56 : '';
+      var customerId = (_ref55 = (_ref56 = (_customer$customer_id = customer.customer_id) !== null && _customer$customer_id !== void 0 ? _customer$customer_id : customer.customerId) !== null && _ref56 !== void 0 ? _ref56 : customer.id) !== null && _ref55 !== void 0 ? _ref55 : null;
+      var customerName = (_ref57 = (_ref58 = (_ref59 = (_customer$customer_na = customer.customer_name) !== null && _customer$customer_na !== void 0 ? _customer$customer_na : customer.customerName) !== null && _ref59 !== void 0 ? _ref59 : customer.display_name) !== null && _ref58 !== void 0 ? _ref58 : customer.name) !== null && _ref57 !== void 0 ? _ref57 : '';
       tempOrder.customer_id = customerId === null || customerId === undefined || customerId === '' ? null : Number(customerId);
       tempOrder.customer_name = String(customerName || '');
-      tempOrder.country_calling_code = String((_ref59 = (_customer$country_cal = customer.country_calling_code) !== null && _customer$country_cal !== void 0 ? _customer$country_cal : customer.countryCallingCode) !== null && _ref59 !== void 0 ? _ref59 : '');
+      tempOrder.country_calling_code = String((_ref60 = (_customer$country_cal = customer.country_calling_code) !== null && _customer$country_cal !== void 0 ? _customer$country_cal : customer.countryCallingCode) !== null && _ref60 !== void 0 ? _ref60 : '');
       tempOrder.phone = String(customer.phone || '');
       tempOrder.email = String(customer.email || '');
       tempOrder.customer = this.buildTempOrderCustomer({
@@ -2916,8 +3207,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       var nextCustomerId = (_tempOrder$customer_i5 = tempOrder.customer_id) !== null && _tempOrder$customer_i5 !== void 0 ? _tempOrder$customer_i5 : null;
       if (String(previousCustomerId !== null && previousCustomerId !== void 0 ? previousCustomerId : '') !== String(nextCustomerId !== null && nextCustomerId !== void 0 ? nextCustomerId : '')) {
+        this.store.availableWalletIds = [];
         clearTempOrderHolderAssignments(tempOrder);
         this.clearCustomerBoundDiscounts(tempOrder);
+        this.applyDiscount();
       }
       this.persistTempOrder();
       this.saveDraftInBackground();
@@ -2959,6 +3252,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       tempOrder.email = '';
       tempOrder.customer = null;
       if (tempOrder._extend) delete tempOrder._extend.customerSnapshot;
+      this.store.availableWalletIds = [];
       this.clearCustomerBoundDiscounts(tempOrder);
       this.persistTempOrder();
       this.saveDraftInBackground();
@@ -3012,7 +3306,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addOrderPayment",
     value: function addOrderPayment(payment) {
-      var _this18 = this;
+      var _this20 = this;
       this.logInfo('addOrderPayment', {
         payment: payment
       });
@@ -3029,7 +3323,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this18.logError('recalculate summary after addOrderPayment failed', {
+        _this20.logError('recalculate summary after addOrderPayment failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -3084,67 +3378,172 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       this.persistTempOrder();
       return tempOrder.payments;
     }
-
-    /**
-     * 覆盖当前订单中的 wallet pass 支付项。
-     *
-     * 判断口径与 PaymentModal 保持一致：voucher_id 存在且不为 0 的支付项
-     * 视为 wallet pass；其它支付项保持不变。
-     */
   }, {
-    key: "updateVoucherOrderPayments",
-    value: function updateVoucherOrderPayments(payments) {
-      var _this19 = this;
-      var tempOrder = this.ensureTempOrder();
-      var isVoucherPayment = function isVoucherPayment(payment) {
-        return payment.voucher_id !== undefined && Number(payment.voucher_id) !== 0;
-      };
-      var hasSyncedOrderPayment = function hasSyncedOrderPayment(payment) {
-        return payment.order_payment_id !== undefined && payment.order_payment_id !== null;
-      };
-      // const normalizeVoucherPaymentStatus = (payment: OrderPaymentSource): OrderPaymentSource => {
-      //   const paymentRecord = payment as Record<string, any>;
-      //   // if (paymentRecord.status !== 'active') return payment;
-      //   // return {
-      //   //   ...paymentRecord,
-      //   //   status: 'paid',
-      //   // };
-      //   if (paymentRecord.status === 'active') {
-      //     paymentRecord.status = 'paid'
-      //   }
-      //   return paymentRecord
-      // };
-      var mappedVouchers = mapPaymentItemsToOrderPayments(payments.map(function (payment) {
-        return _this19.normalizePaymentSource(payment, {
-          defaultPaid: true
+    key: "confirmPendingVoucherPaymentsInList",
+    value: function confirmPendingVoucherPaymentsInList(payments) {
+      return (payments || []).map(function (payment) {
+        if (!isPendingVoucherPaymentRecord(payment)) return payment;
+        return _objectSpread(_objectSpread({}, payment), {}, {
+          status: ORDER_PAYMENT_STATUS_PAID
         });
-      })).filter(function (payment) {
-        return isVoucherPayment(payment);
       });
-      var nonVoucherPayments = (tempOrder.payments || []).filter(function (payment) {
-        return !isVoucherPayment(payment);
-      });
-      var syncedVoucherPayments = (tempOrder.payments || []).filter(function (payment) {
-        return isVoucherPayment(payment) && hasSyncedOrderPayment(payment);
-      });
-      var syncedVoucherPaymentIds = new Set(syncedVoucherPayments.map(function (payment) {
-        return String(payment.order_payment_id);
-      }));
-      var replaceableVouchers = mappedVouchers.filter(function (payment) {
-        if (!hasSyncedOrderPayment(payment)) return true;
-        return !syncedVoucherPaymentIds.has(String(payment.order_payment_id));
+    }
+  }, {
+    key: "discardPendingVoucherPaymentsFromList",
+    value: function discardPendingVoucherPaymentsFromList(payments) {
+      return (payments || []).filter(function (payment) {
+        return !isPendingVoucherPaymentRecord(payment);
+      });
+    }
+  }, {
+    key: "prepareVoucherPaymentsForSubmit",
+    value: function prepareVoucherPaymentsForSubmit(payments) {
+      var confirmPendingVoucherPayments = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+      var mappedPayments = mapPaymentItemsToOrderPayments(payments || []);
+      return confirmPendingVoucherPayments ? this.confirmPendingVoucherPaymentsInList(mappedPayments) : this.discardPendingVoucherPaymentsFromList(mappedPayments);
+    }
+  }, {
+    key: "applyPaymentLifecycleChange",
+    value: function applyPaymentLifecycleChange(tempOrder, options) {
+      var _this21 = this;
+      this.updateTempOrderPaymentStatus(tempOrder);
+      if ((options === null || options === void 0 ? void 0 : options.persist) !== false) {
+        this.persistTempOrder();
+      }
+      if ((options === null || options === void 0 ? void 0 : options.recalculateSummary) === false) return;
+      var logContext = (options === null || options === void 0 ? void 0 : options.logContext) || 'payment lifecycle change';
+      void this.recalculateSummary({
+        createIfMissing: true
+      }).catch(function (error) {
+        _this21.logError("recalculate summary after ".concat(logContext, " failed"), {
+          error: error instanceof Error ? error.message : String(error)
+        });
+      });
+    }
+  }, {
+    key: "confirmPendingVoucherPayments",
+    value: function confirmPendingVoucherPayments(options) {
+      var tempOrder = this.ensureTempOrder();
+      var payments = tempOrder.payments || [];
+      var hasPendingVoucher = payments.some(function (payment) {
+        return isPendingVoucherPaymentRecord(payment);
+      });
+      if (!hasPendingVoucher) return payments;
+      tempOrder.payments = this.confirmPendingVoucherPaymentsInList(payments);
+      this.applyPaymentLifecycleChange(tempOrder, _objectSpread(_objectSpread({}, options), {}, {
+        logContext: 'confirmPendingVoucherPayments'
+      }));
+      // this.recalculateSummary();
+      return tempOrder.payments;
+    }
+  }, {
+    key: "discardPendingVoucherPayments",
+    value: function discardPendingVoucherPayments(options) {
+      var tempOrder = this.ensureTempOrder();
+      var payments = tempOrder.payments || [];
+      var nextPayments = this.discardPendingVoucherPaymentsFromList(payments);
+      if (nextPayments.length === payments.length) return payments;
+      tempOrder.payments = nextPayments;
+      this.applyPaymentLifecycleChange(tempOrder, _objectSpread(_objectSpread({}, options), {}, {
+        logContext: 'discardPendingVoucherPayments'
+      }));
+      return tempOrder.payments;
+    }
+
+    /**
+     * 覆盖当前订单中的 wallet pass 支付项。
+     *
+     * 判断口径与 PaymentModal 保持一致：voucher_id 存在且不为 0 的支付项
+     * 视为 wallet pass；其它支付项保持不变。
+     */
+  }, {
+    key: "updateVoucherOrderPayments",
+    value: function updateVoucherOrderPayments(payments, options) {
+      var _this22 = this;
+      var tempOrder = this.ensureTempOrder();
+      var isOrderPaymentType = function isOrderPaymentType(value) {
+        return value === 'normal' || value === 'deposit';
+      };
+      var voucherOrderPaymentType = this.resolveNextOrderPaymentType(tempOrder);
+      var withVoucherPaymentType = function withVoucherPaymentType(payment) {
+        var paymentRecord = payment;
+        if (!isVoucherPaymentRecord(paymentRecord)) return payment;
+        var explicitPaymentType = isOrderPaymentType(paymentRecord.order_payment_type) ? paymentRecord.order_payment_type : isOrderPaymentType(paymentRecord.type) ? paymentRecord.type : undefined;
+        var nextPaymentType = explicitPaymentType || voucherOrderPaymentType;
+        var shouldPreserveCustomPaymentType = paymentRecord.custom_payment_type === undefined && paymentRecord.type !== undefined && !isOrderPaymentType(paymentRecord.type);
+        return _objectSpread(_objectSpread(_objectSpread({}, paymentRecord), shouldPreserveCustomPaymentType ? {
+          custom_payment_type: paymentRecord.type
+        } : {}), {}, {
+          type: nextPaymentType,
+          order_payment_type: nextPaymentType
+        });
+      };
+      var normalizeVoucherPaymentStatus = function normalizeVoucherPaymentStatus(payment) {
+        var paymentRecord = payment;
+        if (!isVoucherPaymentRecord(paymentRecord)) return payment;
+        if (hasSyncedOrderPaymentRecord(paymentRecord) && (paymentRecord.status === undefined || paymentRecord.status === 'active')) {
+          return _objectSpread(_objectSpread({}, paymentRecord), {}, {
+            status: ORDER_PAYMENT_STATUS_PAID
+          });
+        }
+        if (paymentRecord.status !== undefined && paymentRecord.status !== 'active') {
+          return payment;
+        }
+        return _objectSpread(_objectSpread({}, paymentRecord), {}, {
+          status: (options === null || options === void 0 ? void 0 : options.status) || ORDER_PAYMENT_STATUS_PENDING
+        });
+      };
+      var mappedVouchers = mapPaymentItemsToOrderPayments(payments.map(function (payment) {
+        return _this22.normalizePaymentSource(normalizeVoucherPaymentStatus(withVoucherPaymentType(payment)), {
+          defaultPaid: false
+        });
+      })).filter(function (payment) {
+        return isVoucherPaymentRecord(payment);
+      });
+      var nonVoucherPayments = (tempOrder.payments || []).filter(function (payment) {
+        return !isVoucherPaymentRecord(payment);
+      });
+      var normalizeCommittedVoucherPayment = function normalizeCommittedVoucherPayment(payment) {
+        if (hasSyncedOrderPaymentRecord(payment) && (payment.status === undefined || payment.status === 'active')) {
+          return _objectSpread(_objectSpread({}, payment), {}, {
+            status: ORDER_PAYMENT_STATUS_PAID
+          });
+        }
+        return payment;
+      };
+      var committedVoucherPayments = (tempOrder.payments || []).filter(function (payment) {
+        return isCommittedVoucherPaymentRecord(payment);
+      }).map(function (payment) {
+        return normalizeCommittedVoucherPayment(payment);
+      });
+      var committedVoucherPaymentIds = new Set(committedVoucherPayments.filter(function (payment) {
+        return hasSyncedOrderPaymentRecord(payment);
+      }).map(function (payment) {
+        return String(payment.order_payment_id);
+      }));
+      var committedVoucherIds = new Set(committedVoucherPayments.map(function (payment) {
+        return String(payment.voucher_id);
+      }));
+      var replaceableVouchers = mappedVouchers.filter(function (payment) {
+        if (hasSyncedOrderPaymentRecord(payment) && committedVoucherPaymentIds.has(String(payment.order_payment_id))) {
+          return false;
+        }
+        if (payment.voucher_id !== undefined && committedVoucherIds.has(String(payment.voucher_id))) {
+          return false;
+        }
+        return true;
       });
       var cappedVouchers = this.capVoucherPaymentsByRemainingAmount({
         vouchers: replaceableVouchers,
-        nonVoucherPayments: [].concat(_toConsumableArray(nonVoucherPayments), _toConsumableArray(syncedVoucherPayments))
+        nonVoucherPayments: [].concat(_toConsumableArray(nonVoucherPayments), _toConsumableArray(committedVoucherPayments))
       });
-      tempOrder.payments = [].concat(_toConsumableArray(nonVoucherPayments), _toConsumableArray(syncedVoucherPayments), _toConsumableArray(cappedVouchers));
+      tempOrder.payments = [].concat(_toConsumableArray(nonVoucherPayments), _toConsumableArray(committedVoucherPayments), _toConsumableArray(cappedVouchers));
       this.updateTempOrderPaymentStatus(tempOrder);
       this.persistTempOrder();
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this19.logError('recalculate summary after updateVoucherOrderPayments failed', {
+        _this22.logError('recalculate summary after updateVoucherOrderPayments failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -3153,45 +3552,45 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "shouldMergeProductToOrder",
     value: function () {
-      var _shouldMergeProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(params) {
+      var _shouldMergeProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(params) {
         var _this$orderHooks;
         var onBeforeMergeProductToOrder, result;
-        return _regeneratorRuntime().wrap(function _callee14$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        return _regeneratorRuntime().wrap(function _callee15$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               onBeforeMergeProductToOrder = (_this$orderHooks = this.orderHooks) === null || _this$orderHooks === void 0 ? void 0 : _this$orderHooks.onBeforeMergeProductToOrder;
               if (onBeforeMergeProductToOrder) {
-                _context16.next = 3;
+                _context17.next = 3;
                 break;
               }
-              return _context16.abrupt("return", true);
+              return _context17.abrupt("return", true);
             case 3:
-              _context16.next = 5;
+              _context17.next = 5;
               return onBeforeMergeProductToOrder(_objectSpread(_objectSpread({}, params), {}, {
                 defaultShouldMerge: true
               }));
             case 5:
-              result = _context16.sent;
+              result = _context17.sent;
               if (!(typeof result === 'boolean')) {
-                _context16.next = 8;
+                _context17.next = 8;
                 break;
               }
-              return _context16.abrupt("return", result);
+              return _context17.abrupt("return", result);
             case 8:
               if (!(result && _typeof(result) === 'object' && typeof result.shouldMerge === 'boolean')) {
-                _context16.next = 10;
+                _context17.next = 10;
                 break;
               }
-              return _context16.abrupt("return", result.shouldMerge);
+              return _context17.abrupt("return", result.shouldMerge);
             case 10:
-              return _context16.abrupt("return", true);
+              return _context17.abrupt("return", true);
             case 11:
             case "end":
-              return _context16.stop();
+              return _context17.stop();
           }
-        }, _callee14, this);
+        }, _callee15, this);
       }));
-      function shouldMergeProductToOrder(_x13) {
+      function shouldMergeProductToOrder(_x14) {
         return _shouldMergeProductToOrder.apply(this, arguments);
       }
       return shouldMergeProductToOrder;
@@ -3211,8 +3610,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hasLinkedBookingUid",
     value: function hasLinkedBookingUid(product) {
-      var _product$booking_uid, _product$metadata7;
-      var bookingUid = (_product$booking_uid = product === null || product === void 0 ? void 0 : product.booking_uid) !== null && _product$booking_uid !== void 0 ? _product$booking_uid : product === null || product === void 0 || (_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.booking_uid;
+      var _product$booking_uid, _product$metadata9;
+      var bookingUid = (_product$booking_uid = product === null || product === void 0 ? void 0 : product.booking_uid) !== null && _product$booking_uid !== void 0 ? _product$booking_uid : product === null || product === void 0 || (_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.booking_uid;
       return bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '';
     }
 
@@ -3227,30 +3626,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "finalizeProductOrderMutation",
     value: function () {
-      var _finalizeProductOrderMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(tempOrder, options) {
-        return _regeneratorRuntime().wrap(function _callee15$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+      var _finalizeProductOrderMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(tempOrder, options) {
+        return _regeneratorRuntime().wrap(function _callee16$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
               this.syncTempOrderHolderFromBookings(tempOrder);
               if (options !== null && options !== void 0 && options.skipEditDiscountConfigRefresh) {
-                _context17.next = 4;
+                _context18.next = 4;
                 break;
               }
-              _context17.next = 4;
+              _context18.next = 4;
               return this.ensureEditDiscountConfigForProductChange(tempOrder);
             case 4:
               if (options !== null && options !== void 0 && options.skipDiscountRecalculation) {
-                _context17.next = 7;
+                _context18.next = 7;
                 break;
               }
-              _context17.next = 7;
+              _context18.next = 7;
               return this.applyPromotion();
             case 7:
               if (!(options !== null && options !== void 0 && options.skipDiscountRecalculation)) {
                 this.applyDiscount();
               }
               this.sanitizeTempOrderProducts(tempOrder);
-              _context17.next = 11;
+              _context18.next = 11;
               return this.recalculateSummary({
                 createIfMissing: true
               });
@@ -3258,11 +3657,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.persistTempOrder();
             case 12:
             case "end":
-              return _context17.stop();
+              return _context18.stop();
           }
-        }, _callee15, this);
+        }, _callee16, this);
       }));
-      function finalizeProductOrderMutation(_x14, _x15) {
+      function finalizeProductOrderMutation(_x15, _x16) {
         return _finalizeProductOrderMutation.apply(this, arguments);
       }
       return finalizeProductOrderMutation;
@@ -3277,13 +3676,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "appendProductLineToTempOrder",
     value: (function () {
-      var _appendProductLineToTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(tempOrder, product, booking) {
+      var _appendProductLineToTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(tempOrder, product, booking) {
         var _booking_uid,
           _metadata,
-          _this20 = this;
+          _this23 = this;
         var linked, productToAdd, incomingFingerprint, normalizedIncoming, incomingBookingUid, hasIncomingGoodPass, hasIncomingProductNote, hasIncomingBookingUid, shouldForceNewLine, matchedIndex, matchedProduct, existedFingerprint, shouldMerge, _targetProduct$metada, targetProduct, targetUid, normalizedProduct, nextNum, targetIsManualProductDiscount, nextDiscountList;
-        return _regeneratorRuntime().wrap(function _callee16$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        return _regeneratorRuntime().wrap(function _callee17$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
               linked = booking ? this.createLinkedProductAndBooking({
                 product: product,
@@ -3305,9 +3704,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
               shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid;
               matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
-                if (_this20.hasGoodPassDiscount(item)) return false;
-                if (_this20.hasOrderProductLineNote(item)) return false;
+                var _item$metadata3;
+                if (_this23.hasGoodPassDiscount(item)) return false;
+                if (_this23.hasOrderProductLineNote(item)) return false;
                 if (item.order_detail_id !== undefined && item.order_detail_id !== null) return false;
+                if ((_item$metadata3 = item.metadata) !== null && _item$metadata3 !== void 0 && _item$metadata3.is_edit_for_runtime) return false;
                 if (item.product_id !== productToAdd.product_id) return false;
                 if (item.product_variant_id !== productToAdd.product_variant_id) return false;
                 var existedFingerprint = buildProductLineFingerprint(getProductSkuOptions(item), item.product_bundle);
@@ -3316,10 +3717,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               matchedProduct = matchedIndex === -1 ? null : tempOrder.products[matchedIndex];
               existedFingerprint = matchedProduct ? buildProductLineFingerprint(getProductSkuOptions(matchedProduct), matchedProduct.product_bundle) : '';
               if (!matchedProduct) {
-                _context18.next = 20;
+                _context19.next = 20;
                 break;
               }
-              _context18.next = 17;
+              _context19.next = 17;
               return this.shouldMergeProductToOrder({
                 incomingProduct: productToAdd,
                 normalizedIncoming: normalizedIncoming,
@@ -3331,13 +3732,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 booking: booking
               });
             case 17:
-              _context18.t0 = _context18.sent;
-              _context18.next = 21;
+              _context19.t0 = _context19.sent;
+              _context19.next = 21;
               break;
             case 20:
-              _context18.t0 = false;
+              _context19.t0 = false;
             case 21:
-              shouldMerge = _context18.t0;
+              shouldMerge = _context19.t0;
               if (matchedIndex === -1 || !matchedProduct || !shouldMerge) {
                 this.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
                 if (linked) {
@@ -3391,11 +3792,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
             case 24:
             case "end":
-              return _context18.stop();
+              return _context19.stop();
           }
-        }, _callee16, this);
+        }, _callee17, this);
       }));
-      function appendProductLineToTempOrder(_x16, _x17, _x18) {
+      function appendProductLineToTempOrder(_x17, _x18, _x19) {
         return _appendProductLineToTempOrder.apply(this, arguments);
       }
       return appendProductLineToTempOrder;
@@ -3411,58 +3812,61 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProductToOrder",
     value: (function () {
-      var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(product, booking) {
-        var tempOrder, _ref60, _productRecord$num, productRecord, splitCount, i, singleLine;
-        return _regeneratorRuntime().wrap(function _callee17$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+      var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(product, booking) {
+        var tempOrder, _ref61, _productRecord$num, productRecord, splitCount, i, singleLine;
+        return _regeneratorRuntime().wrap(function _callee18$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
-              debugger;
               if (!booking) {
-                _context19.next = 19;
+                _context20.next = 18;
                 break;
               }
               productRecord = product;
-              splitCount = getSafeProductNum((_ref60 = (_productRecord$num = productRecord.num) !== null && _productRecord$num !== void 0 ? _productRecord$num : productRecord.product_quantity) !== null && _ref60 !== void 0 ? _ref60 : 1);
+              splitCount = getSafeProductNum((_ref61 = (_productRecord$num = productRecord.num) !== null && _productRecord$num !== void 0 ? _productRecord$num : productRecord.product_quantity) !== null && _ref61 !== void 0 ? _ref61 : 1);
               if (!(splitCount > 1)) {
-                _context19.next = 19;
+                _context20.next = 18;
                 break;
               }
               i = 0;
-            case 7:
+            case 6:
               if (!(i < splitCount)) {
-                _context19.next = 16;
+                _context20.next = 15;
                 break;
               }
               singleLine = cloneDeep(productRecord);
               singleLine.num = 1;
               delete singleLine.product_quantity;
-              _context19.next = 13;
+              _context20.next = 12;
               return this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking));
-            case 13:
+            case 12:
               i += 1;
-              _context19.next = 7;
+              _context20.next = 6;
               break;
-            case 16:
-              _context19.next = 18;
+            case 15:
+              _context20.next = 17;
               return this.finalizeProductOrderMutation(tempOrder);
+            case 17:
+              return _context20.abrupt("return", tempOrder.products);
             case 18:
-              return _context19.abrupt("return", tempOrder.products);
-            case 19:
-              _context19.next = 21;
+              _context20.next = 20;
               return this.appendProductLineToTempOrder(tempOrder, product, booking);
-            case 21:
-              _context19.next = 23;
+            case 20:
+              _context20.next = 22;
               return this.finalizeProductOrderMutation(tempOrder);
-            case 23:
-              return _context19.abrupt("return", tempOrder.products);
+            case 22:
+              this.logInfo('addProductToOrder success', {
+                product_id: product.product_id,
+                with_booking: !!booking
+              });
+              return _context20.abrupt("return", tempOrder.products);
             case 24:
             case "end":
-              return _context19.stop();
+              return _context20.stop();
           }
-        }, _callee17, this);
+        }, _callee18, this);
       }));
-      function addProductToOrder(_x19, _x20) {
+      function addProductToOrder(_x20, _x21) {
         return _addProductToOrder.apply(this, arguments);
       }
       return addProductToOrder;
@@ -3480,90 +3884,93 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProductsToOrder",
     value: (function () {
-      var _addProductsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(items, options) {
-        var tempOrder, _iterator20, _step20, item, product, booking, _ref61, _productRecord$num2, productRecord, splitCount, i, singleLine;
-        return _regeneratorRuntime().wrap(function _callee18$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+      var _addProductsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(items, options) {
+        var tempOrder, _iterator20, _step20, item, product, booking, _ref62, _productRecord$num2, productRecord, splitCount, i, singleLine;
+        return _regeneratorRuntime().wrap(function _callee19$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (!(!Array.isArray(items) || items.length === 0)) {
-                _context20.next = 3;
+                _context21.next = 3;
                 break;
               }
-              return _context20.abrupt("return", tempOrder.products);
+              return _context21.abrupt("return", tempOrder.products);
             case 3:
               _iterator20 = _createForOfIteratorHelper(items || []);
-              _context20.prev = 4;
+              _context21.prev = 4;
               _iterator20.s();
             case 6:
               if ((_step20 = _iterator20.n()).done) {
-                _context20.next = 30;
+                _context21.next = 30;
                 break;
               }
               item = _step20.value;
               product = item.product, booking = item.booking;
               if (product) {
-                _context20.next = 11;
+                _context21.next = 11;
                 break;
               }
-              return _context20.abrupt("continue", 28);
+              return _context21.abrupt("continue", 28);
             case 11:
               if (!booking) {
-                _context20.next = 26;
+                _context21.next = 26;
                 break;
               }
               productRecord = product;
-              splitCount = getSafeProductNum((_ref61 = (_productRecord$num2 = productRecord.num) !== null && _productRecord$num2 !== void 0 ? _productRecord$num2 : productRecord.product_quantity) !== null && _ref61 !== void 0 ? _ref61 : 1);
+              splitCount = getSafeProductNum((_ref62 = (_productRecord$num2 = productRecord.num) !== null && _productRecord$num2 !== void 0 ? _productRecord$num2 : productRecord.product_quantity) !== null && _ref62 !== void 0 ? _ref62 : 1);
               if (!(splitCount > 1)) {
-                _context20.next = 26;
+                _context21.next = 26;
                 break;
               }
               i = 0;
             case 16:
               if (!(i < splitCount)) {
-                _context20.next = 25;
+                _context21.next = 25;
                 break;
               }
               singleLine = cloneDeep(productRecord);
               singleLine.num = 1;
               delete singleLine.product_quantity;
-              _context20.next = 22;
+              _context21.next = 22;
               return this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking));
             case 22:
               i += 1;
-              _context20.next = 16;
+              _context21.next = 16;
               break;
             case 25:
-              return _context20.abrupt("continue", 28);
+              return _context21.abrupt("continue", 28);
             case 26:
-              _context20.next = 28;
+              _context21.next = 28;
               return this.appendProductLineToTempOrder(tempOrder, product, booking);
             case 28:
-              _context20.next = 6;
+              _context21.next = 6;
               break;
             case 30:
-              _context20.next = 35;
+              _context21.next = 35;
               break;
             case 32:
-              _context20.prev = 32;
-              _context20.t0 = _context20["catch"](4);
-              _iterator20.e(_context20.t0);
+              _context21.prev = 32;
+              _context21.t0 = _context21["catch"](4);
+              _iterator20.e(_context21.t0);
             case 35:
-              _context20.prev = 35;
+              _context21.prev = 35;
               _iterator20.f();
-              return _context20.finish(35);
+              return _context21.finish(35);
             case 38:
-              _context20.next = 40;
+              _context21.next = 40;
               return this.finalizeProductOrderMutation(tempOrder, options);
             case 40:
-              return _context20.abrupt("return", tempOrder.products);
-            case 41:
+              this.logInfo('addProductsToOrder success', {
+                itemsCount: items.length
+              });
+              return _context21.abrupt("return", tempOrder.products);
+            case 42:
             case "end":
-              return _context20.stop();
+              return _context21.stop();
           }
-        }, _callee18, this, [[4, 32, 35, 38]]);
+        }, _callee19, this, [[4, 32, 35, 38]]);
       }));
-      function addProductsToOrder(_x21, _x22) {
+      function addProductsToOrder(_x22, _x23) {
         return _addProductsToOrder.apply(this, arguments);
       }
       return addProductsToOrder;
@@ -3590,26 +3997,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getBundleRuntimeIdentity",
     value: function getBundleRuntimeIdentity(bundle) {
-      var _ref62, _bundle$bundle_id2, _ref63, _bundle$bundle_group_2, _ref64, _ref65, _bundle$bundle_produc3, _ref66, _bundle$bundle_varian3;
+      var _ref63, _bundle$bundle_id2, _ref64, _bundle$bundle_group_2, _ref65, _ref66, _bundle$bundle_produc3, _ref67, _bundle$bundle_varian3;
       if (!bundle || _typeof(bundle) !== 'object') return '';
-      return [(_ref62 = (_bundle$bundle_id2 = bundle.bundle_id) !== null && _bundle$bundle_id2 !== void 0 ? _bundle$bundle_id2 : bundle.id) !== null && _ref62 !== void 0 ? _ref62 : '', (_ref63 = (_bundle$bundle_group_2 = bundle.bundle_group_id) !== null && _bundle$bundle_group_2 !== void 0 ? _bundle$bundle_group_2 : bundle.group_id) !== null && _ref63 !== void 0 ? _ref63 : '', (_ref64 = (_ref65 = (_bundle$bundle_produc3 = bundle.bundle_product_id) !== null && _bundle$bundle_produc3 !== void 0 ? _bundle$bundle_produc3 : bundle._bundle_product_id) !== null && _ref65 !== void 0 ? _ref65 : bundle.product_id) !== null && _ref64 !== void 0 ? _ref64 : '', (_ref66 = (_bundle$bundle_varian3 = bundle.bundle_variant_id) !== null && _bundle$bundle_varian3 !== void 0 ? _bundle$bundle_varian3 : bundle.product_variant_id) !== null && _ref66 !== void 0 ? _ref66 : 0].join('|');
+      return [(_ref63 = (_bundle$bundle_id2 = bundle.bundle_id) !== null && _bundle$bundle_id2 !== void 0 ? _bundle$bundle_id2 : bundle.id) !== null && _ref63 !== void 0 ? _ref63 : '', (_ref64 = (_bundle$bundle_group_2 = bundle.bundle_group_id) !== null && _bundle$bundle_group_2 !== void 0 ? _bundle$bundle_group_2 : bundle.group_id) !== null && _ref64 !== void 0 ? _ref64 : '', (_ref65 = (_ref66 = (_bundle$bundle_produc3 = bundle.bundle_product_id) !== null && _bundle$bundle_produc3 !== void 0 ? _bundle$bundle_produc3 : bundle._bundle_product_id) !== null && _ref66 !== void 0 ? _ref66 : bundle.product_id) !== null && _ref65 !== void 0 ? _ref65 : '', (_ref67 = (_bundle$bundle_varian3 = bundle.bundle_variant_id) !== null && _bundle$bundle_varian3 !== void 0 ? _bundle$bundle_varian3 : bundle.product_variant_id) !== null && _ref67 !== void 0 ? _ref67 : 0].join('|');
     }
   }, {
     key: "preservePersistedBundlePriceFields",
     value: function preservePersistedBundlePriceFields(previousBundles, nextBundles) {
-      var _this21 = this;
+      var _this24 = this;
       if (!Array.isArray(nextBundles)) return nextBundles;
       if (!Array.isArray(previousBundles) || previousBundles.length === 0) return nextBundles;
       var previousByIdentity = new Map();
       previousBundles.forEach(function (bundle) {
-        var identity = _this21.getBundleRuntimeIdentity(bundle);
+        var identity = _this24.getBundleRuntimeIdentity(bundle);
         if (identity) previousByIdentity.set(identity, bundle);
       });
       return nextBundles.map(function (bundle, index) {
         if (!bundle || _typeof(bundle) !== 'object') return bundle;
-        var previous = previousByIdentity.get(_this21.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
+        var previous = previousByIdentity.get(_this24.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
         if (!previous || _typeof(previous) !== 'object') return bundle;
-        return _objectSpread(_objectSpread({}, bundle), {}, {
+        return _objectSpread(_objectSpread(_objectSpread({}, bundle), (bundle.cover === undefined || bundle.cover === null || bundle.cover === '') && previous.cover !== undefined && previous.cover !== null && previous.cover !== '' ? {
+          cover: previous.cover
+        } : {}), {}, {
           price: previous.price,
           custom_price: previous.custom_price,
           bundle_payment_price: previous.bundle_payment_price,
@@ -3622,7 +4031,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyOrderProductUpdateToTempOrder",
     value: function applyOrderProductUpdateToTempOrder(tempOrder, params) {
-      var _targetProduct$metada2, _product_sku, _metadata2, _metadata3, _metadata4, _metadata5, _metadata6, _metadata7, _nextProduct$metadata, _targetProduct$metada8, _tempOrder$products$p;
+      var _targetProduct$metada2, _product_sku, _metadata2, _metadata3, _metadata4, _metadata5, _metadata6, _metadata7, _metadata8, _metadata9, _metadata10, _nextProduct$metadata, _targetProduct$metada15, _tempOrder$products$p, _tempOrder$products$p2;
       var product_id = params.product_id,
         product_variant_id = params.product_variant_id,
         updates = params.updates,
@@ -3650,8 +4059,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (unique_identification_number !== undefined) {
         var targetUid = String(unique_identification_number);
         productIndex = tempOrder.products.findIndex(function (item) {
-          var _item$metadata3;
-          return String(((_item$metadata3 = item.metadata) === null || _item$metadata3 === void 0 ? void 0 : _item$metadata3.unique_identification_number) || item.unique_identification_number || '') === targetUid;
+          var _item$metadata4;
+          return String(((_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.unique_identification_number) || item.unique_identification_number || '') === targetUid;
         });
       }
       if (productIndex === -1) {
@@ -3682,9 +4091,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       // 如果 caller 走推荐路径（updates.metadata.* 显式指定主价），保留 metadata 由 normalize 认它。
       var callerUpdatesTopPrice = Object.prototype.hasOwnProperty.call(updates || {}, 'selling_price') || Object.prototype.hasOwnProperty.call(updates || {}, 'original_price');
       var callerUpdatesMainMeta = (updates === null || updates === void 0 || (_metadata2 = updates.metadata) === null || _metadata2 === void 0 ? void 0 : _metadata2.main_product_selling_price) !== undefined || (updates === null || updates === void 0 || (_metadata3 = updates.metadata) === null || _metadata3 === void 0 ? void 0 : _metadata3.main_product_original_price) !== undefined || (updates === null || updates === void 0 || (_metadata4 = updates.metadata) === null || _metadata4 === void 0 ? void 0 : _metadata4.source_product_price) !== undefined;
+      var callerUpdatesSourcePrice = (updates === null || updates === void 0 || (_metadata5 = updates.metadata) === null || _metadata5 === void 0 ? void 0 : _metadata5.source_product_price) !== undefined;
+      var callerUpdatesMainSellingPrice = (updates === null || updates === void 0 || (_metadata6 = updates.metadata) === null || _metadata6 === void 0 ? void 0 : _metadata6.main_product_selling_price) !== undefined;
+      var callerUpdatesMainOriginalPrice = (updates === null || updates === void 0 || (_metadata7 = updates.metadata) === null || _metadata7 === void 0 ? void 0 : _metadata7.main_product_original_price) !== undefined;
+      var previousLineFingerprint = buildProductLineFingerprint(getProductSkuOptions(targetProduct), targetProduct.product_bundle);
+      var nextLineFingerprint = buildProductLineFingerprint(getProductSkuOptions(nextProduct), nextProduct.product_bundle);
+      var callerChangesVariant = Number(product_variant_id || 0) !== Number(targetProduct.product_variant_id || 0);
+      var callerChangesLineConfiguration = callerChangesVariant || previousLineFingerprint !== nextLineFingerprint;
       var isPersistedOrderLine = targetProduct.order_detail_id !== undefined && targetProduct.order_detail_id !== null;
       var callerChangesDiscountList = Array.isArray(updates === null || updates === void 0 ? void 0 : updates.discount_list) && updates.discount_list.length > 0 && !isSameDiscountList(updates.discount_list, targetProduct.discount_list);
-      var callerUpdatesManualPrice = (updates === null || updates === void 0 || (_metadata5 = updates.metadata) === null || _metadata5 === void 0 ? void 0 : _metadata5.price_override) !== undefined || (updates === null || updates === void 0 || (_metadata6 = updates.metadata) === null || _metadata6 === void 0 ? void 0 : _metadata6.is_manual_discount) !== undefined || (updates === null || updates === void 0 || (_metadata7 = updates.metadata) === null || _metadata7 === void 0 ? void 0 : _metadata7.product_discount_reason) !== undefined || callerChangesDiscountList;
+      var callerUpdatesManualPrice = (updates === null || updates === void 0 || (_metadata8 = updates.metadata) === null || _metadata8 === void 0 ? void 0 : _metadata8.price_override) !== undefined || (updates === null || updates === void 0 || (_metadata9 = updates.metadata) === null || _metadata9 === void 0 ? void 0 : _metadata9.is_manual_discount) !== undefined || (updates === null || updates === void 0 || (_metadata10 = updates.metadata) === null || _metadata10 === void 0 ? void 0 : _metadata10.product_discount_reason) !== undefined || callerChangesDiscountList;
       var callerAllowsBookingReprice = function () {
         if (params.allow_booking_reprice !== true || !booking || !callerUpdatesTopPrice || !callerUpdatesMainMeta) {
           return false;
@@ -3697,7 +4113,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         };
         return hasChangedPrice(updates.selling_price, targetProduct.selling_price) || hasChangedPrice(updates.original_price, targetProduct.original_price);
       }();
-      if (isPersistedOrderLine && !callerUpdatesManualPrice && !callerAllowsBookingReprice) {
+      if (isPersistedOrderLine && !callerChangesLineConfiguration && !callerUpdatesManualPrice && !callerAllowsBookingReprice) {
         var _targetProduct$metada3, _targetProduct$metada4, _targetProduct$metada5, _targetProduct$metada6, _targetProduct$metada7;
         nextProduct.selling_price = targetProduct.selling_price;
         nextProduct.original_price = targetProduct.original_price;
@@ -3709,19 +4125,60 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           price_schema_version: (_targetProduct$metada6 = (_targetProduct$metada7 = targetProduct.metadata) === null || _targetProduct$metada7 === void 0 ? void 0 : _targetProduct$metada7.price_schema_version) !== null && _targetProduct$metada6 !== void 0 ? _targetProduct$metada6 : 2
         });
         nextProduct.product_bundle = this.preservePersistedBundlePriceFields(targetProduct.product_bundle, nextProduct.product_bundle);
-      } else if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+      } else if (callerChangesLineConfiguration && callerUpdatesSourcePrice && (!callerUpdatesMainSellingPrice || !callerUpdatesMainOriginalPrice)) {
+        var _targetProduct$metada8, _targetProduct$metada9;
+        // 新配置只传了 source 时，不能把未传的 main_product_* 从旧行继承下来。
+        // 以新 source + 新 option 重建券前价；券后价未显式提供时保留旧主商品折扣额。
+        var previousMainOriginal = new Decimal(Number((_targetProduct$metada8 = targetProduct.metadata) === null || _targetProduct$metada8 === void 0 ? void 0 : _targetProduct$metada8.main_product_original_price) || 0);
+        var previousMainSelling = new Decimal(Number((_targetProduct$metada9 = targetProduct.metadata) === null || _targetProduct$metada9 === void 0 ? void 0 : _targetProduct$metada9.main_product_selling_price) || previousMainOriginal.toNumber());
+        var preservedDiscount = previousMainOriginal.minus(previousMainSelling);
+        var nextMainOriginal = new Decimal(Number(updates.metadata.source_product_price) || 0).plus(sumOptionUnitPrice(getProductSkuOptions(nextProduct)));
+        nextProduct.metadata = _objectSpread(_objectSpread({}, nextProduct.metadata || {}), {}, {
+          source_product_price: String(updates.metadata.source_product_price),
+          main_product_original_price: callerUpdatesMainOriginalPrice ? String(updates.metadata.main_product_original_price) : nextMainOriginal.toDecimalPlaces(2).toFixed(2),
+          main_product_selling_price: callerUpdatesMainSellingPrice ? String(updates.metadata.main_product_selling_price) : nextMainOriginal.minus(preservedDiscount).toDecimalPlaces(2).toFixed(2),
+          price_schema_version: 2
+        });
+      } else if (callerChangesVariant && !callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+        // variant 已变化但 caller 没有显式报价时，旧 v2 metadata 不能继续充当权威价格源。
+        // 清理后由 normalize 优先读取 metadata.origin.variant 中新 variant 的目录价；
+        // 顶层 original/selling 的旧差额仍会作为 legacy discount 迁移到新价格。
         var existedMeta = nextProduct.metadata || {};
         nextProduct.metadata = _objectSpread({}, existedMeta);
         delete nextProduct.metadata.source_product_price;
         delete nextProduct.metadata.main_product_selling_price;
         delete nextProduct.metadata.main_product_original_price;
         delete nextProduct.metadata.price_schema_version;
+      } else if (callerChangesLineConfiguration && !callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+        var _ref68, _targetProduct$metada10, _targetProduct$metada11, _ref69, _targetProduct$metada12, _targetProduct$metada13, _targetProduct$metada14;
+        // 仅 option / bundle 变化时，保留历史 source 和主商品折扣金额，
+        // 但必须让 original 与 selling 一起随新的 option 金额移动。
+        var previousOptionSum = sumOptionUnitPrice(getProductSkuOptions(targetProduct));
+        var nextOptionSum = sumOptionUnitPrice(getProductSkuOptions(nextProduct));
+        var _previousMainOriginal = new Decimal(Number((_ref68 = (_targetProduct$metada10 = (_targetProduct$metada11 = targetProduct.metadata) === null || _targetProduct$metada11 === void 0 ? void 0 : _targetProduct$metada11.main_product_original_price) !== null && _targetProduct$metada10 !== void 0 ? _targetProduct$metada10 : targetProduct.original_price) !== null && _ref68 !== void 0 ? _ref68 : 0) || 0);
+        var _previousMainSelling = new Decimal(Number((_ref69 = (_targetProduct$metada12 = (_targetProduct$metada13 = targetProduct.metadata) === null || _targetProduct$metada13 === void 0 ? void 0 : _targetProduct$metada13.main_product_selling_price) !== null && _targetProduct$metada12 !== void 0 ? _targetProduct$metada12 : targetProduct.selling_price) !== null && _ref69 !== void 0 ? _ref69 : _previousMainOriginal.toNumber()) || 0);
+        var _preservedDiscount = _previousMainOriginal.minus(_previousMainSelling);
+        var previousSource = ((_targetProduct$metada14 = targetProduct.metadata) === null || _targetProduct$metada14 === void 0 ? void 0 : _targetProduct$metada14.source_product_price) != null ? new Decimal(Number(targetProduct.metadata.source_product_price) || 0) : _previousMainOriginal.minus(previousOptionSum);
+        var _nextMainOriginal = previousSource.plus(nextOptionSum);
+        nextProduct.metadata = _objectSpread(_objectSpread({}, nextProduct.metadata || {}), {}, {
+          source_product_price: previousSource.toDecimalPlaces(2).toFixed(2),
+          main_product_original_price: _nextMainOriginal.toDecimalPlaces(2).toFixed(2),
+          main_product_selling_price: _nextMainOriginal.minus(_preservedDiscount).toDecimalPlaces(2).toFixed(2),
+          price_schema_version: 2
+        });
+      } else if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+        var _existedMeta = nextProduct.metadata || {};
+        nextProduct.metadata = _objectSpread({}, _existedMeta);
+        delete nextProduct.metadata.source_product_price;
+        delete nextProduct.metadata.main_product_selling_price;
+        delete nextProduct.metadata.main_product_original_price;
+        delete nextProduct.metadata.price_schema_version;
       }
       // normalizeOrderProduct 幂等：v2 metadata 存在 → 保留 main_product_* 折扣重算 composite；
       // 否则 → 把顶层 selling_price 视作 source，派生 main_product_* 并写 price_schema_version: 2。
       var normalizedProduct = mergeOrderProductDisplayFields(nextProduct, normalizeOrderProduct(nextProduct));
       normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
-      var preservedBookingUid = nextProduct.booking_uid || ((_nextProduct$metadata = nextProduct.metadata) === null || _nextProduct$metadata === void 0 ? void 0 : _nextProduct$metadata.booking_uid) || targetProduct.booking_uid || ((_targetProduct$metada8 = targetProduct.metadata) === null || _targetProduct$metada8 === void 0 ? void 0 : _targetProduct$metada8.booking_uid);
+      var preservedBookingUid = nextProduct.booking_uid || ((_nextProduct$metadata = nextProduct.metadata) === null || _nextProduct$metadata === void 0 ? void 0 : _nextProduct$metadata.booking_uid) || targetProduct.booking_uid || ((_targetProduct$metada15 = targetProduct.metadata) === null || _targetProduct$metada15 === void 0 ? void 0 : _targetProduct$metada15.booking_uid);
       if (!booking && preservedBookingUid) {
         normalizedProduct.booking_uid = preservedBookingUid;
         normalizedProduct.metadata = _objectSpread(_objectSpread({}, normalizedProduct.metadata || {}), {}, {
@@ -3729,8 +4186,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         });
       }
       if (booking) {
-        var _normalizedProduct$me, _targetProduct$metada9;
-        var productUid = String(((_normalizedProduct$me = normalizedProduct.metadata) === null || _normalizedProduct$me === void 0 ? void 0 : _normalizedProduct$me.unique_identification_number) || ((_targetProduct$metada9 = targetProduct.metadata) === null || _targetProduct$metada9 === void 0 ? void 0 : _targetProduct$metada9.unique_identification_number) || unique_identification_number || createUuidV4());
+        var _normalizedProduct$me, _targetProduct$metada16;
+        var productUid = String(((_normalizedProduct$me = normalizedProduct.metadata) === null || _normalizedProduct$me === void 0 ? void 0 : _normalizedProduct$me.unique_identification_number) || ((_targetProduct$metada16 = targetProduct.metadata) === null || _targetProduct$metada16 === void 0 ? void 0 : _targetProduct$metada16.unique_identification_number) || unique_identification_number || createUuidV4());
         normalizedProduct.metadata = _objectSpread(_objectSpread({}, normalizedProduct.metadata || {}), {}, {
           unique_identification_number: productUid
         });
@@ -3753,36 +4210,42 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       tempOrder.products[productIndex] = normalizedProduct;
       this.syncTempOrderHolderFromBookings(tempOrder);
       this.captureProductRuntime(tempOrder, updates, tempOrder.products[productIndex], (_tempOrder$products$p = tempOrder.products[productIndex].metadata) === null || _tempOrder$products$p === void 0 ? void 0 : _tempOrder$products$p.unique_identification_number);
+      return (_tempOrder$products$p2 = tempOrder.products[productIndex].metadata) === null || _tempOrder$products$p2 === void 0 ? void 0 : _tempOrder$products$p2.unique_identification_number;
     }
   }, {
     key: "updateOrderProduct",
     value: function () {
-      var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(params) {
-        var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee19$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+      var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(params) {
+        var tempOrder, updatedProductUid;
+        return _regeneratorRuntime().wrap(function _callee20$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
-              this.applyOrderProductUpdateToTempOrder(tempOrder, params);
-              _context21.next = 4;
+              updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params);
+              _context22.next = 4;
               return this.applyPromotion();
             case 4:
-              this.applyDiscount();
+              this.applyDiscount({
+                reapplyBookingDiscountProductUids: params.allow_booking_discount_reapply && updatedProductUid ? [String(updatedProductUid)] : undefined
+              });
               this.sanitizeTempOrderProducts(tempOrder);
-              _context21.next = 8;
+              _context22.next = 8;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 8:
               this.persistTempOrder();
-              return _context21.abrupt("return", tempOrder.products);
-            case 10:
+              this.logInfo('updateOrderProduct success', {
+                params: params
+              });
+              return _context22.abrupt("return", tempOrder.products);
+            case 11:
             case "end":
-              return _context21.stop();
+              return _context22.stop();
           }
-        }, _callee19, this);
+        }, _callee20, this);
       }));
-      function updateOrderProduct(_x23) {
+      function updateOrderProduct(_x24) {
         return _updateOrderProduct.apply(this, arguments);
       }
       return updateOrderProduct;
@@ -3790,33 +4253,43 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProducts",
     value: function () {
-      var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(paramsList) {
-        var _this22 = this;
-        var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee20$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+      var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(paramsList) {
+        var _this25 = this;
+        var tempOrder, reapplyBookingDiscountProductUids;
+        return _regeneratorRuntime().wrap(function _callee21$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (paramsList.length) {
-                _context22.next = 3;
+                _context23.next = 3;
                 break;
               }
-              return _context22.abrupt("return", tempOrder.products);
+              return _context23.abrupt("return", tempOrder.products);
             case 3:
-              paramsList.forEach(function (params) {
-                _this22.applyOrderProductUpdateToTempOrder(tempOrder, params);
+              reapplyBookingDiscountProductUids = paramsList.reduce(function (acc, params) {
+                var updatedProductUid = _this25.applyOrderProductUpdateToTempOrder(tempOrder, params);
+                // 批量改预约时间时，延迟到最后一次折扣计算里统一恢复已选预约折扣卡。
+                if (params.allow_booking_discount_reapply && updatedProductUid) {
+                  acc.push(String(updatedProductUid));
+                }
+                return acc;
+              }, []);
+              _context23.next = 6;
+              return this.finalizeAfterProductsMutation(tempOrder, {
+                reapplyBookingDiscountProductUids: reapplyBookingDiscountProductUids.length ? reapplyBookingDiscountProductUids : undefined
               });
-              _context22.next = 6;
-              return this.finalizeAfterProductsMutation(tempOrder);
             case 6:
-              return _context22.abrupt("return", tempOrder.products);
-            case 7:
+              this.logInfo('updateOrderProduct success', {
+                paramsList: paramsList
+              });
+              return _context23.abrupt("return", tempOrder.products);
+            case 8:
             case "end":
-              return _context22.stop();
+              return _context23.stop();
           }
-        }, _callee20, this);
+        }, _callee21, this);
       }));
-      function updateOrderProducts(_x24) {
+      function updateOrderProducts(_x25) {
         return _updateOrderProducts.apply(this, arguments);
       }
       return updateOrderProducts;
@@ -3824,11 +4297,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProductQuantity",
     value: function () {
-      var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(params) {
-        var _targetProduct$metada10;
+      var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(params) {
+        var _targetProduct$metada17;
         var product_id, product_variant_id, num, unique_identification_number, identity_key, product_sku, product_bundle, tempOrder, identityLookup, productIndex, targetUid, targetProduct, normalizedProduct;
-        return _regeneratorRuntime().wrap(function _callee21$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+        return _regeneratorRuntime().wrap(function _callee22$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
               product_id = params.product_id, product_variant_id = params.product_variant_id, num = params.num, unique_identification_number = params.unique_identification_number, identity_key = params.identity_key, product_sku = params.product_sku, product_bundle = params.product_bundle;
               tempOrder = this.ensureTempOrder();
@@ -3849,15 +4322,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (unique_identification_number !== undefined) {
                 targetUid = String(unique_identification_number);
                 productIndex = tempOrder.products.findIndex(function (item) {
-                  var _item$metadata4;
-                  return String(((_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.unique_identification_number) || item.unique_identification_number || '') === targetUid;
+                  var _item$metadata5;
+                  return String(((_item$metadata5 = item.metadata) === null || _item$metadata5 === void 0 ? void 0 : _item$metadata5.unique_identification_number) || item.unique_identification_number || '') === targetUid;
                 });
               }
               if (productIndex === -1) {
                 productIndex = getProductIdentityIndex(tempOrder.products, identityLookup);
               }
               if (!(productIndex === -1)) {
-                _context23.next = 12;
+                _context24.next = 12;
                 break;
               }
               throw new Error('[Order] 目标商品不存在，无法更新数量');
@@ -3866,30 +4339,33 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               normalizedProduct = normalizeOrderProduct(_objectSpread(_objectSpread({}, targetProduct), {}, {
                 num: getSafeProductNum(num),
                 metadata: _objectSpread(_objectSpread({}, targetProduct.metadata || {}), {}, {
-                  unique_identification_number: ((_targetProduct$metada10 = targetProduct.metadata) === null || _targetProduct$metada10 === void 0 ? void 0 : _targetProduct$metada10.unique_identification_number) || unique_identification_number
+                  unique_identification_number: ((_targetProduct$metada17 = targetProduct.metadata) === null || _targetProduct$metada17 === void 0 ? void 0 : _targetProduct$metada17.unique_identification_number) || unique_identification_number
                 })
               }));
               normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
               tempOrder.products[productIndex] = normalizedProduct;
-              _context23.next = 18;
+              _context24.next = 18;
               return this.applyPromotion();
             case 18:
               this.applyDiscount();
               this.sanitizeTempOrderProducts(tempOrder);
-              _context23.next = 22;
+              _context24.next = 22;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 22:
               this.persistTempOrder();
-              return _context23.abrupt("return", tempOrder.products);
-            case 24:
+              this.logInfo('updateOrderProductQuantity success', {
+                params: params
+              });
+              return _context24.abrupt("return", tempOrder.products);
+            case 25:
             case "end":
-              return _context23.stop();
+              return _context24.stop();
           }
-        }, _callee21, this);
+        }, _callee22, this);
       }));
-      function updateOrderProductQuantity(_x25) {
+      function updateOrderProductQuantity(_x26) {
         return _updateOrderProductQuantity.apply(this, arguments);
       }
       return updateOrderProductQuantity;
@@ -3930,17 +4406,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "finalizeAfterProductsMutation",
     value: (function () {
-      var _finalizeAfterProductsMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(tempOrder) {
-        return _regeneratorRuntime().wrap(function _callee22$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+      var _finalizeAfterProductsMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(tempOrder, options) {
+        return _regeneratorRuntime().wrap(function _callee23$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
               this.syncTempOrderHolderFromBookings(tempOrder);
-              _context24.next = 3;
+              _context25.next = 3;
               return this.applyPromotion();
             case 3:
-              this.applyDiscount();
+              this.applyDiscount({
+                reapplyBookingDiscountProductUids: options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids
+              });
               this.sanitizeTempOrderProducts(tempOrder);
-              _context24.next = 7;
+              _context25.next = 7;
               return this.recalculateSummary({
                 createIfMissing: true
               });
@@ -3948,11 +4426,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.persistTempOrder();
             case 8:
             case "end":
-              return _context24.stop();
+              return _context25.stop();
           }
-        }, _callee22, this);
+        }, _callee23, this);
       }));
-      function finalizeAfterProductsMutation(_x26) {
+      function finalizeAfterProductsMutation(_x27, _x28) {
         return _finalizeAfterProductsMutation.apply(this, arguments);
       }
       return finalizeAfterProductsMutation;
@@ -3967,18 +4445,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeProductsFromOrder",
     value: (function () {
-      var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(identities) {
-        var _this23 = this;
+      var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(identities) {
+        var _this26 = this;
         var tempOrder, productsBeforeRemove, bookingsBeforeRemove, matchedProducts, removedProducts, _i2, _removedProducts, product, linkedBookingUidsToRemove, _iterator21, _step21, _loop3;
-        return _regeneratorRuntime().wrap(function _callee23$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+        return _regeneratorRuntime().wrap(function _callee24$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (identities.length) {
-                _context26.next = 3;
+                _context27.next = 3;
                 break;
               }
-              return _context26.abrupt("return", tempOrder.products);
+              return _context27.abrupt("return", tempOrder.products);
             case 3:
               productsBeforeRemove = tempOrder.products || [];
               bookingsBeforeRemove = tempOrder.bookings || [];
@@ -4001,29 +4479,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               linkedBookingUidsToRemove = new Set();
               _iterator21 = _createForOfIteratorHelper(matchedProducts);
-              _context26.prev = 11;
+              _context27.prev = 11;
               _loop3 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop3() {
-                var _metadata8, _metadata9, _metadata10, _metadata11;
+                var _metadata11, _metadata12, _metadata13, _metadata14;
                 var product, productUid, productBookingUid, isAddTimeProduct;
-                return _regeneratorRuntime().wrap(function _loop3$(_context25) {
-                  while (1) switch (_context25.prev = _context25.next) {
+                return _regeneratorRuntime().wrap(function _loop3$(_context26) {
+                  while (1) switch (_context26.prev = _context26.next) {
                     case 0:
                       product = _step21.value;
-                      productUid = (product === null || product === void 0 || (_metadata8 = product.metadata) === null || _metadata8 === void 0 ? void 0 : _metadata8.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
-                      productBookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_metadata9 = product.metadata) === null || _metadata9 === void 0 ? void 0 : _metadata9.booking_uid);
-                      isAddTimeProduct = (product === null || product === void 0 || (_metadata10 = product.metadata) === null || _metadata10 === void 0 ? void 0 : _metadata10.product_add_schedule_time) !== undefined && (product === null || product === void 0 || (_metadata11 = product.metadata) === null || _metadata11 === void 0 ? void 0 : _metadata11.product_add_schedule_time) !== null;
+                      productUid = (product === null || product === void 0 || (_metadata11 = product.metadata) === null || _metadata11 === void 0 ? void 0 : _metadata11.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+                      productBookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_metadata12 = product.metadata) === null || _metadata12 === void 0 ? void 0 : _metadata12.booking_uid);
+                      isAddTimeProduct = (product === null || product === void 0 || (_metadata13 = product.metadata) === null || _metadata13 === void 0 ? void 0 : _metadata13.product_add_schedule_time) !== undefined && (product === null || product === void 0 || (_metadata14 = product.metadata) === null || _metadata14 === void 0 ? void 0 : _metadata14.product_add_schedule_time) !== null;
                       if (!isAddTimeProduct) {
-                        _context25.next = 6;
+                        _context26.next = 6;
                         break;
                       }
-                      return _context25.abrupt("return", 1);
+                      return _context26.abrupt("return", 1);
                     case 6:
                       if (productBookingUid !== undefined && productBookingUid !== null && productBookingUid !== '') {
                         linkedBookingUidsToRemove.add(String(productBookingUid));
                       }
                       if (productUid !== undefined && productUid !== null && productUid !== '') {
                         bookingsBeforeRemove.forEach(function (booking) {
-                          var bookingUid = _this23.getBookingUniqueIdentificationNumber(booking);
+                          var bookingUid = _this26.getBookingUniqueIdentificationNumber(booking);
                           if (bookingUid && String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === String(productUid)) {
                             linkedBookingUidsToRemove.add(bookingUid);
                           }
@@ -4031,37 +4509,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }
                     case 8:
                     case "end":
-                      return _context25.stop();
+                      return _context26.stop();
                   }
                 }, _loop3);
               });
               _iterator21.s();
             case 14:
               if ((_step21 = _iterator21.n()).done) {
-                _context26.next = 20;
+                _context27.next = 20;
                 break;
               }
-              return _context26.delegateYield(_loop3(), "t0", 16);
+              return _context27.delegateYield(_loop3(), "t0", 16);
             case 16:
-              if (!_context26.t0) {
-                _context26.next = 18;
+              if (!_context27.t0) {
+                _context27.next = 18;
                 break;
               }
-              return _context26.abrupt("continue", 18);
+              return _context27.abrupt("continue", 18);
             case 18:
-              _context26.next = 14;
+              _context27.next = 14;
               break;
             case 20:
-              _context26.next = 25;
+              _context27.next = 25;
               break;
             case 22:
-              _context26.prev = 22;
-              _context26.t1 = _context26["catch"](11);
-              _iterator21.e(_context26.t1);
+              _context27.prev = 22;
+              _context27.t1 = _context27["catch"](11);
+              _iterator21.e(_context27.t1);
             case 25:
-              _context26.prev = 25;
+              _context27.prev = 25;
               _iterator21.f();
-              return _context26.finish(25);
+              return _context27.finish(25);
             case 28:
               if (linkedBookingUidsToRemove.size > 0) {
                 // 删除主预约商品时，同步移除挂在同一 booking_uid 下的加时商品，避免残留孤儿行。
@@ -4072,17 +4550,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   return !(isAddTimeProduct && lineBookingUid !== undefined && lineBookingUid !== null && linkedBookingUidsToRemove.has(String(lineBookingUid)));
                 });
               }
-              _context26.next = 31;
+              _context27.next = 31;
               return this.finalizeAfterProductsMutation(tempOrder);
             case 31:
-              return _context26.abrupt("return", tempOrder.products);
-            case 32:
+              this.logInfo('removeProductsFromOrder success', {
+                identities: identities
+              });
+              return _context27.abrupt("return", tempOrder.products);
+            case 33:
             case "end":
-              return _context26.stop();
+              return _context27.stop();
           }
-        }, _callee23, this, [[11, 22, 25, 28]]);
+        }, _callee24, this, [[11, 22, 25, 28]]);
       }));
-      function removeProductsFromOrder(_x27) {
+      function removeProductsFromOrder(_x29) {
         return _removeProductsFromOrder.apply(this, arguments);
       }
       return removeProductsFromOrder;
@@ -4090,18 +4571,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeProductFromOrder",
     value: function () {
-      var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(identity) {
-        return _regeneratorRuntime().wrap(function _callee24$(_context27) {
-          while (1) switch (_context27.prev = _context27.next) {
+      var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(identity) {
+        return _regeneratorRuntime().wrap(function _callee25$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
-              return _context27.abrupt("return", this.removeProductsFromOrder([identity]));
+              return _context28.abrupt("return", this.removeProductsFromOrder([identity]));
             case 1:
             case "end":
-              return _context27.stop();
+              return _context28.stop();
           }
-        }, _callee24, this);
+        }, _callee25, this);
       }));
-      function removeProductFromOrder(_x28) {
+      function removeProductFromOrder(_x30) {
         return _removeProductFromOrder.apply(this, arguments);
       }
       return removeProductFromOrder;
@@ -4113,10 +4594,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clearOrderCartLines",
     value: (function () {
-      var _clearOrderCartLines = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
+      var _clearOrderCartLines = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee25$(_context28) {
-          while (1) switch (_context28.prev = _context28.next) {
+        return _regeneratorRuntime().wrap(function _callee26$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               tempOrder.products = [];
@@ -4127,23 +4608,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   productsByUid: {}
                 });
               }
-              _context28.next = 7;
+              _context29.next = 7;
               return this.applyPromotion();
             case 7:
               this.applyDiscount();
               this.sanitizeTempOrderProducts(tempOrder);
-              _context28.next = 11;
+              _context29.next = 11;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 11:
               this.persistTempOrder();
-              return _context28.abrupt("return", tempOrder);
-            case 13:
+              this.logInfo('clearOrderCartLines success', {});
+              return _context29.abrupt("return", tempOrder);
+            case 14:
             case "end":
-              return _context28.stop();
+              return _context29.stop();
           }
-        }, _callee25, this);
+        }, _callee26, this);
       }));
       function clearOrderCartLines() {
         return _clearOrderCartLines.apply(this, arguments);
@@ -4154,23 +4636,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildCurrentSubmitPayloadForLocalPrint",
     value: function buildCurrentSubmitPayloadForLocalPrint(params) {
-      var _params$cacheId, _this$otherParams2, _ref67, _params$businessCode, _this$otherParams3, _this$otherParams4;
+      var _params$cacheId, _this$otherParams3, _ref70, _params$businessCode, _this$otherParams4, _this$otherParams5;
       var tempOrder = this.ensureTempOrder();
       this.persistTempOrder();
       var payload = buildSubmitPayload({
         tempOrder: tempOrder,
         cacheId: (_params$cacheId = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId !== void 0 ? _params$cacheId : this.cacheId,
-        platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.platform),
-        businessCode: (_ref67 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.businessCode) !== null && _ref67 !== void 0 ? _ref67 : (_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.business_code,
+        platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.platform),
+        businessCode: (_ref70 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.businessCode) !== null && _ref70 !== void 0 ? _ref70 : (_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.business_code,
         channel: params === null || params === void 0 ? void 0 : params.channel,
         type: params === null || params === void 0 ? void 0 : params.type,
         summary: this.store.summary || createEmptySummary(),
         enhance: function enhance(nextPayload) {
-          var _ref68, _tempOrder$order_numb, _ref69, _tempOrder$shop_order, _ref70, _tempOrder$shop_full_;
+          var _ref71, _tempOrder$order_numb, _ref72, _tempOrder$shop_order, _ref73, _tempOrder$shop_full_;
           return _objectSpread(_objectSpread({}, nextPayload), {}, {
-            order_number: (_ref68 = (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : nextPayload.order_number) !== null && _ref68 !== void 0 ? _ref68 : null,
-            shop_order_number: (_ref69 = (_tempOrder$shop_order = tempOrder.shop_order_number) !== null && _tempOrder$shop_order !== void 0 ? _tempOrder$shop_order : nextPayload.shop_order_number) !== null && _ref69 !== void 0 ? _ref69 : null,
-            shop_full_order_number: (_ref70 = (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : nextPayload.shop_full_order_number) !== null && _ref70 !== void 0 ? _ref70 : null,
+            order_number: (_ref71 = (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : nextPayload.order_number) !== null && _ref71 !== void 0 ? _ref71 : null,
+            shop_order_number: (_ref72 = (_tempOrder$shop_order = tempOrder.shop_order_number) !== null && _tempOrder$shop_order !== void 0 ? _tempOrder$shop_order : nextPayload.shop_order_number) !== null && _ref72 !== void 0 ? _ref72 : null,
+            shop_full_order_number: (_ref73 = (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : nextPayload.shop_full_order_number) !== null && _ref73 !== void 0 ? _ref73 : null,
             small_ticket_data_flag: 1
           });
         }
@@ -4181,17 +4663,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyLocalPrintOrderNumbers",
     value: function () {
-      var _applyLocalPrintOrderNumbers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(order) {
+      var _applyLocalPrintOrderNumbers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(order) {
         var tempOrder, shopOrderNumber, shopFullOrderNumber;
-        return _regeneratorRuntime().wrap(function _callee26$(_context29) {
-          while (1) switch (_context29.prev = _context29.next) {
+        return _regeneratorRuntime().wrap(function _callee27$(_context30) {
+          while (1) switch (_context30.prev = _context30.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               if (!(!order || _typeof(order) !== 'object')) {
-                _context29.next = 3;
+                _context30.next = 3;
                 break;
               }
-              return _context29.abrupt("return", tempOrder);
+              return _context30.abrupt("return", tempOrder);
             case 3:
               shopOrderNumber = order.shop_order_number;
               shopFullOrderNumber = order.shop_full_order_number;
@@ -4202,17 +4684,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.shop_full_order_number = String(shopFullOrderNumber);
               }
               this.persistTempOrder();
-              _context29.next = 10;
+              _context30.next = 10;
               return this.saveDraft();
             case 10:
-              return _context29.abrupt("return", tempOrder);
+              return _context30.abrupt("return", tempOrder);
             case 11:
             case "end":
-              return _context29.stop();
+              return _context30.stop();
           }
-        }, _callee26, this);
+        }, _callee27, this);
       }));
-      function applyLocalPrintOrderNumbers(_x29) {
+      function applyLocalPrintOrderNumbers(_x31) {
         return _applyLocalPrintOrderNumbers.apply(this, arguments);
       }
       return applyLocalPrintOrderNumbers;
@@ -4226,18 +4708,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitTempOrder",
     value: (function () {
-      var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(params) {
-        return _regeneratorRuntime().wrap(function _callee27$(_context30) {
-          while (1) switch (_context30.prev = _context30.next) {
+      var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(params) {
+        return _regeneratorRuntime().wrap(function _callee28$(_context31) {
+          while (1) switch (_context31.prev = _context31.next) {
             case 0:
-              return _context30.abrupt("return", this.runSubmitTempOrder(params));
+              return _context31.abrupt("return", this.runSubmitTempOrder(params));
             case 1:
             case "end":
-              return _context30.stop();
+              return _context31.stop();
           }
-        }, _callee27, this);
+        }, _callee28, this);
       }));
-      function submitTempOrder(_x30) {
+      function submitTempOrder(_x32) {
         return _submitTempOrder.apply(this, arguments);
       }
       return submitTempOrder;
@@ -4245,20 +4727,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitTempOrderAsync",
     value: function () {
-      var _submitTempOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(params) {
-        return _regeneratorRuntime().wrap(function _callee28$(_context31) {
-          while (1) switch (_context31.prev = _context31.next) {
+      var _submitTempOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(params) {
+        return _regeneratorRuntime().wrap(function _callee29$(_context32) {
+          while (1) switch (_context32.prev = _context32.next) {
             case 0:
-              return _context31.abrupt("return", this.runSubmitTempOrder(_objectSpread(_objectSpread({}, params), {}, {
+              return _context32.abrupt("return", this.runSubmitTempOrder(_objectSpread(_objectSpread({}, params), {}, {
                 syncMode: true
               })));
             case 1:
             case "end":
-              return _context31.stop();
+              return _context32.stop();
           }
-        }, _callee28, this);
+        }, _callee29, this);
       }));
-      function submitTempOrderAsync(_x31) {
+      function submitTempOrderAsync(_x33) {
         return _submitTempOrderAsync.apply(this, arguments);
       }
       return submitTempOrderAsync;
@@ -4266,42 +4748,57 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "runSubmitTempOrder",
     value: function () {
-      var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(params) {
-        var _params$cacheId2, _this$otherParams5, _ref71, _params$businessCode2, _this$otherParams6, _this$otherParams7;
-        var tempOrder, latestSummary, effectiveCacheId, hasPaymentOverride, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
-        return _regeneratorRuntime().wrap(function _callee29$(_context32) {
-          while (1) switch (_context32.prev = _context32.next) {
+      var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(params) {
+        var _params$cacheId2, _this$otherParams6, _ref74, _ref75, _submitSnapshot$busin, _this$otherParams7, _this$otherParams8, _submitSnapshot$type;
+        var tempOrder, shouldConfirmPendingVoucherPayments, hasPaymentOverride, preparedPaymentOverride, latestSummary, effectiveCacheId, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, submitSnapshot, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
+        return _regeneratorRuntime().wrap(function _callee30$(_context33) {
+          while (1) switch (_context33.prev = _context33.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
+              shouldConfirmPendingVoucherPayments = (params === null || params === void 0 ? void 0 : params.confirmPendingVoucherPayments) !== false;
+              hasPaymentOverride = (params === null || params === void 0 ? void 0 : params.payments) !== undefined;
+              preparedPaymentOverride = hasPaymentOverride ? this.prepareVoucherPaymentsForSubmit((params === null || params === void 0 ? void 0 : params.payments) || [], shouldConfirmPendingVoucherPayments) : undefined;
+              if (!hasPaymentOverride) {
+                if (shouldConfirmPendingVoucherPayments) {
+                  this.confirmPendingVoucherPayments({
+                    persist: false,
+                    recalculateSummary: false
+                  });
+                } else {
+                  this.discardPendingVoucherPayments({
+                    persist: false,
+                    recalculateSummary: false
+                  });
+                }
+              }
               this.persistTempOrder();
-              _context32.next = 4;
+              _context33.next = 8;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 4:
-              _context32.t1 = _context32.sent;
-              if (_context32.t1) {
-                _context32.next = 7;
+            case 8:
+              _context33.t1 = _context33.sent;
+              if (_context33.t1) {
+                _context33.next = 11;
                 break;
               }
-              _context32.t1 = this.store.summary;
-            case 7:
-              _context32.t0 = _context32.t1;
-              if (_context32.t0) {
-                _context32.next = 10;
+              _context33.t1 = this.store.summary;
+            case 11:
+              _context33.t0 = _context33.t1;
+              if (_context33.t0) {
+                _context33.next = 14;
                 break;
               }
-              _context32.t0 = createEmptySummary();
-            case 10:
-              latestSummary = _context32.t0;
+              _context33.t0 = createEmptySummary();
+            case 14:
+              latestSummary = _context33.t0;
               effectiveCacheId = (_params$cacheId2 = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId2 !== void 0 ? _params$cacheId2 : this.cacheId;
-              hasPaymentOverride = (params === null || params === void 0 ? void 0 : params.payments) !== undefined;
               hasPaymentStatusOverride = (params === null || params === void 0 ? void 0 : params.paymentStatus) !== undefined;
               hasSmallTicketDataFlagOverride = (params === null || params === void 0 ? void 0 : params.smallTicketDataFlag) !== undefined;
               enhancePayload = hasPaymentOverride || hasPaymentStatusOverride || hasSmallTicketDataFlagOverride || params !== null && params !== void 0 && params.enhancePayload ? function (payload, ctx) {
                 var nextPayload = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, payload), hasPaymentOverride ? {
-                  payments: mapPaymentItemsToOrderPayments((params === null || params === void 0 ? void 0 : params.payments) || [])
-                } : {}), hasPaymentStatusOverride ? {
+                  payments: preparedPaymentOverride || []
+                } : {}), hasPaymentStatusOverride && !shouldConfirmPendingVoucherPayments ? {
                   payment_status: params === null || params === void 0 ? void 0 : params.paymentStatus
                 } : {}), hasSmallTicketDataFlagOverride ? {
                   small_ticket_data_flag: params === null || params === void 0 ? void 0 : params.smallTicketDataFlag
@@ -4309,17 +4806,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 var enhancedPayload = params !== null && params !== void 0 && params.enhancePayload ? params.enhancePayload(nextPayload, ctx) : nextPayload;
                 return enhancedPayload;
               } : undefined;
+              submitSnapshot = this.getLastOrderSubmitSnapshot();
               payload = buildSubmitPayload({
                 tempOrder: tempOrder,
                 cacheId: effectiveCacheId,
-                platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.platform),
-                businessCode: (_ref71 = (_params$businessCode2 = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode2 !== void 0 ? _params$businessCode2 : (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.businessCode) !== null && _ref71 !== void 0 ? _ref71 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.business_code,
+                platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.platform),
+                businessCode: (_ref74 = (_ref75 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref75 !== void 0 ? _ref75 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.businessCode) !== null && _ref74 !== void 0 ? _ref74 : (_this$otherParams8 = this.otherParams) === null || _this$otherParams8 === void 0 ? void 0 : _this$otherParams8.business_code,
                 channel: params === null || params === void 0 ? void 0 : params.channel,
-                type: params === null || params === void 0 ? void 0 : params.type,
+                type: (_submitSnapshot$type = submitSnapshot.type) !== null && _submitSnapshot$type !== void 0 ? _submitSnapshot$type : params === null || params === void 0 ? void 0 : params.type,
                 summary: latestSummary,
                 request_unique_idempotency_token: params === null || params === void 0 ? void 0 : params.request_unique_idempotency_token,
                 enhance: enhancePayload
               });
+              console.log('[Order.runSubmitTempOrder.payload]', payload);
               if (params !== null && params !== void 0 && params.syncMode) {
                 payload.sync_mode = true;
               }
@@ -4327,10 +4826,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!payload.created_at) {
                 payload.created_at = dayjs().format('YYYY-MM-DD HH:mm:ss');
               }
-              _context32.next = 21;
+              _context33.next = 26;
               return this.saveDraft();
-            case 21:
-              _context32.prev = 21;
+            case 26:
+              _context33.prev = 26;
               this.logInfo('submitTempOrder calling sales checkout', {
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
@@ -4340,76 +4839,78 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 smallTicketDataFlag: payload.small_ticket_data_flag,
                 syncMode: payload.sync_mode
               });
-              _context32.next = 25;
+              _context33.next = 30;
               return this.submitSalesOrder({
                 query: payload
               });
-            case 25:
-              result = _context32.sent;
-              _context32.next = 38;
+            case 30:
+              result = _context33.sent;
+              _context33.next = 43;
               break;
-            case 28:
-              _context32.prev = 28;
-              _context32.t2 = _context32["catch"](21);
-              backendErrorResponse = this.extractSubmitErrorResponse(_context32.t2);
+            case 33:
+              _context33.prev = 33;
+              _context33.t2 = _context33["catch"](26);
+              backendErrorResponse = this.extractSubmitErrorResponse(_context33.t2);
               if (!backendErrorResponse) {
-                _context32.next = 35;
+                _context33.next = 40;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
-              return _context32.abrupt("return", backendErrorResponse);
-            case 35:
+              return _context33.abrupt("return", backendErrorResponse);
+            case 40:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
-                error: _context32.t2 instanceof Error ? _context32.t2.message : String(_context32.t2),
+                error: _context33.t2 instanceof Error ? _context33.t2.message : String(_context33.t2),
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
                 paymentStatus: payload.payment_status,
                 paymentsCount: ((_payload$payments2 = payload.payments) === null || _payload$payments2 === void 0 ? void 0 : _payload$payments2.length) || 0
               });
-              throw _context32.t2;
-            case 38:
+              throw _context33.t2;
+            case 43:
               if (!this.isSubmitResponseRejected(result)) {
-                _context32.next = 42;
+                _context33.next = 47;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
-              return _context32.abrupt("return", result);
-            case 42:
+              return _context33.abrupt("return", result);
+            case 47:
               submittedOrderId = this.extractOrderIdFromSubmitResult(result);
               this.logInfo('runSubmitTempOrder: 提交成功', {
                 submittedOrderId: submittedOrderId,
                 result: result,
-                tempOrder: tempOrder
+                tempOrder: _objectSpread(_objectSpread({}, tempOrder), {}, {
+                  _extend: undefined
+                })
               });
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
-                _context32.next = 51;
+                _context33.next = 56;
                 break;
               }
               tempOrder.order_id = submittedOrderId;
               resultRecord = result;
-              _context32.next = 49;
+              _context33.next = 54;
               return this.markLocalOrderSynced(submittedOrderId, (resultRecord === null || resultRecord === void 0 ? void 0 : resultRecord.data) || resultRecord || {});
-            case 49:
-              _context32.next = 52;
+            case 54:
+              _context33.next = 57;
               break;
-            case 51:
+            case 56:
               if (this.isLocalPendingSubmitResult(result)) {
                 this.store.syncState = 'local';
               } else {
                 this.store.syncState = 'submitted';
               }
-            case 52:
-              return _context32.abrupt("return", result);
-            case 53:
+            case 57:
+              return _context33.abrupt("return", result);
+            case 58:
             case "end":
-              return _context32.stop();
+              return _context33.stop();
           }
-        }, _callee29, this, [[21, 28]]);
+        }, _callee30, this, [[26, 33]]);
       }));
-      function runSubmitTempOrder(_x32) {
+      function runSubmitTempOrder(_x34) {
         return _runSubmitTempOrder.apply(this, arguments);
       }
       return runSubmitTempOrder;
@@ -4417,10 +4918,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "markLocalOrderSynced",
     value: function () {
-      var _markLocalOrderSynced = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(orderId, remoteOrder) {
+      var _markLocalOrderSynced = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(orderId, remoteOrder) {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee30$(_context33) {
-          while (1) switch (_context33.prev = _context33.next) {
+        return _regeneratorRuntime().wrap(function _callee31$(_context34) {
+          while (1) switch (_context34.prev = _context34.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               tempOrder.order_id = orderId;
@@ -4428,15 +4929,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.store.lastOrderInfo = remoteOrder;
               this.store.syncState = 'submitted';
               this.persistTempOrder();
-              _context33.next = 8;
+              _context34.next = 8;
               return this.saveDraft();
             case 8:
             case "end":
-              return _context33.stop();
+              return _context34.stop();
           }
-        }, _callee30, this);
+        }, _callee31, this);
       }));
-      function markLocalOrderSynced(_x33, _x34) {
+      function markLocalOrderSynced(_x35, _x36) {
         return _markLocalOrderSynced.apply(this, arguments);
       }
       return markLocalOrderSynced;
@@ -4479,10 +4980,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function extractSubmitErrorResponse(error) {
       var _error$response,
         _error$response2,
-        _this24 = this;
+        _this27 = this;
       var candidates = [error === null || error === void 0 || (_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.data, error === null || error === void 0 ? void 0 : error.data, error === null || error === void 0 || (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : _error$response2.body, error === null || error === void 0 ? void 0 : error.body];
       return candidates.find(function (candidate) {
-        return _this24.isSubmitErrorResponse(candidate);
+        return _this27.isSubmitErrorResponse(candidate);
       }) || null;
     }
   }, {
@@ -4509,48 +5010,47 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncPaymentsToOrder",
     value: function () {
-      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(params) {
-        var tempOrder, mappedPayments, paymentTotal, targetAmount, isFullyPaid, paymentStatus, paymentSyncIdempotencyToken, submitResult;
-        return _regeneratorRuntime().wrap(function _callee31$(_context34) {
-          while (1) switch (_context34.prev = _context34.next) {
+      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(params) {
+        var _params$confirmPendin;
+        var tempOrder, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, orderPaidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, submitResult;
+        return _regeneratorRuntime().wrap(function _callee32$(_context35) {
+          while (1) switch (_context35.prev = _context35.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               mappedPayments = mapPaymentItemsToOrderPayments(params.payments || []);
-              paymentTotal = this.calculatePaymentTotal(mappedPayments);
-              targetAmount = this.getPaymentTargetAmount();
-              isFullyPaid = targetAmount.lte(0) ? true : paymentTotal.gte(targetAmount);
-              paymentStatus = isFullyPaid ? params.paymentStatus || 'paid' : 'partially_paid';
-              tempOrder.payments = mappedPayments;
+              shouldConfirmPendingVoucherPayments = (_params$confirmPendin = params.confirmPendingVoucherPayments) !== null && _params$confirmPendin !== void 0 ? _params$confirmPendin : params.submitWhenPaid === true;
+              effectivePayments = shouldConfirmPendingVoucherPayments ? this.confirmPendingVoucherPaymentsInList(mappedPayments) : params.confirmPendingVoucherPayments === false ? this.discardPendingVoucherPaymentsFromList(mappedPayments) : mappedPayments;
+              completion = this.getPaymentCompletion(effectivePayments);
+              orderPaidPaymentTotal = this.calculateOrderPaidPaymentTotal(effectivePayments);
+              paymentStatus = completion.isOrderFullyPaid ? params.paymentStatus || 'paid' : orderPaidPaymentTotal.gt(0) ? 'partially_paid' : 'payment_processing';
+              tempOrder.payments = effectivePayments;
               tempOrder.payment_status = paymentStatus;
               this.persistTempOrder();
-              _context34.next = 11;
+              _context35.next = 12;
               return this.saveDraft();
-            case 11:
+            case 12:
               if (params.submitWhenPaid) {
-                _context34.next = 13;
+                _context35.next = 14;
                 break;
               }
-              return _context34.abrupt("return", {
-                isFullyPaid: isFullyPaid
-              });
-            case 13:
+              return _context35.abrupt("return", completion);
+            case 14:
               if (!(this.store.syncState === 'submitting')) {
-                _context34.next = 15;
+                _context35.next = 16;
                 break;
               }
-              return _context34.abrupt("return", {
-                isFullyPaid: isFullyPaid
-              });
-            case 15:
+              return _context35.abrupt("return", completion);
+            case 16:
               this.store.syncState = 'submitting';
-              paymentSyncIdempotencyToken = this.buildPaymentSyncIdempotencyToken(tempOrder, mappedPayments);
-              _context34.next = 19;
+              paymentSyncIdempotencyToken = this.buildPaymentSyncIdempotencyToken(tempOrder, effectivePayments);
+              _context35.next = 20;
               return this.submitTempOrder({
-                payments: mappedPayments,
+                payments: effectivePayments,
                 paymentStatus: paymentStatus,
                 smallTicketDataFlag: params.smallTicketDataFlag,
                 businessCode: params.businessCode,
                 channel: params.channel,
+                confirmPendingVoucherPayments: true,
                 enhancePayload: function enhancePayload(payload) {
                   var nextPayload = _objectSpread(_objectSpread({}, payload), {}, {
                     request_unique_idempotency_token: paymentSyncIdempotencyToken
@@ -4558,19 +5058,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   return nextPayload;
                 }
               });
-            case 19:
-              submitResult = _context34.sent;
-              return _context34.abrupt("return", {
-                isFullyPaid: isFullyPaid,
+            case 20:
+              submitResult = _context35.sent;
+              return _context35.abrupt("return", _objectSpread(_objectSpread({}, completion), {}, {
                 submitResult: submitResult
-              });
-            case 21:
+              }));
+            case 22:
             case "end":
-              return _context34.stop();
+              return _context35.stop();
           }
-        }, _callee31, this);
+        }, _callee32, this);
       }));
-      function syncPaymentsToOrder(_x35) {
+      function syncPaymentsToOrder(_x37) {
         return _syncPaymentsToOrder.apply(this, arguments);
       }
       return syncPaymentsToOrder;
@@ -4659,11 +5158,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitOrder",
     value: function () {
-      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(order) {
+      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(order) {
         var _order$query$cartItem, _params$bookings, _params$relation_prod;
         var url, query, fetchUrl, params;
-        return _regeneratorRuntime().wrap(function _callee32$(_context35) {
-          while (1) switch (_context35.prev = _context35.next) {
+        return _regeneratorRuntime().wrap(function _callee33$(_context36) {
+          while (1) switch (_context36.prev = _context36.next) {
             case 0:
               this.logInfo('submitOrder called', {
                 url: order.url,
@@ -4683,14 +5182,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 relationProductsCount: ((_params$relation_prod = params.relation_products) === null || _params$relation_prod === void 0 ? void 0 : _params$relation_prod.length) || 0,
                 scheduleDate: params.schedule_date
               });
-              return _context35.abrupt("return", this.request.post(fetchUrl, params));
+              return _context36.abrupt("return", this.request.post(fetchUrl, params));
             case 6:
             case "end":
-              return _context35.stop();
+              return _context36.stop();
           }
-        }, _callee32, this);
+        }, _callee33, this);
       }));
-      function submitOrder(_x36) {
+      function submitOrder(_x38) {
         return _submitOrder.apply(this, arguments);
       }
       return submitOrder;
@@ -4698,13 +5197,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "cancelOrder",
     value: function () {
-      var _cancelOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(params) {
+      var _cancelOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(params) {
         var payload;
-        return _regeneratorRuntime().wrap(function _callee33$(_context36) {
-          while (1) switch (_context36.prev = _context36.next) {
+        return _regeneratorRuntime().wrap(function _callee34$(_context37) {
+          while (1) switch (_context37.prev = _context37.next) {
             case 0:
               if (!(!Array.isArray(params.order_ids) || params.order_ids.length === 0)) {
-                _context36.next = 2;
+                _context37.next = 2;
                 break;
               }
               throw new Error('取消订单失败：order_ids 不能为空');
@@ -4720,16 +5219,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 method: 'PUT',
                 orderIdsCount: params.order_ids.length
               });
-              return _context36.abrupt("return", this.request.put('/order/update-status', payload, {
+              return _context37.abrupt("return", this.request.put('/order/update-status', payload, {
                 isShopApi: true
               }));
             case 5:
             case "end":
-              return _context36.stop();
+              return _context37.stop();
           }
-        }, _callee33, this);
+        }, _callee34, this);
       }));
-      function cancelOrder(_x37) {
+      function cancelOrder(_x39) {
         return _cancelOrder.apply(this, arguments);
       }
       return cancelOrder;
@@ -4737,19 +5236,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "changeBookingStatus",
     value: function () {
-      var _changeBookingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(params) {
+      var _changeBookingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35(params) {
         var url, payload;
-        return _regeneratorRuntime().wrap(function _callee34$(_context37) {
-          while (1) switch (_context37.prev = _context37.next) {
+        return _regeneratorRuntime().wrap(function _callee35$(_context38) {
+          while (1) switch (_context38.prev = _context38.next) {
             case 0:
               if (params.booking_id) {
-                _context37.next = 2;
+                _context38.next = 2;
                 break;
               }
               throw new Error('变更预约状态失败：booking_id 不能为空');
             case 2:
               if (params.appointment_status) {
-                _context37.next = 4;
+                _context38.next = 4;
                 break;
               }
               throw new Error('变更预约状态失败：appointment_status 不能为空');
@@ -4764,16 +5263,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 bookingId: params.booking_id,
                 appointmentStatus: params.appointment_status
               });
-              return _context37.abrupt("return", this.request.put(url, payload, {
+              return _context38.abrupt("return", this.request.put(url, payload, {
                 isShopApi: true
               }));
             case 8:
             case "end":
-              return _context37.stop();
+              return _context38.stop();
           }
-        }, _callee34, this);
+        }, _callee35, this);
       }));
-      function changeBookingStatus(_x38) {
+      function changeBookingStatus(_x40) {
         return _changeBookingStatus.apply(this, arguments);
       }
       return changeBookingStatus;
@@ -4791,11 +5290,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createOrderByCheckout",
     value: (function () {
-      var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35(params) {
+      var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
         var _params$payments, _params$bookings2, _params$relation_prod2, _params$payments2, _params$payments3, _params$bookings3, _params$relation_prod3, _params$payments4;
         var onlineStorePaymentCodeList, _orderData$payments, _orderData$bookings, _orderData$relation_p, _orderData$payments2, _orderData$payments3, _orderData$bookings2, _orderData$relation_p2, _orderData$payments4, _orderData$payments5, _response$data, orderData, response;
-        return _regeneratorRuntime().wrap(function _callee35$(_context38) {
-          while (1) switch (_context38.prev = _context38.next) {
+        return _regeneratorRuntime().wrap(function _callee36$(_context39) {
+          while (1) switch (_context39.prev = _context39.next) {
             case 0:
               // 过滤掉由在线店铺下单的 payment 支付数据
               onlineStorePaymentCodeList = ['WXPAY', 'WECHAT', 'ALIPAY', 'APPLE_PAY', 'CREDIT_CARD_3DS', 'CREDIT_CARD_TOKEN', 'GOOGLE_PAY', 'GOOGLE_PAY_3DS', 'CREDIT_CARD'];
@@ -4829,7 +5328,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 relationProductsCount: ((_params$relation_prod3 = params.relation_products) === null || _params$relation_prod3 === void 0 ? void 0 : _params$relation_prod3.length) || 0,
                 paymentsCount: ((_params$payments4 = params.payments) === null || _params$payments4 === void 0 ? void 0 : _params$payments4.length) || 0
               });
-              _context38.prev = 4;
+              _context39.prev = 4;
               // 构建订单数据，设置默认值并允许 params 覆盖
               orderData = _objectSpread({
                 sales_channel: 'my_pisel',
@@ -4891,13 +5390,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 hasOrderId: !!orderData.order_id,
                 smallTicketDataFlag: orderData.small_ticket_data_flag
               });
-              _context38.next = 12;
+              _context39.next = 12;
               return this.request.post('/order/checkout', orderData, {
                 osServer: true,
                 customToast: function customToast() {}
               });
             case 12:
-              response = _context38.sent;
+              response = _context39.sent;
               this.logInfo('Order API called successfully', {
                 response: response
               });
@@ -4905,22 +5404,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 success: !!response,
                 hasOrderId: !!(response !== null && response !== void 0 && (_response$data = response.data) !== null && _response$data !== void 0 && _response$data.order_id || response !== null && response !== void 0 && response.order_id)
               });
-              return _context38.abrupt("return", response);
+              return _context39.abrupt("return", response);
             case 18:
-              _context38.prev = 18;
-              _context38.t0 = _context38["catch"](4);
-              console.error('[Order] createOrderByCheckout 创建订单失败:', _context38.t0);
+              _context39.prev = 18;
+              _context39.t0 = _context39["catch"](4);
+              console.error('[Order] createOrderByCheckout 创建订单失败:', _context39.t0);
               this.logInfo('Order API called failed', {
-                error: _context38.t0 instanceof Error ? _context38.t0.message : String(_context38.t0)
+                error: _context39.t0 instanceof Error ? _context39.t0.message : String(_context39.t0)
               });
-              throw _context38.t0;
+              throw _context39.t0;
             case 23:
             case "end":
-              return _context38.stop();
+              return _context39.stop();
           }
-        }, _callee35, this, [[4, 18]]);
+        }, _callee36, this, [[4, 18]]);
       }));
-      function createOrderByCheckout(_x39) {
+      function createOrderByCheckout(_x41) {
         return _createOrderByCheckout.apply(this, arguments);
       }
       return createOrderByCheckout;
@@ -4928,24 +5427,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitSalesOrder",
     value: function () {
-      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
+      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(params) {
         var url, query, fetchUrl;
-        return _regeneratorRuntime().wrap(function _callee36$(_context39) {
-          while (1) switch (_context39.prev = _context39.next) {
+        return _regeneratorRuntime().wrap(function _callee37$(_context40) {
+          while (1) switch (_context40.prev = _context40.next) {
             case 0:
               url = params.url, query = params.query;
               fetchUrl = url || '/order/sales/checkout';
-              return _context39.abrupt("return", this.request.post(fetchUrl, query, {
+              return _context40.abrupt("return", this.request.post(fetchUrl, query, {
                 osServer: true,
                 customToast: function customToast() {}
               }));
             case 3:
             case "end":
-              return _context39.stop();
+              return _context40.stop();
           }
-        }, _callee36, this);
+        }, _callee37, this);
       }));
-      function submitSalesOrder(_x40) {
+      function submitSalesOrder(_x42) {
         return _submitSalesOrder.apply(this, arguments);
       }
       return submitSalesOrder;
@@ -4959,37 +5458,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sendCustomerPayLink",
     value: (function () {
-      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(params) {
+      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(params) {
         var _params$emails;
         var orderIds;
-        return _regeneratorRuntime().wrap(function _callee37$(_context40) {
-          while (1) switch (_context40.prev = _context40.next) {
+        return _regeneratorRuntime().wrap(function _callee38$(_context41) {
+          while (1) switch (_context41.prev = _context41.next) {
             case 0:
               orderIds = params.order_ids || params.orderIds || [];
               if (orderIds.length) {
-                _context40.next = 3;
+                _context41.next = 3;
                 break;
               }
               throw new Error('发送支付链接前必须先提交本地订单并取得订单 ID');
             case 3:
               if ((_params$emails = params.emails) !== null && _params$emails !== void 0 && _params$emails.length) {
-                _context40.next = 5;
+                _context41.next = 5;
                 break;
               }
               throw new Error('发送支付链接需要至少一个邮箱');
             case 5:
-              return _context40.abrupt("return", this.request.post('/order/batch-email', {
+              return _context41.abrupt("return", this.request.post('/order/batch-email', {
                 order_ids: orderIds,
                 notify_action: params.notify_action || 'order_payment_reminder',
                 emails: params.emails
               }));
             case 6:
             case "end":
-              return _context40.stop();
+              return _context41.stop();
           }
-        }, _callee37, this);
+        }, _callee38, this);
       }));
-      function sendCustomerPayLink(_x41) {
+      function sendCustomerPayLink(_x43) {
         return _sendCustomerPayLink.apply(this, arguments);
       }
       return sendCustomerPayLink;
@@ -4997,14 +5496,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getSalesOrderByLookup",
     value: function () {
-      var _getSalesOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(params) {
+      var _getSalesOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(params) {
         var lookup, res;
-        return _regeneratorRuntime().wrap(function _callee38$(_context41) {
-          while (1) switch (_context41.prev = _context41.next) {
+        return _regeneratorRuntime().wrap(function _callee39$(_context42) {
+          while (1) switch (_context42.prev = _context42.next) {
             case 0:
               lookup = params.lookup === undefined || params.lookup === null ? '' : String(params.lookup).trim();
               if (lookup) {
-                _context41.next = 3;
+                _context42.next = 3;
                 break;
               }
               throw new Error('加载销售详情需要 lookup');
@@ -5013,7 +5512,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (lookup.startsWith('LOCAL_')) {
                 params.forceRemote = false;
               }
-              _context41.next = 6;
+              _context42.next = 6;
               return this.request.get("/order/sales/".concat(encodeURIComponent(lookup)), _objectSpread({
                 with: ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info']
               }, params.forceRemote ? {
@@ -5022,18 +5521,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 osServer: true
               });
             case 6:
-              res = _context41.sent;
+              res = _context42.sent;
               if (res.code === 200) {
                 this.store.lastOrderInfo = res.data;
               }
-              return _context41.abrupt("return", res);
+              return _context42.abrupt("return", res);
             case 9:
             case "end":
-              return _context41.stop();
+              return _context42.stop();
           }
-        }, _callee38, this);
+        }, _callee39, this);
       }));
-      function getSalesOrderByLookup(_x42) {
+      function getSalesOrderByLookup(_x44) {
         return _getSalesOrderByLookup.apply(this, arguments);
       }
       return getSalesOrderByLookup;
@@ -5047,14 +5546,36 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hydrateTempOrderFromRecord",
     value: (function () {
-      var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(record, options) {
-        var _this$store$discount15;
-        var raw, nextTempOrder, rawSummary, summarySurcharges, hydratedEditDiscounts, currentDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount16, _this$store$discount17;
-        return _regeneratorRuntime().wrap(function _callee39$(_context42) {
-          while (1) switch (_context42.prev = _context42.next) {
+      var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(record, options) {
+        var _this$store$discount19;
+        var sourceRaw, identityReadySource, normalizedCollections, raw, hasIdentityChanges, identityLogMetadata, hasIdentityWarnings, nextTempOrder, rawSummary, summarySurcharges, hydratedEditDiscounts, currentDiscounts, currentScanDiscounts, hydratedDiscountIds, retainedScanDiscounts, nextDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount20, _this$store$discount21;
+        return _regeneratorRuntime().wrap(function _callee40$(_context43) {
+          while (1) switch (_context43.prev = _context43.next) {
             case 0:
-              raw = record && _typeof(record) === 'object' && record.data && record.order_id == null ? record.data : record || {};
-              nextTempOrder = this.normalizeTempOrderForRuntime(raw);
+              sourceRaw = record && _typeof(record) === 'object' && record.data && record.order_id == null ? record.data : record || {};
+              identityReadySource = this.seedAnonymousBookingUidsFromProducts(sourceRaw);
+              normalizedCollections = normalizeOrderCollections(identityReadySource);
+              raw = normalizedCollections.order;
+              hasIdentityChanges = Object.values(normalizedCollections.stats).some(function (stats) {
+                return stats.backfilledUidCount > 0 || stats.collapsedDuplicateCount > 0 || stats.uidConflictCount > 0 || stats.anonymousRowCount > 0;
+              });
+              if (hasIdentityChanges) {
+                identityLogMetadata = {
+                  collections: normalizedCollections.stats,
+                  uidRemapCount: normalizedCollections.uidRemaps.length
+                };
+                hasIdentityWarnings = Object.values(normalizedCollections.stats).some(function (stats) {
+                  return stats.uidConflictCount > 0 || stats.anonymousRowCount > 0;
+                });
+                if (hasIdentityWarnings) {
+                  this.logWarning('Normalized hydrated order collection identities', identityLogMetadata);
+                } else {
+                  this.logInfo('Normalized hydrated order collection identities', identityLogMetadata);
+                }
+              }
+              nextTempOrder = this.normalizeTempOrderForRuntime(raw, {
+                makeEditMark: true
+              });
               rawSummary = raw.summary && _typeof(raw.summary) === 'object' ? raw.summary : {};
               summarySurcharges = Array.isArray(rawSummary.surcharges) ? rawSummary.surcharges.map(function (s) {
                 return _objectSpread({}, s || {});
@@ -5067,43 +5588,59 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 originalSalesSnapshot: {
                   summary: cloneDeep(this.store.summary),
                   products: cloneDeep(nextTempOrder.products || []),
+                  bookings: cloneDeep(nextTempOrder.bookings || []),
                   payments: cloneDeep(nextTempOrder.payments || []),
                   surcharges: cloneDeep(nextTempOrder.surcharges || []),
+                  shop_discount: nextTempOrder.shop_discount || '0.00',
                   productFingerprint: this.buildOrderProductsFingerprint(nextTempOrder.products || [])
                 }
               });
-              this.store.lastOrderInfo = raw.lastOrderInfo || raw;
+              // lastOrderInfo carries the exact backend snapshot used by deposit/type recovery.
+              // Runtime collection repair lives in tempOrder/originalSalesSnapshot and must not
+              // rewrite this protocol snapshot as a side effect of hydration.
+              this.store.lastOrderInfo = sourceRaw.lastOrderInfo || sourceRaw;
               hydratedEditDiscounts = this.collectHydratedEditDiscounts(nextTempOrder.products);
-              currentDiscounts = typeof ((_this$store$discount15 = this.store.discount) === null || _this$store$discount15 === void 0 ? void 0 : _this$store$discount15.getDiscountList) === 'function' ? this.store.discount.getDiscountList() || [] : [];
-              shouldSkipEmptyDiscountSync = hydratedEditDiscounts.length === 0 && currentDiscounts.length === 0;
+              currentDiscounts = typeof ((_this$store$discount19 = this.store.discount) === null || _this$store$discount19 === void 0 ? void 0 : _this$store$discount19.getDiscountList) === 'function' ? this.store.discount.getDiscountList() || [] : [];
+              currentScanDiscounts = currentDiscounts.filter(function (discount) {
+                return discount === null || discount === void 0 ? void 0 : discount.isScan;
+              });
+              hydratedDiscountIds = new Set(hydratedEditDiscounts.map(function (discount) {
+                return discount === null || discount === void 0 ? void 0 : discount.id;
+              }));
+              retainedScanDiscounts = currentScanDiscounts.filter(function (discount) {
+                return !hydratedDiscountIds.has(discount === null || discount === void 0 ? void 0 : discount.id);
+              });
+              nextDiscounts = [].concat(_toConsumableArray(hydratedEditDiscounts), _toConsumableArray(retainedScanDiscounts));
+              shouldSkipEmptyDiscountSync = nextDiscounts.length === 0 && currentDiscounts.length === 0;
               if (shouldSkipEmptyDiscountSync) {
-                _context42.next = 16;
+                _context43.next = 26;
                 break;
               }
-              _context42.next = 14;
-              return (_this$store$discount16 = this.store.discount) === null || _this$store$discount16 === void 0 ? void 0 : _this$store$discount16.setOriginalDiscountList(hydratedEditDiscounts);
-            case 14:
-              _context42.next = 16;
-              return (_this$store$discount17 = this.store.discount) === null || _this$store$discount17 === void 0 ? void 0 : _this$store$discount17.setDiscountList(hydratedEditDiscounts);
-            case 16:
+              OrderModule.populateSavedAmounts(nextTempOrder.products, nextDiscounts);
+              _context43.next = 24;
+              return (_this$store$discount20 = this.store.discount) === null || _this$store$discount20 === void 0 ? void 0 : _this$store$discount20.setOriginalDiscountList(nextDiscounts);
+            case 24:
+              _context43.next = 26;
+              return (_this$store$discount21 = this.store.discount) === null || _this$store$discount21 === void 0 ? void 0 : _this$store$discount21.setDiscountList(nextDiscounts);
+            case 26:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context42.next = 19;
+                _context43.next = 29;
                 break;
               }
-              _context42.next = 19;
+              _context43.next = 29;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 19:
+            case 29:
               this.persistTempOrder();
-              return _context42.abrupt("return", nextTempOrder);
-            case 21:
+              return _context43.abrupt("return", nextTempOrder);
+            case 31:
             case "end":
-              return _context42.stop();
+              return _context43.stop();
           }
-        }, _callee39, this);
+        }, _callee40, this);
       }));
-      function hydrateTempOrderFromRecord(_x43, _x44) {
+      function hydrateTempOrderFromRecord(_x45, _x46) {
         return _hydrateTempOrderFromRecord.apply(this, arguments);
       }
       return hydrateTempOrderFromRecord;
@@ -5141,10 +5678,83 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return next;
     }
+
+    /**
+     * 匿名 booking 没有服务端行 ID 时，商品侧已有的 booking_uid 就是唯一可用的强引用。
+     * 在统一规范化生成 UUID 前先复用它；已落库 booking 仍按 schedule_event_id 派生稳定 UID。
+     */
+  }, {
+    key: "seedAnonymousBookingUidsFromProducts",
+    value: function seedAnonymousBookingUidsFromProducts(raw) {
+      if (!raw || _typeof(raw) !== 'object') return {};
+      if (!Array.isArray(raw.bookings) || !Array.isArray(raw.products)) return raw;
+      var bookingUidsByProductUid = new Map();
+      var _iterator22 = _createForOfIteratorHelper(raw.products),
+        _step22;
+      try {
+        for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
+          var _product$metadata10;
+          var product = _step22.value;
+          var productUid = getOrderCollectionUid('product', product);
+          var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.booking_uid);
+          if (!productUid || bookingUid === undefined || bookingUid === null || bookingUid === '') {
+            continue;
+          }
+          var candidates = bookingUidsByProductUid.get(productUid) || new Set();
+          candidates.add(String(bookingUid));
+          bookingUidsByProductUid.set(productUid, candidates);
+        }
+      } catch (err) {
+        _iterator22.e(err);
+      } finally {
+        _iterator22.f();
+      }
+      if (bookingUidsByProductUid.size === 0) return raw;
+      var anonymousBookingCountByProductUid = new Map();
+      var _iterator23 = _createForOfIteratorHelper(raw.bookings),
+        _step23;
+      try {
+        for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
+          var _booking$metadata7;
+          var booking = _step23.value;
+          if (getOrderCollectionPersistentId('booking', booking) || getOrderCollectionUid('booking', booking)) {
+            continue;
+          }
+          var _productUid = (booking === null || booking === void 0 ? void 0 : booking.product_uid) || (booking === null || booking === void 0 || (_booking$metadata7 = booking.metadata) === null || _booking$metadata7 === void 0 ? void 0 : _booking$metadata7.product_uid);
+          if (_productUid === undefined || _productUid === null || _productUid === '') continue;
+          var key = String(_productUid);
+          anonymousBookingCountByProductUid.set(key, (anonymousBookingCountByProductUid.get(key) || 0) + 1);
+        }
+      } catch (err) {
+        _iterator23.e(err);
+      } finally {
+        _iterator23.f();
+      }
+      return _objectSpread(_objectSpread({}, raw), {}, {
+        bookings: raw.bookings.map(function (booking) {
+          var _booking$metadata6;
+          if (getOrderCollectionPersistentId('booking', booking) || getOrderCollectionUid('booking', booking)) {
+            return booking;
+          }
+          var productUid = (booking === null || booking === void 0 ? void 0 : booking.product_uid) || (booking === null || booking === void 0 || (_booking$metadata6 = booking.metadata) === null || _booking$metadata6 === void 0 ? void 0 : _booking$metadata6.product_uid);
+          if (productUid === undefined || productUid === null || productUid === '') {
+            return booking;
+          }
+          var productUidKey = String(productUid);
+          // 多条匿名 booking 共用同一商品引用时身份仍然不明确，不能借商品字段猜测合并。
+          if (anonymousBookingCountByProductUid.get(productUidKey) !== 1) {
+            return booking;
+          }
+          var bookingUidCandidates = bookingUidsByProductUid.get(productUidKey);
+          var bookingUid = (bookingUidCandidates === null || bookingUidCandidates === void 0 ? void 0 : bookingUidCandidates.size) === 1 ? _toConsumableArray(bookingUidCandidates)[0] : null;
+          return bookingUid ? setOrderCollectionUid('booking', booking, bookingUid) : booking;
+        })
+      });
+    }
   }, {
     key: "normalizeTempOrderForRuntime",
     value: function normalizeTempOrderForRuntime(raw, options) {
-      var _this25 = this;
+      var _this28 = this;
       var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), raw || {});
       // ES 列表详情使用 id 表示订单主键；OS 详情态统一依赖 order_id 驱动操作按钮。
       if ((nextTempOrder.order_id === undefined || nextTempOrder.order_id === null) && (raw === null || raw === void 0 ? void 0 : raw.id) !== undefined && (raw === null || raw === void 0 ? void 0 : raw.id) !== null) {
@@ -5167,10 +5777,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       nextTempOrder.holder = raw.holder && _typeof(raw.holder) === 'object' ? _objectSpread({}, raw.holder) : null;
       var rawProducts = Array.isArray(raw.products) ? raw.products : [];
       nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map(function (p) {
-        return _this25.normalizeHydratedOrderProduct(p);
+        return _this28.normalizeHydratedOrderProduct(p, {
+          makeEditMark: options === null || options === void 0 ? void 0 : options.makeEditMark
+        });
       }) : [];
       nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map(function (b) {
-        var booking = _this25.normalizeHydratedBookingHolder(b || {});
+        var booking = _this28.normalizeHydratedBookingHolder(b || {});
         return _objectSpread(_objectSpread({}, booking), {}, {
           is_all: normalizeBookingIsAll(booking),
           sub_type: normalizeBookingSubType(booking)
@@ -5196,19 +5808,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       };
       var tempOrderExtend = nextTempOrder._extend;
       var productsByUid = tempOrderExtend.productsByUid || {};
-      var _iterator22 = _createForOfIteratorHelper(nextTempOrder.products.entries()),
-        _step22;
+      var _iterator24 = _createForOfIteratorHelper(nextTempOrder.products.entries()),
+        _step24;
       try {
-        for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
-          var _product$metadata8, _ref72, _ref73, _existed$origin, _rawProduct$metadata;
-          var _step22$value = _slicedToArray(_step22.value, 2),
-            index = _step22$value[0],
-            product = _step22$value[1];
-          var uid = (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.unique_identification_number;
+        for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
+          var _product$metadata11, _ref76, _ref77, _existed$origin, _rawProduct$metadata;
+          var _step24$value = _slicedToArray(_step24.value, 2),
+            index = _step24$value[0],
+            product = _step24$value[1];
+          var uid = (_product$metadata11 = product.metadata) === null || _product$metadata11 === void 0 ? void 0 : _product$metadata11.unique_identification_number;
           if (!uid) continue;
           var existed = productsByUid[uid] && _typeof(productsByUid[uid]) === 'object' ? productsByUid[uid] : {};
           var rawProduct = rawProducts[index] && _typeof(rawProducts[index]) === 'object' ? rawProducts[index] : product;
-          var origin = (_ref72 = (_ref73 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref73 !== void 0 ? _ref73 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref72 !== void 0 ? _ref72 : rawProduct;
+          var origin = (_ref76 = (_ref77 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref77 !== void 0 ? _ref77 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref76 !== void 0 ? _ref76 : rawProduct;
           var originSnapshot = cloneDeep(origin);
           var productOptionString = this.buildHydratedProductOptionString(rawProduct) || this.buildHydratedProductOptionString(product);
           if (productOptionString && originSnapshot && _typeof(originSnapshot) === 'object') {
@@ -5224,9 +5836,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           });
         }
       } catch (err) {
-        _iterator22.e(err);
+        _iterator24.e(err);
       } finally {
-        _iterator22.f();
+        _iterator24.f();
       }
       tempOrderExtend.productsByUid = productsByUid;
       this.hydrateLinkedBookingIdentity(nextTempOrder);
@@ -5242,8 +5854,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var bookingUidByProductUid = new Map();
       var productByUid = new Map();
       (tempOrder.products || []).forEach(function (product) {
-        var _product$metadata9;
-        var productUid = (product === null || product === void 0 || (_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+        var _product$metadata12;
+        var productUid = (product === null || product === void 0 || (_product$metadata12 = product.metadata) === null || _product$metadata12 === void 0 ? void 0 : _product$metadata12.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
         if (productUid !== undefined && productUid !== null && String(productUid) !== '') {
           productByUid.set(String(productUid), product);
         }
@@ -5264,18 +5876,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         bookingUidByProductUid.set(String(productUid), bookingUid);
       });
       (tempOrder.products || []).forEach(function (product) {
-        var _product$metadata10;
-        var productUid = (product === null || product === void 0 || (_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+        var _product$metadata13;
+        var productUid = (product === null || product === void 0 || (_product$metadata13 = product.metadata) === null || _product$metadata13 === void 0 ? void 0 : _product$metadata13.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
         if (productUid === undefined || productUid === null || String(productUid) === '') return;
         var bookingUid = bookingUidByProductUid.get(String(productUid));
         if (!bookingUid) return;
         if (!product.metadata || _typeof(product.metadata) !== 'object') {
           product.metadata = {};
         }
-        var linkedBookingUid = String(product.booking_uid || product.metadata.booking_uid || bookingUid);
+        // booking 已经过统一身份规范化；以它为准同步商品侧旧引用，避免两侧 UID 断链。
+        var linkedBookingUid = String(bookingUid);
         product.booking_uid = linkedBookingUid;
         product.metadata.booking_uid = linkedBookingUid;
       });
+      this.syncLinkedBookingHoldersToProducts(tempOrder);
     }
   }, {
     key: "pickHydratedDisplayText",
@@ -5299,18 +5913,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var segments = [];
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
       if (Array.isArray(sku.variant)) {
-        var _iterator23 = _createForOfIteratorHelper(sku.variant),
-          _step23;
+        var _iterator25 = _createForOfIteratorHelper(sku.variant),
+          _step25;
         try {
-          for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
-            var variant = _step23.value;
+          for (_iterator25.s(); !(_step25 = _iterator25.n()).done;) {
+            var variant = _step25.value;
             var segment = this.formatHydratedNamePair(variant === null || variant === void 0 ? void 0 : variant.group, variant === null || variant === void 0 ? void 0 : variant.item);
             if (segment) segments.push(segment);
           }
         } catch (err) {
-          _iterator23.e(err);
+          _iterator25.e(err);
         } finally {
-          _iterator23.f();
+          _iterator25.f();
         }
       }
       return segments.join(', ');
@@ -5318,10 +5932,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedProductOptionItem",
     value: function normalizeHydratedProductOptionItem(optionItem) {
-      var _ref74, _optionItem$num, _ref75, _optionItem$add_price;
-      var rawNum = (_ref74 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref74 !== void 0 ? _ref74 : 1;
+      var _ref78, _optionItem$num, _ref79, _optionItem$add_price;
+      var rawNum = (_ref78 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref78 !== void 0 ? _ref78 : 1;
       var parsedNum = Number(rawNum);
-      var rawPrice = (_ref75 = (_optionItem$add_price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _optionItem$add_price !== void 0 ? _optionItem$add_price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _ref75 !== void 0 ? _ref75 : 0;
+      var rawPrice = (_ref79 = (_optionItem$add_price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _optionItem$add_price !== void 0 ? _optionItem$add_price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _ref79 !== void 0 ? _ref79 : 0;
       var parsedPrice = Number(rawPrice);
       var normalized = _objectSpread(_objectSpread({}, optionItem), {}, {
         option_group_item_id: optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id,
@@ -5337,8 +5951,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     }
   }, {
     key: "normalizeHydratedOrderProduct",
-    value: function normalizeHydratedOrderProduct(product) {
-      var _this26 = this;
+    value: function normalizeHydratedOrderProduct(product, options) {
+      var _this29 = this;
       var row = _objectSpread({}, product || {});
       if (row.num === undefined && row.product_quantity !== undefined) {
         row.num = row.product_quantity;
@@ -5346,7 +5960,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var productSku = ensureProductSku(row);
       row.product_sku = _objectSpread(_objectSpread({}, productSku), {}, {
         option: normalizeProductSkuOptions(productSku.option.map(function (optionItem) {
-          return _this26.normalizeHydratedProductOptionItem(optionItem || {});
+          return _this29.normalizeHydratedProductOptionItem(optionItem || {});
         }))
       });
       delete row["product_".concat('option', "_item")];
@@ -5355,10 +5969,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (row.booking_uid && !row.metadata.booking_uid) {
         row.metadata.booking_uid = row.booking_uid;
       }
+      row = restoreHydratedBundleDiscounts(row, normalizeOrderProductDiscountList);
       var existingIdentity = row.metadata.unique_identification_number || row.unique_identification_number;
       if (!existingIdentity) {
         row.metadata.unique_identification_number = createUuidV4();
       }
+      // 从云端、本地数据库中获取到的商品数据，先打上 runtime 标记，提供给 UI 做 saved items.
+      if (options !== null && options !== void 0 && options.makeEditMark) {
+        row.metadata.is_edit_for_runtime = true;
+      }
       var normalized = normalizeOrderProduct(row);
       normalized.discount_list = normalizeOrderProductDiscountList(normalized.discount_list);
       var result = _objectSpread(_objectSpread(_objectSpread({}, row), normalized), {}, {
@@ -5366,7 +5985,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         metadata: _objectSpread(_objectSpread({}, row.metadata), normalized.metadata)
       });
       if (result.metadata) delete result.metadata.price_schema_version;
-      return this.sanitizeOrderProductForTempOrder(result);
+      var restored = restoreHydratedBundleDiscounts(result, normalizeOrderProductDiscountList);
+      return this.sanitizeOrderProductForTempOrder(restored);
     }
   }, {
     key: "getLastOrderInfo",
@@ -5377,31 +5997,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderInfo",
     value: function () {
-      var _getOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(order_id) {
+      var _getOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41(order_id) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee40$(_context43) {
-          while (1) switch (_context43.prev = _context43.next) {
+        return _regeneratorRuntime().wrap(function _callee41$(_context44) {
+          while (1) switch (_context44.prev = _context44.next) {
             case 0:
-              _context43.next = 2;
+              _context44.next = 2;
               return this.request.get("/order/sales/".concat(order_id), {
                 with: ['products', 'bookings']
               }, {
                 osServer: true
               });
             case 2:
-              res = _context43.sent;
-              return _context43.abrupt("return", res);
+              res = _context44.sent;
+              return _context44.abrupt("return", res);
             case 4:
             case "end":
-              return _context43.stop();
+              return _context44.stop();
           }
-        }, _callee40, this);
+        }, _callee41, this);
       }));
-      function getOrderInfo(_x45) {
+      function getOrderInfo(_x47) {
         return _getOrderInfo.apply(this, arguments);
       }
       return getOrderInfo;
     }()
+  }, {
+    key: "getVouchers",
+    value: function getVouchers() {
+      var _this$store$tempOrder5;
+      return ((_this$store$tempOrder5 = this.store.tempOrder) === null || _this$store$tempOrder5 === void 0 ? void 0 : _this$store$tempOrder5.vouchers) || [];
+    }
   }], [{
     key: "populateSavedAmounts",
     value: function populateSavedAmounts(productList, discountList) {
@@ -5427,70 +6053,70 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         addDiscountAmount(savedMap, discountKey, amount);
         addDiscountAmount(isPersistedProduct || discount.order_discount_id != null ? editModeSavedMap : runtimeSavedMap, discountKey, amount);
       };
-      var _iterator24 = _createForOfIteratorHelper(productList),
-        _step24;
+      var _iterator26 = _createForOfIteratorHelper(productList),
+        _step26;
       try {
-        for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
-          var product = _step24.value;
+        for (_iterator26.s(); !(_step26 = _iterator26.n()).done;) {
+          var product = _step26.value;
           var qty = product.num || 1;
           var isPersistedProduct = Boolean(product.order_detail_id || product.orderDetailId || product.booking_id);
-          var _iterator26 = _createForOfIteratorHelper(product.discount_list || []),
-            _step26;
+          var _iterator28 = _createForOfIteratorHelper(product.discount_list || []),
+            _step28;
           try {
-            for (_iterator26.s(); !(_step26 = _iterator26.n()).done;) {
-              var pd = _step26.value;
+            for (_iterator28.s(); !(_step28 = _iterator28.n()).done;) {
+              var pd = _step28.value;
               addProductDiscountAmount(pd, qty, isPersistedProduct);
             }
           } catch (err) {
-            _iterator26.e(err);
+            _iterator28.e(err);
           } finally {
-            _iterator26.f();
+            _iterator28.f();
           }
-          var _iterator27 = _createForOfIteratorHelper(product.product_bundle || []),
-            _step27;
+          var _iterator29 = _createForOfIteratorHelper(product.product_bundle || []),
+            _step29;
           try {
-            for (_iterator27.s(); !(_step27 = _iterator27.n()).done;) {
-              var _ref76, _bundle$num3;
-              var bundle = _step27.value;
+            for (_iterator29.s(); !(_step29 = _iterator29.n()).done;) {
+              var _ref80, _bundle$num3;
+              var bundle = _step29.value;
               var isPersistedBundleProduct = isPersistedProduct || Boolean((bundle === null || bundle === void 0 ? void 0 : bundle.order_detail_id) || (bundle === null || bundle === void 0 ? void 0 : bundle.orderDetailId) || (bundle === null || bundle === void 0 ? void 0 : bundle.booking_id));
-              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref76 = (_bundle$num3 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num3 !== void 0 ? _bundle$num3 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref76 !== void 0 ? _ref76 : 1) || 1).toNumber();
-              var _iterator28 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
-                _step28;
+              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref80 = (_bundle$num3 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num3 !== void 0 ? _bundle$num3 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref80 !== void 0 ? _ref80 : 1) || 1).toNumber();
+              var _iterator30 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
+                _step30;
               try {
-                for (_iterator28.s(); !(_step28 = _iterator28.n()).done;) {
-                  var _pd = _step28.value;
+                for (_iterator30.s(); !(_step30 = _iterator30.n()).done;) {
+                  var _pd = _step30.value;
                   addProductDiscountAmount(_pd, bundleQty, isPersistedBundleProduct);
                 }
               } catch (err) {
-                _iterator28.e(err);
+                _iterator30.e(err);
               } finally {
-                _iterator28.f();
+                _iterator30.f();
               }
             }
           } catch (err) {
-            _iterator27.e(err);
+            _iterator29.e(err);
           } finally {
-            _iterator27.f();
+            _iterator29.f();
           }
         }
       } catch (err) {
-        _iterator24.e(err);
+        _iterator26.e(err);
       } finally {
-        _iterator24.f();
+        _iterator26.f();
       }
-      var _iterator25 = _createForOfIteratorHelper(discountList),
-        _step25;
+      var _iterator27 = _createForOfIteratorHelper(discountList),
+        _step27;
       try {
-        for (_iterator25.s(); !(_step25 = _iterator25.n()).done;) {
-          var d = _step25.value;
+        for (_iterator27.s(); !(_step27 = _iterator27.n()).done;) {
+          var d = _step27.value;
           var key = d.id;
           var sourceMap = d.isEditMode ? editModeSavedMap : editModeDiscountKeys.has(key) ? runtimeSavedMap : savedMap;
           d.savedAmount = d.isSelected && key != null && sourceMap.has(key) ? sourceMap.get(key).toNumber() : 0;
         }
       } catch (err) {
-        _iterator25.e(err);
+        _iterator27.e(err);
       } finally {
-        _iterator25.f();
+        _iterator27.f();
       }
     }
   }]);