@pisell/pisellos 2.1.174 → 2.1.176

package/dist/modules/Rules/index.js

@@ -1,3 +1,4 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
@@ -7,7 +8,6 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 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); }); }; }
@@ -31,13 +31,6 @@ import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils"
 import Decimal from 'decimal.js';
 import { isBoolean } from 'lodash-es';
 import dayjs from 'dayjs';
-import { WalletPassEvaluator } from "../../model/strategy/adapter/walletPass/evaluator";
-import { compareEntitlementPassPriority, getRemainingEntitlementUses, isEntitlementPass, isFullCoveragePass, resolveEntitlementQuota } from "../Discount/entitlementPass";
-import { getDiscountUsageBlockReason, getDiscountUsageLimitFailKey } from "../Discount/availability";
-import { withCommittedEntitlementDetails, isPersistedEntitlementLine } from "../Discount/entitlementState";
-import { getDiscountTimeUnavailableReason } from "../../solution/ShopDiscount/utils";
-import { cloneDeep } from 'lodash-es';
-import { prepareEntitlementLines, finalizeEntitlementLines, isEntitlementRuntimeLine, rebuildEntitlementLine } from "./entitlementLines";
 
 // 临时变量
 var flatItem;
@@ -52,23 +45,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
     _defineProperty(_assertThisInitialized(_this), "hooks", void 0);
