@pisell/pisellos 2.2.309 → 2.2.310

package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -7,6 +7,7 @@ exports.buildCacheItemFromOrderLine = buildCacheItemFromOrderLine;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _utils = require("../../Order/utils");
 var _manualProductDiscount = require("../../Order/utils/manualProductDiscount");
+var _entitlementPass = require("../../Discount/entitlementPass");
 var _orderLineDisplay = require("./orderLineDisplay");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function safeFormat(value, fmt) {
@@ -116,11 +117,38 @@ function resolveProductTitle(product, booking, sourceProduct) {
 function resolveProductCover(product, booking, sourceProduct) {
   return sourceProduct?.cover ?? product.product_cover ?? '';
 }
-function resolveMainProductPrice(product, fallback) {
-  const metadata = product.metadata || {};
-  const value = metadata.main_product_original_price ?? metadata.source_product_price;
+function toFinitePrice(value) {
+  if (value === undefined || value === null || value === '') return null;
   const parsed = Number(value);
-  return Number.isFinite(parsed) ? parsed : fallback;
+  return Number.isFinite(parsed) ? parsed : null;
+}
+function hasEntitlementPassDiscount(product) {
+  const hasEntitlementDiscount = discountList => Array.isArray(discountList) && discountList.some(_entitlementPass.isEntitlementPass);
+  return hasEntitlementDiscount(product.discount_list) || Array.isArray(product.product_bundle) && product.product_bundle.some(bundle => hasEntitlementDiscount(bundle?.discount_list));
+}
+function resolveMainProductPrice(product, fallback, sourceProduct, restoreEntitlementPrice = false) {
+  const metadata = product.metadata || {};
+  if (!restoreEntitlementPrice) {
+    const value = metadata.main_product_original_price ?? metadata.source_product_price;
+    const parsed = Number(value);
+    return Number.isFinite(parsed) ? parsed : fallback;
+  }
+  const sourcePrice = toFinitePrice(metadata.source_product_price);
+  if (sourcePrice !== null) return sourcePrice;
+  const variantId = Number(product.product_variant_id || 0);
+  const variantList = sourceProduct?.variant ?? metadata.origin?.variant;
+  if (variantId > 0 && Array.isArray(variantList)) {
+    const matched = variantList.find(variant => Number(variant?.id) === variantId);
+    const variantPrice = toFinitePrice(matched?.price ?? matched?.base_price);
+    if (variantPrice !== null) return variantPrice;
+  }
+  const catalogPrice = toFinitePrice(sourceProduct?.price ?? sourceProduct?.base_price ?? metadata.origin?.price ?? metadata.origin?.base_price);
+  if (catalogPrice !== null) return catalogPrice;
+
+  // legacy 数据没有 source_product_price 时，main_product_original_price
+  // 仍比已被月卡改写为 0 的 selling_price 更可靠。
+  const legacyMainPrice = toFinitePrice(metadata.main_product_original_price);
+  return legacyMainPrice ?? fallback;
 }
 function mapOrderBundleToOtherBundle(bundle) {
   return bundle.map(item => {
@@ -185,7 +213,8 @@ function buildCacheItemFromOrderLine(input) {
   const resolvedId = product.product_id ?? sourceProduct?.id;
   const selling = Number(product.selling_price ?? 0);
   const original = Number(product.original_price ?? selling);
-  const mainProductPrice = resolveMainProductPrice(product, selling);
+  const shouldRestoreEntitlementPrice = hasEntitlementPassDiscount(product);
+  const mainProductPrice = resolveMainProductPrice(product, selling, sourceProduct, shouldRestoreEntitlementPrice);
   const startDate = safeFormat(booking.start_date, 'YYYY-MM-DD');
   const endDate = safeFormat(booking.end_date, 'YYYY-MM-DD');
   const startTime = normalizeTimeString(booking.start_time);
@@ -240,7 +269,7 @@ function buildCacheItemFromOrderLine(input) {
     }
   }
   if (product.metadata?.price_override != null || manualDiscount) {
-    extend.priceOverride = selling;
+    extend.priceOverride = shouldRestoreEntitlementPrice ? product.metadata?.price_override ?? selling : selling;
   }
   if (booking.holder !== undefined) {
     extend.holder = booking.holder;

package/lib/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.buildNormalProductCacheItemFromOrderLine = buildNormalProductCacheItemFromOrderLine;
 var _utils = require("../../Order/utils");
+var _entitlementPass = require("../../Discount/entitlementPass");
 var _orderLineDisplay = require("./orderLineDisplay");
 /**
  * 从已加车的普通商品 order line 反查 SkuDetailModal edit 所需的 cacheItem。
@@ -44,12 +45,16 @@ function resolveSourceProductPrice(product, sourceProduct) {
   }
   return Number(product.selling_price ?? 0);
 }
+function hasEntitlementPassDiscount(product) {
+  const hasEntitlementDiscount = discountList => Array.isArray(discountList) && discountList.some(_entitlementPass.isEntitlementPass);
+  return hasEntitlementDiscount(product.discount_list) || Array.isArray(product.product_bundle) && product.product_bundle.some(bundle => hasEntitlementDiscount(bundle?.discount_list));
+}
 
 /** 订单行 bundle → booking other.bundle（保留 original_price 供 setProductPrice 按比例分摊） */
-function mapOrderBundleToOtherBundle(bundle) {
+function mapOrderBundleToOtherBundle(bundle, preferManualPrice = false) {
   return bundle.map(item => {
     const catalogOriginal = item.original_price ?? item.product_price ?? item.price ?? item.bundle_selling_price;
-    const selling = item.bundle_selling_price ?? item.price ?? catalogOriginal;
+    const selling = preferManualPrice ? item.price ?? item.bundle_selling_price ?? catalogOriginal : item.bundle_selling_price ?? item.price ?? catalogOriginal;
     const {
       bundle_selling_price: _omitBundleSelling,
       ...rest
@@ -78,9 +83,11 @@ function buildNormalProductCacheItemFromOrderLine(input) {
   const selling = Number(product.selling_price ?? 0);
   const original = Number(product.original_price ?? selling);
   const uid = product.metadata?.unique_identification_number;
-  const option = (0, _utils.getProductSkuOptions)(product);
-  const bundle = mapOrderBundleToOtherBundle(Array.isArray(product.product_bundle) ? product.product_bundle : []);
   const originExtend = product.metadata?.origin?._extend;
+  const shouldPreserveEntitlementPriceOverride = hasEntitlementPassDiscount(product) && (originExtend?.priceOverride !== undefined || product.metadata?.price_override != null);
+  const hasPriceOverride = originExtend?.priceOverride !== undefined || shouldPreserveEntitlementPriceOverride;
+  const option = (0, _utils.getProductSkuOptions)(product);
+  const bundle = mapOrderBundleToOtherBundle(Array.isArray(product.product_bundle) ? product.product_bundle : [], shouldPreserveEntitlementPriceOverride);
   const productOptionString = (0, _orderLineDisplay.buildProductOptionStringFromOrderLine)(product);
   const discountList = product.discount_list || [];
   const other = {
@@ -114,8 +121,8 @@ function buildNormalProductCacheItemFromOrderLine(input) {
     ...(productOptionString ? {
       product_option_string: productOptionString
     } : {}),
-    ...(originExtend?.priceOverride !== undefined ? {
-      priceOverride: originExtend.priceOverride
+    ...(hasPriceOverride ? {
+      priceOverride: shouldPreserveEntitlementPriceOverride ? originExtend?.priceOverride ?? product.metadata?.price_override : originExtend?.priceOverride
     } : {}),
     ...(originExtend?.bundle_edit !== undefined ? {
       bundle_edit: originExtend.bundle_edit

package/lib/modules/Customer/index.js

@@ -150,10 +150,14 @@ class CustomerModule extends _BaseModule.BaseModule {
       with: ['latestWalletDetail.wallet', 'contactsInfo', 'formRecord'],
       search_wallet_flag: 1,
       search_wallet_pass_flag: 1,
+      filter_franchisor_permissions: ['use'],
       ...(search && {
         search
       }),
-      ..._otherParams
+      ..._otherParams,
+      ...(url === '/customer/select-list' ? {
+        with_franchisor_data: 1
+      } : {})
     };
     const res = await this.request.get(url, queryParams, {
       cache: {

package/lib/modules/Customer/types.d.ts

@@ -50,6 +50,8 @@ export interface ShopGetCustomerListParams {
     search_wallet_flag?: 0 | 1;
     /** wallet pass搜索标识 */
     search_wallet_pass_flag?: 0 | 1;
+    /** 是否查询连锁加盟组合店铺数据 */
+    with_franchisor_data?: boolean | 0 | 1;
     /** 其他筛选参数 */
     [key: string]: any;
 }

package/lib/modules/Discount/availability.d.ts

@@ -0,0 +1,7 @@
+import type { Discount, DiscountFilterRejectKey } from './types';
+/** 周期限制只影响当前使用；total_credits 才代表整张卡的次数耗尽。 */
+export declare function getDiscountUsageLimitFailKey(discount: Discount): DiscountFilterRejectKey | null;
+export declare function hasAvailableDiscountBalance(discount: Discount): boolean;
+/** 按卡本身当前生命周期判断；预约时间或一次日程不匹配不代表已失效。 */
+export declare function getDiscountLifecycleReason(discount: Discount): 'disabled' | 'exhausted' | 'expired' | undefined;
+export declare function getDiscountUsageBlockReason(discount: Discount): string | undefined;

package/lib/modules/Discount/availability.js

@@ -0,0 +1,43 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDiscountLifecycleReason = getDiscountLifecycleReason;
+exports.getDiscountUsageBlockReason = getDiscountUsageBlockReason;
+exports.getDiscountUsageLimitFailKey = getDiscountUsageLimitFailKey;
+exports.hasAvailableDiscountBalance = hasAvailableDiscountBalance;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _decimal = _interopRequireDefault(require("decimal.js"));
+var _entitlementPass = require("./entitlementPass");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/** 周期限制只影响当前使用；total_credits 才代表整张卡的次数耗尽。 */
+function getDiscountUsageLimitFailKey(discount) {
+  const value = discount.extension_data?.find(field => field.field_key === 'usage_credits')?.value;
+  if (!value) return null;
+  const limits = [['total_credits', discount.total_order_behavior_count], ['per_user_limit', discount.customer_order_behavior_count], ['max_per_day', discount.today_order_behavior_count], ['max_per_week', discount.week_order_behavior_count], ['max_per_month', discount.month_order_behavior_count]];
+  return limits.find(([key, count]) => Number(value[key]) > 0 && Number(count || 0) >= Number(value[key]))?.[0] || null;
+}
+function hasAvailableDiscountBalance(discount) {
+  if ((0, _entitlementPass.isEntitlementPass)(discount)) return (0, _entitlementPass.hasAvailableEntitlementUses)(discount);
+  return new _decimal.default(discount.par_value || 0).minus(discount.used_par_value || 0).greaterThan(0);
+}
+
+/** 按卡本身当前生命周期判断；预约时间或一次日程不匹配不代表已失效。 */
+function getDiscountLifecycleReason(discount) {
+  if (discount.limit_status && discount.limit_status !== 'enable') {
+    return 'disabled';
+  }
+  if (((0, _entitlementPass.isEntitlementPass)(discount) || discount.par_value != null) && !hasAvailableDiscountBalance(discount) || getDiscountUsageLimitFailKey(discount) === 'total_credits') {
+    return 'exhausted';
+  }
+  // 自定义日程沿用快照语义，不使用遗留固定有效期字段推断过期。
+  if (discount.metadata?.validity_type !== 'custom_schedule_validity' && discount.expire_time) {
+    const expiry = (0, _dayjs.default)(discount.expire_time);
+    if (expiry.isValid() && !(0, _dayjs.default)().isBefore(expiry)) return 'expired';
+  }
+  return undefined;
+}
+function getDiscountUsageBlockReason(discount) {
+  return getDiscountLifecycleReason(discount) || getDiscountUsageLimitFailKey(discount) || (discount.unified_available_status != null && String(discount.unified_available_status) !== '' && Number(discount.unified_available_status) === 0 ? 'server_unavailable' : undefined);
+}

package/lib/modules/Discount/entitlementPass.d.ts

@@ -0,0 +1,34 @@
+export declare const ENTITLEMENT_PASS_TYPE = "entitlement_pass";
+export declare const GOOD_PASS_TYPE = "good_pass";
+type DiscountLike = {
+    id?: number | string | null;
+    tag?: unknown;
+    type?: unknown;
+    discount?: object | null;
+    metadata?: object | null;
+    extension_data?: unknown;
+    balance?: unknown;
+    expire_time?: unknown;
+};
+export type EntitlementQuota = {
+    type: 'limited';
+    value: number;
+    balance: number;
+} | {
+    type: 'unlimited';
+    value: null;
+    balance: null;
+};
+export declare function isEntitlementPass(discount: DiscountLike | null | undefined): boolean;
+export declare function isFullCoveragePass(discount: DiscountLike | null | undefined): boolean;
+/**
+ * Resolve the authoritative total-use contract for an Entitlement Pass.
+ * Invalid or missing configuration fails closed. Legacy mode/total_uses fields
+ * are intentionally unsupported.
+ */
+export declare function resolveEntitlementQuota(discount: DiscountLike | null | undefined): EntitlementQuota | null;
+export declare function getRemainingEntitlementUses(discount: DiscountLike | null | undefined, usedCount: number, requestedCount: number): number;
+export declare function hasAvailableEntitlementUses(discount: DiscountLike | null | undefined): boolean;
+/** Sort Entitlement Passes by expiry, finite balance, then card instance id. */
+export declare function compareEntitlementPassPriority(left: DiscountLike, right: DiscountLike): number;
+export {};

package/lib/modules/Discount/entitlementPass.js

@@ -0,0 +1,141 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.GOOD_PASS_TYPE = exports.ENTITLEMENT_PASS_TYPE = void 0;
+exports.compareEntitlementPassPriority = compareEntitlementPassPriority;
+exports.getRemainingEntitlementUses = getRemainingEntitlementUses;
+exports.hasAvailableEntitlementUses = hasAvailableEntitlementUses;
+exports.isEntitlementPass = isEntitlementPass;
+exports.isFullCoveragePass = isFullCoveragePass;
+exports.resolveEntitlementQuota = resolveEntitlementQuota;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const ENTITLEMENT_PASS_TYPE = exports.ENTITLEMENT_PASS_TYPE = 'entitlement_pass';
+const GOOD_PASS_TYPE = exports.GOOD_PASS_TYPE = 'good_pass';
+function getDiscountType(discount) {
+  const nestedDiscount = discount?.discount;
+  return String(discount?.tag || discount?.type || nestedDiscount?.tag || nestedDiscount?.type || '');
+}
+function isEntitlementPass(discount) {
+  return getDiscountType(discount) === ENTITLEMENT_PASS_TYPE;
+}
+function isFullCoveragePass(discount) {
+  const type = getDiscountType(discount);
+  return type === GOOD_PASS_TYPE || type === ENTITLEMENT_PASS_TYPE;
+}
+function resolveIncludedUses(discount) {
+  const metadata = discount.metadata;
+  const hasMetadataIncludedUses = !!metadata && typeof metadata === 'object' && Object.prototype.hasOwnProperty.call(metadata, 'included_uses');
+  const rawValue = hasMetadataIncludedUses ? metadata?.included_uses : Array.isArray(discount.extension_data) ? discount.extension_data.find(item => item?.field_key === 'included_uses')?.value : undefined;
+  if (!rawValue || typeof rawValue !== 'object' || Array.isArray(rawValue)) {
+    return null;
+  }
+  const includedUses = rawValue;
+  if (includedUses.type === 'unlimited' && includedUses.value === null) {
+    return {
+      type: 'unlimited',
+      value: null
+    };
+  }
+  if (includedUses.type === 'limited' && typeof includedUses.value === 'number' && Number.isInteger(includedUses.value) && includedUses.value >= 1 && includedUses.value <= 9999) {
+    return {
+      type: 'limited',
+      value: includedUses.value
+    };
+  }
+  return null;
+}
+function resolveNonNegativeInteger(value) {
+  if (typeof value !== 'number' && typeof value !== 'string' || typeof value === 'string' && value.trim() === '') {
+    return null;
+  }
+  const normalizedValue = Number(value);
+  if (!Number.isInteger(normalizedValue) || normalizedValue < 0) return null;
+  return normalizedValue;
+}
+
+/**
+ * Resolve the authoritative total-use contract for an Entitlement Pass.
+ * Invalid or missing configuration fails closed. Legacy mode/total_uses fields
+ * are intentionally unsupported.
+ */
+function resolveEntitlementQuota(discount) {
+  if (!isEntitlementPass(discount)) return null;
+  const includedUses = resolveIncludedUses(discount);
+  if (!includedUses) return null;
+  if (includedUses.type === 'unlimited') {
+    return {
+      type: 'unlimited',
+      value: null,
+      balance: null
+    };
+  }
+  const balance = resolveNonNegativeInteger(discount?.balance);
+  if (balance === null) return null;
+  return {
+    type: 'limited',
+    value: includedUses.value,
+    balance
+  };
+}
+function getRemainingEntitlementUses(discount, usedCount, requestedCount) {
+  const quota = resolveEntitlementQuota(discount);
+  const normalizedRequestedCount = Math.max(Math.floor(Number(requestedCount) || 0), 0);
+  if (!quota || normalizedRequestedCount <= 0) return 0;
+  if (quota.type === 'unlimited') return normalizedRequestedCount;
+  const normalizedUsedCount = Math.max(Math.floor(Number(usedCount) || 0), 0);
+  return Math.min(Math.max(quota.balance - normalizedUsedCount, 0), normalizedRequestedCount);
+}
+function hasAvailableEntitlementUses(discount) {
+  const quota = resolveEntitlementQuota(discount);
+  return !!quota && (quota.type === 'unlimited' || quota.balance > 0);
+}
+function resolveExpireTimestamp(value) {
+  if (typeof value !== 'string' || !value.trim()) return Number.POSITIVE_INFINITY;
+  const normalizedValue = value.trim();
+  const calendarParts = normalizedValue.match(/^(\d{4})-(\d{2})-(\d{2})(?:[T ](\d{2}):(\d{2})(?::(\d{2}))?)?/);
+  if (calendarParts) {
+    const [, year, month, day, hour = '0', minute = '0', second = '0'] = calendarParts;
+    const yearNumber = Number(year);
+    const monthNumber = Number(month);
+    const dayNumber = Number(day);
+    const hourNumber = Number(hour);
+    const minuteNumber = Number(minute);
+    const secondNumber = Number(second);
+    const daysInMonth = new Date(Date.UTC(yearNumber, monthNumber, 0)).getUTCDate();
+    if (yearNumber <= 0 || monthNumber < 1 || monthNumber > 12 || dayNumber < 1 || dayNumber > daysInMonth || hourNumber < 0 || hourNumber > 23 || minuteNumber < 0 || minuteNumber > 59 || secondNumber < 0 || secondNumber > 59) {
+      return Number.POSITIVE_INFINITY;
+    }
+  }
+  const date = (0, _dayjs.default)(normalizedValue);
+  return date.isValid() ? date.valueOf() : Number.POSITIVE_INFINITY;
+}
+function compareIds(left, right) {
+  const leftNumber = Number(left);
+  const rightNumber = Number(right);
+  if (Number.isFinite(leftNumber) && Number.isFinite(rightNumber)) {
+    return leftNumber - rightNumber;
+  }
+  return String(left ?? '').localeCompare(String(right ?? ''), undefined, {
+    numeric: true
+  });
+}
+
+/** Sort Entitlement Passes by expiry, finite balance, then card instance id. */
+function compareEntitlementPassPriority(left, right) {
+  const expireDifference = resolveExpireTimestamp(left.expire_time) - resolveExpireTimestamp(right.expire_time);
+  if (!Number.isNaN(expireDifference) && expireDifference !== 0) {
+    return expireDifference;
+  }
+  const leftQuota = resolveEntitlementQuota(left);
+  const rightQuota = resolveEntitlementQuota(right);
+  const leftBalance = leftQuota?.type === 'limited' ? leftQuota.balance : Number.POSITIVE_INFINITY;
+  const rightBalance = rightQuota?.type === 'limited' ? rightQuota.balance : Number.POSITIVE_INFINITY;
+  const balanceDifference = leftBalance - rightBalance;
+  if (!Number.isNaN(balanceDifference) && balanceDifference !== 0) {
+    return balanceDifference;
+  }
+  return compareIds(left.id, right.id);
+}

package/lib/modules/Discount/index.d.ts

@@ -25,6 +25,8 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_wallet_pass_holder: 0 | 1;
         with_available_wallet_flag?: 0 | 1;
         with_available_wallet_pass_flag?: 0 | 1;
+        with_entitlement_pass?: 0 | 1;
+        filter_order_wallet_pass_usage?: 0 | 1;
         with_virtual_currency?: 0 | 1;
         request_timezone: string;
         order_id?: number | string;
@@ -36,9 +38,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     }): Promise<DiscountWithReason>;
     batchSearchByProductIds(productIds: number[]): Promise<any>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
-    private checkUsageCreditsLimit;
     filterEnabledDiscountListWithReason(discountList: Discount[]): DiscountWithReason;
-    private checkUsageCreditsLimitWithFailKey;
     uniqueByProductId(discountList: Discount[]): Discount[];
     filterDiscountListByProductIds(discountList: Discount[], productIds: number[]): Discount[];
     calcDiscountApplicableProductTotalPrice(discount: Discount): number | undefined;

package/lib/modules/Discount/index.js

@@ -8,6 +8,7 @@ var _utils = require("../../solution/ShopDiscount/utils");
 var _BaseModule = require("../BaseModule");
 var _types = require("./types");
 var _decimal = _interopRequireDefault(require("decimal.js"));
+var _availability = require("./availability");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class DiscountModule extends _BaseModule.BaseModule {
   defaultName = 'discount';
@@ -83,7 +84,13 @@ class DiscountModule extends _BaseModule.BaseModule {
       with_available_wallet_pass_flag: params.with_available_wallet_pass_flag ?? 1,
       with_virtual_currency: params.with_virtual_currency ?? 1
     });
-    const rawDiscountList = [...(prepareConfig?.data?.good_pass_list || []), ...(prepareConfig?.data?.discount_card_list || [])];
+    const entitlementPassList = prepareConfig?.data?.entitlement_pass_list || [];
+    const entitlementPassIds = new Set(entitlementPassList.map(discount => discount?.id).filter(id => id !== undefined && id !== null).map(id => String(id)));
+    const excludeEntitlementDuplicates = discount => {
+      const id = discount?.id;
+      return id === undefined || id === null || !entitlementPassIds.has(String(id));
+    };
+    const rawDiscountList = [...entitlementPassList, ...(prepareConfig?.data?.good_pass_list || []).filter(excludeEntitlementDuplicates), ...(prepareConfig?.data?.discount_card_list || []).filter(excludeEntitlementDuplicates)];
     const availableWalletList = [...(prepareConfig?.data?.avaiable_wallet_list || []), ...(prepareConfig?.data?.available_wallet_list || [])];
     const availableWalletPassList = prepareConfig?.data?.available_wallet_pass_list || [];
     const availableWalletIds = this.normalizePositiveNumberIds([...availableWalletList.map(item => item?.wallet_id), ...availableWalletPassList.map(item => item?.product_id)]);
@@ -135,7 +142,7 @@ class DiscountModule extends _BaseModule.BaseModule {
     const result = await this.request.get(`/machinecode/batch-search`, {
       code,
       translate_flag: 1,
-      tags: ['good_pass', 'product_discount_card'],
+      tags: ['entitlement_pass', 'good_pass', 'product_discount_card'],
       // available: 1,
       relation_product: 1,
       with: ['extensionData', 'customScheduleSnapshot', 'holder.detail'],
@@ -154,143 +161,30 @@ class DiscountModule extends _BaseModule.BaseModule {
     const result = await this.request.get(`/machinecode/batch-search`, {
       ids: productIds,
       translate_flag: 1,
-      tags: ['good_pass', 'product_discount_card'],
-      relation_product: 1
+      tags: ['entitlement_pass', 'good_pass', 'product_discount_card'],
+      relation_product: 1,
+      with: ['extensionData', 'customScheduleSnapshot', 'holder.detail'],
+      unified_status_info_flag: 1,
+      request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
     });
     return result?.data || [];
   }
-  filterEnabledDiscountList(discountList) {
-    return discountList.filter(discount => discount.limit_status === 'enable' && new _decimal.default(discount?.par_value || 0).minus(new _decimal.default(discount?.used_par_value || 0)).greaterThan(0) && this.checkUsageCreditsLimit(discount));
-  }
-
-  // 检查使用次数限制
-  checkUsageCreditsLimit(discount) {
-    // 如果没有 extension_data，则不需要限制
-    if (!discount.extension_data || discount.extension_data.length === 0) {
-      return true;
-    }
-
-    // 查找 field_key 为 usage_credits 的数据
-    const usageCreditsData = discount.extension_data.find(data => data.field_key === 'usage_credits');
-
-    // 如果没有找到 usage_credits 数据，则不需要限制
-    if (!usageCreditsData) {
-      return true;
-    }
-    const value = usageCreditsData.value;
-
-    // 检查总次数限制
-    if (value.total_credits && value.total_credits > 0) {
-      if ((discount.total_order_behavior_count || 0) >= value.total_credits) {
-        return false;
-      }
-    }
 
-    // 检查单用户限制
-    if (value.per_user_limit && value.per_user_limit > 0) {
-      if ((discount.customer_order_behavior_count || 0) >= value.per_user_limit) {
-        return false;
-      }
-    }
-
-    // 检查单日限制
-    if (value.max_per_day && value.max_per_day > 0) {
-      if ((discount.today_order_behavior_count || 0) >= value.max_per_day) {
-        return false;
-      }
-    }
-
-    // 检查单周限制
-    if (value.max_per_week && value.max_per_week > 0) {
-      if ((discount.week_order_behavior_count || 0) >= value.max_per_week) {
-        return false;
-      }
-    }
-
-    // 检查单月限制
-    if (value.max_per_month && value.max_per_month > 0) {
-      if ((discount.month_order_behavior_count || 0) >= value.max_per_month) {
-        return false;
-      }
-    }
-
-    // 所有检查都通过
-    return true;
+  // 展示列表只剔除已失效项，当前不可用项保留并携带原因。
+  filterEnabledDiscountList(discountList) {
+    return discountList.filter(discount => discount.limit_status === 'enable' && (0, _availability.hasAvailableDiscountBalance)(discount) && !(0, _availability.getDiscountLifecycleReason)(discount)).map(discount => ({
+      ...discount,
+      usageLimitFailKey: (0, _availability.getDiscountUsageLimitFailKey)(discount),
+      reasonCode: (0, _availability.getDiscountUsageBlockReason)(discount)
+    }));
   }
-
-  // 过滤启用且可用的优惠券，并返回校验失败原因
   filterEnabledDiscountListWithReason(discountList) {
-    let lists = discountList.filter(discount => discount.limit_status === 'enable').filter(discount => {
-      const remaining = new _decimal.default(discount?.par_value || 0).minus(new _decimal.default(discount?.used_par_value || 0)).greaterThan(0);
-      return remaining;
-    }).map(discount => {
-      const limitFailKey = this.checkUsageCreditsLimitWithFailKey(discount);
-      return {
-        ...discount,
-        usageLimitFailKey: limitFailKey
-      };
-    });
-
-    // 可用的列表
-    const availableLists = lists.filter(item => !item.usageLimitFailKey && item.unified_available_status !== 0);
-    // 不可用数据
-    const currentFailDiscount = lists.find(item => item.usageLimitFailKey);
     return {
-      discountList: availableLists,
-      unavailableReasonKey: currentFailDiscount?.usageLimitFailKey
+      discountList: this.filterEnabledDiscountList(discountList),
+      unavailableReasonKey: discountList.map(_availability.getDiscountUsageLimitFailKey).find(key => key !== null) || null
     };
   }
 
-  // 检查使用次数限制，并返回校验失败原因
-  checkUsageCreditsLimitWithFailKey(discount) {
-    if (!discount.extension_data || discount.extension_data.length === 0) {
-      return null;
-    }
-    const usageCreditsData = discount.extension_data.find(data => data.field_key === 'usage_credits');
-    if (!usageCreditsData) {
-      return null;
-    }
-    const value = usageCreditsData.value;
-
-    // 总次数限制
-    if (value.total_credits && value.total_credits > 0) {
-      if ((discount.total_order_behavior_count || 0) >= value.total_credits) {
-        return 'total_credits';
-      }
-    }
-
-    // 单用户限制
-    if (value.per_user_limit && value.per_user_limit > 0) {
-      if ((discount.customer_order_behavior_count || 0) >= value.per_user_limit) {
-        return 'per_user_limit';
-      }
-    }
-
-    // 单日限制
-    if (value.max_per_day && value.max_per_day > 0) {
-      if ((discount.today_order_behavior_count || 0) >= value.max_per_day) {
-        return 'max_per_day';
-      }
-    }
-
-    // 单周限制
-    if (value.max_per_week && value.max_per_week > 0) {
-      if ((discount.week_order_behavior_count || 0) >= value.max_per_week) {
-        return 'max_per_week';
-      }
-    }
-
-    // 单月限制
-    if (value.max_per_month && value.max_per_month > 0) {
-      if ((discount.month_order_behavior_count || 0) >= value.max_per_month) {
-        return 'max_per_month';
-      }
-    }
-
-    // 全部通过
-    return null;
-  }
-
   // 根据productIds去重
   uniqueByProductId(discountList) {
     return (0, _utils.uniqueById)(discountList, 'product_id');