@pisell/pisellos 2.2.308 → 2.2.310

package/dist/modules/Order/index.js

@@ -6,13 +6,7 @@ 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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -25,6 +19,12 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -32,21 +32,25 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
 import { OrderHooks } from "./types";
-import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, ensureCartItemOriginHolder, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeOrderMetaList, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, buildPointCardSnapshotFromWalletPassList, mergeOrderProductDisplayFields, resolveIsFormSubject, isMarkdownBundle } from "./utils";
+import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, ensureCartItemOriginHolder, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeOrderMetaList, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, collectPointCardSnapshotCodeCandidates, mergePointCardSnapshotCodes as _mergePointCardSnapshotCodes, buildVirtualCurrencySnapshotFromList, mergeOrderProductDisplayFields, resolveIsFormSubject, isMarkdownBundle } from "./utils";
 import { isNormalProduct } from "../Product/utils";
+import { getWeighedProductPriceFingerprint, resolveWeighedSourcePrice, withOriginalBundleOptionPrices } from "./utils/weighedProduct";
 import dayjs from 'dayjs';
+import { getDiscountLifecycleReason } from "../Discount/availability";
+import { stripOsPrivatePayloadFields } from "../../utils/os-private-payload";
 import { buildSalesNoteText, decodeSalesNotesSnapshot, getSalesNotePolicy } from "./salesNotes";
 import { ensureOrderPaymentNumber, mergeOrderPaymentRecord, resolveOrderPaymentIdentity } from "./payment-utils";
 import { resolvePaymentNumberDevicePrefix, resolvePaymentNumberDevicePrefixFromDeviceId } from "../../utils/payment-number";
 import { processCartPromotion, appendPromotionTags as _appendPromotionTags, getOrderProductUid as getPromotionUid, PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY } from "../../solution/BaseSales/utils/cartPromotion";
 import { buildProductLineFingerprint, getProductIdentityIndex, getSafeProductNum, isIdentityMatch, normalizeOrderProduct } from "../../solution/ScanOrder/utils";
-import { hasManualProductDiscountFlag, syncManualProductDiscountProductNum } from "./utils/manualProductDiscount";
+import { hasManualProductDiscountFlag, syncManualProductDiscountProductNum, buildManualProductDiscountItem, findManualProductDiscountItem, mergeManualProductDiscountIntoList } from "./utils/manualProductDiscount";
 import { expandHydratedProductsForDiscountCollection, restoreHydratedBundleDiscounts } from "./utils/bundleDiscountHydration";
 import { getOrderCollectionPersistentId, getOrderCollectionUid, normalizeOrderCollections, repairDuplicateProductLineIdentities as repairDuplicateOrderProductLineIdentities, setOrderCollectionUid } from "./utils/orderCollectionIdentity";
 import { consolidateDiscountFreeProductLines, ensureUniqueProductLineUids } from "./utils/discountProductLineIdentity";
 import { applyTempOrderSettlementState, getSelectedSettlementSnapshot, getSettlementKey, getTempOrderSettlementKey, getTempOrderSettlementSnapshot, isVirtualSettlementOrder, normalizeVirtualSettlementOrderProduct, normalizeVirtualSettlementProducts, OrderSettlementConflictError, releaseTempOrderSettlementState, VirtualCurrencyAssetNotFoundError, VirtualCurrencyBalanceError } from "./utils/virtualSettlement";
 import { DiscountModule } from "../Discount";
 import { RulesModule } from "../Rules";
+import { isEntitlementPass, isFullCoveragePass } from "../Discount/entitlementPass";
 import { UnavailableReason } from "../Rules/types";
 import Decimal from 'decimal.js';
 import { cloneDeep } from 'lodash-es';
@@ -70,9 +74,26 @@ function isManualProductDiscountProduct(product) {
     return (item === null || item === void 0 ? void 0 : item.type) === 'product';
   });
 }
+function syncReducedEntitlementPassUsageCount(discountList, previousQuantity, nextQuantity) {
+  if (!Array.isArray(discountList)) return discountList;
+  var previousCount = getSafeProductNum(previousQuantity);
+  var nextCount = getSafeProductNum(nextQuantity);
+  if (nextCount >= previousCount) return discountList;
+  return discountList.map(function (discount) {
+    var _discount$metadata$nu, _discount$metadata;
+    if (!isEntitlementPass(discount)) return discount;
+    var rawUsageCount = Number((_discount$metadata$nu = discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.num) !== null && _discount$metadata$nu !== void 0 ? _discount$metadata$nu : previousCount);
+    var usageCount = Number.isFinite(rawUsageCount) ? Math.max(Math.floor(rawUsageCount), 0) : previousCount;
+    return _objectSpread(_objectSpread({}, discount), {}, {
+      metadata: _objectSpread(_objectSpread({}, (discount === null || discount === void 0 ? void 0 : discount.metadata) || {}), {}, {
+        num: Math.min(usageCount, nextCount)
+      })
+    });
+  });
+}
 var ORDER_PAYMENT_STATUS_PAID = 'paid';
 var ORDER_PAYMENT_STATUS_PENDING = 'payment_pending';
-var CUSTOMER_PROMOTION_DISCOUNT_TAGS = new Set(['good_pass', 'product_discount_card', 'discount_card']);
+var CUSTOMER_PROMOTION_DISCOUNT_TAGS = new Set(['entitlement_pass', 'good_pass', 'product_discount_card', 'discount_card']);
 function isCustomerPromotionDiscount(discount) {
   return CUSTOMER_PROMOTION_DISCOUNT_TAGS.has(String((discount === null || discount === void 0 ? void 0 : discount.tag) || (discount === null || discount === void 0 ? void 0 : discount.type) || '').toLowerCase());
 }
@@ -107,12 +128,26 @@ function getVoucherPaymentLifecycleKey(payment) {
   if (!isVoucherPaymentRecord(payment)) return null;
   return "".concat(String(payment.voucher_id), "::").concat(String(payment.status || ''));
 }
-function hasPersistedOrderId(orderId) {
-  if (orderId === undefined || orderId === null || orderId === '') return false;
-  if (typeof orderId === 'string' && orderId.startsWith('LOCAL_')) return false;
-  var normalizedOrderId = Number(orderId);
-  if (Number.isFinite(normalizedOrderId)) return normalizedOrderId > 0;
-  return String(orderId).trim() !== '';
+function getDiscountIdentityKey(discount) {
+  var id = discount === null || discount === void 0 ? void 0 : discount.id;
+  if (id === undefined || id === null || id === '') return null;
+  return String(id);
+}
+function mergeCommittedEntitlementWithRuntime(committed, runtime) {
+  var _committed$committedA, _runtime$id, _runtime$isDisabled, _runtime$isSelected;
+  var committedAppliedProductDetails = (_committed$committedA = committed.committedAppliedProductDetails) !== null && _committed$committedA !== void 0 && _committed$committedA.length ? committed.committedAppliedProductDetails : committed.appliedProductDetails || [];
+  return _objectSpread(_objectSpread(_objectSpread({}, committed), runtime), {}, {
+    id: (_runtime$id = runtime.id) !== null && _runtime$id !== void 0 ? _runtime$id : committed.id,
+    tag: runtime.tag || committed.tag,
+    type: runtime.type || committed.type,
+    isEditMode: false,
+    isDisabled: (_runtime$isDisabled = runtime.isDisabled) !== null && _runtime$isDisabled !== void 0 ? _runtime$isDisabled : false,
+    isSelected: (_runtime$isSelected = runtime.isSelected) !== null && _runtime$isSelected !== void 0 ? _runtime$isSelected : committed.isSelected,
+    isUsed: committed.isUsed || runtime.isUsed,
+    committedAppliedProductDetails: _toConsumableArray(committedAppliedProductDetails),
+    applicableProductDetails: [].concat(_toConsumableArray(committed.applicableProductDetails || []), _toConsumableArray(runtime.applicableProductDetails || [])),
+    appliedProductDetails: [].concat(_toConsumableArray(committedAppliedProductDetails), _toConsumableArray(runtime.appliedProductDetails || []))
+  });
 }
 export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(OrderModule, _BaseModule);
@@ -134,6 +169,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "openCache", false);
     _defineProperty(_assertThisInitialized(_this), "sessionStoragePersistEnabled", false);
     _defineProperty(_assertThisInitialized(_this), "sessionStorageRestoreRecord", null);
+    /** 只允许当前订单最新的 prepare/config 请求回写客户资产态。 */
+    _defineProperty(_assertThisInitialized(_this), "customerWalletPrepareConfigEpoch", 0);
+    /** Payment 可能早于 prepare/config 返回；先按实例 ID 暂存卡号等待 Snapshot。 */
+    _defineProperty(_assertThisInitialized(_this), "pointCardSnapshotCodeCandidates", new Map());
     _defineProperty(_assertThisInitialized(_this), "salesSummaryModuleName", void 0);
     _defineProperty(_assertThisInitialized(_this), "rulesHooksOverride", void 0);
     _defineProperty(_assertThisInitialized(_this), "moduleHooksOverride", void 0);