-    _defineProperty(_assertThisInitialized(_this), "entitlementPassEnabled", false);
-    _defineProperty(_assertThisInitialized(_this), "defaultWalletPassEvaluator", void 0);
     _this.hooks = {};
     return _this;
   }
   _createClass(RulesModule, [{
-    key: "setEntitlementPassEnabled",
-    value: function setEntitlementPassEnabled(enabled) {
-      this.entitlementPassEnabled = enabled;
-    }
-  }, {
-    key: "getWalletPassEvaluator",
-    value: function getWalletPassEvaluator() {
-      var _this$core, _this$core$getWalletP, _this$defaultWalletPa;
-      return ((_this$core = this.core) === null || _this$core === void 0 || (_this$core = _this$core.getPlugin('window')) === null || _this$core === void 0 || (_this$core$getWalletP = _this$core.getWalletPassEvaluator) === null || _this$core$getWalletP === void 0 ? void 0 : _this$core$getWalletP.call(_this$core)) || ((_this$defaultWalletPa = this.defaultWalletPassEvaluator) !== null && _this$defaultWalletPa !== void 0 ? _this$defaultWalletPa : this.defaultWalletPassEvaluator = new WalletPassEvaluator());
-    }
-  }, {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
@@ -115,69 +95,35 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
     value: function getRulesList() {
       return this.store.rulesList;
     }
-  }, {
-    key: "normalizeHolderRecordIds",
-    value: function normalizeHolderRecordIds(value) {
-      var records = Array.isArray(value) ? value : [value];
-      return Array.from(new Set(records.map(function (record) {
-        if (record && _typeof(record) === 'object') {
-          return record.form_record_id;
-        }
-        return record;
-      }).filter(function (record) {
-        return record !== undefined && record !== null && record !== '' && record !== 0 && record !== '0';
-      }).map(String)));
-    }
 
-    /**
-     * 商品未开启 Holder 选择时跳过匹配；已开启时，特定 form Holder 卡
-     * 只适用于同一 Holder Record，是否必填不影响匹配规则。
-     */
+    // 商品不需要holder,则不需要判断，直接返回true，商品需要holder但是还没填写，那么暂时不使用带有holder的券，直到填写才去匹配
   }, {
     key: "checkHolderMatch",
-    value: function checkHolderMatch(discount, product, holderSource, holders) {
-      var _discount$holder, _ref, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9, _ref10, _holderSource$holder_, _holderSource$metadat, _holderSource$origin, _holderSource$metadat2, _holderSource$_origin, _holderSource$_origin2, _holderSource$_origin3, _holderSource$_produc, _holderSource$_produc2, _holderSource$_extend, _holderSource$_extend2, _holderSource$_extend3;
+    value: function checkHolderMatch(discount, product, holders) {
+      var _discount$holder;
       // 非表单类型 holder 视为匹配
       if (((_discount$holder = discount.holder) === null || _discount$holder === void 0 ? void 0 : _discount$holder.holder_type) !== 'form') return true;
-
-      // 旧券沿用预约主体和单个 Holder 的匹配口径。
-      if (!isEntitlementPass(discount)) {
-        if (!product.isNeedHolder) return true;
-        var holder = holders === null || holders === void 0 ? void 0 : holders[0];
-        var orderHolderId = holder && _typeof(holder) === 'object' ? holder.form_record_id : holder;
-        var productHolderId = Array.isArray(product.holder_id) ? product.holder_id[0] : product.holder_id;
-        if (!orderHolderId && !productHolderId) return false;
-        return (productHolderId || orderHolderId) === discount.holder.holder_id;
-      }
-
-      // getProduct 会裁剪商品字段，从原始商品读取配置，套餐子项沿用父商品。
-      var holderConfig = (_ref = (_ref2 = (_ref3 = (_ref4 = (_ref5 = (_ref6 = (_ref7 = (_ref8 = (_ref9 = (_ref10 = (_holderSource$holder_ = holderSource === null || holderSource === void 0 ? void 0 : holderSource.holder_config) !== null && _holderSource$holder_ !== void 0 ? _holderSource$holder_ : holderSource === null || holderSource === void 0 || (_holderSource$metadat = holderSource.metadata) === null || _holderSource$metadat === void 0 ? void 0 : _holderSource$metadat.holder_config) !== null && _ref10 !== void 0 ? _ref10 : holderSource === null || holderSource === void 0 || (_holderSource$origin = holderSource.origin) === null || _holderSource$origin === void 0 ? void 0 : _holderSource$origin.holder_config) !== null && _ref9 !== void 0 ? _ref9 : holderSource === null || holderSource === void 0 || (_holderSource$metadat2 = holderSource.metadata) === null || _holderSource$metadat2 === void 0 || (_holderSource$metadat2 = _holderSource$metadat2.origin) === null || _holderSource$metadat2 === void 0 ? void 0 : _holderSource$metadat2.holder_config) !== null && _ref8 !== void 0 ? _ref8 : holderSource === null || holderSource === void 0 || (_holderSource$_origin = holderSource._origin) === null || _holderSource$_origin === void 0 ? void 0 : _holderSource$_origin.holder_config) !== null && _ref7 !== void 0 ? _ref7 : holderSource === null || holderSource === void 0 || (_holderSource$_origin2 = holderSource._origin) === null || _holderSource$_origin2 === void 0 || (_holderSource$_origin2 = _holderSource$_origin2.product) === null || _holderSource$_origin2 === void 0 ? void 0 : _holderSource$_origin2.holder_config) !== null && _ref6 !== void 0 ? _ref6 : holderSource === null || holderSource === void 0 || (_holderSource$_origin3 = holderSource._originData) === null || _holderSource$_origin3 === void 0 || (_holderSource$_origin3 = _holderSource$_origin3.product) === null || _holderSource$_origin3 === void 0 ? void 0 : _holderSource$_origin3.holder_config) !== null && _ref5 !== void 0 ? _ref5 : holderSource === null || holderSource === void 0 || (_holderSource$_produc = holderSource._productInit) === null || _holderSource$_produc === void 0 ? void 0 : _holderSource$_produc.holder_config) !== null && _ref4 !== void 0 ? _ref4 : holderSource === null || holderSource === void 0 || (_holderSource$_produc2 = holderSource._productOrigin) === null || _holderSource$_produc2 === void 0 ? void 0 : _holderSource$_produc2.holder_config) !== null && _ref3 !== void 0 ? _ref3 : holderSource === null || holderSource === void 0 || (_holderSource$_extend = holderSource._extend) === null || _holderSource$_extend === void 0 ? void 0 : _holderSource$_extend.holder_config) !== null && _ref2 !== void 0 ? _ref2 : holderSource === null || holderSource === void 0 || (_holderSource$_extend2 = holderSource._extend) === null || _holderSource$_extend2 === void 0 || (_holderSource$_extend2 = _holderSource$_extend2.product) === null || _holderSource$_extend2 === void 0 ? void 0 : _holderSource$_extend2.holder_config) !== null && _ref !== void 0 ? _ref : holderSource === null || holderSource === void 0 || (_holderSource$_extend3 = holderSource._extend) === null || _holderSource$_extend3 === void 0 || (_holderSource$_extend3 = _holderSource$_extend3.product) === null || _holderSource$_extend3 === void 0 || (_holderSource$_extend3 = _holderSource$_extend3.metadata) === null || _holderSource$_extend3 === void 0 ? void 0 : _holderSource$_extend3.holder_config;
-      var holderStatus = holderConfig === null || holderConfig === void 0 ? void 0 : holderConfig.status;
-      var holderEnabled = holderStatus == null || holderStatus === '' || holderStatus === true || ['enable', '1'].includes(String(holderStatus).trim().toLowerCase());
-      if (!holderEnabled || !(holderConfig !== null && holderConfig !== void 0 && holderConfig.resource_id)) {
-        return true;
-      }
-      var discountHolderIds = this.normalizeHolderRecordIds(discount.holder.holder_id);
-      if (!discountHolderIds.length) return false;
-      var productHolderIds = this.normalizeHolderRecordIds(product.holder_id);
-      var candidateHolderIds = productHolderIds.length || Array.isArray(product.holder_id) ? productHolderIds : this.normalizeHolderRecordIds(holders);
-      if (!candidateHolderIds.length) return false;
-      var discountHolderIdSet = new Set(discountHolderIds);
-      return candidateHolderIds.every(function (holderId) {
-        return discountHolderIdSet.has(holderId);
-      });
+      // 主预约holder, 目前（20251124）默认只考虑单个holder的情况
+      var orderHolderId = Array.isArray(holders) && holders.length > 0 ? holders[0].form_record_id : undefined;
+      var productHolderId = Array.isArray(product.holder_id) ? product.holder_id[0] : product.holder_id;
+      // 商品不需要选holder，则不对比holder，直接返回true，
+      if (!product.isNeedHolder) return true;
+      // 商品需要holder，但父预约及商品都无holder，返回false
+      if (!orderHolderId && !productHolderId) return false;
+      // 最终直接匹配 holder 是否相同
+      return (productHolderId || orderHolderId) === discount.holder.holder_id;
     }
 
     // 判断discountList 是否可以对当前productList生效
   }, {
     key: "isDiscountListAvailable",
-    value: function isDiscountListAvailable(_ref11) {
+    value: function isDiscountListAvailable(_ref) {
       var _this2 = this;
-      var oldDiscountList = _ref11.oldDiscountList,
-        newDiscountList = _ref11.newDiscountList,
-        productList = _ref11.productList,
-        holders = _ref11.holders,
-        isFormSubject = _ref11.isFormSubject;
+      var oldDiscountList = _ref.oldDiscountList,
+        newDiscountList = _ref.newDiscountList,
+        productList = _ref.productList,
+        holders = _ref.holders,
+        isFormSubject = _ref.isFormSubject;
       // 首先检查是否有新的优惠券可应用
       if (!newDiscountList || newDiscountList.length === 0) {
         return {
@@ -188,7 +134,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       }
 
       // 编辑商品已有商品券
-      if (!newDiscountList.some(isEntitlementPass) && productList.length > 0 && productList.every(function (item) {
+      if (productList.every(function (item) {
         var _product$discount_lis;
         var product = _this2.hooks.getProduct(item);
         return product.booking_id && (((_product$discount_lis = product.discount_list) === null || _product$discount_lis === void 0 ? void 0 : _product$discount_lis.length) || product.total == 0);
@@ -206,10 +152,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var filteredOldDiscountList = oldDiscountList.filter(function (discount) {
         return !discount.isEditMode && (discount.tag !== 'good_pass' || discount.isScan);
       });
-      var mergedDiscountList = uniqueById([].concat(_toConsumableArray(newDiscountList.filter(isEntitlementPass)), _toConsumableArray(filteredOldDiscountList), _toConsumableArray(newDiscountList)));
+      var mergedDiscountList = uniqueById([].concat(_toConsumableArray(filteredOldDiscountList), _toConsumableArray(newDiscountList)));
       var result = this.calcDiscount({
         discountList: mergedDiscountList,
-        productList: this.entitlementPassEnabled ? cloneDeep(productList) : _toConsumableArray(productList),
+        productList: _toConsumableArray(productList),
         holders: holders,
         isFormSubject: isFormSubject
       }, {
@@ -218,16 +164,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
       // 检查是否有产品使用了新折扣
       var hasApplicableDiscount = false;
-      var newDiscountIds = new Set(newDiscountList.map(function (discount) {
-        return String(discount.id);
-      }));
+      var newDiscountIds = newDiscountList.map(function (discount) {
+        return discount.id;
+      });
 
       // 遍历处理后的产品列表，检查是否有产品使用了新折扣
       result.productList.forEach(function (product) {
-        var mappedProduct = _this2.hooks.getProduct(product);
-        if (isPersistedEntitlementLine(product, mappedProduct)) return;
-        var discount_list = mappedProduct.discount_list,
-          bundle = mappedProduct.bundle;
+        var _this2$hooks$getProdu = _this2.hooks.getProduct(product),
+          discount_list = _this2$hooks$getProdu.discount_list,
+          bundle = _this2$hooks$getProdu.bundle;
         var allDiscountList = _toConsumableArray(discount_list || []);
         (bundle || []).forEach(function (item) {
           allDiscountList.push.apply(allDiscountList, _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []));
@@ -236,7 +181,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 检查是否有使用新折扣的情况
           var usedNewDiscount = allDiscountList.some(function (discount) {
             var _discount$discount;
-            return newDiscountIds.has(String(discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id));
+            return newDiscountIds.includes(discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id);
           });
           if (usedNewDiscount) {
             hasApplicableDiscount = true;
@@ -251,7 +196,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       }
       return {
         isAvailable: hasApplicableDiscount,
-        evaluatedDiscountList: result.discountList,
         discountList: hasApplicableDiscount ? result.discountList : oldDiscountList,
         productList: hasApplicableDiscount ? result.productList : productList,
         unavailableReason: unavailableReason
@@ -281,7 +225,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
               var item = _step3.value;
               var product = this.hooks.getProduct(item);
-              var bookingTime = dayjs((product === null || product === void 0 ? void 0 : product.startDate) || undefined).format('YYYY-MM-DD HH:mm:ss');
+              var bookingTime = ((product === null || product === void 0 ? void 0 : product.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss');
               var filteredList = filterDiscountListByBookingTime([discount], bookingTime);
               if (filteredList.length === 0) {
                 return UnavailableReason.TimeLimit;
@@ -306,7 +250,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           var _discount = _step2.value;
           var limitedData = _discount.limited_relation_product_data;
-          if (!limitedData) return UnavailableReason.ProductNotApplicable;
           var hasApplicableProduct = false;
           var _iterator4 = _createForOfIteratorHelper(productList),
             _step4;
@@ -341,68 +284,19 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
     }
   }, {
     key: "calcDiscount",
-    value: function calcDiscount(_ref12, options) {
+    value: function calcDiscount(_ref2, options) {
       var _this3 = this;
-      var discountList = _ref12.discountList,
-        productList = _ref12.productList,
-        holders = _ref12.holders,
-        isFormSubject = _ref12.isFormSubject;
-      discountList = this.entitlementPassEnabled ? withCommittedEntitlementDetails(discountList, productList, this.hooks.getProduct) : discountList.filter(function (item) {
-        return !isEntitlementPass(item);
-      });
-      var usableEntitlements = discountList.filter(function (discount) {
-        return isEntitlementPass(discount) && !discount.isEditMode && !discount.isManualSelect && !getDiscountUsageBlockReason(discount);
-      });
-      var canUseEntitlement = function canUseEntitlement(originProduct) {
-        var _product$original_pri;
-        var product = _this3.hooks.getProduct(originProduct);
-        // 预判任一份可用就按份拆开，实际抵扣仍逐份核对 Holder。
-        var holderProducts = Array.isArray(product.holder_id) && product.holder_id.length > 1 ? product.holder_id.map(function (holder_id) {
-          return _objectSpread(_objectSpread({}, product), {}, {
-            holder_id: holder_id
-          });
-        }) : [product];
-        var items = [{
-          type: 'main',
-          id: product.id,
-          price: (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : product.price
-        }].concat(_toConsumableArray((product.bundle || []).map(function (bundleItem) {
-          var _ref13, _bundleItem$_bundle_p, _bundleItem$original_;
-          return {
-            type: 'bundle',
-            id: (_ref13 = (_bundleItem$_bundle_p = bundleItem._bundle_product_id) !== null && _bundleItem$_bundle_p !== void 0 ? _bundleItem$_bundle_p : bundleItem.bundle_product_id) !== null && _ref13 !== void 0 ? _ref13 : bundleItem.product_id,
-            price: (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.price,
-            bundleItem: bundleItem
-          };
-        })));
-        return usableEntitlements.some(function (discount) {
-          var scope = discount.limited_relation_product_data;
-          if (!scope || !holderProducts.some(function (item) {
-            return _this3.checkHolderMatch(discount, item, originProduct, holders);
-          }) || !filterDiscountListByBookingTime([discount], dayjs(product.startDate || undefined).format('YYYY-MM-DD HH:mm:ss')).length) return false;
-          return items.some(function (item) {
-            var _scope$exclude_produc, _scope$product_ids;
-            return Number(item.price) > 0 && (scope.type === 'product_all' ? !(scope.filter === 1 && (_scope$exclude_produc = scope.exclude_product_ids) !== null && _scope$exclude_produc !== void 0 && _scope$exclude_produc.some(function (id) {
-              return String(id) === String(item.id);
-            })) : !!((_scope$product_ids = scope.product_ids) !== null && _scope$product_ids !== void 0 && _scope$product_ids.includes(item.id))) && _this3.checkPackageSubItemUsageRules(discount, _objectSpread(_objectSpread({}, item), {}, {
-              originProduct: originProduct,
-              parentProduct: product
-            }));
-          });
-        });
-      };
-      if (this.entitlementPassEnabled) productList = prepareEntitlementLines(productList, this.hooks, canUseEntitlement);
+      var discountList = _ref2.discountList,
+        productList = _ref2.productList,
+        holders = _ref2.holders,
+        isFormSubject = _ref2.isFormSubject;
       var editModeDiscount = [];
       var addModeDiscount = [];
       discountList.forEach(function (discount) {
         if (discount.isEditMode) {
           editModeDiscount.push(discount);
         } else {
-          addModeDiscount.push(isEntitlementPass(discount) ? _objectSpread(_objectSpread({}, discount), {}, {
-            config: undefined,
-            reason: undefined,
-            reasonCode: undefined
-          }) : discount);
+          addModeDiscount.push(discount);
         }
       });
 
@@ -453,7 +347,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 2. 展开 bundle 子商品
           if (product.bundle && Array.isArray(product.bundle) && product.bundle.length > 0) {
             product.bundle.forEach(function (bundleItem, bundleIndex) {
-              var _ref14, _bundleItem$_bundle_p2;
               flattened.push({
                 type: 'bundle',
                 originProduct: originProduct,
@@ -462,7 +355,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 bundleIndex: bundleIndex,
                 // 虚拟商品属性
                 price: Number(bundleItem.price || 0),
-                id: (_ref14 = (_bundleItem$_bundle_p2 = bundleItem._bundle_product_id) !== null && _bundleItem$_bundle_p2 !== void 0 ? _bundleItem$_bundle_p2 : bundleItem.bundle_product_id) !== null && _ref14 !== void 0 ? _ref14 : bundleItem.product_id,
+                id: bundleItem._bundle_product_id,
+                // 🔥 使用 _bundle_product_id
                 _id: "".concat(product._id, "_bundle_").concat(bundleIndex),
                 parentId: product._id,
                 num: bundleItem.num || 1,
@@ -568,9 +462,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           return 0;
         }
-        if (isEntitlementPass(a) || isEntitlementPass(b)) {
-          return isEntitlementPass(a) && isEntitlementPass(b) ? compareEntitlementPassPriority(a, b) : isEntitlementPass(a) ? -1 : 1;
-        }
 
         // 1. 先按优先级排序
         var priorityA = getPriority(a);
@@ -622,10 +513,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
       // 对扁平化后的列表按价格降序排序（用于应用优惠券时优先选择高价商品）
       var sortedFlattenedList = flattenedList.sort(function (a, b) {
-        var _ref15, _a$original_price, _ref16, _b$original_price;
+        var _ref3, _a$original_price, _ref4, _b$original_price;
         // 子商品优先使用 original_price，主商品使用 price
-        var priceA = new Decimal(a.type === 'bundle' ? (_ref15 = (_a$original_price = a.original_price) !== null && _a$original_price !== void 0 ? _a$original_price : a.price) !== null && _ref15 !== void 0 ? _ref15 : '0' : a.price || '0');
-        var priceB = new Decimal(b.type === 'bundle' ? (_ref16 = (_b$original_price = b.original_price) !== null && _b$original_price !== void 0 ? _b$original_price : b.price) !== null && _ref16 !== void 0 ? _ref16 : '0' : b.price || '0');
+        var priceA = new Decimal(a.type === 'bundle' ? (_ref3 = (_a$original_price = a.original_price) !== null && _a$original_price !== void 0 ? _a$original_price : a.price) !== null && _ref3 !== void 0 ? _ref3 : '0' : a.price || '0');
+        var priceB = new Decimal(b.type === 'bundle' ? (_ref4 = (_b$original_price = b.original_price) !== null && _b$original_price !== void 0 ? _b$original_price : b.price) !== null && _ref4 !== void 0 ? _ref4 : '0' : b.price || '0');
         if (priceA.equals(priceB)) {
           // 价格相同时，主商品优先
           if (a.type !== b.type) {
@@ -673,93 +564,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       });
        */
 
-      // 旧券沿用一次性标记；多次卡按卡 ID 累计本次分配数量。
+      // 标记已使用的优惠券
       var usedDiscounts = new Map();
-      var entitlementUsageCounts = new Map();
-      var usedProductIdCounts = new Map();
-      var markDiscountUsed = function markDiscountUsed(discount) {
-        if (isEntitlementPass(discount)) {
-          entitlementUsageCounts.set(discount.id, (entitlementUsageCounts.get(discount.id) || 0) + 1);
-        } else {
-          usedDiscounts.set(discount.id, true);
-        }
-        usedProductIdCounts.set(discount.product_id, (usedProductIdCounts.get(discount.product_id) || 0) + 1);
-      };
-
-      // 沿用商品券逐份拆分，同一多次卡可重复分配，数量受本单剩余额度限制。
-      var getFullCoveragePasses = function getFullCoveragePasses(discounts, quantity) {
-        var allocated = [];
-        var productCounts = new Map(usedProductIdCounts);
-        var _iterator5 = _createForOfIteratorHelper(discounts),
-          _step5;
-        try {
-          for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-            var _discount$config;
-            var discount = _step5.value;
-            if (!isFullCoveragePass(discount) || allocated.length >= quantity) continue;
-            var count = isEntitlementPass(discount) ? getRemainingEntitlementUses(discount, entitlementUsageCounts.get(discount.id) || 0, quantity - allocated.length) : usedDiscounts.get(discount.id) ? 0 : 1;
-            var limit = Number(((_discount$config = discount.config) === null || _discount$config === void 0 ? void 0 : _discount$config.maxUsagePerOrder) || 0);
-            if (isEntitlementPass(discount) && limit > 0) {
-              count = Math.min(count, Math.max(0, Math.floor(limit) - (productCounts.get(discount.product_id) || 0)));
-            }
-            for (var i = 0; i < count; i++) allocated.push(discount);
-            productCounts.set(discount.product_id, (productCounts.get(discount.product_id) || 0) + count);
-          }
-        } catch (err) {
-          _iterator5.e(err);
-        } finally {
-          _iterator5.f();
-        }
-        return allocated;
-      };
-      var evaluator;
-      addModeDiscount.filter(isEntitlementPass).forEach(function (discount) {
-        var _evaluator, _discount$unified_ava, _discount$limited_rel, _discount$limited_rel2;
-        discount.usageLimitFailKey = getDiscountUsageLimitFailKey(discount);
-        discount.reasonCode = getDiscountUsageBlockReason(discount);
-        var quota = resolveEntitlementQuota(discount);
-        if (discount.reasonCode || !quota) {
-          discount.config = {
-            isAvailable: false
-          };
-          return;
-        }
-        (_evaluator = evaluator) !== null && _evaluator !== void 0 ? _evaluator : evaluator = _this3.getWalletPassEvaluator();
-        var result = evaluator.checkVoucherAvailability({
-          orderTotalAmount: productList.reduce(function (sum, item) {
-            var product = _this3.hooks.getProduct(item);
-            return sum.plus(new Decimal(product.origin_total || 0).times(product.quantity || product.num || 1));
-          }, new Decimal(0)).toNumber(),
-          // 策略按统一商品结构读主价与数量，套餐次数还需乘父商品份数。
-          products: sortedFlattenedList.map(function (item) {
-            var _item$parentProduct, _item$parentProduct2, _item$product;
-            return {
-              product_id: item.id,
-              price: item.price || 0,
-              main_product_selling_price: item.price || 0,
-              quantity: (item.quantity || item.num || 1) * (item.type === 'bundle' ? ((_item$parentProduct = item.parentProduct) === null || _item$parentProduct === void 0 ? void 0 : _item$parentProduct.quantity) || ((_item$parentProduct2 = item.parentProduct) === null || _item$parentProduct2 === void 0 ? void 0 : _item$parentProduct2.num) || 1 : 1),
-              product_options: item.type === 'main' ? (_item$product = item.product) === null || _item$product === void 0 ? void 0 : _item$product.options : undefined
-            };
-          }),
-          vouchers: [_objectSpread(_objectSpread({}, discount), {}, {
-            amount: Number(discount.par_value || 0),
-            balance: quota.type === 'unlimited' ? Number.MAX_SAFE_INTEGER : quota.balance,
-            type: 'entitlement_pass',
-            unified_available_status: (_discount$unified_ava = discount.unified_available_status) !== null && _discount$unified_ava !== void 0 ? _discount$unified_ava : 1,
-            available_product_type: (_discount$limited_rel = discount.limited_relation_product_data) === null || _discount$limited_rel === void 0 ? void 0 : _discount$limited_rel.type,
-            available_product_ids: (_discount$limited_rel2 = discount.limited_relation_product_data) === null || _discount$limited_rel2 === void 0 ? void 0 : _discount$limited_rel2.product_ids
-          })]
-        });
-        discount.config = _objectSpread(_objectSpread({}, result.config), {}, {
-          isAvailable: result.isAvailable
-        });
-        if (!result.isAvailable) {
-          discount.reason = result.reason;
-          discount.reasonCode = result.reasonCode || 'not_meet_the_required_conditions';
-        }
-      });
-      var entitlementTimeReasons = new Map();
-      var entitlementHolderMismatch = new Set();
 
       // 记录每个优惠券适用的商品ID
       var discountApplicability = new Map();
@@ -805,7 +611,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
         // 编辑的商品使用了优惠券不可用
         var isAvailableProduct = flatItem.type === 'main' ? !((_product2 = product) !== null && _product2 !== void 0 && _product2.booking_id && (_product3 = product) !== null && _product3 !== void 0 && (_product3 = _product3.discount_list) !== null && _product3 !== void 0 && _product3.length && (_product4 = product) !== null && _product4 !== void 0 && (_product4 = _product4.discount_list) !== null && _product4 !== void 0 && _product4.every(function (d) {
-          return d.id && ['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(d.tag || d.type);
+          return d.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(d.tag || d.type);
         })) : !(flatItem !== null && flatItem !== void 0 && flatItem.booking_id && !!(flatItem !== null && flatItem !== void 0 && (_flatItem$bundleItem = flatItem.bundleItem) !== null && _flatItem$bundleItem !== void 0 && (_flatItem$bundleItem = _flatItem$bundleItem.discount_list) !== null && _flatItem$bundleItem !== void 0 && _flatItem$bundleItem.length) && flatItem !== null && flatItem !== void 0 && (_flatItem$bundleItem2 = flatItem.bundleItem) !== null && _flatItem$bundleItem2 !== void 0 && (_flatItem$bundleItem2 = _flatItem$bundleItem2.discount_list) !== null && _flatItem$bundleItem2 !== void 0 && _flatItem$bundleItem2.every(function (d) {
           return d.id;
         }));
@@ -825,7 +631,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var limitedData = discount.limited_relation_product_data;
 
         // 时间限制检查
-        var timeLimit = !!filterDiscountListByBookingTime([discount], dayjs(((_product5 = product) === null || _product5 === void 0 ? void 0 : _product5.startDate) || undefined).format('YYYY-MM-DD HH:mm:ss')).length;
+        var timeLimit = !!filterDiscountListByBookingTime([discount], (((_product5 = product) === null || _product5 === void 0 ? void 0 : _product5.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
         if (!timeLimit) {
           return false;
         }
@@ -906,7 +712,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 收集该折扣卡适用的商品（排除被其他专属折扣卡占用的商品）
         var applicableProducts = [];
         sortedFlattenedList.forEach(function (flatItem) {
-          var _flatItem$parentProdu2, _flatItem$parentProdu3, _product$price, _ref17, _flatItem$original_pr;
+          var _flatItem$parentProdu2, _flatItem$parentProdu3, _product$price, _ref5, _flatItem$original_pr;
           // 🔥 检查该商品是否被其他专属折扣卡占用
           var occupyingDiscountId = occupiedItems.get(flatItem._id);
           if (occupyingDiscountId !== undefined && occupyingDiscountId !== discount.id) {
@@ -934,7 +740,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 对于主商品：使用 price
           // 对于子商品：优先使用 flatItem.original_price，否则使用 flatItem.price
-          var originalAmount = flatItem.type === 'main' ? Number((_product$price = product.price) !== null && _product$price !== void 0 ? _product$price : 0) : Number((_ref17 = (_flatItem$original_pr = flatItem.original_price) !== null && _flatItem$original_pr !== void 0 ? _flatItem$original_pr : flatItem.price) !== null && _ref17 !== void 0 ? _ref17 : 0);
+          var originalAmount = flatItem.type === 'main' ? Number((_product$price = product.price) !== null && _product$price !== void 0 ? _product$price : 0) : Number((_ref5 = (_flatItem$original_pr = flatItem.original_price) !== null && _flatItem$original_pr !== void 0 ? _flatItem$original_pr : flatItem.price) !== null && _ref5 !== void 0 ? _ref5 : 0);
 
           // 传递 parentQuantity 用于差值处理时判断是否是真正的"数量为1"
           var productData = {
@@ -990,32 +796,22 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           originProduct = flatItem.originProduct;
         }
         addModeDiscount.forEach(function (discount) {
-          var _discount$config2, _product6, _limitedData$exclude_2, _product7, _product8, _product9, _flatItem$bundleItem3, _flatItem$bundleItem4;
+          var _product6, _product7, _product8, _product9, _flatItem$bundleItem3, _flatItem$bundleItem4;
           var limitedData = discount === null || discount === void 0 ? void 0 : discount.limited_relation_product_data;
-          if (!limitedData || isEntitlementPass(discount) && ((_discount$config2 = discount.config) === null || _discount$config2 === void 0 ? void 0 : _discount$config2.isAvailable) === false) return;
-
           // 拿到discount配置的holder信息 product信息 product.holder 加在 isLimitedProduct
           var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
           var isHolderMatch = _this3.checkHolderMatch(discount, {
             isNeedHolder: isFormSubject && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
             holder_id: (_tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.holder_id) || product.holder_id
-          }, flatItem.originProduct, holders);
+          }, holders);
           var timeLimit = true;
-          var useTime = dayjs(((_product6 = product) === null || _product6 === void 0 ? void 0 : _product6.startDate) || undefined).format('YYYY-MM-DD HH:mm:ss');
-          timeLimit = !!filterDiscountListByBookingTime([discount], useTime).length;
-          if (isEntitlementPass(discount)) {
-            var reason = getDiscountTimeUnavailableReason(discount, useTime);
-            var reasons = entitlementTimeReasons.get(discount.id) || [];
-            reasons.push(reason);
-            entitlementTimeReasons.set(discount.id, reasons);
-            if (!isHolderMatch) entitlementHolderMismatch.add(discount.id);
-          }
+          timeLimit = !!filterDiscountListByBookingTime([discount], (((_product6 = product) === null || _product6 === void 0 ? void 0 : _product6.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
           // 是符合折扣的商品
-          var isLimitedProduct = (limitedData.type === 'product_all' && !(limitedData.filter === 1 && (_limitedData$exclude_2 = limitedData.exclude_product_ids) !== null && _limitedData$exclude_2 !== void 0 && _limitedData$exclude_2.includes(product.id)) || limitedData.product_ids && limitedData.product_ids.includes(product.id)) && isHolderMatch;
+          var isLimitedProduct = (limitedData.type === 'product_all' || limitedData.product_ids && limitedData.product_ids.includes(product.id)) && isHolderMatch;
 
           // 编辑的商品 使用了优惠券不可用
           var isAvailableProduct = flatItem.type === 'main' ? !((_product7 = product) !== null && _product7 !== void 0 && _product7.booking_id && (_product8 = product) !== null && _product8 !== void 0 && (_product8 = _product8.discount_list) !== null && _product8 !== void 0 && _product8.length && (_product9 = product) !== null && _product9 !== void 0 && (_product9 = _product9.discount_list) !== null && _product9 !== void 0 && _product9.every(function (discount) {
-            return discount.id && ['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
+            return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
           })) : !(flatItem !== null && flatItem !== void 0 && flatItem.booking_id && !!(flatItem !== null && flatItem !== void 0 && (_flatItem$bundleItem3 = flatItem.bundleItem) !== null && _flatItem$bundleItem3 !== void 0 && (_flatItem$bundleItem3 = _flatItem$bundleItem3.discount_list) !== null && _flatItem$bundleItem3 !== void 0 && _flatItem$bundleItem3.length) && flatItem !== null && flatItem !== void 0 && (_flatItem$bundleItem4 = flatItem.bundleItem) !== null && _flatItem$bundleItem4 !== void 0 && (_flatItem$bundleItem4 = _flatItem$bundleItem4.discount_list) !== null && _flatItem$bundleItem4 !== void 0 && _flatItem$bundleItem4.every(function (discount) {
             return discount.id;
           }));
@@ -1024,7 +820,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
 
           // 判断优惠券是否适用于该商品
-          if (isAvailableProduct && !isPersistedEntitlementLine(originProduct, flatItem.type === 'main' ? flatItem.product : flatItem.parentProduct) && isLimitedProduct && isBundleAvailable && timeLimit) {
+          if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable) {
             var _discountApplicabilit, _discount$metadata4, _discount$metadata5;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
@@ -1032,7 +828,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 记录可抵扣的商品详情
             var applicableProducts = discountApplicableProducts.get(discount.id) || [];
             var discountType = discount.tag || discount.type;
-            var isGoodPass = isFullCoveragePass(discount);
+            var isGoodPass = discountType === 'good_pass';
 
             // 使用数量
             var num = isGoodPass || (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'main' ? 1 : product.num;
@@ -1048,7 +844,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 title: discount.format_title,
                 original_amount: product.price || product.origin_total,
                 pre_value: discount.par_value,
-                product_id: product.id
+                product_id: originProduct.id
               },
               metadata: {
                 num: num,
@@ -1093,8 +889,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         }
 
         // 已有优惠的商品跳过
-        if (isPersistedEntitlementLine(originProduct, flatItem.type === 'main' ? flatItem.product : flatItem.parentProduct) || (_product10 = product) !== null && _product10 !== void 0 && _product10.booking_id && (_product$discount_lis2 = product.discount_list) !== null && _product$discount_lis2 !== void 0 && _product$discount_lis2.length && (_product11 = product) !== null && _product11 !== void 0 && (_product11 = _product11.discount_list) !== null && _product11 !== void 0 && _product11.every(function (discount) {
-          return discount.id && ['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
+        if ((_product10 = product) !== null && _product10 !== void 0 && _product10.booking_id && (_product$discount_lis2 = product.discount_list) !== null && _product$discount_lis2 !== void 0 && _product$discount_lis2.length && (_product11 = product) !== null && _product11 !== void 0 && (_product11 = _product11.discount_list) !== null && _product11 !== void 0 && _product11.every(function (discount) {
+          return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
         })) {
           if (flatItem.type === 'main') {
             processedProductsMap.set(product._id, [originProduct]);
@@ -1108,33 +904,31 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
         // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
-          var _discount$config3, _discount$config4, _discount$config5, _product$discount_lis3, _product$discount_lis4;
-          if (isEntitlementPass(discount) && (((_discount$config3 = discount.config) === null || _discount$config3 === void 0 ? void 0 : _discount$config3.isAvailable) === false || getRemainingEntitlementUses(discount, entitlementUsageCounts.get(discount.id) || 0, 1) <= 0 || Number((_discount$config4 = discount.config) === null || _discount$config4 === void 0 ? void 0 : _discount$config4.maxUsagePerOrder) > 0 && (usedProductIdCounts.get(discount.product_id) || 0) >= Number((_discount$config5 = discount.config) === null || _discount$config5 === void 0 ? void 0 : _discount$config5.maxUsagePerOrder))) return false;
+          var _product$discount_lis3, _product$discount_lis4;
           // 如果商品价格为 0，其实不需要使用任何优惠券，直接 return true
           // 商品券时主商品价格为0不可用
-          if ((Number(product.price) <= 0 || !product.price) && !((_product$discount_lis3 = product.discount_list) !== null && _product$discount_lis3 !== void 0 && _product$discount_lis3.length) && isFullCoveragePass(discount)) return false;
+          if ((Number(product.price) <= 0 || !product.price) && !((_product$discount_lis3 = product.discount_list) !== null && _product$discount_lis3 !== void 0 && _product$discount_lis3.length) && (discount.tag || discount.type) === 'good_pass') return false;
 
           // 折扣卡商品价格为0时不可用
           if ((Number(product.price) <= 0 || !product.price) && !((_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.find(function (n) {
             var _n$discount;
             return ((_n$discount = n.discount) === null || _n$discount === void 0 ? void 0 : _n$discount.resource_id) === discount.id;
-          })) && !isFullCoveragePass(discount)) return false;
+          })) && (discount.tag || discount.type) !== 'good_pass') return false;
           // 如果优惠券已被使用，则跳过
           var targetUsedDiscounts = usedDiscounts.get(discount.id);
           if (targetUsedDiscounts && (discount.tag || discount.type) === 'good_pass') return false;
           var limitedData = discount.limited_relation_product_data;
-          if (!limitedData) return false;
 
           // 拿到discount配置的holder信息 product信息 product.holder 不可用return false
           var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
           var isHolderMatch = _this3.checkHolderMatch(discount, {
             isNeedHolder: isFormSubject && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
             holder_id: (_tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.holder_id) || product.holder_id
-          }, flatItem.originProduct, holders);
+          }, holders);
           // 如果 holder 不匹配，则不适用
           if (!isHolderMatch) return false;
           var timeLimit = true;
-          timeLimit = !!filterDiscountListByBookingTime([discount], dayjs(product.startDate || undefined).format('YYYY-MM-DD HH:mm:ss')).length;
+          timeLimit = !!filterDiscountListByBookingTime([discount], (product.startDate || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
           if (!timeLimit) {
             return false;
           }
@@ -1164,12 +958,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 如果有 isScan 且 isSelected 的折扣卡，则优先选中，否则再选择第一个
         // 用于处理：先手动扫描了一张折扣卡，扫描完以后带入客户信息，但是之前那张折扣卡不是最优惠的情况
         var selectedDiscountCard = applicableDiscounts.find(function (n) {
-          return n.isScan && n.isSelected && !isFullCoveragePass(n);
+          return n.isScan && n.isSelected && (n.tag || n.type) !== 'good_pass';
         });
-        var explicitlySelected = (options === null || options === void 0 ? void 0 : options.isSelected) === true ? applicableDiscounts.find(function (item) {
-          return isEntitlementPass(item) && String(item.id) === String(options.discountId);
-        }) : undefined;
-        var selectedDiscount = explicitlySelected || selectedDiscountCard || applicableDiscounts[0];
+        var selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
 
         // 如果是手动折扣，则不适用优惠券
         var isManualDiscount = false;
@@ -1177,8 +968,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var _product$discount_lis5, _product12, _product12$every;
           // 主商品：判断自身是否手动折扣
           isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : product.total != product.origin_total && (product.bundle || []).every(function (item) {
-            var _ref18;
-            return !((_ref18 = item.discount_list || []) !== null && _ref18 !== void 0 && _ref18.length);
+            var _ref6;
+            return !((_ref6 = item.discount_list || []) !== null && _ref6 !== void 0 && _ref6.length);
           }) && (!((_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.length) || ((_product12 = product) === null || _product12 === void 0 || (_product12 = _product12.discount_list) === null || _product12 === void 0 || (_product12$every = _product12.every) === null || _product12$every === void 0 ? void 0 : _product12$every.call(_product12, function (item) {
             return item.type === 'product';
           })));
@@ -1188,8 +979,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           if (parentProduct) {
             var _parentProduct$discou, _parentProduct$discou2, _parentProduct$discou3;
             isManualDiscount = typeof parentProduct.isManualDiscount === 'boolean' ? parentProduct.isManualDiscount : parentProduct.total != parentProduct.origin_total && (parentProduct.bundle || []).every(function (item) {
-              var _ref19;
-              return !((_ref19 = item.discount_list || []) !== null && _ref19 !== void 0 && _ref19.length);
+              var _ref7;
+              return !((_ref7 = item.discount_list || []) !== null && _ref7 !== void 0 && _ref7.length);
             }) && (!((_parentProduct$discou = parentProduct.discount_list) !== null && _parentProduct$discou !== void 0 && _parentProduct$discou.length) || (parentProduct === null || parentProduct === void 0 || (_parentProduct$discou2 = parentProduct.discount_list) === null || _parentProduct$discou2 === void 0 || (_parentProduct$discou3 = _parentProduct$discou2.every) === null || _parentProduct$discou3 === void 0 ? void 0 : _parentProduct$discou3.call(_parentProduct$discou2, function (item) {
               return item.type === 'product';
             })));
@@ -1281,8 +1072,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
-              var _ref20, _product$_promotion$f, _product13, _product$origin_total, _product$price2;
-              var total = product.inPromotion ? (_ref20 = (_product$_promotion$f = (_product13 = product) === null || _product13 === void 0 || (_product13 = _product13._promotion) === null || _product13 === void 0 ? void 0 : _product13.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref20 !== void 0 ? _ref20 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
+              var _ref8, _product$_promotion$f, _product13, _product$origin_total, _product$price2;
+              var total = product.inPromotion ? (_ref8 = (_product$_promotion$f = (_product13 = product) === null || _product13 === void 0 || (_product13 = _product13._promotion) === null || _product13 === void 0 ? void 0 : _product13.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref8 !== void 0 ? _ref8 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
               var main_product_selling_price = (_product$price2 = product.price) !== null && _product$price2 !== void 0 ? _product$price2 : product.main_product_selling_price;
               if ((product.discount_list || []).some(function (item) {
                 return item.type === 'promotion';
@@ -1320,17 +1111,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         }
 
         // 是否需要拆分（商品券需要拆分）
-        var isNeedSplit = isFullCoveragePass(selectedDiscount);
+        var isNeedSplit = (selectedDiscount.tag || selectedDiscount.type) === 'good_pass';
 
         // 需要拆分出来的数量
         var totalQuantity = product.quantity || product.num || 1;
-        var prioritizedDiscounts = [selectedDiscount].concat(_toConsumableArray(applicableDiscounts.filter(function (item) {
-          return item !== selectedDiscount;
-        })));
-        var allocatedPasses = isNeedSplit ? applicableDiscounts.some(isEntitlementPass) ? getFullCoveragePasses(prioritizedDiscounts, totalQuantity) : applicableDiscounts.slice(0, Math.min(totalQuantity, applicableDiscounts.filter(function (item) {
+        var availableGoodPassCount = applicableDiscounts.filter(function (item) {
           return (item.tag || item.type) === 'good_pass';
-        }).length)) : [selectedDiscount];
-        var splitCount = allocatedPasses.length;
+        }).length;
+        var splitCount = isNeedSplit ? Math.min(totalQuantity, availableGoodPassCount) : 1;
         var arr = [];
 
         // 🔥 主商品和bundle子商品分别处理
@@ -1345,8 +1133,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           for (var i = 0; i < splitCount; i++) {
             var _originProduct, _selectedDiscount$met, _selectedDiscount$met2;
-            var _selectedDiscount = allocatedPasses[i];
-            markDiscountUsed(_selectedDiscount);
+            // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
+            var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
+            // 标记优惠券为已使用
+            usedDiscounts.set(_selectedDiscount.id, true);
 
             // 记录实际应用了优惠券的商品信息
             var appliedProducts = appliedDiscountProducts.get(_selectedDiscount.id) || [];
@@ -1381,7 +1171,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               amount = new Decimal(product.price).minus(new Decimal(targetProductTotal)).toNumber();
             }
             var discountType = _selectedDiscount.tag || _selectedDiscount.type;
-            var isGoodPass = isFullCoveragePass(_selectedDiscount);
+            var isGoodPass = discountType === 'good_pass';
             var discountDetail = {
               amount: amount,
               type: _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : discountType,
@@ -1392,7 +1182,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 resource_id: _selectedDiscount.id,
                 title: _selectedDiscount.format_title,
                 original_amount: product.price,
-                product_id: product.id,
+                product_id: originProduct.id,
                 percent: _selectedDiscount.par_value
               },
               // 前端使用的num数量，为了计算优惠金额
@@ -1420,7 +1210,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             if (product.isClient) {
               arr.push(_this3.hooks.setProduct(originProduct, {
                 discount_list: [discountDetail],
-                price: isGoodPass ? 0 : product.price,
+                price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
                 quantity: isNeedSplit ? 1 : product.quantity,
                 origin_total: getProductOriginTotalPrice({
                   product: {
@@ -1436,8 +1226,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             } else {
               arr.push(_this3.hooks.setProduct(originProduct, {
                 discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion').concat([discountDetail]),
-                _id: product._id.split('___')[0] + "___" + _selectedDiscount.id + index + (isEntitlementPass(_selectedDiscount) ? "_".concat(i) : ''),
-                price: isGoodPass ? 0 : product.price,
+                _id: product._id.split('___')[0] + "___" + _selectedDiscount.id + index,
+                price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
                 quantity: isNeedSplit ? 1 : product.quantity,
                 total: _total,
                 origin_total: productOriginTotal,
@@ -1457,16 +1247,16 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 生成有折扣的商品（每张商品券对应 num: 1）
             for (var _i = 0; _i < discountNum; _i++) {
               var _selectedDiscount2$me;
-              var _selectedDiscount2 = allocatedPasses[_i];
-              markDiscountUsed(_selectedDiscount2);
+              var _selectedDiscount2 = applicableDiscounts[_i];
+              usedDiscounts.set(_selectedDiscount2.id, true);
 
               // 🔥 生成唯一的 _id
               var uniqueId = "".concat(flatItem._id, "_split_").concat(_i);
               var _discountDetail = {
-                amount: product.origin_total || product.price || 0,
-                type: _selectedDiscount2.tag || _selectedDiscount2.type,
+                amount: product.origin_total,
+                type: 'good_pass',
                 discount: {
-                  fixed_amount: product.origin_total || product.price || 0,
+                  fixed_amount: product.origin_total,
                   discount_calculation_mode: _selectedDiscount2 === null || _selectedDiscount2 === void 0 || (_selectedDiscount2$me = _selectedDiscount2.metadata) === null || _selectedDiscount2$me === void 0 ? void 0 : _selectedDiscount2$me.discount_calculation_mode,
                   resource_id: _selectedDiscount2.id,
                   title: _selectedDiscount2.format_title,
@@ -1512,14 +1302,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               }));
             }
           } else {
-            var _selectedDiscount$met3, _selectedDiscount$met4, _flatItem$parentProdu9;
+            var _selectedDiscount3$me, _selectedDiscount3$me2, _flatItem$parentProdu9;
             // 折扣卡：不拆分数量，直接应用
-            usedDiscounts.set(selectedDiscount.id, true);
+            var _selectedDiscount3 = selectedDiscountCard || applicableDiscounts[0];
+            usedDiscounts.set(_selectedDiscount3.id, true);
             var _productOriginTotal = product.original_price || product.price || 0;
 
             // 🔥 检查是否是 order_level 固定金额折扣卡
-            var _isOrderLevel = isOrderLevelFixedAmountDiscount(selectedDiscount);
-            var _orderLevelAllocation = _isOrderLevel ? orderLevelDiscountAllocations.get(selectedDiscount.id) : null;
+            var _isOrderLevel = isOrderLevelFixedAmountDiscount(_selectedDiscount3);
+            var _orderLevelAllocation = _isOrderLevel ? orderLevelDiscountAllocations.get(_selectedDiscount3.id) : null;
             var _productAllocation = _orderLevelAllocation === null || _orderLevelAllocation === void 0 ? void 0 : _orderLevelAllocation.get(flatItem._id);
             var _targetProductTotal;
             var fixedAmountPerItem;
@@ -1531,7 +1322,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               _targetProductTotal = Math.max(new Decimal(_productOriginTotal).minus(fixedAmountPerItem).toNumber(), 0);
             } else {
               // item_level 或其他类型：使用原有逻辑
-              _targetProductTotal = getDiscountAmount(selectedDiscount, _productOriginTotal, _productOriginTotal);
+              _targetProductTotal = getDiscountAmount(_selectedDiscount3, _productOriginTotal, _productOriginTotal);
               fixedAmountPerItem = new Decimal(_productOriginTotal).minus(_targetProductTotal).toNumber();
             }
 
@@ -1539,21 +1330,21 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             var _uniqueId = flatItem._id;
             var _discountDetail2 = {
               amount: fixedAmountPerItem * (product.num || 1),
-              type: selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : selectedDiscount.tag,
+              type: _selectedDiscount3.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount3.tag,
               discount: {
-                discount_card_type: selectedDiscount === null || selectedDiscount === void 0 || (_selectedDiscount$met3 = selectedDiscount.metadata) === null || _selectedDiscount$met3 === void 0 ? void 0 : _selectedDiscount$met3.discount_card_type,
+                discount_card_type: _selectedDiscount3 === null || _selectedDiscount3 === void 0 || (_selectedDiscount3$me = _selectedDiscount3.metadata) === null || _selectedDiscount3$me === void 0 ? void 0 : _selectedDiscount3$me.discount_card_type,
                 fixed_amount: fixedAmountPerItem,
-                discount_calculation_mode: selectedDiscount === null || selectedDiscount === void 0 || (_selectedDiscount$met4 = selectedDiscount.metadata) === null || _selectedDiscount$met4 === void 0 ? void 0 : _selectedDiscount$met4.discount_calculation_mode,
-                resource_id: selectedDiscount.id,
-                title: selectedDiscount.format_title,
+                discount_calculation_mode: _selectedDiscount3 === null || _selectedDiscount3 === void 0 || (_selectedDiscount3$me2 = _selectedDiscount3.metadata) === null || _selectedDiscount3$me2 === void 0 ? void 0 : _selectedDiscount3$me2.discount_calculation_mode,
+                resource_id: _selectedDiscount3.id,
+                title: _selectedDiscount3.format_title,
                 original_amount: product.original_price,
                 product_id: product.id,
-                percent: selectedDiscount.par_value
+                percent: _selectedDiscount3.par_value
               },
               metadata: _objectSpread({
                 // 🔥 使用唯一的 _id
                 custom_product_bundle_map_id: _uniqueId,
-                discount_rule_uncheck_flag: selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.discount_rule_uncheck_flag,
+                discount_rule_uncheck_flag: _selectedDiscount3 === null || _selectedDiscount3 === void 0 ? void 0 : _selectedDiscount3.discount_rule_uncheck_flag,
                 num: product.num || 1
               }, _productDiscountDifference !== undefined && {
                 product_discount_difference: _productDiscountDifference
@@ -1562,9 +1353,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             };
 
             // 记录实际应用的折扣
-            var _appliedProducts2 = appliedDiscountProducts.get(selectedDiscount.id) || [];
+            var _appliedProducts2 = appliedDiscountProducts.get(_selectedDiscount3.id) || [];
             _appliedProducts2.push(_discountDetail2);
-            appliedDiscountProducts.set(selectedDiscount.id, _appliedProducts2);
+            appliedDiscountProducts.set(_selectedDiscount3.id, _appliedProducts2);
             processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
               total: _targetProductTotal,
               price: new Decimal(_productOriginTotal || 0).minus(fixedAmountPerItem).toNumber(),
@@ -1582,40 +1373,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         originalProductList.forEach(function (originProduct) {
           var product = _this3.hooks.getProduct(originProduct);
 
-          // 已提交的扣次不参与运行时重组，避免价格或使用明细被二次改写。
-          if (isPersistedEntitlementLine(originProduct, product)) {
-            result.push(originProduct);
-            return;
-          }
-
           // 获取主商品处理结果
           var mainProductArr = processedProductsMap.get(product._id);
-          if (isEntitlementRuntimeLine(originProduct, product) && !product.isManualDiscount && mainProductArr !== null && mainProductArr !== void 0 && mainProductArr.length) {
-            var bundle = (product.bundle || []).flatMap(function (item, index) {
-              var processed = processedFlatItemsMap.get("".concat(product._id, "_bundle_").concat(index));
-              if (!(processed !== null && processed !== void 0 && processed.length)) return [item];
-              return processed.map(function (child) {
-                return _objectSpread(_objectSpread({}, item), {}, {
-                  _id: child._id,
-                  price: child.price,
-                  bundle_selling_price: child.price,
-                  num: child.num,
-                  discount_list: (child.discount_list || []).map(function (detail) {
-                    return _objectSpread(_objectSpread({}, detail), {}, {
-                      metadata: _objectSpread(_objectSpread({}, detail.metadata), {}, {
-                        num: child.num,
-                        custom_product_bundle_map_id: child._id
-                      })
-                    });
-                  })
-                });
-              });
-            });
-            result.push.apply(result, _toConsumableArray(mainProductArr.map(function (item) {
-              return rebuildEntitlementLine(item, bundle, _this3.hooks);
-            })));
-            return;
-          }
           if (!mainProductArr || mainProductArr.length === 0) {
             // 如果没有处理结果，返回默认商品
             var getDefaultProduct = function getDefaultProduct() {
@@ -1678,7 +1437,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   var hasGoodPass = processedBundleItems.some(function (item) {
                     var _item$discount_list;
                     return (_item$discount_list = item.discount_list) === null || _item$discount_list === void 0 ? void 0 : _item$discount_list.some(function (discount) {
-                      return isFullCoveragePass(discount);
+                      return discount.type === 'good_pass' || discount.tag === 'good_pass';
                     });
                   });
                   if (hasGoodPass) {
@@ -2010,29 +1769,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
         // 获取此优惠券实际应用的商品详情
         var appliedProductDetails = appliedDiscountProducts.get(discount.id) || [];
-        if (isEntitlementPass(discount)) {
-          var committed = discount.committedAppliedProductDetails || [];
-          var details = [].concat(_toConsumableArray(committed), _toConsumableArray(appliedProductDetails));
-          var _isAvailable = applicableProducts.length > 0;
-          var timeReasons = entitlementTimeReasons.get(discount.id) || [];
-          var timeReason = timeReasons.length ? timeReasons.every(Boolean) ? timeReasons[0] : undefined : getDiscountTimeUnavailableReason(discount, dayjs().format('YYYY-MM-DD HH:mm:ss'));
-          var reasonCode = _isAvailable ? undefined : discount.reasonCode || timeReason || (entitlementHolderMismatch.has(discount.id) ? 'holder_not_matched' : 'product_not_applicable');
-          return _objectSpread(_objectSpread({}, discount), {}, {
-            isAvailable: _isAvailable || committed.length > 0,
-            isSelected: details.length > 0,
-            isUsed: details.length > 0,
-            reasonCode: reasonCode,
-            reason: reasonCode === discount.reasonCode ? discount.reason : undefined,
-            isManualSelect: options !== null && options !== void 0 && options.scan ? false : discount.isManualSelect,
-            applicableProductIds: applicableProducts,
-            applicableProductDetails: applicableProductDetails,
-            appliedProductDetails: details,
-            savedAmount: details.reduce(function (sum, detail) {
-              var _detail$discount;
-              return new Decimal(sum).plus(new Decimal(((_detail$discount = detail.discount) === null || _detail$discount === void 0 ? void 0 : _detail$discount.fixed_amount) || 0).mul(detail._num || 1)).toNumber();
-            }, 0)
-          });
-        }
 
         // 根据是否有适用商品决定isAvailable
         var isAvailable = applicableProducts.length > 0;
@@ -2088,7 +1824,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       });
       console.log(processedProductList, 'processedProductList');
       return {
-        productList: this.entitlementPassEnabled ? finalizeEntitlementLines(processedProductList, this.hooks) : processedProductList,
+        productList: processedProductList,
         discountList: [].concat(editModeDiscount, _toConsumableArray(updatedDiscountList))
       };
     }
@@ -2113,15 +1849,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var ruleType = usageRules.type;
       // 套餐适用范围配置
       var packageScope = usageRules === null || usageRules === void 0 ? void 0 : usageRules.package_scope;
-      var _ref21 = packageScope || {},
-        _ref21$type = _ref21.type,
-        scopeType = _ref21$type === void 0 ? 'product_all' : _ref21$type,
-        _ref21$exclude_bundle = _ref21.exclude_bundle_product_ids,
-        exclude_bundle_product_ids = _ref21$exclude_bundle === void 0 ? [] : _ref21$exclude_bundle,
-        _ref21$include_bundle = _ref21.include_bundle_product_ids,
-        include_bundle_product_ids = _ref21$include_bundle === void 0 ? [] : _ref21$include_bundle,
-        _ref21$filter = _ref21.filter,
-        filter = _ref21$filter === void 0 ? 0 : _ref21$filter;
+      var _ref9 = packageScope || {},
+        _ref9$type = _ref9.type,
+        scopeType = _ref9$type === void 0 ? 'product_all' : _ref9$type,
+        _ref9$exclude_bundle_ = _ref9.exclude_bundle_product_ids,
+        exclude_bundle_product_ids = _ref9$exclude_bundle_ === void 0 ? [] : _ref9$exclude_bundle_,
+        _ref9$include_bundle_ = _ref9.include_bundle_product_ids,
+        include_bundle_product_ids = _ref9$include_bundle_ === void 0 ? [] : _ref9$include_bundle_,
+        _ref9$filter = _ref9.filter,
+        filter = _ref9$filter === void 0 ? 0 : _ref9$filter;
       var isMainProduct = flatItem.type === 'main'; // 单独购买
       var isBundleItem = flatItem.type === 'bundle'; // 套餐中购买