@pisell/pisellos 0.0.571 → 0.0.572

package/lib/modules/Rules/index.js

@@ -11,6 +11,11 @@ var _utils2 = require("../Cart/utils");
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _lodashEs = require("lodash-es");
 var _dayjs = _interopRequireDefault(require("dayjs"));
+var _evaluator = require("../../model/strategy/adapter/walletPass/evaluator");
+var _entitlementPass = require("../Discount/entitlementPass");
+var _availability = require("../Discount/availability");
+var _entitlementState = require("../Discount/entitlementState");
+var _entitlementLines = require("./entitlementLines");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class RulesModule extends _BaseModule.BaseModule {
   defaultName = 'rules';
@@ -18,6 +23,11 @@ class RulesModule extends _BaseModule.BaseModule {
   store;
   window; // WindowPlugin 实例
   hooks;
+  entitlementPassEnabled = false;
+  defaultWalletPassEvaluator;
+  setEntitlementPassEnabled(enabled) {
+    this.entitlementPassEnabled = enabled;
+  }
   constructor(name, version) {
     super(name, version);
     this.hooks = {};
@@ -38,21 +48,48 @@ class RulesModule extends _BaseModule.BaseModule {
   getWalletPassEvaluator() {
     return this.window.getWalletPassEvaluator?.();
   }
+  normalizeHolderRecordIds(value) {
+    const records = Array.isArray(value) ? value : [value];
+    return Array.from(new Set(records.map(record => {
+      if (record && typeof record === 'object') {
+        return record.form_record_id;
+      }
+      return record;
+    }).filter(record => record !== undefined && record !== null && record !== '' && record !== 0 && record !== '0').map(String)));
+  }
 
-  // 商品不需要holder,则不需要判断，直接返回true，商品需要holder但是还没填写，那么暂时不使用带有holder的券，直到填写才去匹配
-  checkHolderMatch(discount, product, holders) {
+  /**
+   * 商品未开启 Holder 选择时跳过匹配；已开启时，特定 form Holder 卡
+   * 只适用于同一 Holder Record，是否必填不影响匹配规则。
+   */
+  checkHolderMatch(discount, product, holderSource, holders) {
     // 非表单类型 holder 视为匹配
     if (discount.holder?.holder_type !== 'form') return true;
-    // 主预约holder, 目前（20251124）默认只考虑单个holder的情况
-    // 旧版 holders[0].form_record_id 新版 holders[0]
-    const orderHolderId = Array.isArray(holders) && holders.length > 0 ? holders[0].form_record_id || holders[0] : undefined;
-    const 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;
+
+    // 旧券沿用预约主体和单个 Holder 的匹配口径。
+    if (!(0, _entitlementPass.isEntitlementPass)(discount)) {
+      if (!product.isNeedHolder) return true;
+      const holder = holders?.[0];
+      const orderHolderId = holder && typeof holder === 'object' ? holder.form_record_id : holder;
+      const 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 会裁剪商品字段，从原始商品读取配置，套餐子项沿用父商品。
+    const holderConfig = holderSource?.holder_config ?? holderSource?.metadata?.holder_config ?? holderSource?.origin?.holder_config ?? holderSource?.metadata?.origin?.holder_config ?? holderSource?._origin?.holder_config ?? holderSource?._origin?.product?.holder_config ?? holderSource?._originData?.product?.holder_config ?? holderSource?._productInit?.holder_config ?? holderSource?._productOrigin?.holder_config ?? holderSource?._extend?.holder_config ?? holderSource?._extend?.product?.holder_config ?? holderSource?._extend?.product?.metadata?.holder_config;
+    const holderStatus = holderConfig?.status;
+    const holderEnabled = holderStatus == null || holderStatus === '' || holderStatus === true || ['enable', '1'].includes(String(holderStatus).trim().toLowerCase());
+    if (!holderEnabled || !holderConfig?.resource_id) {
+      return true;
+    }
+    const discountHolderIds = this.normalizeHolderRecordIds(discount.holder.holder_id);
+    if (!discountHolderIds.length) return false;
+    const productHolderIds = this.normalizeHolderRecordIds(product.holder_id);
+    const candidateHolderIds = productHolderIds.length || Array.isArray(product.holder_id) ? productHolderIds : this.normalizeHolderRecordIds(holders);
+    if (!candidateHolderIds.length) return false;
+    const discountHolderIdSet = new Set(discountHolderIds);
+    return candidateHolderIds.every(holderId => discountHolderIdSet.has(holderId));
   }
 
   // 判断discountList 是否可以对当前productList生效
@@ -74,7 +111,7 @@ class RulesModule extends _BaseModule.BaseModule {
     }
 
     // 编辑商品已有商品券
-    if (productList.every(item => {
+    if (!newDiscountList.some(_entitlementPass.isEntitlementPass) && productList.length > 0 && productList.every(item => {
       const product = this.hooks.getProduct(item);
       return product.booking_id && (product.discount_list?.length || product.total == 0);
     })) {
@@ -89,10 +126,10 @@ class RulesModule extends _BaseModule.BaseModule {
     // 合并新旧折扣列表，并计算折扣结果,注意，如果旧折扣里有 isEditMode 为 true 的优惠券，则不合并
     // 保留之前扫码得到的商品券（isScan: true）
     const filteredOldDiscountList = oldDiscountList.filter(discount => !discount.isEditMode && (discount.tag !== 'good_pass' || discount.isScan));
-    const mergedDiscountList = (0, _utils.uniqueById)([...filteredOldDiscountList, ...newDiscountList]);
+    const mergedDiscountList = (0, _utils.uniqueById)([...newDiscountList.filter(_entitlementPass.isEntitlementPass), ...filteredOldDiscountList, ...newDiscountList]);
     const result = this.calcDiscount({
       discountList: mergedDiscountList,
-      productList: [...productList],
+      productList: this.entitlementPassEnabled ? (0, _lodashEs.cloneDeep)(productList) : [...productList],
       orderTotalAmount,
       holders,
       isFormSubject
@@ -102,21 +139,23 @@ class RulesModule extends _BaseModule.BaseModule {
 
     // 检查是否有产品使用了新折扣
     let hasApplicableDiscount = false;
-    const newDiscountIds = newDiscountList.map(discount => discount.id);
+    const newDiscountIds = new Set(newDiscountList.map(discount => String(discount.id)));
 
     // 遍历处理后的产品列表，检查是否有产品使用了新折扣
     result.productList.forEach(product => {
+      const mappedProduct = this.hooks.getProduct(product);
+      if ((0, _entitlementState.isPersistedEntitlementLine)(product, mappedProduct)) return;
       const {
         discount_list,
         bundle
-      } = this.hooks.getProduct(product);
+      } = mappedProduct;
       const allDiscountList = [...(discount_list || [])];
       (bundle || []).forEach(item => {
         allDiscountList.push(...(item?.discount_list || []));
       });
       if (allDiscountList && allDiscountList.length > 0) {
         // 检查是否有使用新折扣的情况
-        const usedNewDiscount = allDiscountList.some(discount => newDiscountIds.includes(discount?.discount?.resource_id));
+        const usedNewDiscount = allDiscountList.some(discount => newDiscountIds.has(String(discount?.discount?.resource_id)));
         if (usedNewDiscount) {
           hasApplicableDiscount = true;
         }
@@ -130,6 +169,7 @@ class RulesModule extends _BaseModule.BaseModule {
     }
     return {
       isAvailable: hasApplicableDiscount,
+      evaluatedDiscountList: result.discountList,
       discountList: hasApplicableDiscount ? result.discountList : oldDiscountList,
       productList: hasApplicableDiscount ? result.productList : productList,
       unavailableReason
@@ -154,7 +194,7 @@ class RulesModule extends _BaseModule.BaseModule {
     for (const discount of discountList) {
       for (const item of productList) {
         const product = this.hooks.getProduct(item);
-        const bookingTime = (product?.startDate || (0, _dayjs.default)()).format('YYYY-MM-DD HH:mm:ss');
+        const bookingTime = (0, _dayjs.default)(product?.startDate || undefined).format('YYYY-MM-DD HH:mm:ss');
         const filteredList = (0, _utils.filterDiscountListByBookingTime)([discount], bookingTime);
         if (filteredList.length === 0) {
           return _types.UnavailableReason.TimeLimit;
@@ -165,6 +205,7 @@ class RulesModule extends _BaseModule.BaseModule {
     // 检查商品适用性
     for (const discount of discountList) {
       const limitedData = discount.limited_relation_product_data;
+      if (!limitedData) return _types.UnavailableReason.ProductNotApplicable;
       let hasApplicableProduct = false;
       for (const item of productList) {
         const product = this.hooks.getProduct(item);
@@ -190,6 +231,37 @@ class RulesModule extends _BaseModule.BaseModule {
     orderTotalAmount
   }, options) {
     const resolveIsFormSubject = product => typeof isFormSubject === 'function' ? Boolean(isFormSubject(product)) : Boolean(isFormSubject);
+    discountList = this.entitlementPassEnabled ? (0, _entitlementState.withCommittedEntitlementDetails)(discountList, productList, this.hooks.getProduct) : discountList.filter(item => !(0, _entitlementPass.isEntitlementPass)(item));
+    const usableEntitlements = discountList.filter(discount => (0, _entitlementPass.isEntitlementPass)(discount) && !discount.isEditMode && !discount.isManualSelect && !(0, _availability.getDiscountUsageBlockReason)(discount));
+    const canUseEntitlement = originProduct => {
+      const product = this.hooks.getProduct(originProduct);
+      if (product.vouchersApplicable === false) return false;
+      // 预判任一份可用就按份拆开，实际抵扣仍逐份核对 Holder。
+      const holderProducts = Array.isArray(product.holder_id) && product.holder_id.length > 1 ? product.holder_id.map(holder_id => ({
+        ...product,
+        holder_id
+      })) : [product];
+      const items = [{
+        type: 'main',
+        id: product.id,
+        price: product.original_price ?? product.price
+      }, ...(product.bundle || []).map(bundleItem => ({
+        type: 'bundle',
+        id: bundleItem._bundle_product_id ?? bundleItem.bundle_product_id ?? bundleItem.product_id,
+        price: bundleItem.original_price ?? bundleItem.price,
+        bundleItem
+      }))];
+      return usableEntitlements.some(discount => {
+        const scope = discount.limited_relation_product_data;
+        if (!scope || !holderProducts.some(item => this.checkHolderMatch(discount, item, originProduct, holders)) || !(0, _utils.filterDiscountListByBookingTime)([discount], (0, _dayjs.default)(product.startDate || undefined).format('YYYY-MM-DD HH:mm:ss')).length) return false;
+        return items.some(item => Number(item.price) > 0 && (scope.type === 'product_all' ? !(scope.filter === 1 && scope.exclude_product_ids?.some(id => String(id) === String(item.id))) : !!scope.product_ids?.includes(item.id)) && this.checkPackageSubItemUsageRules(discount, {
+          ...item,
+          originProduct,
+          parentProduct: product
+        }));
+      });
+    };
+    if (this.entitlementPassEnabled) productList = (0, _entitlementLines.prepareEntitlementLines)(productList, this.hooks, canUseEntitlement);
 
     // 识别出来是不是在编辑的界面里又新增了商品
     // 这种情况下，如果有可用的优惠券，也会自动勾选上
@@ -222,7 +294,12 @@ class RulesModule extends _BaseModule.BaseModule {
       if (discount.isEditMode) {
         editModeDiscount.push(discount);
       } else {
-        addModeDiscount.push(discount);
+        addModeDiscount.push((0, _entitlementPass.isEntitlementPass)(discount) ? {
+          ...discount,
+          config: undefined,
+          reason: undefined,
+          reasonCode: undefined
+        } : discount);
       }
     });
 
@@ -289,8 +366,7 @@ class RulesModule extends _BaseModule.BaseModule {
               bundleIndex,
               // 虚拟商品属性
               price: Number(bundleItem.price || 0),
-              id: bundleItem._bundle_product_id,
-              // 🔥 使用 _bundle_product_id
+              id: bundleItem._bundle_product_id ?? bundleItem.bundle_product_id ?? bundleItem.product_id,
               _id: `${product._id}_bundle_${bundleIndex}`,
               parentId: product._id,
               num: bundleItem.num || 1,
@@ -384,6 +460,9 @@ class RulesModule extends _BaseModule.BaseModule {
         }
         return 0;
       }
+      if ((0, _entitlementPass.isEntitlementPass)(a) || (0, _entitlementPass.isEntitlementPass)(b)) {
+        return (0, _entitlementPass.isEntitlementPass)(a) && (0, _entitlementPass.isEntitlementPass)(b) ? (0, _entitlementPass.compareEntitlementPassPriority)(a, b) : (0, _entitlementPass.isEntitlementPass)(a) ? -1 : 1;
+      }
 
       // 1. 先按优先级排序
       const priorityA = getPriority(a);
@@ -540,6 +619,78 @@ class RulesModule extends _BaseModule.BaseModule {
         usedDiscountCardLimitCounts.set(discount.id, currentCount + (discount.metadata?.num || 1));
       }
     });
+    const entitlementUsageCounts = new Map();
+    const markDiscountUsed = discount => {
+      if ((0, _entitlementPass.isEntitlementPass)(discount)) {
+        entitlementUsageCounts.set(discount.id, (entitlementUsageCounts.get(discount.id) || 0) + 1);
+        usedProductIdCounts.set(discount.product_id, (usedProductIdCounts.get(discount.product_id) || 0) + 1);
+      } else {
+        usedDiscounts.set(discount.id, true);
+      }
+    };
+
+    // 沿用商品券逐份拆分，同一多次卡可重复分配，数量受本单剩余额度限制。
+    const getFullCoveragePasses = (discounts, quantity) => {
+      const allocated = [];
+      const productCounts = new Map(usedProductIdCounts);
+      for (const discount of discounts) {
+        if (!(0, _entitlementPass.isFullCoveragePass)(discount) || allocated.length >= quantity) continue;
+        let count = (0, _entitlementPass.isEntitlementPass)(discount) ? (0, _entitlementPass.getRemainingEntitlementUses)(discount, entitlementUsageCounts.get(discount.id) || 0, quantity - allocated.length) : usedDiscounts.get(discount.id) ? 0 : 1;
+        const limit = Number(discount.config?.maxUsagePerOrder || 0);
+        if (limit > 0) {
+          count = Math.min(count, Math.max(0, Math.floor(limit) - (productCounts.get(discount.product_id) || 0)));
+        }
+        for (let i = 0; i < count; i++) allocated.push(discount);
+        productCounts.set(discount.product_id, (productCounts.get(discount.product_id) || 0) + count);
+      }
+      return allocated;
+    };
+    addModeDiscount.filter(_entitlementPass.isEntitlementPass).forEach(discount => {
+      discount.usageLimitFailKey = (0, _availability.getDiscountUsageLimitFailKey)(discount);
+      discount.reasonCode = (0, _availability.getDiscountUsageBlockReason)(discount);
+      const quota = (0, _entitlementPass.resolveEntitlementQuota)(discount);
+      if (discount.reasonCode || !quota) {
+        discount.config = {
+          isAvailable: false
+        };
+        return;
+      }
+      const entitlementEvaluator = evaluator || (this.defaultWalletPassEvaluator ?? (this.defaultWalletPassEvaluator = new _evaluator.WalletPassEvaluator()));
+      const result = entitlementEvaluator.checkVoucherAvailability({
+        // 兼容尚未传入订单总额的预约组件，保留多次卡原有的金额计算。
+        orderTotalAmount: orderTotalAmount || productList.reduce((sum, item) => {
+          const product = this.hooks.getProduct(item);
+          return sum.plus(new _decimal.default(product.origin_total || 0).times(product.quantity || product.num || 1));
+        }, new _decimal.default(0)).toNumber(),
+        // 策略按统一商品结构读主价与数量，套餐次数还需乘父商品份数。
+        products: sortedFlattenedList.map(item => ({
+          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?.quantity || item.parentProduct?.num || 1 : 1),
+          product_options: item.type === 'main' ? item.product?.options : undefined
+        })),
+        vouchers: [{
+          ...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_available_status ?? 1,
+          available_product_type: discount.limited_relation_product_data?.type,
+          available_product_ids: discount.limited_relation_product_data?.product_ids
+        }]
+      });
+      discount.config = {
+        ...result.config,
+        isAvailable: result.isAvailable
+      };
+      if (!result.isAvailable) {
+        discount.reason = result.reason;
+        discount.reasonCode = result.reasonCode || 'not_meet_the_required_conditions';
+      }
+    });
+    const entitlementTimeReasons = new Map();
+    const entitlementHolderMismatch = new Set();
 
     // 记录每个优惠券适用的商品ID
     const discountApplicability = new Map();
@@ -582,7 +733,7 @@ class RulesModule extends _BaseModule.BaseModule {
       }
 
       // 编辑的商品使用了优惠券不可用
-      const isAvailableProduct = flatItem.type === 'main' ? !(product?.booking_id && product?.discount_list?.length && product?.discount_list?.every(d => d.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(d.tag || d.type))) : !(flatItem?.booking_id && !!flatItem?.bundleItem?.discount_list?.length && flatItem?.bundleItem?.discount_list?.every(d => d.id));
+      const isAvailableProduct = flatItem.type === 'main' ? !(product?.booking_id && product?.discount_list?.length && product?.discount_list?.every(d => d.id && ['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(d.tag || d.type))) : !(flatItem?.booking_id && !!flatItem?.bundleItem?.discount_list?.length && flatItem?.bundleItem?.discount_list?.every(d => d.id));
       if (!isAvailableProduct) {
         return false;
       }
@@ -599,7 +750,7 @@ class RulesModule extends _BaseModule.BaseModule {
       const limitedData = discount.limited_relation_product_data;
 
       // 时间限制检查
-      const timeLimit = !!(0, _utils.filterDiscountListByBookingTime)([discount], (product?.startDate || (0, _dayjs.default)()).format('YYYY-MM-DD HH:mm:ss')).length;
+      const timeLimit = !!(0, _utils.filterDiscountListByBookingTime)([discount], (0, _dayjs.default)(product?.startDate || undefined).format('YYYY-MM-DD HH:mm:ss')).length;
       if (!timeLimit) {
         return false;
       }
@@ -760,16 +911,24 @@ class RulesModule extends _BaseModule.BaseModule {
       }
       addModeDiscount.forEach(discount => {
         const limitedData = discount?.limited_relation_product_data;
+        if (!limitedData || (0, _entitlementPass.isEntitlementPass)(discount) && discount.config?.isAvailable === false) return;
         // 拿到discount配置的holder信息 product信息 product.holder 加在 isLimitedProduct
         const _tempVar = flatItem?.type === 'bundle' ? flatItem?.parentProduct : flatItem?.product;
         const isHolderMatch = this.checkHolderMatch(discount, {
           isNeedHolder: resolveIsFormSubject(_tempVar) && !_tempVar?.isNormalProduct,
           holder_id: _tempVar?.holder_id || product.holder_id
-        }, holders);
+        }, flatItem.originProduct, holders);
         let timeLimit = true;
-        timeLimit = !!(0, _utils.filterDiscountListByBookingTime)([discount], (product?.startDate || (0, _dayjs.default)()).format('YYYY-MM-DD HH:mm:ss')).length;
+        const useTime = (0, _dayjs.default)(product?.startDate || undefined).format('YYYY-MM-DD HH:mm:ss');
+        timeLimit = !!(0, _utils.filterDiscountListByBookingTime)([discount], useTime).length;
+        if ((0, _entitlementPass.isEntitlementPass)(discount)) {
+          const reasons = entitlementTimeReasons.get(discount.id) || [];
+          reasons.push((0, _utils.getDiscountTimeUnavailableReason)(discount, useTime));
+          entitlementTimeReasons.set(discount.id, reasons);
+          if (!isHolderMatch) entitlementHolderMismatch.add(discount.id);
+        }
         // 是符合折扣的商品
-        const isLimitedProduct = (limitedData.type === 'product_all' && limitedData.filter !== 1 || limitedData.type === 'product_all' && limitedData.filter === 1 && !limitedData.exclude_product_ids.includes(product.id) || limitedData.product_ids && limitedData.product_ids.includes(product.id)) && isHolderMatch;
+        const isLimitedProduct = (limitedData.type === 'product_all' && isProductIncludedByLimitedData(limitedData, product.id) || limitedData.product_ids && limitedData.product_ids.includes(product.id)) && isHolderMatch;
 
         // 编辑的商品 使用了优惠券不可用
         const isAvailableProduct = flatItem.type === 'main' ? !(product?.booking_id && product?.discount_list?.length && product?.discount_list?.every(discount => discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type))) : !(flatItem?.booking_id && !!flatItem?.bundleItem?.discount_list?.length && flatItem?.bundleItem?.discount_list?.every(discount => discount.id));
@@ -778,14 +937,14 @@ class RulesModule extends _BaseModule.BaseModule {
         const isBundleAvailable = this.checkPackageSubItemUsageRules(discount, flatItem);
 
         // 判断优惠券是否适用于该商品
-        if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable && discount.config?.isAvailable) {
+        if (isAvailableProduct && !(0, _entitlementState.isPersistedEntitlementLine)(originProduct, flatItem.type === 'main' ? flatItem.product : flatItem.parentProduct) && (!(0, _entitlementPass.isEntitlementPass)(discount) || (flatItem.type === 'main' ? flatItem.product : flatItem.parentProduct)?.vouchersApplicable !== false) && isLimitedProduct && timeLimit && isBundleAvailable && discount.config?.isAvailable) {
           // 记录此优惠券适用的商品
           discountApplicability.get(discount.id)?.push(product.id);
 
           // 记录可抵扣的商品详情
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
           const discountType = discount.tag || discount.type;
-          const isGoodPass = discountType === 'good_pass';
+          const isGoodPass = (0, _entitlementPass.isFullCoveragePass)(discount);
 
           // 使用数量
           const num = isGoodPass || flatItem?.type === 'main' ? 1 : product.num;
@@ -801,7 +960,7 @@ class RulesModule extends _BaseModule.BaseModule {
               title: discount.format_title,
               original_amount: product.price || product.origin_total,
               pre_value: discount.par_value,
-              product_id: originProduct.id || originProduct.product_id,
+              product_id: (0, _entitlementPass.isEntitlementPass)(discount) ? product.id : originProduct.id || originProduct.product_id,
               discount_product_id: discount.product_id
             },
             metadata: {
@@ -910,7 +1069,7 @@ class RulesModule extends _BaseModule.BaseModule {
       });
 
       // 已持久化且已有钱包券/折扣卡的商品行跳过，保留后端历史折扣结果。
-      if (isPersistedProduct && hasExistingWalletDiscount) {
+      if ((0, _entitlementState.isPersistedEntitlementLine)(originProduct, flatItem.type === 'main' ? flatItem.product : flatItem.parentProduct) || isPersistedProduct && hasExistingWalletDiscount) {
         if (flatItem.type === 'main') {
           processedProductsMap.set(product._id, [originProduct]);
         } else {
@@ -924,6 +1083,7 @@ class RulesModule extends _BaseModule.BaseModule {
 
       // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
       const applicableDiscounts = sortedDiscountList.filter(discount => {
+        if ((0, _entitlementPass.isEntitlementPass)(discount) && (discount.config?.isAvailable !== true || (flatItem.type === 'main' ? flatItem.product : flatItem.parentProduct)?.vouchersApplicable === false || (0, _entitlementPass.getRemainingEntitlementUses)(discount, entitlementUsageCounts.get(discount.id) || 0, 1) <= 0)) return false;
         // 🔥 检查策略可用性（针对 good_pass 和折扣卡）
         const discountType = discount.tag || discount.type;
         const currentOriginUid = getOriginProductUid(originProduct);
@@ -942,16 +1102,16 @@ class RulesModule extends _BaseModule.BaseModule {
 
         // 如果商品价格为 0，其实不需要使用任何优惠券，直接 return true
         // 商品券时主商品价格为0不可用
-        if ((Number(product.price) <= 0 || !product.price) && !product.discount_list?.length && (discount.tag || discount.type) === 'good_pass') return false;
+        if ((Number(product.price) <= 0 || !product.price) && !product.discount_list?.length && (0, _entitlementPass.isFullCoveragePass)(discount)) return false;
 
         // 折扣卡商品价格为0时不可用
-        if ((Number(product.price) <= 0 || !product.price) && !product.discount_list?.find(n => n.discount?.resource_id === discount.id) && (discount.tag || discount.type) !== 'good_pass') return false;
+        if ((Number(product.price) <= 0 || !product.price) && !product.discount_list?.find(n => n.discount?.resource_id === discount.id) && !(0, _entitlementPass.isFullCoveragePass)(discount)) return false;
         // 如果优惠券已被使用，则跳过
         const targetUsedDiscounts = usedDiscounts.get(discount.id);
         if (targetUsedDiscounts && (discount.tag || discount.type) === 'good_pass') return false;
 
         // 🔥 检查 maxUsagePerOrder 限制：同一 product_id 的商品券使用数量不能超过配置值
-        if ((discount.tag || discount.type) === 'good_pass') {
+        if ((0, _entitlementPass.isFullCoveragePass)(discount)) {
           const maxUsagePerOrder = discount.config?.maxUsagePerOrder;
           if (maxUsagePerOrder && maxUsagePerOrder > 0) {
             const currentUsedCount = usedProductIdCounts.get(discount.product_id) || 0;
@@ -973,17 +1133,18 @@ class RulesModule extends _BaseModule.BaseModule {
           }
         }
         const limitedData = discount.limited_relation_product_data;
+        if (!limitedData) return false;
 
         // 拿到discount配置的holder信息 product信息 product.holder 不可用return false
         const _tempVar = flatItem?.type === 'bundle' ? flatItem?.parentProduct : flatItem?.product;
         const isHolderMatch = this.checkHolderMatch(discount, {
           isNeedHolder: resolveIsFormSubject(_tempVar) && !_tempVar?.isNormalProduct,
           holder_id: _tempVar?.holder_id || product.holder_id
-        }, holders);
+        }, flatItem.originProduct, holders);
         // 如果 holder 不匹配，则不适用
         if (!isHolderMatch) return false;
         let timeLimit = true;
-        timeLimit = !!(0, _utils.filterDiscountListByBookingTime)([discount], (product.startDate || (0, _dayjs.default)()).format('YYYY-MM-DD HH:mm:ss')).length;
+        timeLimit = !!(0, _utils.filterDiscountListByBookingTime)([discount], (0, _dayjs.default)(product.startDate || undefined).format('YYYY-MM-DD HH:mm:ss')).length;
         if (!timeLimit) {
           return false;
         }
@@ -1012,8 +1173,9 @@ class RulesModule extends _BaseModule.BaseModule {
       // 选择第一个适用的优惠券（已经按过期时间排序）
       // 如果有 isScan 且 isSelected 的折扣卡，则优先选中，否则再选择第一个
       // 用于处理：先手动扫描了一张折扣卡，扫描完以后带入客户信息，但是之前那张折扣卡不是最优惠的情况
-      const selectedDiscountCard = applicableDiscounts.find(n => n.isScan && n.isSelected && (n.tag || n.type) !== 'good_pass');
-      const selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
+      const selectedDiscountCard = applicableDiscounts.find(n => n.isScan && n.isSelected && !(0, _entitlementPass.isFullCoveragePass)(n));
+      const explicitlySelected = options?.isSelected === true ? applicableDiscounts.find(item => (0, _entitlementPass.isEntitlementPass)(item) && String(item.id) === String(options.discountId)) : undefined;
+      const selectedDiscount = explicitlySelected || selectedDiscountCard || applicableDiscounts[0];
 
       // 如果是手动折扣，则不适用优惠券
       let isManualDiscount = false;
@@ -1124,7 +1286,7 @@ class RulesModule extends _BaseModule.BaseModule {
 
       // 是否需要拆分（商品券需要拆分，折扣卡在 applicableProductLimit > 0 时也需要拆分）
       const discountType = selectedDiscount.tag || selectedDiscount.type;
-      const isGoodPass = discountType === 'good_pass';
+      const isGoodPass = (0, _entitlementPass.isFullCoveragePass)(selectedDiscount);
       const isDiscountCard = ['discount_card', 'product_discount_card'].includes(discountType);
       const applicableProductLimit = selectedDiscount.config?.applicableProductLimit || 0;
 
@@ -1134,10 +1296,13 @@ class RulesModule extends _BaseModule.BaseModule {
       // 需要拆分出来的数量
       const totalQuantity = product.quantity || product.num || 1;
       const availableGoodPassCount = applicableDiscounts.filter(item => (item.tag || item.type) === 'good_pass').length;
+      const allocatedPasses = isGoodPass && applicableDiscounts.some(_entitlementPass.isEntitlementPass) ? getFullCoveragePasses([selectedDiscount, ...applicableDiscounts.filter(item => item !== selectedDiscount)], totalQuantity) : undefined;
 
       // 🔥 计算最大使用次数限制
       let maxUsageLimit;
-      if (isGoodPass) {
+      if (allocatedPasses) {
+        maxUsageLimit = allocatedPasses.length;
+      } else if (isGoodPass) {
         // 商品券：使用 maxUsagePerOrder 限制
         maxUsageLimit = availableGoodPassCount;
         if (selectedDiscount.config && selectedDiscount.config.maxUsagePerOrder) {
@@ -1173,9 +1338,10 @@ class RulesModule extends _BaseModule.BaseModule {
         for (let i = 0; i < splitCount; i++) {
           // 商品券：每个拆分商品使用不同的商品券（从 applicableDiscounts 按索引取）
           // 折扣卡：所有拆分商品使用同一张折扣卡（selectedDiscountCard 或 applicableDiscounts[0]）
-          const currentSelectedDiscount = isGoodPass ? selectedDiscountCard || applicableDiscounts[i] : selectedDiscountCard || applicableDiscounts[0];
+          const currentSelectedDiscount = allocatedPasses?.[i] || (isGoodPass ? selectedDiscountCard || applicableDiscounts[i] : selectedDiscountCard || applicableDiscounts[0]);
+          const selectedDiscount = currentSelectedDiscount;
           // 标记优惠券为已使用
-          usedDiscounts.set(currentSelectedDiscount.id, true);
+          markDiscountUsed(currentSelectedDiscount);
           // 🔥 更新 product_id 使用计数
           if ((currentSelectedDiscount.tag || currentSelectedDiscount.type) === 'good_pass') {
             const currentCount = usedProductIdCounts.get(currentSelectedDiscount.product_id) || 0;
@@ -1247,7 +1413,7 @@ class RulesModule extends _BaseModule.BaseModule {
           const mainProductDiscountAmount = amount;
           const lineDiscountAmount = new _decimal.default(mainProductDiscountAmount).plus(optionDiscountAmount).toNumber();
           const discountType = selectedDiscount.tag || selectedDiscount.type;
-          const currentIsGoodPass = discountType === 'good_pass';
+          const currentIsGoodPass = (0, _entitlementPass.isFullCoveragePass)(selectedDiscount);
           const discountDetail = {
             amount: lineDiscountAmount,
             type: selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : discountType,
@@ -1258,7 +1424,7 @@ class RulesModule extends _BaseModule.BaseModule {
               resource_id: selectedDiscount.id,
               title: selectedDiscount.format_title,
               original_amount: product.price,
-              product_id: originProduct.id || originProduct.product_id,
+              product_id: (0, _entitlementPass.isEntitlementPass)(selectedDiscount) ? product.id : originProduct.id || originProduct.product_id,
               percent: reapplyDiscountPercent ?? selectedDiscount.par_value,
               discount_product_id: selectedDiscount.product_id
             },
@@ -1326,8 +1492,8 @@ class RulesModule extends _BaseModule.BaseModule {
           for (let i = 0; i < discountNum; i++) {
             // 商品券：每个拆分商品使用不同的商品券
             // 折扣卡：所有拆分商品使用同一张折扣卡
-            const currentBundleDiscount = isGoodPass ? selectedDiscountCard || applicableDiscounts[i] : selectedDiscountCard || applicableDiscounts[0];
-            usedDiscounts.set(currentBundleDiscount.id, true);
+            const currentBundleDiscount = allocatedPasses?.[i] || (isGoodPass ? selectedDiscountCard || applicableDiscounts[i] : selectedDiscountCard || applicableDiscounts[0]);
+            markDiscountUsed(currentBundleDiscount);
             // 🔥 更新 product_id 使用计数
             if ((currentBundleDiscount.tag || currentBundleDiscount.type) === 'good_pass') {
               const currentCount = usedProductIdCounts.get(currentBundleDiscount.product_id) || 0;
@@ -1349,7 +1515,7 @@ class RulesModule extends _BaseModule.BaseModule {
             debugger;
 
             // 确定折扣类型
-            const bundleDiscountType = currentBundleDiscount.tag === 'product_discount_card' ? 'discount_card' : currentBundleDiscount.tag;
+            const bundleDiscountType = currentBundleDiscount.tag === 'product_discount_card' ? 'discount_card' : currentBundleDiscount.tag || currentBundleDiscount.type;
             const discountDetail = {
               amount: bundleDiscountAmount,
               type: bundleDiscountType,
@@ -1361,12 +1527,12 @@ class RulesModule extends _BaseModule.BaseModule {
                 title: currentBundleDiscount.format_title,
                 original_amount: product.origin_total,
                 product_id: product.id || product.product_id,
-                discount_product_id: selectedDiscount.product_id
+                discount_product_id: currentBundleDiscount.product_id
               },
               metadata: {
                 // 🔥 使用拆分后的唯一 _id
                 custom_product_bundle_map_id: uniqueId,
-                discount_rule_uncheck_flag: selectedDiscount?.discount_rule_uncheck_flag,
+                discount_rule_uncheck_flag: currentBundleDiscount?.discount_rule_uncheck_flag,
                 num: 1
               },
               _num: 1,
@@ -1399,6 +1565,9 @@ class RulesModule extends _BaseModule.BaseModule {
             // 重新查找适用于剩余商品的可用折扣（已使用的会被自动过滤掉）
             const nextApplicableDiscounts = sortedDiscountList.filter(nextDiscount => {
               const nextDiscountType = nextDiscount.tag || nextDiscount.type;
+              if ((0, _entitlementPass.isEntitlementPass)(nextDiscount)) {
+                if (nextDiscount.config?.isAvailable !== true || flatItem.parentProduct?.vouchersApplicable === false || (0, _entitlementPass.getRemainingEntitlementUses)(nextDiscount, entitlementUsageCounts.get(nextDiscount.id) || 0, 1) <= 0 || !this.checkHolderMatch(nextDiscount, flatItem.parentProduct, originProduct, holders) || !(0, _utils.filterDiscountListByBookingTime)([nextDiscount], (0, _dayjs.default)(product.startDate || undefined).format('YYYY-MM-DD HH:mm:ss')).length) return false;
+              }
               // 检查策略可用性
               if (['good_pass', 'discount_card', 'product_discount_card'].includes(nextDiscountType)) {
                 if (nextDiscount.config === undefined || !nextDiscount?.config?.isAvailable) {
@@ -1406,13 +1575,13 @@ class RulesModule extends _BaseModule.BaseModule {
                 }
               }
               // 折扣卡时总价为0时不可用
-              if ((Number(product.total) <= 0 || !product.total) && !product.discount_list?.find(n => n.discount?.resource_id === nextDiscount.id) && nextDiscountType !== 'good_pass') return false;
+              if ((Number(product.total) <= 0 || !product.total) && !product.discount_list?.find(n => n.discount?.resource_id === nextDiscount.id) && !(0, _entitlementPass.isFullCoveragePass)(nextDiscount)) return false;
 
               // 商品券已被使用则跳过
               if (usedDiscounts.get(nextDiscount.id) && nextDiscountType === 'good_pass') return false;
 
               // 检查 maxUsagePerOrder 限制
-              if (nextDiscountType === 'good_pass') {
+              if ((0, _entitlementPass.isFullCoveragePass)(nextDiscount)) {
                 const maxUsagePerOrder = nextDiscount.config?.maxUsagePerOrder;
                 if (maxUsagePerOrder && maxUsagePerOrder > 0) {
                   const currentUsedCount = usedProductIdCounts.get(nextDiscount.product_id) || 0;
@@ -1433,8 +1602,9 @@ class RulesModule extends _BaseModule.BaseModule {
                 }
               }
               const limitedData = nextDiscount.limited_relation_product_data;
+              if (!limitedData) return false;
               if (limitedData.type === 'product_all') {
-                if (limitedData.filter === 1 && limitedData.exclude_product_ids.includes(product.id)) {
+                if (!isProductIncludedByLimitedData(limitedData, product.id)) {
                   return false;
                 }
                 if (!this.checkPackageSubItemUsageRules(nextDiscount, flatItem)) {
@@ -1464,12 +1634,12 @@ class RulesModule extends _BaseModule.BaseModule {
             }
 
             // 选择最优折扣
-            const nextSelectedDiscountCard = nextApplicableDiscounts.find(n => n.isScan && n.isSelected && (n.tag || n.type) !== 'good_pass');
+            const nextSelectedDiscountCard = nextApplicableDiscounts.find(n => n.isScan && n.isSelected && !(0, _entitlementPass.isFullCoveragePass)(n));
             const nextSelectedDiscount = nextSelectedDiscountCard || nextApplicableDiscounts[0];
 
             // 判断新折扣是否需要拆分
             const nextDiscType = nextSelectedDiscount.tag || nextSelectedDiscount.type;
-            const nextIsGoodPass = nextDiscType === 'good_pass';
+            const nextIsGoodPass = (0, _entitlementPass.isFullCoveragePass)(nextSelectedDiscount);
             const nextIsDiscountCard = ['discount_card', 'product_discount_card'].includes(nextDiscType);
             const nextApplicableProductLimit = nextSelectedDiscount.config?.applicableProductLimit || 0;
             const nextIsNeedSplit = nextIsGoodPass || nextIsDiscountCard && nextApplicableProductLimit > 0;
@@ -1490,7 +1660,7 @@ class RulesModule extends _BaseModule.BaseModule {
               const nextTargetTotal = (0, _utils.getDiscountAmount)(nextBundleDiscount, nextOriginTotal, nextOriginTotal);
               const nextDiscountAmount = new _decimal.default(nextOriginTotal).minus(nextTargetTotal).toNumber();
               const nextUniqueId = `${flatItem._id}_split_${continueSplitIndex}`;
-              const nextBundleDiscType = nextBundleDiscount.tag === 'product_discount_card' ? 'discount_card' : nextBundleDiscount.tag;
+              const nextBundleDiscType = nextBundleDiscount.tag === 'product_discount_card' ? 'discount_card' : nextBundleDiscount.tag || nextBundleDiscount.type;
               const nextDiscountDetail = {
                 amount: nextDiscountAmount * remainingNum,
                 type: nextBundleDiscType,
@@ -1529,8 +1699,11 @@ class RulesModule extends _BaseModule.BaseModule {
             }
 
             // 🔥 需要拆分：计算最大使用次数
+            const nextAllocatedPasses = nextIsGoodPass && nextApplicableDiscounts.some(_entitlementPass.isEntitlementPass) ? getFullCoveragePasses([nextSelectedDiscount, ...nextApplicableDiscounts.filter(item => item !== nextSelectedDiscount)], remainingNum) : undefined;
             let nextMaxUsageLimit;
-            if (nextIsGoodPass) {
+            if (nextAllocatedPasses) {
+              nextMaxUsageLimit = nextAllocatedPasses.length;
+            } else if (nextIsGoodPass) {
               const nextGoodPassCount = nextApplicableDiscounts.filter(item => (item.tag || item.type) === 'good_pass').length;
               nextMaxUsageLimit = nextGoodPassCount;
               if (nextSelectedDiscount.config?.maxUsagePerOrder) {
@@ -1559,8 +1732,8 @@ class RulesModule extends _BaseModule.BaseModule {
 
             // 生成有折扣的商品
             for (let j = 0; j < nextSplitCount; j++) {
-              const nextBundleDiscount = nextIsGoodPass ? nextSelectedDiscountCard || nextApplicableDiscounts[j] : nextSelectedDiscountCard || nextApplicableDiscounts[0];
-              usedDiscounts.set(nextBundleDiscount.id, true);
+              const nextBundleDiscount = nextAllocatedPasses?.[j] || (nextIsGoodPass ? nextSelectedDiscountCard || nextApplicableDiscounts[j] : nextSelectedDiscountCard || nextApplicableDiscounts[0]);
+              markDiscountUsed(nextBundleDiscount);
               if ((nextBundleDiscount.tag || nextBundleDiscount.type) === 'good_pass') {
                 const curCount = usedProductIdCounts.get(nextBundleDiscount.product_id) || 0;
                 usedProductIdCounts.set(nextBundleDiscount.product_id, curCount + 1);
@@ -1573,7 +1746,7 @@ class RulesModule extends _BaseModule.BaseModule {
               const nextUniqueId = `${flatItem._id}_split_${continueSplitIndex}`;
               const nextDiscountedPrice = (0, _utils.getDiscountAmount)(nextBundleDiscount, product.origin_total, product.origin_total);
               const nextBundleDiscAmount = new _decimal.default(product.origin_total || 0).minus(nextDiscountedPrice).toNumber();
-              const nextBundleDiscTypeStr = nextBundleDiscount.tag === 'product_discount_card' ? 'discount_card' : nextBundleDiscount.tag;
+              const nextBundleDiscTypeStr = nextBundleDiscount.tag === 'product_discount_card' ? 'discount_card' : nextBundleDiscount.tag || nextBundleDiscount.type;
               const nextDiscountDetail = {
                 amount: nextBundleDiscAmount,
                 type: nextBundleDiscTypeStr,
@@ -1704,8 +1877,37 @@ class RulesModule extends _BaseModule.BaseModule {
       originalProductList.forEach(originProduct => {
         const product = this.hooks.getProduct(originProduct);
 
+        // 已提交的扣次不参与运行时重组，避免价格或使用明细被二次改写。
+        if ((0, _entitlementState.isPersistedEntitlementLine)(originProduct, product)) {
+          result.push(originProduct);
+          return;
+        }
+
         // 获取主商品处理结果
         const mainProductArr = processedProductsMap.get(product._id);
+        if ((0, _entitlementLines.isEntitlementRuntimeLine)(originProduct, product) && !product.isManualDiscount && mainProductArr?.length) {
+          const bundle = (product.bundle || []).flatMap((item, index) => {
+            const processed = processedFlatItemsMap.get(`${product._id}_bundle_${index}`);
+            if (!processed?.length) return [item];
+            return processed.map(child => ({
+              ...item,
+              _id: child._id,
+              price: child.price,
+              bundle_selling_price: child.price,
+              num: child.num,
+              discount_list: (child.discount_list || []).map(detail => ({
+                ...detail,
+                metadata: {
+                  ...detail.metadata,
+                  num: child.num,
+                  custom_product_bundle_map_id: child._id
+                }
+              }))
+            }));
+          });
+          result.push(...mainProductArr.map(item => (0, _entitlementLines.rebuildEntitlementLine)(item, bundle, this.hooks)));
+          return;
+        }
         if (!mainProductArr || mainProductArr.length === 0) {
           // 如果没有处理结果，返回默认商品（还原 option 价格）
           const getDefaultProduct = () => {
@@ -1768,7 +1970,7 @@ class RulesModule extends _BaseModule.BaseModule {
                 // 处理过的bundle item
                 bundleProcessingInfo.set(bundleIndex, processedBundleItems);
                 // 🔥 检查是否应用了商品券（good_pass）
-                const hasGoodPass = processedBundleItems.some(item => item.discount_list?.some(discount => discount.type === 'good_pass' || discount.tag === 'good_pass'));
+                const hasGoodPass = processedBundleItems.some(item => item.discount_list?.some(discount => (0, _entitlementPass.isFullCoveragePass)(discount)));
                 if (hasGoodPass) {
                   hasGoodPassApplied = true;
                 }
@@ -2084,6 +2286,27 @@ class RulesModule extends _BaseModule.BaseModule {
 
       // 获取此优惠券实际应用的商品详情
       const appliedProductDetails = appliedDiscountProducts.get(discount.id) || [];
+      if ((0, _entitlementPass.isEntitlementPass)(discount)) {
+        const committed = discount.committedAppliedProductDetails || [];
+        const details = [...committed, ...appliedProductDetails];
+        const isAvailable = applicableProducts.length > 0;
+        const timeReasons = entitlementTimeReasons.get(discount.id) || [];
+        const timeReason = timeReasons.length ? timeReasons.every(Boolean) ? timeReasons[0] : undefined : (0, _utils.getDiscountTimeUnavailableReason)(discount, (0, _dayjs.default)().format('YYYY-MM-DD HH:mm:ss'));
+        const reasonCode = isAvailable ? undefined : discount.reasonCode || timeReason || (entitlementHolderMismatch.has(discount.id) ? 'holder_not_matched' : 'product_not_applicable');
+        return {
+          ...discount,
+          isAvailable: isAvailable || committed.length > 0,
+          isSelected: details.length > 0,
+          isUsed: details.length > 0,
+          reasonCode,
+          reason: reasonCode === discount.reasonCode ? discount.reason : undefined,
+          isManualSelect: options?.scan ? false : discount.isManualSelect,
+          applicableProductIds: applicableProducts,
+          applicableProductDetails,
+          appliedProductDetails: details,
+          savedAmount: details.reduce((sum, detail) => new _decimal.default(sum).plus(new _decimal.default(detail.discount?.fixed_amount || 0).mul(detail._num || 1)).toNumber(), 0)
+        };
+      }
 
       // 根据是否有适用商品决定isAvailable
       const isAvailable = applicableProducts.length > 0;
@@ -2141,7 +2364,7 @@ class RulesModule extends _BaseModule.BaseModule {
       };
     });
     return {
-      productList: processedProductList,
+      productList: this.entitlementPassEnabled ? (0, _entitlementLines.finalizeEntitlementLines)(processedProductList, this.hooks) : processedProductList,
       discountList: [...editModeDiscount, ...updatedDiscountList]
     };
   }