@@ -174,7 +213,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             _step2;
           try {
             for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-              var _item$type2, _ref, _ref2, _item$discount$resour, _item$discount, _item$discount$title, _item$discount2, _item$discount3, _item$discount$fixed_, _item$discount4, _item$discount5, _item$amount, _ref3, _item$discount$origin, _item$discount6, _ref4, _ref5, _item$metadata$num, _item$metadata, _ref6, _ref7, _item$metadata$num2, _item$metadata2, _ref8, _item$discount$discou, _item$discount7, _item$amount2, _item$amount3, _product$product_id, _product$is_charge_ta, _ref9, _product$original_pri, _ref10, _item$discount$discou2, _item$discount8, _item$discount$discou3, _item$discount9;
+              var _item$type2, _ref, _ref2, _item$discount$resour, _item$discount, _item$discount$title, _item$discount2, _item$metadata, _item$discount3, _item$discount4, _item$discount$fixed_, _item$discount5, _item$discount6, _item$amount, _ref3, _item$discount$origin, _item$discount7, _ref4, _ref5, _item$metadata$num, _item$metadata2, _item$discount$produc, _item$discount8, _ref6, _ref7, _item$metadata$num2, _item$metadata3, _item$discount9, _ref8, _item$discount$discou, _item$discount10, _item$amount2, _item$amount3, _product$product_id, _product$is_charge_ta, _ref9, _product$original_pri, _ref10, _item$discount$discou2, _item$discount11, _item$discount$discou3, _item$discount12;
               var item = _step2.value;
               var type = (_item$type2 = item === null || item === void 0 ? void 0 : item.type) !== null && _item$type2 !== void 0 ? _item$type2 : item === null || item === void 0 ? void 0 : item.tag;
               if (!type || type === 'product') continue;
@@ -185,22 +224,31 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               var key = Number.isFinite(id) ? id : String(resourceId);
               var title = (_item$discount$title = item === null || item === void 0 || (_item$discount2 = item.discount) === null || _item$discount2 === void 0 ? void 0 : _item$discount2.title) !== null && _item$discount$title !== void 0 ? _item$discount$title : {};
               var amount = Number((item === null || item === void 0 ? void 0 : item.amount) || 0);
-              var discountCardType = item === null || item === void 0 || (_item$discount3 = item.discount) === null || _item$discount3 === void 0 ? void 0 : _item$discount3.discount_card_type;
-              var parValue = isDiscountCard ? discountCardType === 'fixed_amount' ? (_item$discount$fixed_ = item === null || item === void 0 || (_item$discount4 = item.discount) === null || _item$discount4 === void 0 ? void 0 : _item$discount4.fixed_amount) !== null && _item$discount$fixed_ !== void 0 ? _item$discount$fixed_ : item === null || item === void 0 ? void 0 : item.amount : item === null || item === void 0 || (_item$discount5 = item.discount) === null || _item$discount5 === void 0 ? void 0 : _item$discount5.percent : '0';
+              var encoded = (item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.encoded) || (item === null || item === void 0 ? void 0 : item.encoded) || (item === null || item === void 0 || (_item$discount3 = item.discount) === null || _item$discount3 === void 0 ? void 0 : _item$discount3.encoded) || '';
+              var discountCardType = item === null || item === void 0 || (_item$discount4 = item.discount) === null || _item$discount4 === void 0 ? void 0 : _item$discount4.discount_card_type;
+              var parValue = isDiscountCard ? discountCardType === 'fixed_amount' ? (_item$discount$fixed_ = item === null || item === void 0 || (_item$discount5 = item.discount) === null || _item$discount5 === void 0 ? void 0 : _item$discount5.fixed_amount) !== null && _item$discount$fixed_ !== void 0 ? _item$discount$fixed_ : item === null || item === void 0 ? void 0 : item.amount : item === null || item === void 0 || (_item$discount6 = item.discount) === null || _item$discount6 === void 0 ? void 0 : _item$discount6.percent : '0';
               var detail = {
                 amount: String((_item$amount = item === null || item === void 0 ? void 0 : item.amount) !== null && _item$amount !== void 0 ? _item$amount : '0'),
                 type: type,
                 resource_id: key,
                 title: title,
-                original_amount: String((_ref3 = (_item$discount$origin = item === null || item === void 0 || (_item$discount6 = item.discount) === null || _item$discount6 === void 0 ? void 0 : _item$discount6.original_amount) !== null && _item$discount$origin !== void 0 ? _item$discount$origin : item === null || item === void 0 ? void 0 : item.amount) !== null && _ref3 !== void 0 ? _ref3 : '0'),
-                num: Number((_ref4 = (_ref5 = (_item$metadata$num = item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.num) !== null && _item$metadata$num !== void 0 ? _item$metadata$num : product === null || product === void 0 ? void 0 : product.num) !== null && _ref5 !== void 0 ? _ref5 : product === null || product === void 0 ? void 0 : product.product_quantity) !== null && _ref4 !== void 0 ? _ref4 : 1) || 1,
+                original_amount: String((_ref3 = (_item$discount$origin = item === null || item === void 0 || (_item$discount7 = item.discount) === null || _item$discount7 === void 0 ? void 0 : _item$discount7.original_amount) !== null && _item$discount$origin !== void 0 ? _item$discount$origin : item === null || item === void 0 ? void 0 : item.amount) !== null && _ref3 !== void 0 ? _ref3 : '0'),
+                num: Number((_ref4 = (_ref5 = (_item$metadata$num = item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.num) !== null && _item$metadata$num !== void 0 ? _item$metadata$num : product === null || product === void 0 ? void 0 : product.num) !== null && _ref5 !== void 0 ? _ref5 : product === null || product === void 0 ? void 0 : product.product_quantity) !== null && _ref4 !== void 0 ? _ref4 : 1) || 1,
                 metadata: item === null || item === void 0 ? void 0 : item.metadata,
-                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
+                discount: _objectSpread(_objectSpread({}, (item === null || item === void 0 ? void 0 : item.discount) || {}), {}, {
+                  product_id: (_item$discount$produc = item === null || item === void 0 || (_item$discount8 = item.discount) === null || _item$discount8 === void 0 ? void 0 : _item$discount8.product_id) !== null && _item$discount$produc !== void 0 ? _item$discount$produc : product === null || product === void 0 ? void 0 : product.product_id
+                }),
+                _num: Number((_ref6 = (_ref7 = (_item$metadata$num2 = item === null || item === void 0 || (_item$metadata3 = item.metadata) === null || _item$metadata3 === void 0 ? void 0 : _item$metadata3.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;
+                if (!existed.encoded && encoded) {
+                  existed.encoded = encoded;
+                  existed.metadata = _objectSpread(_objectSpread({}, existed.metadata), {}, {
+                    encoded: encoded
+                  });
+                }
                 existed.amount = Number(existed.amount || 0) + amount;
                 existed.used_par_value = String(Number(existed.used_par_value || 0) + amount);
                 if (!isDiscountCard) {
@@ -219,10 +267,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               discountMap.set(key, {
                 id: key,
                 product_name: '',
-                encoded: '',
-                code: '',
+                encoded: encoded,
+                code: (item === null || item === void 0 ? void 0 : item.code) || (item === null || item === void 0 || (_item$discount9 = item.discount) === null || _item$discount9 === void 0 ? void 0 : _item$discount9.code) || '',
+                metadata: {
+                  encoded: encoded
+                },
                 tag: type,
-                product_id: (_ref8 = (_item$discount$discou = item === null || item === void 0 || (_item$discount7 = item.discount) === null || _item$discount7 === void 0 ? void 0 : _item$discount7.discount_product_id) !== null && _item$discount$discou !== void 0 ? _item$discount$discou : product === null || product === void 0 ? void 0 : product.product_id) !== null && _ref8 !== void 0 ? _ref8 : 0,
+                product_id: (_ref8 = (_item$discount$discou = item === null || item === void 0 || (_item$discount10 = item.discount) === null || _item$discount10 === void 0 ? void 0 : _item$discount10.discount_product_id) !== null && _item$discount$discou !== void 0 ? _item$discount$discou : product === null || product === void 0 ? void 0 : product.product_id) !== null && _ref8 !== void 0 ? _ref8 : 0,
                 relation_type: '',
                 par_value: String(parValue !== null && parValue !== void 0 ? parValue : '0'),
                 used_par_value: String((_item$amount2 = item === null || item === void 0 ? void 0 : item.amount) !== null && _item$amount2 !== void 0 ? _item$amount2 : '0'),
@@ -255,8 +306,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 amount: amount,
                 discount: _objectSpread(_objectSpread({}, (item === null || item === void 0 ? void 0 : item.discount) || {}), {}, {
                   resource_id: key,
-                  discount_product_id: (_ref10 = (_item$discount$discou2 = item === null || item === void 0 || (_item$discount8 = item.discount) === null || _item$discount8 === void 0 ? void 0 : _item$discount8.discount_product_id) !== null && _item$discount$discou2 !== void 0 ? _item$discount$discou2 : product === null || product === void 0 ? void 0 : product.product_id) !== null && _ref10 !== void 0 ? _ref10 : 0,
-                  discount_calculation_mode: (_item$discount$discou3 = item === null || item === void 0 || (_item$discount9 = item.discount) === null || _item$discount9 === void 0 ? void 0 : _item$discount9.discount_calculation_mode) !== null && _item$discount$discou3 !== void 0 ? _item$discount$discou3 : 'item_level'
+                  discount_product_id: (_ref10 = (_item$discount$discou2 = item === null || item === void 0 || (_item$discount11 = item.discount) === null || _item$discount11 === void 0 ? void 0 : _item$discount11.discount_product_id) !== null && _item$discount$discou2 !== void 0 ? _item$discount$discou2 : product === null || product === void 0 ? void 0 : product.product_id) !== null && _ref10 !== void 0 ? _ref10 : 0,
+                  discount_calculation_mode: (_item$discount$discou3 = item === null || item === void 0 || (_item$discount12 = item.discount) === null || _item$discount12 === void 0 ? void 0 : _item$discount12.discount_calculation_mode) !== null && _item$discount$discou3 !== void 0 ? _item$discount$discou3 : 'item_level'
                 }),
                 applicableProductDetails: [detail],
                 appliedProductDetails: [detail]
@@ -560,7 +611,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createDefaultRulesHooks",
     value: function createDefaultRulesHooks() {
-      return createDefaultOrderRulesHooks();
+      var _this2 = this;
+      return createDefaultOrderRulesHooks(function () {
+        var _this2$store$tempOrde;
+        return ((_this2$store$tempOrde = _this2.store.tempOrder) === null || _this2$store$tempOrde === void 0 ? void 0 : _this2$store$tempOrde.bookings) || [];
+      });
+    }
+
+    /**
+     * Stable across notifyTempOrderChanged's immutable copy, but changes when a
+     * different local/server order becomes current.
+     */
+  }, {
+    key: "getDiscountConfigOrderIdentityKey",
+    value: function getDiscountConfigOrderIdentityKey(tempOrder) {
+      var _ref12, _identity$orderId, _tempOrder$request_un, _ref13, _identity$externalSal, _ref14, _ref15, _identity$localId, _tempOrder$_extend;
+      var identity = this.getOrderIdentity();
+      return JSON.stringify([(_ref12 = (_identity$orderId = identity === null || identity === void 0 ? void 0 : identity.orderId) !== null && _identity$orderId !== void 0 ? _identity$orderId : tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.order_id) !== null && _ref12 !== void 0 ? _ref12 : '', (_tempOrder$request_un = tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.request_unique_idempotency_token) !== null && _tempOrder$request_un !== void 0 ? _tempOrder$request_un : '', (_ref13 = (_identity$externalSal = identity === null || identity === void 0 ? void 0 : identity.externalSaleNumber) !== null && _identity$externalSal !== void 0 ? _identity$externalSal : tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.external_sale_number) !== null && _ref13 !== void 0 ? _ref13 : '', (_ref14 = (_ref15 = (_identity$localId = identity === null || identity === void 0 ? void 0 : identity.localId) !== null && _identity$localId !== void 0 ? _identity$localId : tempOrder === null || tempOrder === void 0 || (_tempOrder$_extend = tempOrder._extend) === null || _tempOrder$_extend === void 0 ? void 0 : _tempOrder$_extend.localId) !== null && _ref15 !== void 0 ? _ref15 : this.cacheId) !== null && _ref14 !== void 0 ? _ref14 : '']);
     }
 
     // ─── Discount: 公共 API ───
@@ -568,13 +635,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "loadDiscountConfig",
     value: function () {
       var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
-        var _this$store$tempOrder, _this$store$discount, _this$store$tempOrder2;
-        var orderId, prepareConfigResult, discountList, _this$store$discount2, _this$store$discount3, _this$store$discount4, currentDiscountList, currentEditDiscounts, currentScanDiscounts, currentScanDiscountIds, runtimeDiscountIds, runtimeDiscounts, mergedDiscountList;
+        var _this$store$tempOrder,
+          _this$store$discount,
+          _this3 = this,
+          _this$store$tempOrder2;
+        var orderId, requestEpoch, requestOrderIdentityKey, prepareConfigResult, isCurrentRequest, discountList, _this$store$discount2, _this$store$discount3, _this$store$discount4, currentDiscountList, currentCommittedDiscounts, currentScanDiscounts, currentScanDiscountById, committedDiscountById, mergedCommittedDiscountIds, refreshedScanDiscountIds, runtimeDiscountIds, runtimeDiscounts, retainedCommittedDiscounts, retainedScanDiscounts, mergedDiscountList;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               orderId = params.orderId || ((_this$store$tempOrder = this.store.tempOrder) === null || _this$store$tempOrder === void 0 ? void 0 : _this$store$tempOrder.order_id) || undefined;
-              _context3.next = 3;
+              requestEpoch = ++this.customerWalletPrepareConfigEpoch;
+              requestOrderIdentityKey = this.getDiscountConfigOrderIdentityKey(this.store.tempOrder);
+              _context3.next = 5;
               return (_this$store$discount = this.store.discount) === null || _this$store$discount === void 0 ? void 0 : _this$store$discount.loadPrepareConfig(_objectSpread({
                 customer_id: params.customerId,
                 action: params.action || (orderId ? 'edit' : 'create'),
@@ -583,56 +655,130 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 with_wallet_pass_holder: 1,
                 with_available_wallet_flag: 1,
                 with_available_wallet_pass_flag: 1,
+                with_entitlement_pass: 1,
+                filter_order_wallet_pass_usage: 0,
                 with_virtual_currency: 1,
                 request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
               }, orderId ? {
                 order_id: orderId
               } : {}));
-            case 3:
+            case 5:
               prepareConfigResult = _context3.sent;
+              isCurrentRequest = function isCurrentRequest() {
+                var _this3$store$tempOrde, _this3$store$tempOrde2;
+                return requestEpoch === _this3.customerWalletPrepareConfigEpoch && _this3.getDiscountConfigOrderIdentityKey(_this3.store.tempOrder) === requestOrderIdentityKey && String((_this3$store$tempOrde = (_this3$store$tempOrde2 = _this3.store.tempOrder) === null || _this3$store$tempOrde2 === void 0 ? void 0 : _this3$store$tempOrde2.customer_id) !== null && _this3$store$tempOrde !== void 0 ? _this3$store$tempOrde : '') === String(params.customerId);
+              };
+              if (isCurrentRequest()) {
+                _context3.next = 9;
+                break;
+              }
+              return _context3.abrupt("return", this.getDiscountList());
+            case 9:
               discountList = prepareConfigResult === null || prepareConfigResult === void 0 ? void 0 : prepareConfigResult.discountList;
-              this.store.availableWalletIds = (prepareConfigResult === null || prepareConfigResult === void 0 ? void 0 : prepareConfigResult.availableWalletIds) || [];
-              this.store.virtualCurrencyList = (prepareConfigResult === null || prepareConfigResult === void 0 ? void 0 : prepareConfigResult.virtualCurrencyList) || [];
               if (prepareConfigResult) {
-                this.writePointCardSnapshotFromPrepareConfig({
-                  orderId: orderId,
+                this.writeCustomerWalletSnapshotsFromPrepareConfig({
                   customerId: params.customerId,
-                  availableWalletPassList: prepareConfigResult.availableWalletPassList || []
+                  availableWalletIds: prepareConfigResult.availableWalletIds || [],
+                  availableWalletPassList: prepareConfigResult.availableWalletPassList || [],
+                  virtualCurrencyList: prepareConfigResult.virtualCurrencyList || []
                 });
               }
               if (!discountList) {
-                _context3.next = 20;
+                _context3.next = 32;
                 break;
               }
               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;
+              currentCommittedDiscounts = currentDiscountList.filter(function (discount) {
+                var _discount$committedAp;
+                return (discount === null || discount === void 0 ? void 0 : discount.isEditMode) || (discount === null || discount === void 0 || (_discount$committedAp = discount.committedAppliedProductDetails) === null || _discount$committedAp === void 0 ? void 0 : _discount$committedAp.length);
               });
               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;
+              currentScanDiscountById = new Map(currentScanDiscounts.flatMap(function (discount) {
+                var id = getDiscountIdentityKey(discount);
+                return id === null ? [] : [[id, discount]];
+              }));
+              committedDiscountById = new Map(currentCommittedDiscounts.flatMap(function (discount) {
+                var id = getDiscountIdentityKey(discount);
+                return id === null ? [] : [[id, discount]];
               }));
+              mergedCommittedDiscountIds = new Set();
+              refreshedScanDiscountIds = new Set();
               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;
+              runtimeDiscounts = discountList.flatMap(function (discount) {
+                var id = getDiscountIdentityKey(discount);
+                if (id === null) return [discount];
+                if (runtimeDiscountIds.has(id)) return [];
+                runtimeDiscountIds.add(id);
+                var currentScanDiscount = currentScanDiscountById.get(id);
+                if (currentScanDiscount && (!isEntitlementPass(currentScanDiscount) || !isEntitlementPass(discount))) {
+                  return [];
+                }
+                var committedDiscount = committedDiscountById.get(id);
+                var nextDiscount = discount;
+                if (committedDiscount && isEntitlementPass(committedDiscount) && isEntitlementPass(discount)) {
+                  mergedCommittedDiscountIds.add(id);
+                  nextDiscount = mergeCommittedEntitlementWithRuntime(committedDiscount, discount);
+                }
+                if (currentScanDiscount) {
+                  var _currentScanDiscount$, _currentScanDiscount$2;
+                  refreshedScanDiscountIds.add(id);
+                  nextDiscount = _objectSpread(_objectSpread({}, nextDiscount), {}, {
+                    isScan: true,
+                    isSelected: (_currentScanDiscount$ = currentScanDiscount.isSelected) !== null && _currentScanDiscount$ !== void 0 ? _currentScanDiscount$ : nextDiscount.isSelected,
+                    isManualSelect: (_currentScanDiscount$2 = currentScanDiscount.isManualSelect) !== null && _currentScanDiscount$2 !== void 0 ? _currentScanDiscount$2 : nextDiscount.isManualSelect
+                  });
+                }
+                return [nextDiscount];
+              });
+              retainedCommittedDiscounts = currentCommittedDiscounts.filter(function (discount) {
+                var id = getDiscountIdentityKey(discount);
+                return id === null || !mergedCommittedDiscountIds.has(id);
+              }).map(function (discount) {
+                var _discount$committedAp2;
+                return (_discount$committedAp2 = discount.committedAppliedProductDetails) !== null && _discount$committedAp2 !== void 0 && _discount$committedAp2.length ? _objectSpread(_objectSpread({}, discount), {}, {
+                  isEditMode: true,
+                  isDisabled: true,
+                  isSelected: true,
+                  isUsed: true,
+                  appliedProductDetails: _toConsumableArray(discount.committedAppliedProductDetails)
+                }) : discount;
+              });
+              retainedScanDiscounts = currentScanDiscounts.filter(function (discount) {
+                var id = getDiscountIdentityKey(discount);
+                return id === null || !refreshedScanDiscountIds.has(id);
               });
-              mergedDiscountList = [].concat(_toConsumableArray(currentEditDiscounts), _toConsumableArray(currentScanDiscounts), _toConsumableArray(runtimeDiscounts));
-              _context3.next = 18;
+              mergedDiscountList = [].concat(_toConsumableArray(retainedCommittedDiscounts), _toConsumableArray(retainedScanDiscounts), _toConsumableArray(runtimeDiscounts));
+              if (isCurrentRequest()) {
+                _context3.next = 26;
+                break;
+              }
+              return _context3.abrupt("return", this.getDiscountList());
+            case 26:
+              _context3.next = 28;
               return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.setOriginalDiscountList(mergedDiscountList);
-            case 18:
-              _context3.next = 20;
+            case 28:
+              if (isCurrentRequest()) {
+                _context3.next = 30;
+                break;
+              }
+              return _context3.abrupt("return", this.getDiscountList());
+            case 30:
+              _context3.next = 32;
               return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.setDiscountList(mergedDiscountList);
-            case 20:
+            case 32:
+              if (isCurrentRequest()) {
+                _context3.next = 34;
+                break;
+              }
+              return _context3.abrupt("return", this.getDiscountList());
+            case 34:
               if (params.apply !== false && (_this$store$tempOrder2 = this.store.tempOrder) !== null && _this$store$tempOrder2 !== void 0 && (_this$store$tempOrder2 = _this$store$tempOrder2.products) !== null && _this$store$tempOrder2 !== void 0 && _this$store$tempOrder2.length) {
                 this.applyDiscount();
               }
               return _context3.abrupt("return", this.getDiscountList());
-            case 22:
+            case 36:
             case "end":
               return _context3.stop();
           }
@@ -659,6 +805,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function getVirtualCurrencyList() {
       return cloneDeep(this.store.virtualCurrencyList || []);
     }
+  }, {
+    key: "getCustomerWalletPrepareConfigEpoch",
+    value: function getCustomerWalletPrepareConfigEpoch() {
+      return this.customerWalletPrepareConfigEpoch;
+    }
   }, {
     key: "syncScannedDiscountsToOriginalDiscountList",
     value: function () {
@@ -701,13 +852,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "ensureEditDiscountConfigForProductChange",
     value: function () {
       var _ensureEditDiscountConfigForProductChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(tempOrder) {
-        var _tempOrder$customer, _tempOrder$_extend, _tempOrder$_extend2, _this$store$discount10;
+        var _tempOrder$customer, _tempOrder$_extend2, _tempOrder$_extend3, _this$store$discount10;
         var orderId, customerId, currentDiscountList, hasRuntimeDiscounts;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               orderId = tempOrder.order_id;
-              customerId = Number(tempOrder.customer_id || ((_tempOrder$customer = tempOrder.customer) === null || _tempOrder$customer === void 0 ? void 0 : _tempOrder$customer.id) || ((_tempOrder$_extend = tempOrder._extend) === null || _tempOrder$_extend === void 0 || (_tempOrder$_extend = _tempOrder$_extend.customerSnapshot) === null || _tempOrder$_extend === void 0 ? void 0 : _tempOrder$_extend.id) || ((_tempOrder$_extend2 = tempOrder._extend) === null || _tempOrder$_extend2 === void 0 || (_tempOrder$_extend2 = _tempOrder$_extend2.customerSnapshot) === null || _tempOrder$_extend2 === void 0 ? void 0 : _tempOrder$_extend2.customer_id) || 0);
+              customerId = Number(tempOrder.customer_id || ((_tempOrder$customer = tempOrder.customer) === null || _tempOrder$customer === void 0 ? void 0 : _tempOrder$customer.id) || ((_tempOrder$_extend2 = tempOrder._extend) === null || _tempOrder$_extend2 === void 0 || (_tempOrder$_extend2 = _tempOrder$_extend2.customerSnapshot) === null || _tempOrder$_extend2 === void 0 ? void 0 : _tempOrder$_extend2.id) || ((_tempOrder$_extend3 = tempOrder._extend) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3.customerSnapshot) === null || _tempOrder$_extend3 === void 0 ? void 0 : _tempOrder$_extend3.customer_id) || 0);
               if (!(!orderId || !customerId || customerId === 1)) {
                 _context5.next = 4;
                 break;
@@ -747,7 +898,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(code, customerId) {
         var _this$store$discount11, _tempOrder$holder, _this$store$summary;
-        var resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelected, tempOrder, holders, _ref12, isAvailable, newDiscountList, evaluatedDiscountList, unavailableReason, shouldRetainForLater, normalizedNewDiscountList, retainedDiscountList, resolvedDiscountList, _this$store$discount12, _this$store$discount13;
+        var resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelected, tempOrder, holders, _ref16, isAvailable, newDiscountList, evaluatedDiscountList, unavailableReason, scannedIds, evaluatedScannedDiscounts, shouldRetainForLater, normalizedNewDiscountList, resolvedDiscountList, _this$store$discount12, _this$store$discount13, retainedDiscounts;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -837,7 +988,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 20:
               tempOrder = this.store.tempOrder;
               holders = (tempOrder === null || tempOrder === void 0 || (_tempOrder$holder = tempOrder.holder) === null || _tempOrder$holder === void 0 ? void 0 : _tempOrder$holder.form_record) || [];
-              _ref12 = rulesModule.isDiscountListAvailable({
+              _ref16 = rulesModule.isDiscountListAvailable({
                 productList: (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.products) || [],
                 oldDiscountList: this.getDiscountList(),
                 newDiscountList: withScanList,
@@ -849,47 +1000,73 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }) || {
                 isAvailable: false,
                 discountList: this.getDiscountList()
-              }, isAvailable = _ref12.isAvailable, newDiscountList = _ref12.discountList, evaluatedDiscountList = _ref12.evaluatedDiscountList, unavailableReason = _ref12.unavailableReason;
-              shouldRetainForLater = !isAvailable && unavailableReason === UnavailableReason.ProductNotApplicable && withScanList.some(isCustomerPromotionDiscount);
+              }, isAvailable = _ref16.isAvailable, newDiscountList = _ref16.discountList, evaluatedDiscountList = _ref16.evaluatedDiscountList, unavailableReason = _ref16.unavailableReason;
+              scannedIds = new Set(withScanList.map(function (discount) {
+                return String(discount.id);
+              }));
+              evaluatedScannedDiscounts = (evaluatedDiscountList || withScanList).filter(function (discount) {
+                return scannedIds.has(String(discount.id)) && isCustomerPromotionDiscount(discount) && !getDiscountLifecycleReason(discount);
+              });
+              shouldRetainForLater = !isAvailable && evaluatedScannedDiscounts.length > 0;
               normalizedNewDiscountList = newDiscountList ? markScannedDiscounts(newDiscountList, withScanList) : undefined;
-              retainedDiscountList = evaluatedDiscountList ? markScannedDiscounts(evaluatedDiscountList, withScanList) : normalizedNewDiscountList;
               resolvedDiscountList = normalizedNewDiscountList || this.getDiscountList();
               if (!(isAvailable && normalizedNewDiscountList)) {
-                _context6.next = 36;
+                _context6.next = 37;
                 break;
               }
-              _context6.next = 30;
+              _context6.next = 31;
               return (_this$store$discount12 = this.store.discount) === null || _this$store$discount12 === void 0 ? void 0 : _this$store$discount12.setDiscountList(normalizedNewDiscountList);
-            case 30:
-              this.applyDiscount();
-              _context6.next = 33;
+            case 31:
+              // 实际写回商品时沿用扫码试算的优先级，避免旧商品行的选卡覆盖本次扫码。
+              this.applyDiscount({
+                preferredEntitlementPassIds: withScanList.filter(function (discount) {
+                  return isEntitlementPass(discount);
+                }).map(function (discount) {
+                  return discount.id;
+                })
+              });
+              _context6.next = 34;
               return this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
-            case 33:
+            case 34:
               resolvedDiscountList = this.getDiscountList();
-              _context6.next = 42;
+              _context6.next = 45;
               break;
-            case 36:
-              if (!(shouldRetainForLater && retainedDiscountList)) {
-                _context6.next = 42;
+            case 37:
+              if (!shouldRetainForLater) {
+                _context6.next = 45;
                 break;
               }
-              _context6.next = 39;
-              return (_this$store$discount13 = this.store.discount) === null || _this$store$discount13 === void 0 ? void 0 : _this$store$discount13.setDiscountList(retainedDiscountList);
-            case 39:
-              _context6.next = 41;
+              // 只合并本次识别的卡券；不把试算产生的其他选券状态写回订单。
+              retainedDiscounts = new Map(this.getDiscountList().map(function (discount) {
+                return [String(discount.id), discount];
+              }));
+              evaluatedScannedDiscounts.forEach(function (discount) {
+                retainedDiscounts.set(String(discount.id), _objectSpread(_objectSpread({}, discount), {}, {
+                  isScan: true,
+                  isAvailable: false,
+                  isSelected: false,
+                  reasonCode: discount.reasonCode || 'product_not_applicable',
+                  appliedProductDetails: [],
+                  savedAmount: 0
+                }));
+              });
+              _context6.next = 42;
+              return (_this$store$discount13 = this.store.discount) === null || _this$store$discount13 === void 0 ? void 0 : _this$store$discount13.setDiscountList(_toConsumableArray(retainedDiscounts.values()));
+            case 42:
+              _context6.next = 44;
               return this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
-            case 41:
+            case 44:
               resolvedDiscountList = this.getDiscountList();
-            case 42:
+            case 45:
               return _context6.abrupt("return", {
                 type: 'clientCalc',
                 isAvailable: isAvailable || false,
                 isAccepted: Boolean(isAvailable || shouldRetainForLater),
                 discountList: resolvedDiscountList,
-                scannedDiscountList: resultDiscountList,
+                scannedDiscountList: evaluatedScannedDiscounts,
                 unavailableReason: unavailableReason
               });
-            case 43:
+            case 46:
             case "end":
               return _context6.stop();
           }
@@ -905,7 +1082,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function applyDiscount(options) {
       var _this$store$discount16,
         _this$store$summary2,
-        _this2 = this;
+        _this4 = this;
       var tempOrder = this.store.tempOrder;
       // 任意 products CRUD 后都应当重算 discount 状态；即使 products 为空，
       // 也需要让 Rules.calcDiscount 把 DiscountModule 的 isSelected / isAvailable /
@@ -936,14 +1113,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         },
         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
+        reapplyBookingDiscountProductUids: options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids,
+        reapplyWeighedDiscountProductUids: options === null || options === void 0 ? void 0 : options.reapplyWeighedDiscountProductUids,
+        preferredEntitlementPassIds: options === null || options === void 0 ? void 0 : options.preferredEntitlementPassIds
       });
       if (result !== null && result !== void 0 && result.productList) {
         var previousProductsByUid = indexOrderProductsByUid(tempOrder.products);
         tempOrder.products = this.applyProductDiscountPrices((result.productList || []).map(function (product, index) {
-          var _ref13;
+          var _ref17;
           var uid = getOrderProductLineUid(product);
-          var previous = (_ref13 = uid ? previousProductsByUid.get(uid) : undefined) !== null && _ref13 !== void 0 ? _ref13 : previousProductsByUid.get("__index__:".concat(index));
+          var previous = (_ref17 = uid ? previousProductsByUid.get(uid) : undefined) !== null && _ref17 !== void 0 ? _ref17 : previousProductsByUid.get("__index__:".concat(index));
           if (isManualProductDiscountProduct(previous)) {
             return previous;
           }
@@ -961,7 +1140,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         (_this$store$discount17 = this.store.discount) === null || _this$store$discount17 === void 0 || _this$store$discount17.setDiscountList(result.discountList);
       }
       this.hasActiveCustomerBoundDiscount = (tempOrder.products || []).some(function (product) {
-        return _this2.productHasCustomerBoundDiscount(product);
+        return _this4.productHasCustomerBoundDiscount(product);
       });
     }
 
@@ -1024,7 +1203,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _evaluatePromotion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
         var _this$promotionEvalua,
           _this$promotionEvalua2,
-          _this3 = this;
+          _this5 = this;
         var tempOrder, strategyConfigs, result, removeSet, _iterator3, _step3, reduce, _iterator6, _step6, _loop2, _iterator4, _step4, _loop, payload;
         return _regeneratorRuntime().wrap(function _callee7$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
@@ -1183,7 +1362,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     case 6:
                       _context7.prev = 6;
                       _context7.next = 9;
-                      return _this3.giftSelectResolver({
+                      return _this5.giftSelectResolver({
                         strategyId: addAction.strategyId,
                         strategyName: addAction.strategyName,
                         giftCount: addAction.giftCount,
@@ -1218,7 +1397,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                         _context7.next = 26;
                         break;
                       }
-                      linked = _this3.createLinkedProductAndBooking({
+                      linked = _this5.createLinkedProductAndBooking({
                         product: gp,
                         booking: booking
                       });
@@ -1518,12 +1697,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       });
     }
   }, {
-    key: "clearTempOrderPointCardSnapshot",
-    value: function clearTempOrderPointCardSnapshot(tempOrder) {
+    key: "clearTempOrderCustomerWalletSnapshots",
+    value: function clearTempOrderCustomerWalletSnapshots(tempOrder) {
       var orderMetaList = normalizeOrderMetaList(tempOrder.order_meta_list);
       if (!orderMetaList) return;
       var nextOrderMetaList = _objectSpread({}, orderMetaList);
       delete nextOrderMetaList.point_cards_snapshot;
+      delete nextOrderMetaList.virtual_currency_snapshot;
       if (Object.keys(nextOrderMetaList).length === 0) {
         delete tempOrder.order_meta_list;
         return;
@@ -1531,19 +1711,115 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       tempOrder.order_meta_list = nextOrderMetaList;
     }
   }, {
-    key: "writePointCardSnapshotFromPrepareConfig",
-    value: function writePointCardSnapshotFromPrepareConfig(params) {
-      var _tempOrder$customer_i, _params$orderId;
+    key: "clearCustomerWalletState",
+    value: function clearCustomerWalletState(tempOrder) {
+      this.clearCustomerWalletRuntimeState();
+      this.clearTempOrderCustomerWalletSnapshots(tempOrder);
+    }
+  }, {
+    key: "clearCustomerWalletRuntimeState",
+    value: function clearCustomerWalletRuntimeState() {
+      this.customerWalletPrepareConfigEpoch += 1;
+      this.pointCardSnapshotCodeCandidates.clear();
+      this.store.availableWalletIds = [];
+      this.store.virtualCurrencyList = [];
+    }
+  }, {
+    key: "rememberPointCardSnapshotCodeCandidates",
+    value: function rememberPointCardSnapshotCodeCandidates(value) {
+      var _this6 = this;
+      collectPointCardSnapshotCodeCandidates(value).forEach(function (_ref18) {
+        var id = _ref18.id,
+          code = _ref18.code;
+        if (!_this6.pointCardSnapshotCodeCandidates.has(id)) {
+          _this6.pointCardSnapshotCodeCandidates.set(id, code);
+        }
+      });
+    }
+  }, {
+    key: "getRememberedPointCardSnapshotCodeCandidates",
+    value: function getRememberedPointCardSnapshotCodeCandidates() {
+      return _toConsumableArray(this.pointCardSnapshotCodeCandidates).map(function (_ref19) {
+        var _ref20 = _slicedToArray(_ref19, 2),
+          id = _ref20[0],
+          code = _ref20[1];
+        return {
+          id: id,
+          code: code
+        };
+      });
+    }
+  }, {
+    key: "getPointCardSnapshotOrderIdentityKey",
+    value: function getPointCardSnapshotOrderIdentityKey(identity) {
+      if (identity !== null && identity !== void 0 && identity.externalSaleNumber) {
+        return "external:".concat(identity.externalSaleNumber);
+      }
+      if ((identity === null || identity === void 0 ? void 0 : identity.orderId) !== undefined && identity.orderId !== null) {
+        return "order:".concat(identity.orderId);
+      }
+      if (identity !== null && identity !== void 0 && identity.localId) return "local:".concat(identity.localId);
+      if (identity !== null && identity !== void 0 && identity.orderNumber) return "number:".concat(identity.orderNumber);
+      return '';
+    }
+  }, {
+    key: "isPointCardSnapshotMergeContextCurrent",
+    value: function isPointCardSnapshotMergeContextCurrent(context) {
+      var _context$customerId, _this$store$tempOrder4, _this$store$tempOrder5;
+      if (!context) return true;
+      if (context.customerId !== undefined && String((_context$customerId = context.customerId) !== null && _context$customerId !== void 0 ? _context$customerId : '') !== String((_this$store$tempOrder4 = (_this$store$tempOrder5 = this.store.tempOrder) === null || _this$store$tempOrder5 === void 0 ? void 0 : _this$store$tempOrder5.customer_id) !== null && _this$store$tempOrder4 !== void 0 ? _this$store$tempOrder4 : '')) {
+        return false;
+      }
+      var expectedOrderKey = this.getPointCardSnapshotOrderIdentityKey(context.orderIdentity);
+      return !expectedOrderKey || expectedOrderKey === this.getPointCardSnapshotOrderIdentityKey(this.getOrderIdentity());
+    }
+  }, {
+    key: "writeCustomerWalletSnapshotsFromPrepareConfig",
+    value: function writeCustomerWalletSnapshotsFromPrepareConfig(params) {
+      var _tempOrder$customer_i;
       var tempOrder = this.store.tempOrder;
       if (!tempOrder) return;
       if (String((_tempOrder$customer_i = tempOrder.customer_id) !== null && _tempOrder$customer_i !== void 0 ? _tempOrder$customer_i : '') !== String(params.customerId)) return;
-      var effectiveOrderId = (_params$orderId = params.orderId) !== null && _params$orderId !== void 0 ? _params$orderId : tempOrder.order_id;
-      if (hasPersistedOrderId(effectiveOrderId)) return;
-      tempOrder.order_meta_list = _objectSpread(_objectSpread({}, normalizeOrderMetaList(tempOrder.order_meta_list) || {}), {}, {
-        point_cards_snapshot: buildPointCardSnapshotFromWalletPassList(params.availableWalletPassList)
+      var currentOrderMetaList = normalizeOrderMetaList(tempOrder.order_meta_list);
+      var virtualCurrencyList = Array.isArray(params.virtualCurrencyList) ? params.virtualCurrencyList : [];
+      var snapshotsWithExistingCodes = _mergePointCardSnapshotCodes(params.availableWalletPassList, currentOrderMetaList === null || currentOrderMetaList === void 0 ? void 0 : currentOrderMetaList.point_cards_snapshot);
+      tempOrder.order_meta_list = _objectSpread(_objectSpread({}, currentOrderMetaList || {}), {}, {
+        point_cards_snapshot: _mergePointCardSnapshotCodes(snapshotsWithExistingCodes, this.getRememberedPointCardSnapshotCodeCandidates()),
+        virtual_currency_snapshot: buildVirtualCurrencySnapshotFromList(virtualCurrencyList)
+      });
+      this.store.availableWalletIds = _toConsumableArray(params.availableWalletIds);
+      this.store.virtualCurrencyList = cloneDeep(virtualCurrencyList);
+      this.persistTempOrder();
+      this.saveDraftInBackground();
+    }
+
+    /**
+     * 将 Payment WalletPass 返回的实例 code 回填到当前订单 Snapshot。
+     * 这里只按资产 ID 补空值，不新增卡、不覆盖 prepare/config 冻结的余额。
+     */
+  }, {
+    key: "mergePointCardSnapshotCodes",
+    value: function mergePointCardSnapshotCodes(walletPassList, context) {
+      var tempOrder = this.store.tempOrder;
+      var currentOrderMetaList = normalizeOrderMetaList(tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.order_meta_list);
+      var currentSnapshots = (currentOrderMetaList === null || currentOrderMetaList === void 0 ? void 0 : currentOrderMetaList.point_cards_snapshot) || [];
+      if (!tempOrder || !this.isPointCardSnapshotMergeContextCurrent(context)) {
+        return currentSnapshots;
+      }
+      this.rememberPointCardSnapshotCodeCandidates(walletPassList);
+      if (!currentSnapshots.length) return currentSnapshots;
+      var nextSnapshots = _mergePointCardSnapshotCodes(currentSnapshots, this.getRememberedPointCardSnapshotCodeCandidates());
+      var hasChanged = nextSnapshots.some(function (snapshot, index) {
+        var _currentSnapshots$ind;
+        return snapshot.code !== ((_currentSnapshots$ind = currentSnapshots[index]) === null || _currentSnapshots$ind === void 0 ? void 0 : _currentSnapshots$ind.code);
+      });
+      if (!hasChanged) return currentSnapshots;
+      tempOrder.order_meta_list = _objectSpread(_objectSpread({}, currentOrderMetaList || {}), {}, {
+        point_cards_snapshot: nextSnapshots
       });
       this.persistTempOrder();
       this.saveDraftInBackground();
+      return nextSnapshots;
     }
   }, {
     key: "createExternalSaleNumber",
@@ -1645,15 +1921,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 _ref21, _ref22, _ref23, _result$data$order_id, _result$data, _result$data2;
+      return (_ref21 = (_ref22 = (_ref23 = (_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 && _ref23 !== void 0 ? _ref23 : result === null || result === void 0 || (_result$data2 = result.data) === null || _result$data2 === void 0 ? void 0 : _result$data2.id) !== null && _ref22 !== void 0 ? _ref22 : result === null || result === void 0 ? void 0 : result.id) !== null && _ref21 !== void 0 ? _ref21 : null;
     }
   }, {
     key: "calculatePaymentEffectiveAmount",
     value: function calculatePaymentEffectiveAmount(payment) {
-      var _ref17, _payment$origin_amoun;
+      var _ref24, _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((_ref24 = (_payment$origin_amoun = payment.origin_amount) !== null && _payment$origin_amoun !== void 0 ? _payment$origin_amoun : payment.amount) !== null && _ref24 !== void 0 ? _ref24 : 0);
       var serviceFee = new Decimal(payment.service_fee || 0);
       // TODO: 后端允许 amount 表示顾客实际支付总额后，移除这个兼容分支。
       var effectiveAmount = serviceFee.gt(0) && amount.eq(originAmount) ? amount.plus(serviceFee) : amount;
@@ -1663,23 +1939,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculatePaymentTotal",
     value: function calculatePaymentTotal(payments) {
-      var _this4 = this;
+      var _this7 = this;
       return mapPaymentItemsToOrderPayments(payments, {
         includeVoided: false
       }).reduce(function (sum, payment) {
         if (!isPaidPaymentRecord(payment)) return sum;
-        return sum.plus(_this4.calculatePaymentEffectiveAmount(payment));
+        return sum.plus(_this7.calculatePaymentEffectiveAmount(payment));
       }, new Decimal(0));
     }
   }, {
     key: "calculateOrderPaidPaymentTotal",
     value: function calculateOrderPaidPaymentTotal(payments) {
-      var _this5 = this;
+      var _this8 = this;
       return mapPaymentItemsToOrderPayments(payments, {
         includeVoided: false
       }).reduce(function (sum, payment) {
         if (!isPaidPaymentRecord(payment)) return sum;
-        return sum.plus(_this5.calculatePaymentGapAmount(payment));
+        return sum.plus(_this8.calculatePaymentGapAmount(payment));
       }, new Decimal(0));
     }
   }, {
@@ -1815,13 +2091,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculateDepositPaidAmount",
     value: function calculateDepositPaidAmount(payments) {
-      var _this6 = this;
+      var _this9 = this;
       return (payments || []).reduce(function (sum, payment) {
         var paymentRecord = payment;
         if (!isPaidPaymentRecord(paymentRecord)) return sum;
         var isDepositPayment = paymentRecord.type === 'deposit' || paymentRecord.order_payment_type === 'deposit';
         if (!isDepositPayment) return sum;
-        return sum.plus(_this6.calculatePaymentGapAmount(paymentRecord));
+        return sum.plus(_this9.calculatePaymentGapAmount(paymentRecord));
       }, new Decimal(0));
     }
   }, {
@@ -1858,28 +2134,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getPaymentNumberDevicePrefixSync",
     value: function getPaymentNumberDevicePrefixSync() {
-      var _this7 = this;
+      var _this10 = this;
       return resolvePaymentNumberDevicePrefixFromDeviceId(function (key) {
-        return _this7.getPaymentNumberAppData(key);
+        return _this10.getPaymentNumberAppData(key);
       });
     }
   }, {
     key: "getPaymentNumberDevicePrefixAsync",
     value: function getPaymentNumberDevicePrefixAsync() {
-      var _this8 = this;
+      var _this11 = this;
       return resolvePaymentNumberDevicePrefix(function (key) {
-        return _this8.getPaymentNumberAppData(key);
+        return _this11.getPaymentNumberAppData(key);
       });
     }
   }, {
     key: "normalizePaymentSource",
     value: function normalizePaymentSource(payment, options) {
-      var _ref18, _paymentRecord$origin;
+      var _ref25, _paymentRecord$origin;
       var paymentRecord = payment;
       var metadata = paymentRecord.metadata && _typeof(paymentRecord.metadata) === 'object' ? _objectSpread({}, paymentRecord.metadata) : {};
       var normalized = ensureOrderPaymentNumber(_objectSpread(_objectSpread({}, paymentRecord), {}, {
         metadata: metadata,
-        origin_amount: (_ref18 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref18 !== void 0 ? _ref18 : '0.00'
+        origin_amount: (_ref25 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref25 !== void 0 ? _ref25 : '0.00'
       }), (options === null || options === void 0 ? void 0 : options.devicePrefix) || this.getPaymentNumberDevicePrefixSync(), createUuidV4);
       if (paymentRecord.status !== undefined) {
         normalized.status = paymentRecord.status;
@@ -1998,16 +2274,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculatePaidPaymentSummary",
     value: function calculatePaidPaymentSummary(payments) {
-      var _this9 = this;
+      var _this12 = this;
       return (payments || []).reduce(function (summary, payment) {
         var paymentRecord = payment;
         if (!isPaidPaymentRecord(paymentRecord)) return summary;
         return {
           customerPaidAmount: summary.customerPaidAmount.plus(paymentRecord.amount || 0),
-          orderPaidAmount: summary.orderPaidAmount.plus(_this9.calculatePaymentOrderAmount(paymentRecord)),
-          gapPaidAmount: summary.gapPaidAmount.plus(_this9.calculatePaymentGapAmount(paymentRecord)),
-          payServiceChargeAmount: summary.payServiceChargeAmount.plus(_this9.calculatePaymentServiceFee(paymentRecord)),
-          roundingAmount: summary.roundingAmount.plus(_this9.calculatePaymentRoundingAmount(paymentRecord))
+          orderPaidAmount: summary.orderPaidAmount.plus(_this12.calculatePaymentOrderAmount(paymentRecord)),
+          gapPaidAmount: summary.gapPaidAmount.plus(_this12.calculatePaymentGapAmount(paymentRecord)),
+          payServiceChargeAmount: summary.payServiceChargeAmount.plus(_this12.calculatePaymentServiceFee(paymentRecord)),
+          roundingAmount: summary.roundingAmount.plus(_this12.calculatePaymentRoundingAmount(paymentRecord))
         };
       }, {
         customerPaidAmount: new Decimal(0),
@@ -2214,15 +2490,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeFingerprintValue",
     value: function normalizeFingerprintValue(value) {
-      var _this10 = this;
+      var _this13 = this;
       if (Array.isArray(value)) {
         return value.map(function (item) {
-          return _this10.normalizeFingerprintValue(item);
+          return _this13.normalizeFingerprintValue(item);
         });
       }
       if (!value || _typeof(value) !== 'object') return value !== null && value !== void 0 ? value : '';
       return Object.keys(value).sort().reduce(function (result, key) {
-        result[key] = _this10.normalizeFingerprintValue(value[key]);
+        result[key] = _this13.normalizeFingerprintValue(value[key]);
         return result;
       }, {});
     }
@@ -2235,16 +2511,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _product$payment_pric,
         _sku$code,
         _sku$barcode,
-        _ref19,
+        _ref26,
         _sku$variant_id,
-        _this11 = this;
+        _this14 = 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) {
         var _discount$type;
         return (_discount$type = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type !== void 0 ? _discount$type : discount === null || discount === void 0 ? void 0 : discount.tag;
       });
-      var extensionType = (product === null || product === void 0 ? void 0 : product.extension_type) || (discountTypes.includes('good_pass') ? 'good_pass' : 'normal');
+      var fullCoveragePassType = discountTypes.find(function (type) {
+        return ['entitlement_pass', 'good_pass'].includes(type);
+      });
+      var extensionType = (product === null || product === void 0 ? void 0 : product.extension_type) || fullCoveragePassType || 'normal';
       return {
         product_id: (_product$product_id2 = product === null || product === void 0 ? void 0 : product.product_id) !== null && _product$product_id2 !== void 0 ? _product$product_id2 : null,
         product_variant_id: (_product$product_vari = product === null || product === void 0 ? void 0 : product.product_variant_id) !== null && _product$product_vari !== void 0 ? _product$product_vari : null,
@@ -2262,37 +2541,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: (_ref26 = (_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 && _ref26 !== void 0 ? _ref26 : 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 _ref27, _option$id, _option$option_group_, _ref28, _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: (_ref27 = (_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 && _ref27 !== void 0 ? _ref27 : 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: (_ref28 = (_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 && _ref28 !== void 0 ? _ref28 : null,
               num: Number((_option$num = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num !== void 0 ? _option$num : 1) || 1,
-              add_price: _this11.normalizeFingerprintMoney((_option$add_price = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price !== void 0 ? _option$add_price : option === null || option === void 0 ? void 0 : option.price)
+              add_price: _this14.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 _ref29, _ref30, _bundle$bundle_produc, _ref31, _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: (_ref29 = (_ref30 = (_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 && _ref30 !== void 0 ? _ref30 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref29 !== void 0 ? _ref29 : null,
+            bundle_variant_id: (_ref31 = (_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 && _ref31 !== void 0 ? _ref31 : 0,
             num: getSafeProductNum((_bundle$num = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle === null || bundle === void 0 ? void 0 : bundle.quantity),
-            price: _this11.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.price),
-            bundle_selling_price: _this11.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price),
+            price: _this14.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.price),
+            bundle_selling_price: _this14.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 _ref32, _discount$type2, _ref33, _ref34, _discount$discount_id, _discount$discount;
           return {
-            type: (_ref25 = (_discount$type2 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type2 !== void 0 ? _discount$type2 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref25 !== void 0 ? _ref25 : '',
-            discount_id: (_ref26 = (_ref27 = (_discount$discount_id = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id !== void 0 ? _discount$discount_id : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref27 !== void 0 ? _ref27 : discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) !== null && _ref26 !== void 0 ? _ref26 : null,
-            amount: _this11.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
+            type: (_ref32 = (_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 && _ref32 !== void 0 ? _ref32 : '',
+            discount_id: (_ref33 = (_ref34 = (_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 && _ref34 !== void 0 ? _ref34 : discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) !== null && _ref33 !== void 0 ? _ref33 : null,
+            amount: _this14.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
           };
         }))
       };
@@ -2300,9 +2579,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildOrderProductsFingerprint",
     value: function buildOrderProductsFingerprint(products) {
-      var _this12 = this;
+      var _this15 = this;
       var items = (products || []).map(function (product) {
-        return _this12.buildProductFingerprintItem(product);
+        return _this15.buildProductFingerprintItem(product);
       });
       items.sort(function (left, right) {
         return JSON.stringify(left).localeCompare(JSON.stringify(right));
@@ -2315,30 +2594,33 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _product$product_id3,
         _product$product_vari2,
         _product$num2,
-        _ref28,
+        _ref35,
         _metadata$unique_iden,
         _metadata$price_overr,
         _metadata$is_manual_d,
         _metadata$product_dis,
         _sku$code2,
         _sku$barcode2,
-        _ref29,
+        _ref36,
         _sku$variant_id2,
-        _this13 = this;
+        _this16 = 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) {
         var _discount$type3;
         return (_discount$type3 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type3 !== void 0 ? _discount$type3 : discount === null || discount === void 0 ? void 0 : discount.tag;
       });
-      var extensionType = (product === null || product === void 0 ? void 0 : product.extension_type) || (discountTypes.includes('good_pass') ? 'good_pass' : 'normal');
+      var fullCoveragePassType = discountTypes.find(function (type) {
+        return ['entitlement_pass', 'good_pass'].includes(type);
+      });
+      var extensionType = (product === null || product === void 0 ? void 0 : product.extension_type) || fullCoveragePassType || 'normal';
       return {
         product_id: (_product$product_id3 = product === null || product === void 0 ? void 0 : product.product_id) !== null && _product$product_id3 !== void 0 ? _product$product_id3 : null,
         product_variant_id: (_product$product_vari2 = product === null || product === void 0 ? void 0 : product.product_variant_id) !== null && _product$product_vari2 !== void 0 ? _product$product_vari2 : null,
         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: (_ref35 = (_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 && _ref35 !== void 0 ? _ref35 : '',
           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 : ''
@@ -2346,47 +2628,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: (_ref36 = (_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 && _ref36 !== void 0 ? _ref36 : 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 _ref37, _option$id2, _option$option_group_3, _ref38, _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: (_ref37 = (_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 && _ref37 !== void 0 ? _ref37 : 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: (_ref38 = (_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 && _ref38 !== void 0 ? _ref38 : null,
               num: Number((_option$num2 = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num2 !== void 0 ? _option$num2 : 1) || 1,
-              add_price: _this13.normalizeFingerprintMoney((_option$add_price2 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price2 !== void 0 ? _option$add_price2 : option === null || option === void 0 ? void 0 : option.price)
+              add_price: _this16.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 _ref39, _bundle$bundle_id, _ref40, _bundle$bundle_group_, _ref41, _ref42, _bundle$bundle_produc2, _ref43, _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: (_ref39 = (_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 && _ref39 !== void 0 ? _ref39 : null,
+            bundle_group_id: (_ref40 = (_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 && _ref40 !== void 0 ? _ref40 : null,
+            bundle_product_id: (_ref41 = (_ref42 = (_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 && _ref42 !== void 0 ? _ref42 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref41 !== void 0 ? _ref41 : null,
+            bundle_variant_id: (_ref43 = (_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 && _ref43 !== void 0 ? _ref43 : 0,
             num: getSafeProductNum((_bundle$num2 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num2 !== void 0 ? _bundle$num2 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity),
             price_type: (_bundle$price_type2 = bundle === null || bundle === void 0 ? void 0 : bundle.price_type) !== null && _bundle$price_type2 !== void 0 ? _bundle$price_type2 : '',
             price_type_ext: (_bundle$price_type_ex2 = bundle === null || bundle === void 0 ? void 0 : bundle.price_type_ext) !== null && _bundle$price_type_ex2 !== void 0 ? _bundle$price_type_ex2 : '',
-            option: _this13.normalizeFingerprintValue(((bundle === null || bundle === void 0 ? void 0 : bundle.option) || []).map(function (option) {
-              var _ref37, _option$id3, _option$option_group_5, _ref38, _option$option_group_6, _option$num3, _option$add_price3;
+            option: _this16.normalizeFingerprintValue(((bundle === null || bundle === void 0 ? void 0 : bundle.option) || []).map(function (option) {
+              var _ref44, _option$id3, _option$option_group_5, _ref45, _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: (_ref44 = (_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 && _ref44 !== void 0 ? _ref44 : 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: (_ref45 = (_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 && _ref45 !== void 0 ? _ref45 : null,
                 num: Number((_option$num3 = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num3 !== void 0 ? _option$num3 : 1) || 1,
-                add_price: _this13.normalizeFingerprintMoney((_option$add_price3 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price3 !== void 0 ? _option$add_price3 : option === null || option === void 0 ? void 0 : option.price)
+                add_price: _this16.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 _ref46, _discount$type4, _ref47, _ref48, _discount$discount_id2, _discount$discount2;
           return {
-            type: (_ref39 = (_discount$type4 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type4 !== void 0 ? _discount$type4 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref39 !== void 0 ? _ref39 : '',
-            discount_id: (_ref40 = (_ref41 = (_discount$discount_id2 = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id2 !== void 0 ? _discount$discount_id2 : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref41 !== void 0 ? _ref41 : discount === null || discount === void 0 || (_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) !== null && _ref40 !== void 0 ? _ref40 : null,
-            amount: _this13.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
+            type: (_ref46 = (_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 && _ref46 !== void 0 ? _ref46 : '',
+            discount_id: (_ref47 = (_ref48 = (_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 && _ref48 !== void 0 ? _ref48 : discount === null || discount === void 0 || (_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) !== null && _ref47 !== void 0 ? _ref47 : null,
+            amount: _this16.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
           };
         }))
       };
@@ -2394,9 +2676,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildOrderProductsStructuralFingerprint",
     value: function buildOrderProductsStructuralFingerprint(products) {
-      var _this14 = this;
+      var _this17 = this;
       var items = (products || []).map(function (product) {
-        return _this14.buildProductStructuralFingerprintItem(product);
+        return _this17.buildProductStructuralFingerprintItem(product);
       });
       items.sort(function (left, right) {
         return JSON.stringify(left).localeCompare(JSON.stringify(right));
@@ -2406,8 +2688,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getManualDepositOverride",
     value: function getManualDepositOverride(tempOrder) {
-      var _tempOrder$_extend3;
-      var override = (_tempOrder$_extend3 = tempOrder._extend) === null || _tempOrder$_extend3 === void 0 ? void 0 : _tempOrder$_extend3.manualDepositOverride;
+      var _tempOrder$_extend4;
+      var override = (_tempOrder$_extend4 = tempOrder._extend) === null || _tempOrder$_extend4 === void 0 ? void 0 : _tempOrder$_extend4.manualDepositOverride;
       if (!override || _typeof(override) !== 'object') return null;
       if (typeof override.amount !== 'string') return null;
       if (typeof override.productStructuralFingerprint !== 'string') return null;
@@ -2426,16 +2708,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clearManualDepositOverride",
     value: function clearManualDepositOverride(tempOrder) {
-      var _tempOrder$_extend4;
-      if (!((_tempOrder$_extend4 = tempOrder._extend) !== null && _tempOrder$_extend4 !== void 0 && _tempOrder$_extend4.manualDepositOverride)) return;
+      var _tempOrder$_extend5;
+      if (!((_tempOrder$_extend5 = tempOrder._extend) !== null && _tempOrder$_extend5 !== void 0 && _tempOrder$_extend5.manualDepositOverride)) return;
       tempOrder._extend = _objectSpread({}, tempOrder._extend);
       delete tempOrder._extend.manualDepositOverride;
     }
   }, {
     key: "getOriginalSalesSnapshot",
     value: function getOriginalSalesSnapshot(tempOrder) {
-      var _tempOrder$_extend5;
-      var snapshot = (_tempOrder$_extend5 = tempOrder._extend) === null || _tempOrder$_extend5 === void 0 ? void 0 : _tempOrder$_extend5.originalSalesSnapshot;
+      var _tempOrder$_extend6;
+      var snapshot = (_tempOrder$_extend6 = tempOrder._extend) === null || _tempOrder$_extend6 === void 0 ? void 0 : _tempOrder$_extend6.originalSalesSnapshot;
       if (!snapshot || _typeof(snapshot) !== 'object') return null;
       if (typeof snapshot.productFingerprint !== 'string') return null;
       return snapshot;
@@ -2639,6 +2921,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var freshTempOrder = this.createDefaultTempOrderInstance();
       this.ensureExternalSaleNumber(freshTempOrder);
       this.store.tempOrder = freshTempOrder;
+      this.clearCustomerWalletRuntimeState();
       this.store.summary = createEmptySummary();
       this.store.lastOrderInfo = undefined;
       this.store.syncState = undefined;
@@ -2671,32 +2954,33 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 ensureIdentity: false
               });
               this.store.tempOrder = nextTempOrder;
+              this.clearCustomerWalletRuntimeState();
               if (!((options === null || options === void 0 ? void 0 : options.recalculateSummary) !== false)) {
-                _context13.next = 10;
+                _context13.next = 11;
                 break;
               }
-              _context13.next = 8;
+              _context13.next = 9;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 8:
-              _context13.next = 11;
+            case 9:
+              _context13.next = 12;
               break;
-            case 10:
-              this.store.summary = createEmptySummary();
             case 11:
+              this.store.summary = createEmptySummary();
+            case 12:
               if ((options === null || options === void 0 ? void 0 : options.persist) !== false) {
                 this.persistTempOrder();
               }
               if (!(options !== null && options !== void 0 && options.saveDraft)) {
-                _context13.next = 15;
+                _context13.next = 16;
                 break;
               }
-              _context13.next = 15;
+              _context13.next = 16;
               return this.saveDraft();
-            case 15:
-              return _context13.abrupt("return", nextTempOrder);
             case 16:
+              return _context13.abrupt("return", nextTempOrder);
+            case 17:
             case "end":
               return _context13.stop();
           }
@@ -2710,13 +2994,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderIdentity",
     value: function getOrderIdentity() {
-      var _ref42, _ref43, _tempOrder$order_id, _tempOrder$_extend6;
+      var _ref49, _ref50, _tempOrder$order_id, _tempOrder$_extend7;
       var tempOrder = this.store.tempOrder;
       if (!tempOrder) return null;
       var lastOrderInfo = this.store.lastOrderInfo || {};
-      var orderId = (_ref42 = (_ref43 = (_tempOrder$order_id = tempOrder.order_id) !== null && _tempOrder$order_id !== void 0 ? _tempOrder$order_id : lastOrderInfo.order_id) !== null && _ref43 !== void 0 ? _ref43 : lastOrderInfo.id) !== null && _ref42 !== void 0 ? _ref42 : null;
+      var orderId = (_ref49 = (_ref50 = (_tempOrder$order_id = tempOrder.order_id) !== null && _tempOrder$order_id !== void 0 ? _tempOrder$order_id : lastOrderInfo.order_id) !== null && _ref50 !== void 0 ? _ref50 : lastOrderInfo.id) !== null && _ref49 !== void 0 ? _ref49 : null;
       return {
-        localId: this.cacheId || ((_tempOrder$_extend6 = tempOrder._extend) === null || _tempOrder$_extend6 === void 0 ? void 0 : _tempOrder$_extend6.localId),
+        localId: this.cacheId || ((_tempOrder$_extend7 = tempOrder._extend) === null || _tempOrder$_extend7 === void 0 ? void 0 : _tempOrder$_extend7.localId),
         orderId: orderId,
         externalSaleNumber: tempOrder.external_sale_number || lastOrderInfo.external_sale_number || '',
         orderNumber: tempOrder.order_number || lastOrderInfo.order_number || '',
@@ -2846,9 +3130,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sanitizeTempOrderProducts",
     value: function sanitizeTempOrderProducts(tempOrder) {
-      var _this15 = this;
+      var _this18 = this;
       tempOrder.products = (tempOrder.products || []).map(function (product) {
-        return _this15.sanitizeOrderProductForTempOrder(_this15.normalizeVirtualSettlementProductIfEnabled(product));
+        return _this18.sanitizeOrderProductForTempOrder(_this18.normalizeVirtualSettlementProductIfEnabled(product));
       });
       this.syncTempOrderSettlementState(tempOrder);
       ensureUniqueProductLineUids(tempOrder);
@@ -2869,8 +3153,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "repairDuplicateProductLineIdentities",
     value: function repairDuplicateProductLineIdentities(tempOrder) {
-      var _tempOrder$_extend7;
-      var result = repairDuplicateOrderProductLineIdentities(tempOrder.products, (_tempOrder$_extend7 = tempOrder._extend) === null || _tempOrder$_extend7 === void 0 ? void 0 : _tempOrder$_extend7.productsByUid);
+      var _tempOrder$_extend8;
+      var result = repairDuplicateOrderProductLineIdentities(tempOrder.products, (_tempOrder$_extend8 = tempOrder._extend) === null || _tempOrder$_extend8 === void 0 ? void 0 : _tempOrder$_extend8.productsByUid);
       if (!result.repairs.length) return;
       tempOrder.products = result.products;
       if (result.productsByUid) {
@@ -2884,11 +3168,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, _ref51, _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 = (_ref51 = (_rawProduct$_origin = rawProduct._origin) !== null && _rawProduct$_origin !== void 0 ? _rawProduct$_origin : normalizedProduct._origin) !== null && _ref51 !== void 0 ? _ref51 : existed.origin;
       extend.productsByUid[uid] = _objectSpread(_objectSpread({}, existed), origin !== undefined ? {
         origin: origin
       } : {});
@@ -2968,7 +3252,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncLinkedBookingHoldersToProducts",
     value: function syncLinkedBookingHoldersToProducts(tempOrder) {
-      var _this16 = this;
+      var _this19 = this;
       var bookings = tempOrder.bookings || [];
       var products = tempOrder.products || [];
       if (!bookings.length || !products.length) return;
@@ -2993,7 +3277,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         var bookingUid = product.booking_uid || ((_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.booking_uid);
         var linkedBooking = (productUid !== undefined && productUid !== null && String(productUid) !== '' ? bookingByProductUid.get(String(productUid)) : undefined) || (bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '' ? bookingByBookingUid.get(String(bookingUid)) : undefined);
         if (linkedBooking) {
-          _this16.setProductHolderFromBooking(product, linkedBooking);
+          _this19.setProductHolderFromBooking(product, linkedBooking);
         }
       });
     }
@@ -3031,7 +3315,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildTempOrderHolderFromBookings",
     value: function buildTempOrderHolderFromBookings(tempOrder) {
-      var _baseHolder$customer_, _baseHolder, _ref45, _baseHolder$form_id, _baseHolder2, _tempOrder$holder2, _baseHolder3, _this$otherParams2;
+      var _baseHolder$customer_, _baseHolder, _ref52, _baseHolder$form_id, _baseHolder2, _tempOrder$holder2, _baseHolder3, _this$otherParams2;
       var holderRecords = [];
       var holderNames = [];
       var baseHolder = null;
@@ -3078,7 +3362,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       var nextHolder = {
         customer_id: (_baseHolder$customer_ = (_baseHolder = baseHolder) === null || _baseHolder === void 0 ? void 0 : _baseHolder.customer_id) !== null && _baseHolder$customer_ !== void 0 ? _baseHolder$customer_ : tempOrder.customer_id,
-        form_id: (_ref45 = (_baseHolder$form_id = (_baseHolder2 = baseHolder) === null || _baseHolder2 === void 0 ? void 0 : _baseHolder2.form_id) !== null && _baseHolder$form_id !== void 0 ? _baseHolder$form_id : (_tempOrder$holder2 = tempOrder.holder) === null || _tempOrder$holder2 === void 0 ? void 0 : _tempOrder$holder2.form_id) !== null && _ref45 !== void 0 ? _ref45 : 0,
+        form_id: (_ref52 = (_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 && _ref52 !== void 0 ? _ref52 : 0,
         form_record: holderRecords
       };
       if (holderNames.length) {
@@ -3121,9 +3405,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "findBookingIndexByUniqueIdentificationNumber",
     value: function findBookingIndexByUniqueIdentificationNumber(tempOrder, uniqueIdentificationNumber) {
-      var _this17 = this;
+      var _this20 = this;
       return (tempOrder.bookings || []).findIndex(function (booking) {
-        return _this17.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
+        return _this20.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
       });
     }
   }, {
@@ -3131,12 +3415,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function removeLinkedBookingsForProduct(tempOrder, product) {
       var _product$metadata5,
         _product$metadata6,
-        _this18 = this;
+        _this21 = this;
       var productUid = (product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
       var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.booking_uid);
       if (!productUid && !bookingUid) return;
       tempOrder.bookings = (tempOrder.bookings || []).filter(function (booking) {
-        var currentBookingUid = _this18.getBookingUniqueIdentificationNumber(booking);
+        var currentBookingUid = _this21.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;
@@ -3153,9 +3437,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyOrderProductsDepositSummary",
     value: function applyOrderProductsDepositSummary(tempOrder, summary) {
-      var _tempOrder$_extend8;
+      var _tempOrder$_extend9;
       var depositSummary = calculateOrderProductsDeposit(tempOrder.products || [], {
-        productsByUid: (_tempOrder$_extend8 = tempOrder._extend) === null || _tempOrder$_extend8 === void 0 ? void 0 : _tempOrder$_extend8.productsByUid
+        productsByUid: (_tempOrder$_extend9 = tempOrder._extend) === null || _tempOrder$_extend9 === void 0 ? void 0 : _tempOrder$_extend9.productsByUid
       });
       var manualDepositOverride = this.getManualDepositOverride(tempOrder);
       var currentStructuralFingerprint = manualDepositOverride ? this.buildOrderProductsStructuralFingerprint(tempOrder.products) : '';
@@ -3183,7 +3467,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "recalculateSummary",
     value: function () {
       var _recalculateSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(options) {
-        var _this$otherParams3, _ref46, _salesSummaryResult$e;
+        var _this$otherParams3, _ref53, _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 _callee13$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
@@ -3262,7 +3546,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((_ref53 = (_salesSummaryResult$e = salesSummaryResult.expect_amount) !== null && _salesSummaryResult$e !== void 0 ? _salesSummaryResult$e : salesSummaryResult.total_amount) !== null && _ref53 !== void 0 ? _ref53 : 0) : null;
               amountPaymentPatch = hasSalesSummaryAmount || !roundingAmount.eq(0) || !payServiceChargeAmount.eq(0) ? _objectSpread({
                 rounding_amount: roundingAmount.toFixed(2)
               }, expectAmount ? {
@@ -3385,8 +3669,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTempOrderNote",
     value: function getTempOrderNote() {
-      var _this$store$tempOrder4;
-      return ((_this$store$tempOrder4 = this.store.tempOrder) === null || _this$store$tempOrder4 === void 0 ? void 0 : _this$store$tempOrder4.note) || '';
+      var _this$store$tempOrder6;
+      return ((_this$store$tempOrder6 = this.store.tempOrder) === null || _this$store$tempOrder6 === void 0 ? void 0 : _this$store$tempOrder6.note) || '';
     }
   }, {
     key: "ensureSalesNotesRuntimeState",
@@ -3438,7 +3722,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeSalesNotesForMissingProductLines",
     value: function removeSalesNotesForMissingProductLines(tempOrder) {
-      var _this19 = this;
+      var _this22 = this;
       var state = this.ensureSalesNotesRuntimeState(tempOrder);
       if (!state.loaded || !Array.isArray(tempOrder.notes) || tempOrder.notes.length === 0) {
         return;
@@ -3450,7 +3734,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         return typeof uid === 'string' && uid.length > 0;
       }));
       var nextNotes = tempOrder.notes.filter(function (note) {
-        var primary = _this19.getSalesNotePrimaryRelation(note);
+        var primary = _this22.getSalesNotePrimaryRelation(note);
         if (!primary || primary.target_type !== 'order_detail') return true;
         return remainingProductUids.has(primary.target_uuid);
       });
@@ -3462,7 +3746,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "setSalesNoteOnTempOrder",
     value: function setSalesNoteOnTempOrder(tempOrder, input) {
       var _input$target,
-        _this20 = this,
+        _this23 = this,
         _tempOrder$shop_order;
       this.ensureSalesNotesLoadedForMutation(tempOrder);
       var note_type = String(input.note_type || '').trim();
@@ -3486,7 +3770,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var notes = tempOrder.notes || [];
       // 当前 allergy policy 固定同一商品行只保留一条；业务调用方不参与去重规则。
       var existingIndex = policy.uniquePerPrimaryTarget ? notes.findIndex(function (note) {
-        var primary = _this20.getSalesNotePrimaryRelation(note);
+        var primary = _this23.getSalesNotePrimaryRelation(note);
         return note.note_type === note_type && (primary === null || primary === void 0 ? void 0 : primary.target_type) === 'order_detail' && primary.target_uuid === target_uuid;
       }) : -1;
       var existing = existingIndex >= 0 ? notes[existingIndex] : null;
@@ -3738,17 +4022,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 _ref54, _ref55, _ref56, _source$name, _ref57, _ref58, _ref59, _source$customer_name, _source$id, _source$customer_id, _ref60, _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 = (_ref54 = (_ref55 = (_ref56 = (_source$name = source.name) !== null && _source$name !== void 0 ? _source$name : source.display_name) !== null && _ref56 !== void 0 ? _ref56 : source.customerName) !== null && _ref55 !== void 0 ? _ref55 : source.customer_name) !== null && _ref54 !== void 0 ? _ref54 : params.customerName;
+      var customerName = (_ref57 = (_ref58 = (_ref59 = (_source$customer_name = source.customer_name) !== null && _source$customer_name !== void 0 ? _source$customer_name : source.customerName) !== null && _ref59 !== void 0 ? _ref59 : source.display_name) !== null && _ref58 !== void 0 ? _ref58 : source.name) !== null && _ref57 !== void 0 ? _ref57 : 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((_ref60 = (_source$country_calli = source.country_calling_code) !== null && _source$country_calli !== void 0 ? _source$country_calli : source.countryCallingCode) !== null && _ref60 !== void 0 ? _ref60 : 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)
       });
@@ -3758,7 +4042,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function isCustomerBoundDiscount(discount) {
       var _discount$type5;
       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';
+      return type === 'entitlement_pass' || type === 'good_pass' || type === 'discount_card' || type === 'product_discount_card';
     }
   }, {
     key: "shouldKeepCustomerBoundDiscountAfterCustomerChange",
@@ -3768,15 +4052,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "productHasCustomerBoundDiscount",
     value: function productHasCustomerBoundDiscount(product) {
-      var _this21 = this;
+      var _this24 = this;
       if (((product === null || product === void 0 ? void 0 : product.discount_list) || []).some(function (discount) {
-        return _this21.isCustomerBoundDiscount(discount);
+        return _this24.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 _this21.isCustomerBoundDiscount(discount);
+          return _this24.isCustomerBoundDiscount(discount);
         });
       });
     }
@@ -3785,18 +4069,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function shouldSkipDiscountCalculation(tempOrder) {
       var _this$store$discount20,
         _this$store$discount21,
-        _this22 = this;
+        _this25 = this;
       if (this.hasActiveCustomerBoundDiscount) return false;
       var discountList = ((_this$store$discount20 = this.store.discount) === null || _this$store$discount20 === void 0 || (_this$store$discount21 = _this$store$discount20.getDiscountList) === null || _this$store$discount21 === void 0 ? void 0 : _this$store$discount21.call(_this$store$discount20)) || [];
       if (discountList.length > 0) return false;
       return !(tempOrder.products || []).some(function (product) {
-        return _this22.productHasCustomerBoundDiscount(product);
+        return _this25.productHasCustomerBoundDiscount(product);
       });
     }
   }, {
     key: "clearCustomerBoundDiscounts",
     value: function clearCustomerBoundDiscounts(tempOrder) {
-      var _this23 = this,
+      var _this26 = this,
         _discountModule$getDi,
         _discountModule$getOr,
         _discountModule$setDi,
@@ -3805,7 +4089,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var filterDiscountList = function filterDiscountList(discountList) {
         if (!Array.isArray(discountList)) return [];
         return discountList.filter(function (discount) {
-          var shouldRemove = _this23.isCustomerBoundDiscount(discount);
+          var shouldRemove = _this26.isCustomerBoundDiscount(discount);
           if (shouldRemove) didRemoveCustomerBoundDiscount = true;
           return !shouldRemove;
         });
@@ -3832,12 +4116,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 (_this23.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
-        return !_this23.isCustomerBoundDiscount(discount);
+        if (_this26.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
+        return !_this26.isCustomerBoundDiscount(discount);
       });
       var nextOriginalDiscounts = currentOriginalDiscounts.filter(function (discount) {
-        if (_this23.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
-        return !_this23.isCustomerBoundDiscount(discount);
+        if (_this26.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
+        return !_this26.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));
@@ -3852,14 +4136,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateTempOrderCustomer",
     value: function updateTempOrderCustomer(customer) {
-      var _tempOrder$customer_i3, _ref54, _ref55, _customer$customer_id, _ref56, _ref57, _ref58, _customer$customer_na, _ref59, _customer$country_cal, _tempOrder$customer_i4;
+      var _tempOrder$customer_i3, _ref61, _ref62, _customer$customer_id, _ref63, _ref64, _ref65, _customer$customer_na, _ref66, _customer$country_cal, _tempOrder$customer_i4;
       var tempOrder = this.ensureTempOrder();
       var previousCustomerId = (_tempOrder$customer_i3 = tempOrder.customer_id) !== null && _tempOrder$customer_i3 !== void 0 ? _tempOrder$customer_i3 : null;
-      var customerId = (_ref54 = (_ref55 = (_customer$customer_id = customer.customer_id) !== null && _customer$customer_id !== void 0 ? _customer$customer_id : customer.customerId) !== null && _ref55 !== void 0 ? _ref55 : customer.id) !== null && _ref54 !== void 0 ? _ref54 : null;
-      var customerName = (_ref56 = (_ref57 = (_ref58 = (_customer$customer_na = customer.customer_name) !== null && _customer$customer_na !== void 0 ? _customer$customer_na : customer.customerName) !== null && _ref58 !== void 0 ? _ref58 : customer.display_name) !== null && _ref57 !== void 0 ? _ref57 : customer.name) !== null && _ref56 !== void 0 ? _ref56 : '';
+      var customerId = (_ref61 = (_ref62 = (_customer$customer_id = customer.customer_id) !== null && _customer$customer_id !== void 0 ? _customer$customer_id : customer.customerId) !== null && _ref62 !== void 0 ? _ref62 : customer.id) !== null && _ref61 !== void 0 ? _ref61 : null;
+      var customerName = (_ref63 = (_ref64 = (_ref65 = (_customer$customer_na = customer.customer_name) !== null && _customer$customer_na !== void 0 ? _customer$customer_na : customer.customerName) !== null && _ref65 !== void 0 ? _ref65 : customer.display_name) !== null && _ref64 !== void 0 ? _ref64 : customer.name) !== null && _ref63 !== void 0 ? _ref63 : '';
       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((_ref66 = (_customer$country_cal = customer.country_calling_code) !== null && _customer$country_cal !== void 0 ? _customer$country_cal : customer.countryCallingCode) !== null && _ref66 !== void 0 ? _ref66 : '');
       tempOrder.phone = String(customer.phone || '');
       tempOrder.email = String(customer.email || '');
       tempOrder.customer = this.buildTempOrderCustomer({
@@ -3871,9 +4155,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         email: tempOrder.email
       });
       var nextCustomerId = (_tempOrder$customer_i4 = tempOrder.customer_id) !== null && _tempOrder$customer_i4 !== void 0 ? _tempOrder$customer_i4 : null;
-      if (String(previousCustomerId !== null && previousCustomerId !== void 0 ? previousCustomerId : '') !== String(nextCustomerId !== null && nextCustomerId !== void 0 ? nextCustomerId : '') && !hasPersistedOrderId(tempOrder.order_id)) {
-        this.store.availableWalletIds = [];
-        this.clearTempOrderPointCardSnapshot(tempOrder);
+      if (String(previousCustomerId !== null && previousCustomerId !== void 0 ? previousCustomerId : '') !== String(nextCustomerId !== null && nextCustomerId !== void 0 ? nextCustomerId : '')) {
+        this.clearCustomerWalletState(tempOrder);
       }
       this.persistTempOrder();
       return {
@@ -3912,11 +4195,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       var nextCustomerId = (_tempOrder$customer_i6 = tempOrder.customer_id) !== null && _tempOrder$customer_i6 !== void 0 ? _tempOrder$customer_i6 : null;
       if (String(previousCustomerId !== null && previousCustomerId !== void 0 ? previousCustomerId : '') !== String(nextCustomerId !== null && nextCustomerId !== void 0 ? nextCustomerId : '')) {
-        this.store.availableWalletIds = [];
-        this.store.virtualCurrencyList = [];
-        if (!hasPersistedOrderId(tempOrder.order_id)) {
-          this.clearTempOrderPointCardSnapshot(tempOrder);
-        }
+        this.clearCustomerWalletState(tempOrder);
         clearTempOrderHolderAssignments(tempOrder);
         this.clearCustomerBoundDiscounts(tempOrder);
         this.applyDiscount();
@@ -3945,8 +4224,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderCustomerSnapshot",
     value: function getOrderCustomerSnapshot() {
-      var _this$store$tempOrder5;
-      var snapshot = (_this$store$tempOrder5 = this.store.tempOrder) === null || _this$store$tempOrder5 === void 0 || (_this$store$tempOrder5 = _this$store$tempOrder5._extend) === null || _this$store$tempOrder5 === void 0 ? void 0 : _this$store$tempOrder5.customerSnapshot;
+      var _this$store$tempOrder7;
+      var snapshot = (_this$store$tempOrder7 = this.store.tempOrder) === null || _this$store$tempOrder7 === void 0 || (_this$store$tempOrder7 = _this$store$tempOrder7._extend) === null || _this$store$tempOrder7 === void 0 ? void 0 : _this$store$tempOrder7.customerSnapshot;
       return snapshot ? cloneDeep(snapshot) : null;
     }
   }, {
@@ -3961,11 +4240,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       tempOrder.email = '';
       tempOrder.customer = null;
       if (tempOrder._extend) delete tempOrder._extend.customerSnapshot;
-      this.store.availableWalletIds = [];
-      this.store.virtualCurrencyList = [];
-      if (!hasPersistedOrderId(tempOrder.order_id)) {
-        this.clearTempOrderPointCardSnapshot(tempOrder);
-      }
+      this.clearCustomerWalletState(tempOrder);
       this.clearCustomerBoundDiscounts(tempOrder);
       this.applyDiscount();
       this.persistTempOrder();
@@ -4010,10 +4285,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setOrderPayments",
     value: function setOrderPayments(payments) {
-      var _this24 = this;
+      var _this27 = this;
       var tempOrder = this.ensureTempOrder();
       tempOrder.payments = mapPaymentItemsToOrderPayments((payments || []).map(function (payment) {
-        return _this24.normalizePaymentSource(payment, {
+        return _this27.normalizePaymentSource(payment, {
           defaultPaid: false
         });
       }));
@@ -4068,7 +4343,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addOrderPaymentWithDevicePrefix",
     value: function addOrderPaymentWithDevicePrefix(payment, devicePrefix) {
-      var _this25 = this;
+      var _this28 = this;
       this.logInfo('addOrderPayment', {
         payment: payment
       });
@@ -4086,7 +4361,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this25.logError('recalculate summary after addOrderPayment failed', {
+        _this28.logError('recalculate summary after addOrderPayment failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -4199,7 +4474,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyPaymentLifecycleChange",
     value: function applyPaymentLifecycleChange(tempOrder, options) {
-      var _this26 = this;
+      var _this29 = this;
       this.updateTempOrderPaymentStatus(tempOrder);
       if ((options === null || options === void 0 ? void 0 : options.persist) !== false) {
         this.persistTempOrder();
@@ -4209,7 +4484,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this26.logError("recalculate summary after ".concat(logContext, " failed"), {
+        _this29.logError("recalculate summary after ".concat(logContext, " failed"), {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -4253,7 +4528,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateVoucherOrderPayments",
     value: function updateVoucherOrderPayments(payments, options) {
-      var _this27 = this;
+      var _this30 = this;
       var tempOrder = this.ensureTempOrder();
       var isOrderPaymentType = function isOrderPaymentType(value) {
         return value === 'normal' || value === 'deposit';
@@ -4288,7 +4563,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         });
       };
       var mappedVouchers = mapPaymentItemsToOrderPayments(payments.map(function (payment) {
-        return _this27.normalizePaymentSource(normalizeVoucherPaymentStatus(withVoucherPaymentType(payment)), {
+        return _this30.normalizePaymentSource(normalizeVoucherPaymentStatus(withVoucherPaymentType(payment)), {
           defaultPaid: false,
           devicePrefix: options === null || options === void 0 ? void 0 : options.devicePrefix
         });
@@ -4341,7 +4616,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this27.logError('recalculate summary after updateVoucherOrderPayments failed', {
+        _this30.logError('recalculate summary after updateVoucherOrderPayments failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -4399,7 +4674,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "shouldMergeProductToOrder",
     value: function shouldMergeProductToOrder(params) {
       var _this$orderHooks,
-        _this28 = this;
+        _this31 = this;
       var onBeforeMergeProductToOrder = (_this$orderHooks = this.orderHooks) === null || _this$orderHooks === void 0 ? void 0 : _this$orderHooks.onBeforeMergeProductToOrder;
       if (!onBeforeMergeProductToOrder) return true;
       var result = onBeforeMergeProductToOrder(_objectSpread(_objectSpread({}, params), {}, {
@@ -4407,7 +4682,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }));
       if (result && _typeof(result) === 'object' && typeof result.then === 'function') {
         return Promise.resolve(result).then(function (resolved) {
-          return _this28.normalizeShouldMergeProductResult(resolved);
+          return _this31.normalizeShouldMergeProductResult(resolved);
         });
       }
       return this.normalizeShouldMergeProductResult(result);
@@ -4456,7 +4731,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "assertAndLockProductSettlement",
     value: function assertAndLockProductSettlement(tempOrder, product) {
-      var _ref60, _ref61, _product$selling_pric;
+      var _ref67, _ref68, _product$selling_pric;
       if (!this.isMultiCurrencySettlementEnabled()) return;
       var currentKey = getTempOrderSettlementKey(tempOrder);
       var incomingKey = getSettlementKey(getSelectedSettlementSnapshot(product)) || 'legal_currency';
@@ -4483,7 +4758,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       applyTempOrderSettlementState(tempOrder, snapshot || {
         settlement_type: 'legal_currency',
-        price: (_ref60 = (_ref61 = (_product$selling_pric = product.selling_price) !== null && _product$selling_pric !== void 0 ? _product$selling_pric : product.original_price) !== null && _ref61 !== void 0 ? _ref61 : product.payment_price) !== null && _ref60 !== void 0 ? _ref60 : 0,
+        price: (_ref67 = (_ref68 = (_product$selling_pric = product.selling_price) !== null && _product$selling_pric !== void 0 ? _product$selling_pric : product.original_price) !== null && _ref68 !== void 0 ? _ref68 : product.payment_price) !== null && _ref67 !== void 0 ? _ref67 : 0,
         unit_label: tempOrder.currency_code,
         symbol: tempOrder.currency_symbol,
         amount_format: tempOrder.currency_format
@@ -4608,7 +4883,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _metadata,
         _productToAdd$metadat,
         _origin,
-        _this29 = this;
+        _this32 = this;
       var linked = booking ? this.createLinkedProductAndBooking({
         product: product,
         booking: booking
@@ -4635,18 +4910,35 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       normalizedIncoming.discount_list = normalizeOrderProductDiscountList(normalizedIncoming.discount_list);
       var hasIncomingGoodPass = this.hasGoodPassDiscount(normalizedIncoming);
+      var hasIncomingEntitlementPass = this.hasEntitlementPassDiscount(normalizedIncoming);
+      var isIncomingEntitlementAppend = this.isRuntimeEntitlementAppend(productToAdd, tempOrder);
+      var isIncomingPersistedEntitlementPass = hasIncomingEntitlementPass && this.isPersistedProductLine(normalizedIncoming);
       var hasIncomingProductNote = this.hasOrderProductLineNote(normalizedIncoming);
       var hasIncomingManualProductDiscount = isManualProductDiscountProduct(normalizedIncoming);
       var hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
       var isIncomingCustomItem = ((_productToAdd$metadat = productToAdd.metadata) === null || _productToAdd$metadat === void 0 || (_productToAdd$metadat = _productToAdd$metadat.origin) === null || _productToAdd$metadat === void 0 ? void 0 : _productToAdd$metadat.isCustomItem) === true || ((_origin = productToAdd._origin) === null || _origin === void 0 ? void 0 : _origin.isCustomItem) === true;
-      var shouldForceNewLine = disableMerge || !!booking || hasIncomingProductNote || hasIncomingManualProductDiscount || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
-      var matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
-        var _item$metadata3;
-        if (_this29.hasGoodPassDiscount(item)) return false;
-        if (_this29.hasOrderProductLineNote(item)) return false;
-        if (isManualProductDiscountProduct(item)) return false;
-        if (item.order_detail_id !== undefined && item.order_detail_id !== null) return false;
-        if ((_item$metadata3 = item.metadata) !== null && _item$metadata3 !== void 0 && _item$metadata3.is_edit_for_runtime) return false;
+      var shouldForceNewLine = disableMerge || !!booking || hasIncomingGoodPass || isIncomingPersistedEntitlementPass || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
+      var matchedIndex = shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
+        if (_this32.hasGoodPassDiscount(item)) return false;
+        var isRuntimeEntitlementPass = _this32.isRuntimeEntitlementAppend(item, tempOrder);
+        if (isIncomingEntitlementAppend !== isRuntimeEntitlementPass) {
+          return false;
+        }
+        if (isIncomingEntitlementAppend && _this32.isPersistedProductLine(item)) {
+          return false;
+        }
+        var hasExistingProductNote = _this32.hasOrderProductLineNote(item);
+        if ((hasIncomingProductNote || hasExistingProductNote) && (!isRuntimeEntitlementPass || String(normalizedIncoming.note || '').trim() !== String(item.note || '').trim())) {
+          return false;
+        }
+        var hasExistingManualProductDiscount = isManualProductDiscountProduct(item);
+        if (isRuntimeEntitlementPass && !_this32.hasSameEntitlementMergePriceConfig(normalizedIncoming, item)) {
+          return false;
+        }
+        if ((hasIncomingManualProductDiscount || hasExistingManualProductDiscount) && !isRuntimeEntitlementPass) {
+          return false;
+        }
+        if (_this32.isPersistedProductLine(item)) return false;
         if (item.product_id !== productToAdd.product_id) return false;
         if (item.product_variant_id !== productToAdd.product_variant_id) return false;
         var existedFingerprint = buildProductLineFingerprint(getProductSkuOptions(item), item.product_bundle);
@@ -4657,7 +4949,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var commitProductLine = function commitProductLine(shouldMerge) {
         var committedProduct;
         if (matchedIndex === -1 || !matchedProduct || !shouldMerge) {
-          _this29.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
+          _this32.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
           if (linked) {
             normalizedIncoming.booking_uid = linked.bookingUid;
             normalizedIncoming.metadata = _objectSpread(_objectSpread({}, normalizedIncoming.metadata || {}), {}, {
@@ -4675,7 +4967,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           var _targetProduct$metada;
           var targetProduct = matchedProduct;
           var targetUid = (_targetProduct$metada = targetProduct.metadata) === null || _targetProduct$metada === void 0 ? void 0 : _targetProduct$metada.unique_identification_number;
-          var normalizedProduct = _this29.normalizeVirtualSettlementProductIfEnabled(mergeOrderProductDisplayFields(targetProduct, normalizeOrderProduct(_objectSpread(_objectSpread({}, productToAdd), {}, {
+          var normalizedProduct = _this32.normalizeVirtualSettlementProductIfEnabled(mergeOrderProductDisplayFields(targetProduct, normalizeOrderProduct(_objectSpread(_objectSpread({}, productToAdd), {}, {
             metadata: _objectSpread(_objectSpread({}, productToAdd.metadata || {}), {}, {
               unique_identification_number: targetUid
             })
@@ -4698,7 +4990,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             order_detail_id: targetProduct.order_detail_id,
             num: nextNum
           });
-          _this29.captureProductRuntime(tempOrder, productToAdd, tempOrder.products[matchedIndex], targetUid);
+          _this32.captureProductRuntime(tempOrder, productToAdd, tempOrder.products[matchedIndex], targetUid);
           committedProduct = tempOrder.products[matchedIndex];
           if (matchedIndex !== tempOrder.products.length - 1) {
             var mergedProduct = tempOrder.products[matchedIndex];
@@ -4736,14 +5028,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createSplitBookingLine",
     value: function createSplitBookingLine(product, booking, index, splitCount) {
-      var _booking$metadata6, _ref62, _ref63, _bookingHolder$form_r, _booking$metadata7, _product$metadata10, _bookingHolder$name, _singleBooking$metada;
+      var _booking$metadata6, _ref69, _ref70, _bookingHolder$form_r, _booking$metadata7, _product$metadata10, _bookingHolder$name, _singleBooking$metada;
       var singleLine = cloneDeep(product);
       singleLine.num = 1;
       delete singleLine.product_quantity;
       var singleBooking = cloneDeep(booking);
       var bookingHolder = booking !== null && booking !== void 0 && booking.holder && _typeof(booking.holder) === 'object' ? booking.holder : null;
       var metadataHolder = booking !== null && booking !== void 0 && (_booking$metadata6 = booking.metadata) !== null && _booking$metadata6 !== void 0 && _booking$metadata6.holder && _typeof(booking.metadata.holder) === 'object' ? booking.metadata.holder : null;
-      var rawHolderIds = (_ref62 = (_ref63 = (_bookingHolder$form_r = bookingHolder === null || bookingHolder === void 0 ? void 0 : bookingHolder.form_record) !== null && _bookingHolder$form_r !== void 0 ? _bookingHolder$form_r : booking === null || booking === void 0 || (_booking$metadata7 = booking.metadata) === null || _booking$metadata7 === void 0 ? void 0 : _booking$metadata7.holder_id) !== null && _ref63 !== void 0 ? _ref63 : metadataHolder === null || metadataHolder === void 0 ? void 0 : metadataHolder.form_record) !== null && _ref62 !== void 0 ? _ref62 : product === null || product === void 0 || (_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.holder_id;
+      var rawHolderIds = (_ref69 = (_ref70 = (_bookingHolder$form_r = bookingHolder === null || bookingHolder === void 0 ? void 0 : bookingHolder.form_record) !== null && _bookingHolder$form_r !== void 0 ? _bookingHolder$form_r : booking === null || booking === void 0 || (_booking$metadata7 = booking.metadata) === null || _booking$metadata7 === void 0 ? void 0 : _booking$metadata7.holder_id) !== null && _ref70 !== void 0 ? _ref70 : metadataHolder === null || metadataHolder === void 0 ? void 0 : metadataHolder.form_record) !== null && _ref69 !== void 0 ? _ref69 : product === null || product === void 0 || (_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.holder_id;
       var holderIds = (Array.isArray(rawHolderIds) ? rawHolderIds : [rawHolderIds]).map(function (holderId) {
         return holderId && _typeof(holderId) === 'object' ? holderId.form_record_id : holderId;
       }).filter(function (holderId) {
@@ -4808,8 +5100,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "addProductToOrder",
     value: (function () {
       var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(product, booking, options) {
-        var _this30 = this;
-        var tempOrder, salesNoteDrafts, mutationSnapshot, attachSalesNoteDrafts, rollbackProductAndNotesMutation, insertAfterProductUid, anchorIndex, insertAtIndex, _ref64, _productRecord$num, productRecord, splitCount, i, splitLine, committedProduct, _committedProduct, _committedProduct2;
+        var _this33 = this;
+        var tempOrder, salesNoteDrafts, mutationSnapshot, attachSalesNoteDrafts, rollbackProductAndNotesMutation, insertAfterProductUid, anchorIndex, insertAtIndex, _ref71, _productRecord$num, productRecord, splitCount, i, splitLine, committedProduct, _committedProduct, _committedProduct2;
         return _regeneratorRuntime().wrap(function _callee23$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
@@ -4837,7 +5129,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   throw new Error('[Order Notes] 商品行缺少 unique_identification_number');
                 }
                 salesNoteDrafts.forEach(function (draft) {
-                  _this30.setSalesNoteOnTempOrder(tempOrder, {
+                  _this33.setSalesNoteOnTempOrder(tempOrder, {
                     note_type: draft.note_type,
                     target: {
                       target_type: 'order_detail',
@@ -4867,7 +5159,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               productRecord = product;
-              splitCount = getSafeProductNum((_ref64 = (_productRecord$num = productRecord.num) !== null && _productRecord$num !== void 0 ? _productRecord$num : productRecord.product_quantity) !== null && _ref64 !== void 0 ? _ref64 : 1);
+              splitCount = getSafeProductNum((_ref71 = (_productRecord$num = productRecord.num) !== null && _productRecord$num !== void 0 ? _productRecord$num : productRecord.product_quantity) !== null && _ref71 !== void 0 ? _ref71 : 1);
               if (!(splitCount > 1)) {
                 _context25.next = 27;
                 break;
@@ -4972,7 +5264,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "addProductsToOrder",
     value: (function () {
       var _addProductsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(items, options) {
-        var tempOrder, _iterator20, _step20, item, product, booking, _ref65, _productRecord$num2, productRecord, splitCount, i, splitLine, _appendResult, appendResult;
+        var tempOrder, _iterator20, _step20, item, product, booking, _ref72, _productRecord$num2, productRecord, splitCount, i, splitLine, _appendResult, appendResult;
         return _regeneratorRuntime().wrap(function _callee24$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
@@ -5004,7 +5296,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               productRecord = product;
-              splitCount = getSafeProductNum((_ref65 = (_productRecord$num2 = productRecord.num) !== null && _productRecord$num2 !== void 0 ? _productRecord$num2 : productRecord.product_quantity) !== null && _ref65 !== void 0 ? _ref65 : 1);
+              splitCount = getSafeProductNum((_ref72 = (_productRecord$num2 = productRecord.num) !== null && _productRecord$num2 !== void 0 ? _productRecord$num2 : productRecord.product_quantity) !== null && _ref72 !== void 0 ? _ref72 : 1);
               if (!(splitCount > 1)) {
                 _context26.next = 26;
                 break;
@@ -5071,45 +5363,99 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return addProductsToOrder;
     }())
   }, {
-    key: "hasGoodPassDiscount",
-    value: function hasGoodPassDiscount(product) {
+    key: "getFullCoveragePassDiscounts",
+    value: function getFullCoveragePassDiscounts(product) {
       var _product$_extend;
-      var hasMainGoodPass = (product.discount_list || []).some(function (item) {
-        return (item === null || item === void 0 ? void 0 : item.type) === 'good_pass' || (item === null || item === void 0 ? void 0 : item.tag) === 'good_pass';
-      });
-      if (hasMainGoodPass) return true;
-      var bundleDiscountList = [];
+      var discountList = _toConsumableArray(product.discount_list || []);
       (product.product_bundle || []).forEach(function (item) {
-        bundleDiscountList.push.apply(bundleDiscountList, _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []));
+        discountList.push.apply(discountList, _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []));
       });
       ((product === null || product === void 0 || (_product$_extend = product._extend) === null || _product$_extend === void 0 || (_product$_extend = _product$_extend.other) === null || _product$_extend === void 0 ? void 0 : _product$_extend.bundle) || []).forEach(function (item) {
-        bundleDiscountList.push.apply(bundleDiscountList, _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []));
+        discountList.push.apply(discountList, _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []));
+      });
+      return discountList.filter(function (item) {
+        return isFullCoveragePass(item);
       });
-      return bundleDiscountList.some(function (item) {
-        return (item === null || item === void 0 ? void 0 : item.type) === 'good_pass' || (item === null || item === void 0 ? void 0 : item.tag) === 'good_pass';
+    }
+  }, {
+    key: "hasEntitlementPassDiscount",
+    value: function hasEntitlementPassDiscount(product) {
+      return this.getFullCoveragePassDiscounts(product).some(function (item) {
+        return isEntitlementPass(item);
+      });
+    }
+  }, {
+    key: "hasGoodPassDiscount",
+    value: function hasGoodPassDiscount(product) {
+      return this.getFullCoveragePassDiscounts(product).some(function (item) {
+        return !isEntitlementPass(item);
       });
     }
+  }, {
+    key: "isPersistedProductLine",
+    value: function isPersistedProductLine(product) {
+      var _product$metadata11;
+      return product.order_detail_id !== undefined && product.order_detail_id !== null && product.order_detail_id !== '' || ((_product$metadata11 = product.metadata) === null || _product$metadata11 === void 0 ? void 0 : _product$metadata11.is_edit_for_runtime) === true;
+    }
+  }, {
+    key: "isRuntimeEntitlementAppend",
+    value: function isRuntimeEntitlementAppend(product, tempOrder) {
+      var _product$metadata$uni, _product$metadata12, _tempOrder$_extend10, _product$_origin;
+      if (this.isPersistedProductLine(product)) return false;
+      var uid = (_product$metadata$uni = (_product$metadata12 = product.metadata) === null || _product$metadata12 === void 0 ? void 0 : _product$metadata12.unique_identification_number) !== null && _product$metadata$uni !== void 0 ? _product$metadata$uni : product.unique_identification_number;
+      var storedOrigin = uid !== undefined && uid !== null && uid !== '' ? (_tempOrder$_extend10 = tempOrder._extend) === null || _tempOrder$_extend10 === void 0 || (_tempOrder$_extend10 = _tempOrder$_extend10.productsByUid) === null || _tempOrder$_extend10 === void 0 || (_tempOrder$_extend10 = _tempOrder$_extend10[String(uid)]) === null || _tempOrder$_extend10 === void 0 ? void 0 : _tempOrder$_extend10.origin : undefined;
+      return Boolean((product === null || product === void 0 || (_product$_origin = product._origin) === null || _product$_origin === void 0 ? void 0 : _product$_origin.__entitlementPassRuntimeAppend) === true || (storedOrigin === null || storedOrigin === void 0 ? void 0 : storedOrigin.__entitlementPassRuntimeAppend) === true);
+    }
+  }, {
+    key: "hasSameEntitlementMergePriceConfig",
+    value: function hasSameEntitlementMergePriceConfig(incoming, existing) {
+      var _this34 = this;
+      var buildPriceConfig = function buildPriceConfig(product) {
+        var metadata = product.metadata || {};
+        var bundle = (product.product_bundle || []).map(function (item) {
+          var _ref73, _item$bundle_id, _ref74, _ref75, _item$bundle_product_, _ref76, _item$bundle_variant_, _ref77, _item$price_type, _ref78, _item$price_type_ext;
+          return {
+            bundle_id: (_ref73 = (_item$bundle_id = item.bundle_id) !== null && _item$bundle_id !== void 0 ? _item$bundle_id : item.id) !== null && _ref73 !== void 0 ? _ref73 : null,
+            bundle_product_id: (_ref74 = (_ref75 = (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id) !== null && _ref75 !== void 0 ? _ref75 : item.product_id) !== null && _ref74 !== void 0 ? _ref74 : null,
+            bundle_variant_id: (_ref76 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.product_variant_id) !== null && _ref76 !== void 0 ? _ref76 : 0,
+            price_type: (_ref77 = (_item$price_type = item.price_type) !== null && _item$price_type !== void 0 ? _item$price_type : item.custom_price_type) !== null && _ref77 !== void 0 ? _ref77 : '',
+            price_type_ext: (_ref78 = (_item$price_type_ext = item.price_type_ext) !== null && _item$price_type_ext !== void 0 ? _item$price_type_ext : item.custom_price_type_ext) !== null && _ref78 !== void 0 ? _ref78 : ''
+          };
+        }).sort(function (left, right) {
+          return JSON.stringify(left).localeCompare(JSON.stringify(right));
+        });
+        return JSON.stringify({
+          original_price: _this34.normalizeFingerprintMoney(product.original_price),
+          source_product_price: _this34.normalizeFingerprintMoney(metadata.source_product_price),
+          main_product_original_price: _this34.normalizeFingerprintMoney(metadata.main_product_original_price),
+          price_override: _this34.normalizeFingerprintMoney(metadata.price_override),
+          is_manual_discount: Boolean(metadata.is_manual_discount),
+          bundle: bundle
+        });
+      };
+      return buildPriceConfig(incoming) === buildPriceConfig(existing);
+    }
   }, {
     key: "getBundleRuntimeIdentity",
     value: function getBundleRuntimeIdentity(bundle) {
-      var _ref66, _bundle$bundle_id2, _ref67, _bundle$bundle_group_2, _ref68, _ref69, _bundle$bundle_produc3, _ref70, _bundle$bundle_varian3;
+      var _ref79, _bundle$bundle_id2, _ref80, _bundle$bundle_group_2, _ref81, _ref82, _bundle$bundle_produc3, _ref83, _bundle$bundle_varian3;
       if (!bundle || _typeof(bundle) !== 'object') return '';
-      return [(_ref66 = (_bundle$bundle_id2 = bundle.bundle_id) !== null && _bundle$bundle_id2 !== void 0 ? _bundle$bundle_id2 : bundle.id) !== null && _ref66 !== void 0 ? _ref66 : '', (_ref67 = (_bundle$bundle_group_2 = bundle.bundle_group_id) !== null && _bundle$bundle_group_2 !== void 0 ? _bundle$bundle_group_2 : bundle.group_id) !== null && _ref67 !== void 0 ? _ref67 : '', (_ref68 = (_ref69 = (_bundle$bundle_produc3 = bundle.bundle_product_id) !== null && _bundle$bundle_produc3 !== void 0 ? _bundle$bundle_produc3 : bundle._bundle_product_id) !== null && _ref69 !== void 0 ? _ref69 : bundle.product_id) !== null && _ref68 !== void 0 ? _ref68 : '', (_ref70 = (_bundle$bundle_varian3 = bundle.bundle_variant_id) !== null && _bundle$bundle_varian3 !== void 0 ? _bundle$bundle_varian3 : bundle.product_variant_id) !== null && _ref70 !== void 0 ? _ref70 : 0].join('|');
+      return [(_ref79 = (_bundle$bundle_id2 = bundle.bundle_id) !== null && _bundle$bundle_id2 !== void 0 ? _bundle$bundle_id2 : bundle.id) !== null && _ref79 !== void 0 ? _ref79 : '', (_ref80 = (_bundle$bundle_group_2 = bundle.bundle_group_id) !== null && _bundle$bundle_group_2 !== void 0 ? _bundle$bundle_group_2 : bundle.group_id) !== null && _ref80 !== void 0 ? _ref80 : '', (_ref81 = (_ref82 = (_bundle$bundle_produc3 = bundle.bundle_product_id) !== null && _bundle$bundle_produc3 !== void 0 ? _bundle$bundle_produc3 : bundle._bundle_product_id) !== null && _ref82 !== void 0 ? _ref82 : bundle.product_id) !== null && _ref81 !== void 0 ? _ref81 : '', (_ref83 = (_bundle$bundle_varian3 = bundle.bundle_variant_id) !== null && _bundle$bundle_varian3 !== void 0 ? _bundle$bundle_varian3 : bundle.product_variant_id) !== null && _ref83 !== void 0 ? _ref83 : 0].join('|');
     }
   }, {
     key: "preservePersistedBundlePriceFields",
     value: function preservePersistedBundlePriceFields(previousBundles, nextBundles) {
-      var _this31 = this;
+      var _this35 = 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 = _this31.getBundleRuntimeIdentity(bundle);
+        var identity = _this35.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(_this31.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
+        var previous = previousByIdentity.get(_this35.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
         if (!previous || _typeof(previous) !== 'object') return bundle;
         return _objectSpread(_objectSpread(_objectSpread({}, bundle), (bundle.cover === undefined || bundle.cover === null || bundle.cover === '') && previous.cover !== undefined && previous.cover !== null && previous.cover !== '' ? {
           cover: previous.cover
@@ -5125,8 +5471,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     }
   }, {
     key: "applyOrderProductUpdateToTempOrder",
-    value: function applyOrderProductUpdateToTempOrder(tempOrder, params) {
-      var _targetProduct$metada2, _product_sku, _metadata2, _metadata3, _metadata4, _metadata5, _metadata6, _metadata7, _metadata8, _metadata9, _metadata10, _nextProduct$metadata, _targetProduct$metada15, _tempOrder$products$p, _tempOrder$products$p2;
+    value: function applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids) {
+      var _targetProduct$metada2, _product_sku, _metadata2, _metadata3, _metadata4, _metadata5, _metadata6, _metadata7, _metadata8, _metadata9, _metadata10, _nextProduct$metadata2, _targetProduct$metada20, _tempOrder$products$p, _tempOrder$products$p2;
       var product_id = params.product_id,
         product_variant_id = params.product_variant_id,
         updates = params.updates,
@@ -5192,7 +5538,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       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 callerChangesWeighing = getWeighedProductPriceFingerprint(targetProduct.product_sku) !== getWeighedProductPriceFingerprint(nextProduct.product_sku);
+      var callerChangesLineConfiguration = callerChangesVariant || callerChangesWeighing || 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 || (_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;
@@ -5208,33 +5555,50 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         };
         return hasChangedPrice(updates.selling_price, targetProduct.selling_price) || hasChangedPrice(updates.original_price, targetProduct.original_price);
       }();
+      var weighedSourcePrice = callerChangesWeighing ? resolveWeighedSourcePrice(nextProduct.product_sku) : undefined;
+      var hasResolvedWeighedPrice = weighedSourcePrice !== undefined;
+      if (hasResolvedWeighedPrice && !callerUpdatesSourcePrice) {
+        var _ref84, _targetProduct$metada3, _targetProduct$metada4, _ref85, _targetProduct$metada5, _targetProduct$metada6;
+        var nextMainOriginal = new Decimal(weighedSourcePrice).plus(sumOptionUnitPrice(getProductSkuOptions(nextProduct)));
+        var previousMainOriginal = new Decimal((_ref84 = (_targetProduct$metada3 = (_targetProduct$metada4 = targetProduct.metadata) === null || _targetProduct$metada4 === void 0 ? void 0 : _targetProduct$metada4.main_product_original_price) !== null && _targetProduct$metada3 !== void 0 ? _targetProduct$metada3 : targetProduct.original_price) !== null && _ref84 !== void 0 ? _ref84 : 0);
+        var previousMainSelling = new Decimal((_ref85 = (_targetProduct$metada5 = (_targetProduct$metada6 = targetProduct.metadata) === null || _targetProduct$metada6 === void 0 ? void 0 : _targetProduct$metada6.main_product_selling_price) !== null && _targetProduct$metada5 !== void 0 ? _targetProduct$metada5 : targetProduct.selling_price) !== null && _ref85 !== void 0 ? _ref85 : 0);
+        // A manual final price remains fixed; other legacy discounts keep their amount
+        // until Rules reapplies the currently selected wallet discount below.
+        var nextMainSelling = isManualProductDiscountProduct(nextProduct) ? previousMainSelling : nextMainOriginal.minus(previousMainOriginal.minus(previousMainSelling));
+        nextProduct.metadata = _objectSpread(_objectSpread({}, nextProduct.metadata), {}, {
+          source_product_price: weighedSourcePrice,
+          main_product_original_price: callerUpdatesMainOriginalPrice ? nextProduct.metadata.main_product_original_price : nextMainOriginal.toFixed(2),
+          main_product_selling_price: callerUpdatesMainSellingPrice ? nextProduct.metadata.main_product_selling_price : Decimal.max(0, nextMainSelling).toFixed(2),
+          price_schema_version: 2
+        });
+      }
       if (isPersistedOrderLine && !callerChangesLineConfiguration && !callerUpdatesManualPrice && !callerAllowsBookingReprice) {
-        var _targetProduct$metada3, _targetProduct$metada4, _targetProduct$metada5, _targetProduct$metada6, _targetProduct$metada7;
+        var _targetProduct$metada7, _targetProduct$metada8, _targetProduct$metada9, _targetProduct$metada10, _targetProduct$metada11;
         nextProduct.selling_price = targetProduct.selling_price;
         nextProduct.original_price = targetProduct.original_price;
         nextProduct.payment_price = targetProduct.payment_price;
         nextProduct.metadata = _objectSpread(_objectSpread({}, nextProduct.metadata || {}), {}, {
-          source_product_price: (_targetProduct$metada3 = targetProduct.metadata) === null || _targetProduct$metada3 === void 0 ? void 0 : _targetProduct$metada3.source_product_price,
-          main_product_selling_price: (_targetProduct$metada4 = targetProduct.metadata) === null || _targetProduct$metada4 === void 0 ? void 0 : _targetProduct$metada4.main_product_selling_price,
-          main_product_original_price: (_targetProduct$metada5 = targetProduct.metadata) === null || _targetProduct$metada5 === void 0 ? void 0 : _targetProduct$metada5.main_product_original_price,
-          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
+          source_product_price: (_targetProduct$metada7 = targetProduct.metadata) === null || _targetProduct$metada7 === void 0 ? void 0 : _targetProduct$metada7.source_product_price,
+          main_product_selling_price: (_targetProduct$metada8 = targetProduct.metadata) === null || _targetProduct$metada8 === void 0 ? void 0 : _targetProduct$metada8.main_product_selling_price,
+          main_product_original_price: (_targetProduct$metada9 = targetProduct.metadata) === null || _targetProduct$metada9 === void 0 ? void 0 : _targetProduct$metada9.main_product_original_price,
+          price_schema_version: (_targetProduct$metada10 = (_targetProduct$metada11 = targetProduct.metadata) === null || _targetProduct$metada11 === void 0 ? void 0 : _targetProduct$metada11.price_schema_version) !== null && _targetProduct$metada10 !== void 0 ? _targetProduct$metada10 : 2
         });
         nextProduct.product_bundle = this.preservePersistedBundlePriceFields(targetProduct.product_bundle, nextProduct.product_bundle);
       } else if (callerChangesLineConfiguration && callerUpdatesSourcePrice && (!callerUpdatesMainSellingPrice || !callerUpdatesMainOriginalPrice)) {
-        var _targetProduct$metada8, _targetProduct$metada9;
+        var _targetProduct$metada12, _targetProduct$metada13, _targetProduct$metada14;
         // 新配置只传了 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)));
+        var _previousMainOriginal = new Decimal(Number((_targetProduct$metada12 = targetProduct.metadata) === null || _targetProduct$metada12 === void 0 ? void 0 : _targetProduct$metada12.main_product_original_price) || 0);
+        var _previousMainSelling = new Decimal(Number((_targetProduct$metada13 = (_targetProduct$metada14 = targetProduct.metadata) === null || _targetProduct$metada14 === void 0 ? void 0 : _targetProduct$metada14.main_product_selling_price) !== null && _targetProduct$metada13 !== void 0 ? _targetProduct$metada13 : _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),
+          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) : hasResolvedWeighedPrice && isManualProductDiscountProduct(nextProduct) ? _previousMainSelling.toFixed(2) : _nextMainOriginal.minus(preservedDiscount).toDecimalPlaces(2).toFixed(2),
           price_schema_version: 2
         });
-      } else if (callerChangesVariant && !callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+      } else if (callerChangesVariant && !hasResolvedWeighedPrice && !callerUpdatesTopPrice && !callerUpdatesMainMeta) {
         // variant 已变化但 caller 没有显式报价时，旧 v2 metadata 不能继续充当权威价格源。
         // 清理后由 normalize 优先读取 metadata.origin.variant 中新 variant 的目录价；
         // 顶层 original/selling 的旧差额仍会作为 legacy discount 迁移到新价格。
@@ -5244,24 +5608,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         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 _ref71, _targetProduct$metada10, _targetProduct$metada11, _ref72, _targetProduct$metada12, _targetProduct$metada13, _targetProduct$metada14;
+      } else if (callerChangesLineConfiguration && !hasResolvedWeighedPrice && !callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+        var _ref86, _targetProduct$metada15, _targetProduct$metada16, _ref87, _targetProduct$metada17, _targetProduct$metada18, _targetProduct$metada19;
         // 仅 option / bundle 变化时，保留历史 source 和主商品折扣金额，
         // 但必须让 original 与 selling 一起随新的 option 金额移动。
         var previousOptionSum = sumOptionUnitPrice(getProductSkuOptions(targetProduct));
         var nextOptionSum = sumOptionUnitPrice(getProductSkuOptions(nextProduct));
-        var _previousMainOriginal = new Decimal(Number((_ref71 = (_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 && _ref71 !== void 0 ? _ref71 : 0) || 0);
-        var _previousMainSelling = new Decimal(Number((_ref72 = (_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 && _ref72 !== void 0 ? _ref72 : _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);
+        var _previousMainOriginal2 = new Decimal(Number((_ref86 = (_targetProduct$metada15 = (_targetProduct$metada16 = targetProduct.metadata) === null || _targetProduct$metada16 === void 0 ? void 0 : _targetProduct$metada16.main_product_original_price) !== null && _targetProduct$metada15 !== void 0 ? _targetProduct$metada15 : targetProduct.original_price) !== null && _ref86 !== void 0 ? _ref86 : 0) || 0);
+        var _previousMainSelling2 = new Decimal(Number((_ref87 = (_targetProduct$metada17 = (_targetProduct$metada18 = targetProduct.metadata) === null || _targetProduct$metada18 === void 0 ? void 0 : _targetProduct$metada18.main_product_selling_price) !== null && _targetProduct$metada17 !== void 0 ? _targetProduct$metada17 : targetProduct.selling_price) !== null && _ref87 !== void 0 ? _ref87 : _previousMainOriginal2.toNumber()) || 0);
+        var _preservedDiscount = _previousMainOriginal2.minus(_previousMainSelling2);
+        var previousSource = ((_targetProduct$metada19 = targetProduct.metadata) === null || _targetProduct$metada19 === void 0 ? void 0 : _targetProduct$metada19.source_product_price) != null ? new Decimal(Number(targetProduct.metadata.source_product_price) || 0) : _previousMainOriginal2.minus(previousOptionSum);
+        var _nextMainOriginal2 = 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),
+          main_product_original_price: _nextMainOriginal2.toDecimalPlaces(2).toFixed(2),
+          main_product_selling_price: _nextMainOriginal2.minus(_preservedDiscount).toDecimalPlaces(2).toFixed(2),
           price_schema_version: 2
         });
-      } else if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+      } else if (callerUpdatesTopPrice && !callerUpdatesMainMeta && !hasResolvedWeighedPrice) {
         var _existedMeta = nextProduct.metadata || {};
         nextProduct.metadata = _objectSpread({}, _existedMeta);
         delete nextProduct.metadata.source_product_price;
@@ -5269,11 +5633,40 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         delete nextProduct.metadata.main_product_original_price;
         delete nextProduct.metadata.price_schema_version;
       }
+      if (callerChangesLineConfiguration && resolveWeighedSourcePrice(nextProduct.product_sku) !== undefined && nextProduct.metadata.main_product_original_price != null && nextProduct.metadata.main_product_selling_price != null && isManualProductDiscountProduct(nextProduct)) {
+        var _nextProduct$metadata;
+        var originalPrice = composeLinePrice({
+          mainPrice: nextProduct.metadata.main_product_original_price,
+          bundle: withOriginalBundleOptionPrices(nextProduct.product_bundle),
+          useOriginalBundle: true
+        });
+        var sellingPrice = composeLinePrice({
+          mainPrice: nextProduct.metadata.main_product_selling_price,
+          bundle: nextProduct.product_bundle
+        });
+        var previousManualDiscount = findManualProductDiscountItem(nextProduct.discount_list);
+        nextProduct.original_price = originalPrice;
+        nextProduct.metadata = _objectSpread(_objectSpread({}, nextProduct.metadata), {}, {
+          origin: _objectSpread(_objectSpread({}, nextProduct.metadata.origin), {}, {
+            _extend: _objectSpread(_objectSpread({}, (_nextProduct$metadata = nextProduct.metadata.origin) === null || _nextProduct$metadata === void 0 ? void 0 : _nextProduct$metadata._extend), {}, {
+              origin_total: Number(originalPrice)
+            })
+          })
+        });
+        nextProduct.discount_list = mergeManualProductDiscountIntoList(nextProduct.discount_list, buildManualProductDiscountItem({
+          originTotal: Number(originalPrice),
+          sellingTotal: Number(sellingPrice),
+          quantity: nextProduct.num,
+          message: previousManualDiscount === null || previousManualDiscount === void 0 ? void 0 : previousManualDiscount.discount.message,
+          discountway: previousManualDiscount === null || previousManualDiscount === void 0 ? void 0 : previousManualDiscount.discount.discountway,
+          discount_per: previousManualDiscount === null || previousManualDiscount === void 0 ? void 0 : previousManualDiscount.discount.discount_per
+        }));
+      }
       // normalizeOrderProduct 幂等：v2 metadata 存在 → 保留 main_product_* 折扣重算 composite；
       // 否则 → 把顶层 selling_price 视作 source，派生 main_product_* 并写 price_schema_version: 2。
       var normalizedProduct = this.normalizeVirtualSettlementProductIfEnabled(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$metada15 = targetProduct.metadata) === null || _targetProduct$metada15 === void 0 ? void 0 : _targetProduct$metada15.booking_uid);
+      normalizedProduct.discount_list = normalizeOrderProductDiscountList(isPersistedOrderLine ? syncReducedEntitlementPassUsageCount(normalizedProduct.discount_list, targetProduct.num, normalizedProduct.num) : normalizedProduct.discount_list);
+      var preservedBookingUid = nextProduct.booking_uid || ((_nextProduct$metadata2 = nextProduct.metadata) === null || _nextProduct$metadata2 === void 0 ? void 0 : _nextProduct$metadata2.booking_uid) || targetProduct.booking_uid || ((_targetProduct$metada20 = targetProduct.metadata) === null || _targetProduct$metada20 === void 0 ? void 0 : _targetProduct$metada20.booking_uid);
       if (!booking && preservedBookingUid) {
         normalizedProduct.booking_uid = preservedBookingUid;
         normalizedProduct.metadata = _objectSpread(_objectSpread({}, normalizedProduct.metadata || {}), {}, {
@@ -5281,8 +5674,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         });
       }
       if (booking) {
-        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());
+        var _normalizedProduct$me, _targetProduct$metada21;
+        var productUid = String(((_normalizedProduct$me = normalizedProduct.metadata) === null || _normalizedProduct$me === void 0 ? void 0 : _normalizedProduct$me.unique_identification_number) || ((_targetProduct$metada21 = targetProduct.metadata) === null || _targetProduct$metada21 === void 0 ? void 0 : _targetProduct$metada21.unique_identification_number) || unique_identification_number || createUuidV4());
         normalizedProduct.metadata = _objectSpread(_objectSpread({}, normalizedProduct.metadata || {}), {}, {
           unique_identification_number: productUid
         });
@@ -5302,6 +5695,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         });
         tempOrder.bookings = [].concat(_toConsumableArray(tempOrder.bookings || []), [linked.booking]);
       }
+      if (callerChangesWeighing && !isManualProductDiscountProduct(normalizedProduct)) {
+        var _normalizedProduct$me2;
+        var uid = (_normalizedProduct$me2 = normalizedProduct.metadata) === null || _normalizedProduct$me2 === void 0 ? void 0 : _normalizedProduct$me2.unique_identification_number;
+        if (uid) reapplyWeighedDiscountProductUids === null || reapplyWeighedDiscountProductUids === void 0 || reapplyWeighedDiscountProductUids.push(String(uid));
+      }
       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);
@@ -5311,32 +5709,34 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderProduct",
     value: function () {
       var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(params) {
-        var tempOrder, updatedProductUid, promotionPayload;
+        var tempOrder, reapplyWeighedDiscountProductUids, updatedProductUid, promotionPayload;
         return _regeneratorRuntime().wrap(function _callee25$(_context27) {
           while (1) switch (_context27.prev = _context27.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
-              updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params);
-              _context27.next = 4;
+              reapplyWeighedDiscountProductUids = [];
+              updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids);
+              _context27.next = 5;
               return this.evaluatePromotion();
-            case 4:
+            case 5:
               promotionPayload = _context27.sent;
               this.applyDiscount({
+                reapplyWeighedDiscountProductUids: reapplyWeighedDiscountProductUids,
                 reapplyBookingDiscountProductUids: params.allow_booking_discount_reapply && updatedProductUid ? [String(updatedProductUid)] : undefined
               });
               this.sanitizeTempOrderProducts(tempOrder);
-              _context27.next = 9;
+              _context27.next = 10;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 9:
+            case 10:
               this.persistTempOrder();
               this.emitPromotionApplied(promotionPayload);
               this.logInfo('updateOrderProduct success', {
                 params: params
               });
               return _context27.abrupt("return", tempOrder.products);
-            case 13:
+            case 14:
             case "end":
               return _context27.stop();
           }
@@ -5351,8 +5751,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderProducts",
     value: function () {
       var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(paramsList) {
-        var _this32 = this;
-        var tempOrder, reapplyBookingDiscountProductUids;
+        var _this36 = this;
+        var tempOrder, reapplyWeighedDiscountProductUids, reapplyBookingDiscountProductUids;
         return _regeneratorRuntime().wrap(function _callee26$(_context28) {
           while (1) switch (_context28.prev = _context28.next) {
             case 0:
@@ -5363,24 +5763,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               return _context28.abrupt("return", tempOrder.products);
             case 3:
+              reapplyWeighedDiscountProductUids = [];
               reapplyBookingDiscountProductUids = paramsList.reduce(function (acc, params) {
-                var updatedProductUid = _this32.applyOrderProductUpdateToTempOrder(tempOrder, params);
+                var updatedProductUid = _this36.applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids);
                 // 批量改预约时间时，延迟到最后一次折扣计算里统一恢复已选预约折扣卡。
                 if (params.allow_booking_discount_reapply && updatedProductUid) {
                   acc.push(String(updatedProductUid));
                 }
                 return acc;
               }, []);
-              _context28.next = 6;
+              _context28.next = 7;
               return this.finalizeAfterProductsMutation(tempOrder, {
+                reapplyWeighedDiscountProductUids: reapplyWeighedDiscountProductUids,
                 reapplyBookingDiscountProductUids: reapplyBookingDiscountProductUids.length ? reapplyBookingDiscountProductUids : undefined
               });
-            case 6:
+            case 7:
               this.logInfo('updateOrderProduct success', {
                 paramsList: paramsList
               });
               return _context28.abrupt("return", tempOrder.products);
-            case 8:
+            case 9:
             case "end":
               return _context28.stop();
           }
@@ -5395,8 +5797,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderProductQuantity",
     value: function () {
       var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(params) {
-        var _targetProduct$metada17;
-        var product_id, product_variant_id, num, unique_identification_number, identity_key, product_sku, product_bundle, tempOrder, identityLookup, productIndex, targetUid, targetProduct, normalizedProduct, settlementSnapshot, currencyProductId, asset, requiredAmount, balance, isVirtualSettlement, promotionPayload;
+        var _targetProduct$metada22;
+        var product_id, product_variant_id, num, unique_identification_number, identity_key, product_sku, product_bundle, tempOrder, identityLookup, productIndex, targetUid, targetProduct, isPersistedOrderLine, normalizedProduct, settlementSnapshot, currencyProductId, asset, requiredAmount, balance, isVirtualSettlement, promotionPayload;
         return _regeneratorRuntime().wrap(function _callee27$(_context29) {
           while (1) switch (_context29.prev = _context29.next) {
             case 0:
@@ -5434,16 +5836,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               throw new Error('[Order] 目标商品不存在，无法更新数量');
             case 13:
               targetProduct = tempOrder.products[productIndex];
+              isPersistedOrderLine = targetProduct.order_detail_id !== undefined && targetProduct.order_detail_id !== null;
               normalizedProduct = this.normalizeVirtualSettlementProductIfEnabled(normalizeOrderProduct(_objectSpread(_objectSpread({}, targetProduct), {}, {
                 num: getSafeProductNum(num),
                 metadata: _objectSpread(_objectSpread({}, targetProduct.metadata || {}), {}, {
-                  unique_identification_number: ((_targetProduct$metada17 = targetProduct.metadata) === null || _targetProduct$metada17 === void 0 ? void 0 : _targetProduct$metada17.unique_identification_number) || unique_identification_number
+                  unique_identification_number: ((_targetProduct$metada22 = targetProduct.metadata) === null || _targetProduct$metada22 === void 0 ? void 0 : _targetProduct$metada22.unique_identification_number) || unique_identification_number
                 })
               })));
-              normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
+              normalizedProduct.discount_list = normalizeOrderProductDiscountList(isPersistedOrderLine ? syncReducedEntitlementPassUsageCount(normalizedProduct.discount_list, targetProduct.num, normalizedProduct.num) : normalizedProduct.discount_list);
               settlementSnapshot = getSelectedSettlementSnapshot(normalizedProduct);
               if (!(this.isMultiCurrencySettlementEnabled() && (settlementSnapshot === null || settlementSnapshot === void 0 ? void 0 : settlementSnapshot.settlement_type) === 'virtual_currency' && tempOrder.customer_id && Number(tempOrder.customer_id) !== 1)) {
-                _context29.next = 26;
+                _context29.next = 27;
                 break;
               }
               currencyProductId = Number(settlementSnapshot.currency_product_id);
@@ -5451,11 +5854,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return Number(item === null || item === void 0 ? void 0 : item.product_id) === currencyProductId;
               });
               if (asset) {
-                _context29.next = 22;
+                _context29.next = 23;
                 break;
               }
               throw new VirtualCurrencyAssetNotFoundError(currencyProductId);
-            case 22:
+            case 23:
               requiredAmount = tempOrder.products.reduce(function (sum, item, index) {
                 var current = index === productIndex ? normalizedProduct : item;
                 var currentSnapshot = getSelectedSettlementSnapshot(current);
@@ -5463,44 +5866,44 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }, new Decimal(0));
               balance = new Decimal(asset.balance || 0);
               if (!balance.lt(requiredAmount)) {
-                _context29.next = 26;
+                _context29.next = 27;
                 break;
               }
               throw new VirtualCurrencyBalanceError(balance.toFixed(2), requiredAmount.toFixed(2));
-            case 26:
+            case 27:
               tempOrder.products[productIndex] = normalizedProduct;
               this.prepareVirtualSettlementTempOrder(tempOrder);
               isVirtualSettlement = this.isActiveVirtualSettlementOrder(tempOrder);
               if (isVirtualSettlement) {
-                _context29.next = 35;
+                _context29.next = 36;
                 break;
               }
-              _context29.next = 32;
+              _context29.next = 33;
               return this.evaluatePromotion();
-            case 32:
+            case 33:
               _context29.t0 = _context29.sent;
-              _context29.next = 36;
+              _context29.next = 37;
               break;
-            case 35:
-              _context29.t0 = null;
             case 36:
+              _context29.t0 = null;
+            case 37:
               promotionPayload = _context29.t0;
               if (!isVirtualSettlement) {
                 this.applyDiscount();
               }
               this.sanitizeTempOrderProducts(tempOrder);
-              _context29.next = 41;
+              _context29.next = 42;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 41:
+            case 42:
               this.persistTempOrder();
               this.emitPromotionApplied(promotionPayload);
               this.logInfo('updateOrderProductQuantity success', {
                 params: params
               });
               return _context29.abrupt("return", tempOrder.products);
-            case 45:
+            case 46:
             case "end":
               return _context29.stop();
           }
@@ -5558,7 +5961,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 3:
               promotionPayload = _context30.sent;
               this.applyDiscount({
-                reapplyBookingDiscountProductUids: options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids
+                reapplyBookingDiscountProductUids: options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids,
+                reapplyWeighedDiscountProductUids: options === null || options === void 0 ? void 0 : options.reapplyWeighedDiscountProductUids
               });
               this.sanitizeTempOrderProducts(tempOrder);
               _context30.next = 8;
@@ -5590,7 +5994,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "removeProductsFromOrder",
     value: (function () {
       var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(identities, options) {
-        var _this33 = this;
+        var _this37 = this;
         var tempOrder, productsBeforeRemove, bookingsBeforeRemove, preserveDisplayPosition, anchorIndex, productsAfterAnchor, matchedProducts, removedProducts, _i2, _removedProducts, product, linkedBookingUidsToRemove, _iterator21, _step21, _loop3, remainingProductIndex, remainingProduct, nextProduct, productsWithoutRemaining, nextProductIndex;
         return _regeneratorRuntime().wrap(function _callee29$(_context32) {
           while (1) switch (_context32.prev = _context32.next) {
@@ -5655,7 +6059,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }
                       if (productUid !== undefined && productUid !== null && productUid !== '') {
                         bookingsBeforeRemove.forEach(function (booking) {
-                          var bookingUid = _this33.getBookingUniqueIdentificationNumber(booking);
+                          var bookingUid = _this37.getBookingUniqueIdentificationNumber(booking);
                           if (bookingUid && String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === String(productUid)) {
                             linkedBookingUidsToRemove.add(bookingUid);
                           }
@@ -5870,23 +6274,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildCurrentSubmitPayloadForLocalPrint",
     value: function buildCurrentSubmitPayloadForLocalPrint(params) {
-      var _params$cacheId, _this$otherParams5, _ref73, _params$businessCode, _this$otherParams6, _this$otherParams7;
+      var _params$cacheId, _this$otherParams5, _ref88, _params$businessCode, _this$otherParams6, _this$otherParams7;
       var tempOrder = this.ensureTempOrder();
       this.persistTempOrder();
       var payload = buildSubmitPayload({
         tempOrder: tempOrder,
         cacheId: (_params$cacheId = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId !== void 0 ? _params$cacheId : this.cacheId,
         platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.platform),
-        businessCode: (_ref73 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.businessCode) !== null && _ref73 !== void 0 ? _ref73 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.business_code,
+        businessCode: (_ref88 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.businessCode) !== null && _ref88 !== void 0 ? _ref88 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.business_code,
         channel: params === null || params === void 0 ? void 0 : params.channel,
         type: params === null || params === void 0 ? void 0 : params.type,
         summary: this.store.summary || createEmptySummary(),
         enhance: function enhance(nextPayload) {
-          var _ref74, _tempOrder$order_numb, _ref75, _tempOrder$shop_order2, _ref76, _tempOrder$shop_full_;
+          var _ref89, _tempOrder$order_numb, _ref90, _tempOrder$shop_order2, _ref91, _tempOrder$shop_full_;
           return _objectSpread(_objectSpread({}, nextPayload), {}, {
-            order_number: (_ref74 = (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : nextPayload.order_number) !== null && _ref74 !== void 0 ? _ref74 : null,
-            shop_order_number: (_ref75 = (_tempOrder$shop_order2 = tempOrder.shop_order_number) !== null && _tempOrder$shop_order2 !== void 0 ? _tempOrder$shop_order2 : nextPayload.shop_order_number) !== null && _ref75 !== void 0 ? _ref75 : null,
-            shop_full_order_number: (_ref76 = (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : nextPayload.shop_full_order_number) !== null && _ref76 !== void 0 ? _ref76 : null,
+            order_number: (_ref89 = (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : nextPayload.order_number) !== null && _ref89 !== void 0 ? _ref89 : null,
+            shop_order_number: (_ref90 = (_tempOrder$shop_order2 = tempOrder.shop_order_number) !== null && _tempOrder$shop_order2 !== void 0 ? _tempOrder$shop_order2 : nextPayload.shop_order_number) !== null && _ref90 !== void 0 ? _ref90 : null,
+            shop_full_order_number: (_ref91 = (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : nextPayload.shop_full_order_number) !== null && _ref91 !== void 0 ? _ref91 : null,
             small_ticket_data_flag: 1
           });
         }
@@ -6050,7 +6454,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "runSubmitTempOrder",
     value: function () {
       var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(params) {
-        var _params$cacheId3, _this$otherParams12, _ref77, _ref78, _submitSnapshot$busin, _this$otherParams13, _this$otherParams14, _submitSnapshot$type;
+        var _params$cacheId3, _this$otherParams12, _ref92, _ref93, _submitSnapshot$busin, _this$otherParams13, _this$otherParams14, _submitSnapshot$type;
         var tempOrder, isOnlineStorePlatform, shouldConfirmPendingVoucherPayments, hasPaymentOverride, preparedPaymentOverride, latestSummary, effectiveCacheId, hasPaymentStatusOverride, shouldOverridePaymentStatus, hasSmallTicketDataFlagOverride, enhancePayload, submitSnapshot, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, isLocalPendingSubmit, salesNotesState, submittedOrderId, resultRecord;
         return _regeneratorRuntime().wrap(function _callee37$(_context40) {
           while (1) switch (_context40.prev = _context40.next) {
@@ -6117,7 +6521,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder,
                 cacheId: effectiveCacheId,
                 platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.platform),
-                businessCode: (_ref77 = (_ref78 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref78 !== void 0 ? _ref78 : (_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.businessCode) !== null && _ref77 !== void 0 ? _ref77 : (_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.business_code,
+                businessCode: (_ref92 = (_ref93 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref93 !== void 0 ? _ref93 : (_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.businessCode) !== null && _ref92 !== void 0 ? _ref92 : (_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.business_code,
                 channel: params === null || params === void 0 ? void 0 : params.channel,
                 type: (_submitSnapshot$type = submitSnapshot.type) !== null && _submitSnapshot$type !== void 0 ? _submitSnapshot$type : params === null || params === void 0 ? void 0 : params.type,
                 summary: latestSummary,
@@ -6287,10 +6691,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function extractSubmitErrorResponse(error) {
       var _error$response,
         _error$response2,
-        _this34 = this;
+        _this38 = 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 _this34.isSubmitErrorResponse(candidate);
+        return _this38.isSubmitErrorResponse(candidate);
       }) || null;
     }
   }, {
@@ -6318,7 +6722,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "syncPaymentsToOrder",
     value: function () {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(params) {
-        var _this35 = this,
+        var _this39 = this,
           _params$confirmPendin;
         var tempOrder, needsPaymentNumber, devicePrefix, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, orderPaidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, enhancePayload, submitParams, submitResult;
         return _regeneratorRuntime().wrap(function _callee39$(_context42) {
@@ -6343,7 +6747,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 9:
               devicePrefix = _context42.t0;
               mappedPayments = mapPaymentItemsToOrderPayments((params.payments || []).map(function (payment) {
-                return _this35.normalizePaymentSource(payment, {
+                return _this39.normalizePaymentSource(payment, {
                   defaultPaid: false,
                   devicePrefix: devicePrefix
                 });
@@ -6422,7 +6826,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createOrder",
     value: function createOrder(params) {
-      var _this36 = this;
+      var _this40 = this;
       var order = _objectSpread({
         type: (params === null || params === void 0 ? void 0 : params.type) || 'appointment_booking',
         // 要从外面拿，virtual
@@ -6454,7 +6858,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
 
           // 为预约补齐 holder 信息
           if (params !== null && params !== void 0 && (_params$extraData = params.extraData) !== null && _params$extraData !== void 0 && _params$extraData.is_add_holder_info) {
-            ensureCartItemOriginHolder(item, _this36.window);
+            ensureCartItemOriginHolder(item, _this40.window);
           }
 
           // 购物车是否为普通商品
@@ -6754,17 +7158,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "submitSalesOrder",
     value: function () {
       var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee44(params) {
-        var url, query, fetchUrl;
+        var url, query, fetchUrl, requestQuery;
         return _regeneratorRuntime().wrap(function _callee44$(_context47) {
           while (1) switch (_context47.prev = _context47.next) {
             case 0:
               url = params.url, query = params.query;
               fetchUrl = url || '/order/sales/checkout';
-              return _context47.abrupt("return", this.request.post(fetchUrl, query, {
+              requestQuery = this.isSalesCheckoutHandledByOsServer(fetchUrl) ? query : stripOsPrivatePayloadFields(query);
+              return _context47.abrupt("return", this.request.post(fetchUrl, requestQuery, {
                 osServer: true,
                 customToast: function customToast() {}
               }));
-            case 3:
+            case 4:
             case "end":
               return _context47.stop();
           }
@@ -6775,6 +7180,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return submitSalesOrder;
     }()
+  }, {
+    key: "isSalesCheckoutHandledByOsServer",
+    value: function isSalesCheckoutHandledByOsServer(fetchUrl) {
+      var _this$core2, _this$request;
+      var server = (_this$core2 = this.core) === null || _this$core2 === void 0 ? void 0 : _this$core2.server;
+      if (!server || typeof server.hasRoute !== 'function') return false;
+      var requestBaseUrl = String(((_this$request = this.request) === null || _this$request === void 0 ? void 0 : _this$request.baseUrl) || '/shop').replace(/\/+$/, '');
+      if (!requestBaseUrl.startsWith('/')) return false;
+      var normalizedFetchUrl = fetchUrl.startsWith('/') ? fetchUrl : "/".concat(fetchUrl);
+      var routePath = normalizedFetchUrl === requestBaseUrl || normalizedFetchUrl.startsWith("".concat(requestBaseUrl, "/")) ? normalizedFetchUrl : "".concat(requestBaseUrl).concat(normalizedFetchUrl);
+      return server.hasRoute('post', routePath) === true;
+    }
+
     /**
      * 发送支付链接邮件。
      *
@@ -6916,8 +7334,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 allowUnresolvedSalesNotes: isSessionStorageHydrate
               });
               this.store.tempOrder = nextTempOrder;
+              this.clearCustomerWalletRuntimeState();
               if (!isSessionStorageHydrate) {
-                _context50.next = 30;
+                _context50.next = 31;
                 break;
               }
               // 会话快照是未提交购物车，不应获得编辑订单的 saved/edit 标记与服务端基线。
@@ -6933,24 +7352,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               nextTempOrder.discount_list = restoredSessionDiscounts;
               this.store.summary = createEmptySummary();
               this.store.lastOrderInfo = undefined;
-              _context50.next = 23;
+              _context50.next = 24;
               return (_this$store$discount24 = this.store.discount) === null || _this$store$discount24 === void 0 ? void 0 : _this$store$discount24.setOriginalDiscountList(cloneDeep(restoredSessionDiscounts));
-            case 23:
-              _context50.next = 25;
+            case 24:
+              _context50.next = 26;
               return (_this$store$discount25 = this.store.discount) === null || _this$store$discount25 === void 0 ? void 0 : _this$store$discount25.setDiscountList(cloneDeep(restoredSessionDiscounts));
-            case 25:
+            case 26:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context50.next = 28;
+                _context50.next = 29;
                 break;
               }
-              _context50.next = 28;
+              _context50.next = 29;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 28:
+            case 29:
               this.persistTempOrder();
               return _context50.abrupt("return", nextTempOrder);
-            case 30:
+            case 31:
               // Server list compatibility may synthesize order_id from external_sale_number; tempOrder must not.
               sourceLastOrderInfo = sourceRaw.lastOrderInfo || sourceRaw;
               isDraftOrder = Number(nextTempOrder.is_draft_order || 0) === 1;
@@ -7001,28 +7420,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               nextDiscounts = [].concat(_toConsumableArray(hydratedEditDiscounts), _toConsumableArray(retainedScanDiscounts));
               shouldSkipEmptyDiscountSync = nextDiscounts.length === 0 && currentDiscounts.length === 0;
               if (shouldSkipEmptyDiscountSync) {
-                _context50.next = 54;
+                _context50.next = 55;
                 break;
               }
               OrderModule.populateSavedAmounts(nextTempOrder.products, nextDiscounts);
-              _context50.next = 52;
+              _context50.next = 53;
               return (_this$store$discount27 = this.store.discount) === null || _this$store$discount27 === void 0 ? void 0 : _this$store$discount27.setOriginalDiscountList(nextDiscounts);
-            case 52:
-              _context50.next = 54;
+            case 53:
+              _context50.next = 55;
               return (_this$store$discount28 = this.store.discount) === null || _this$store$discount28 === void 0 ? void 0 : _this$store$discount28.setDiscountList(nextDiscounts);
-            case 54:
+            case 55:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context50.next = 57;
+                _context50.next = 58;
                 break;
               }
-              _context50.next = 57;
+              _context50.next = 58;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 57:
+            case 58:
               this.persistTempOrder();
               return _context50.abrupt("return", nextTempOrder);
-            case 59:
+            case 60:
             case "end":
               return _context50.stop();
           }
@@ -7081,10 +7500,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _step22;
       try {
         for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
-          var _product$metadata11;
+          var _product$metadata13;
           var product = _step22.value;
           var productUid = getOrderCollectionUid('product', product);
-          var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata11 = product.metadata) === null || _product$metadata11 === void 0 ? void 0 : _product$metadata11.booking_uid);
+          var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata13 = product.metadata) === null || _product$metadata13 === void 0 ? void 0 : _product$metadata13.booking_uid);
           if (!productUid || bookingUid === undefined || bookingUid === null || bookingUid === '') {
             continue;
           }
@@ -7142,7 +7561,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeTempOrderForRuntime",
     value: function normalizeTempOrderForRuntime(raw, options) {
-      var _this37 = this,
+      var _this41 = this,
         _raw$_extend;
       var runtimeRaw = this.withoutSyntheticDraftOrderIdForRuntime(raw);
       var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), runtimeRaw || {});
@@ -7167,12 +7586,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 _this37.normalizeHydratedOrderProduct(p, {
+        return _this41.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 = _this37.normalizeHydratedBookingHolder(b || {});
+        var booking = _this41.normalizeHydratedBookingHolder(b || {});
         return _objectSpread(_objectSpread({}, booking), {}, {
           is_all: normalizeBookingIsAll(booking),
           sub_type: normalizeBookingSubType(booking)
@@ -7222,15 +7641,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _step24;
       try {
         for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
-          var _product$metadata12, _ref79, _ref80, _existed$origin, _rawProduct$metadata;
+          var _product$metadata14, _ref94, _ref95, _existed$origin, _rawProduct$metadata;
           var _step24$value = _slicedToArray(_step24.value, 2),
             index = _step24$value[0],
             product = _step24$value[1];
-          var uid = (_product$metadata12 = product.metadata) === null || _product$metadata12 === void 0 ? void 0 : _product$metadata12.unique_identification_number;
+          var uid = (_product$metadata14 = product.metadata) === null || _product$metadata14 === void 0 ? void 0 : _product$metadata14.unique_identification_number;
           if (!uid) continue;
           var existed = productsByUid[uid] && _typeof(productsByUid[uid]) === 'object' ? productsByUid[uid] : {};
           var rawProduct = rawProducts[index] && _typeof(rawProducts[index]) === 'object' ? rawProducts[index] : product;
-          var origin = (_ref79 = (_ref80 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref80 !== void 0 ? _ref80 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref79 !== void 0 ? _ref79 : rawProduct;
+          var origin = (_ref94 = (_ref95 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref95 !== void 0 ? _ref95 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref94 !== void 0 ? _ref94 : rawProduct;
           var originSnapshot = cloneDeep(origin);
           var productOptionString = this.buildHydratedProductOptionString(rawProduct) || this.buildHydratedProductOptionString(product);
           if (productOptionString && originSnapshot && _typeof(originSnapshot) === 'object') {
@@ -7281,8 +7700,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var bookingUidByProductUid = new Map();
       var productByUid = new Map();
       (tempOrder.products || []).forEach(function (product) {
-        var _product$metadata13;
-        var productUid = (product === null || product === void 0 || (_product$metadata13 = product.metadata) === null || _product$metadata13 === void 0 ? void 0 : _product$metadata13.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+        var _product$metadata15;
+        var productUid = (product === null || product === void 0 || (_product$metadata15 = product.metadata) === null || _product$metadata15 === void 0 ? void 0 : _product$metadata15.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
         if (productUid !== undefined && productUid !== null && String(productUid) !== '') {
           productByUid.set(String(productUid), product);
         }
@@ -7303,8 +7722,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         bookingUidByProductUid.set(String(productUid), bookingUid);
       });
       (tempOrder.products || []).forEach(function (product) {
-        var _product$metadata14;
-        var productUid = (product === null || product === void 0 || (_product$metadata14 = product.metadata) === null || _product$metadata14 === void 0 ? void 0 : _product$metadata14.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+        var _product$metadata16;
+        var productUid = (product === null || product === void 0 || (_product$metadata16 = product.metadata) === null || _product$metadata16 === void 0 ? void 0 : _product$metadata16.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
         if (productUid === undefined || productUid === null || String(productUid) === '') return;
         var bookingUid = bookingUidByProductUid.get(String(productUid));
         if (!bookingUid) return;
@@ -7359,10 +7778,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedProductOptionItem",
     value: function normalizeHydratedProductOptionItem(optionItem) {
-      var _ref81, _optionItem$num, _ref82, _optionItem$add_price;
-      var rawNum = (_ref81 = (_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 && _ref81 !== void 0 ? _ref81 : 1;
+      var _ref96, _optionItem$num, _ref97, _optionItem$add_price;
+      var rawNum = (_ref96 = (_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 && _ref96 !== void 0 ? _ref96 : 1;
       var parsedNum = Number(rawNum);
-      var rawPrice = (_ref82 = (_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 && _ref82 !== void 0 ? _ref82 : 0;
+      var rawPrice = (_ref97 = (_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 && _ref97 !== void 0 ? _ref97 : 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,
@@ -7379,7 +7798,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedOrderProduct",
     value: function normalizeHydratedOrderProduct(product, options) {
-      var _this38 = this;
+      var _this42 = this;
       var row = _objectSpread({}, product || {});
       if (row.num === undefined && row.product_quantity !== undefined) {
         row.num = row.product_quantity;
@@ -7387,7 +7806,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 _this38.normalizeHydratedProductOptionItem(optionItem || {});
+          return _this42.normalizeHydratedProductOptionItem(optionItem || {});
         }))
       });
       delete row["product_".concat('option', "_item")];
@@ -7475,8 +7894,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getVouchers",
     value: function getVouchers() {
-      var _this$store$tempOrder6;
-      return ((_this$store$tempOrder6 = this.store.tempOrder) === null || _this$store$tempOrder6 === void 0 ? void 0 : _this$store$tempOrder6.vouchers) || [];
+      var _this$store$tempOrder8;
+      return ((_this$store$tempOrder8 = this.store.tempOrder) === null || _this$store$tempOrder8 === void 0 ? void 0 : _this$store$tempOrder8.vouchers) || [];
     }
   }], [{
     key: "populateSavedAmounts",
@@ -7495,11 +7914,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         targetMap.set(discountKey, (targetMap.get(discountKey) || new Decimal(0)).plus(amount));
       };
       var addProductDiscountAmount = function addProductDiscountAmount(discount, quantity, isPersistedProduct) {
-        var _discount$discount3, _discount$metadata;
+        var _discount$discount3, _discount$metadata2;
         var discountKey = ((_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.resource_id) || discount.id;
         if (discountKey == null) return;
         var qty = Number(quantity) || 1;
-        var amount = new Decimal(discount.amount || 0).times(qty).plus(((_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.product_discount_difference) || 0);
+        var amount = new Decimal(discount.amount || 0).times(qty).plus(((_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.product_discount_difference) || 0);
         addDiscountAmount(savedMap, discountKey, amount);
         addDiscountAmount(isPersistedProduct || discount.order_discount_id != null ? editModeSavedMap : runtimeSavedMap, discountKey, amount);
       };