@pisell/pisellos 0.10.41 → 0.10.43

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

@@ -26,6 +26,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_available_wallet_flag?: 0 | 1;
         with_available_wallet_pass_flag?: 0 | 1;
         with_virtual_currency?: 0 | 1;
+        with_entitlement_pass?: 0 | 1;
         request_timezone: string;
         order_id?: number | string;
     }): Promise<DiscountPrepareConfigResult>;
@@ -36,6 +37,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     }): Promise<DiscountWithReason>;
     batchSearchByProductIds(productIds: number[]): Promise<any>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
+    private hasAvailableBalance;
     private checkUsageCreditsLimit;
     filterEnabledDiscountListWithReason(discountList: Discount[]): DiscountWithReason;
     private checkUsageCreditsLimitWithFailKey;

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 _entitlementPass = require("./entitlementPass");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class DiscountModule extends _BaseModule.BaseModule {
   defaultName = 'discount';
@@ -83,7 +84,14 @@ 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 rawEntitlementPassList = prepareConfig?.data?.entitlement_pass_list;
+    const entitlementPassList = Array.isArray(rawEntitlementPassList) ? rawEntitlementPassList : [];
+    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 +143,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,13 +162,24 @@ 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));
+    return discountList.filter(discount => discount.limit_status === 'enable' && this.hasAvailableBalance(discount) && this.checkUsageCreditsLimit(discount));
+  }
+  hasAvailableBalance(discount) {
+    if ((0, _entitlementPass.isEntitlementPass)(discount)) {
+      return (0, _entitlementPass.hasAvailableEntitlementUses)(discount);
+    }
+
+    // good_pass 与折扣卡继续沿用原有金额余额判断。
+    return new _decimal.default(discount?.par_value || 0).minus(new _decimal.default(discount?.used_par_value || 0)).greaterThan(0);
   }
 
   // 检查使用次数限制
@@ -220,10 +239,7 @@ class DiscountModule extends _BaseModule.BaseModule {
 
   // 过滤启用且可用的优惠券，并返回校验失败原因
   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 => {
+    let lists = discountList.filter(discount => discount.limit_status === 'enable').filter(discount => this.hasAvailableBalance(discount)).map(discount => {
       const limitFailKey = this.checkUsageCreditsLimitWithFailKey(discount);
       return {
         ...discount,

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

@@ -63,6 +63,13 @@ interface UsageCreditsValue {
     max_per_week: number;
     max_per_month: number;
 }
+export type IncludedUses = {
+    type: 'limited';
+    value: number;
+} | {
+    type: 'unlimited';
+    value: null;
+};
 export type DiscountFilterRejectKey = 'total_credits' | 'per_user_limit' | 'max_per_day' | 'max_per_week' | 'max_per_month';
 export interface DiscountWithReason {
     discountList: Discount[];
@@ -107,30 +114,36 @@ interface ExtensionData {
 }
 export interface Discount {
     id: number;
+    shop_id?: number;
     product_name: string;
     encoded: string;
     code: string;
     tag: string;
-    expire_time?: string;
+    expire_time?: string | null;
+    expire_date?: string | null;
+    end_time?: string | null;
     product_id: number;
     relation_type: string;
     par_value: string;
     used_par_value: string;
     limit_status: string;
     limited_relation_product_data: Limitedrelationproductdata;
-    balance: string;
+    balance?: string | number | null;
+    available_num?: number;
+    available_products_info?: any[];
     format_title: Formattitle;
     metadata?: {
         discount_card_type?: 'fixed_amount' | 'percent';
         custom_product_bundle_map_id?: string;
         validity_type?: 'custom_schedule_validity' | 'fixed_validity';
-        discount_calculation_mode: 'item_level' | 'order_level';
-        holder: {
+        included_uses?: IncludedUses;
+        discount_calculation_mode?: 'item_level' | 'order_level';
+        holder?: {
             type: 'customer' | 'custom';
         };
     };
     product: Product;
-    type: 'product' | 'good_pass';
+    type?: 'product' | 'good_pass' | 'entitlement_pass' | 'discount_card' | 'product_discount_card';
     resource_id?: number;
     savedAmount?: number;
     isEditMode?: boolean;
@@ -163,9 +176,17 @@ export interface Discount {
     applicableProductIds?: number[];
     applicableProductDetails: ApplicableProductDetails[];
     appliedProductDetails: ApplicableProductDetails[];
+    /** Entitlement Pass 编辑订单时已经提交的使用明细。 */
+    committedAppliedProductDetails?: ApplicableProductDetails[];
     isDisabledForProductUsed?: boolean;
     amount?: number;
     customer_id?: number | string | null;
+    holder?: {
+        holder_type?: 'customer' | 'form' | string;
+        holder_id?: number | string | Array<number | string>;
+        created_at?: string | null;
+        [key: string]: any;
+    };
     extension_data?: ExtensionData[];
     total_order_behavior_count?: number;
     today_order_behavior_count?: number;

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

@@ -445,7 +445,12 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     }>, options?: {
         skipEditDiscountConfigRefresh?: boolean;
     }): Promise<OrderProduct[]>;
+    private getFullCoveragePassDiscounts;
+    private hasEntitlementPassDiscount;
     private hasGoodPassDiscount;
+    private isPersistedProductLine;
+    private isRuntimeEntitlementAppend;
+    private hasSameEntitlementMergePriceConfig;
     private getBundleRuntimeIdentity;
     private preservePersistedBundlePriceFields;
     private applyOrderProductUpdateToTempOrder;

package/lib/modules/Order/index.js

@@ -21,6 +21,7 @@ var _discountProductLineIdentity = require("./utils/discountProductLineIdentity"
 var _virtualSettlement = require("./utils/virtualSettlement");
 var _Discount = require("../Discount");
 var _Rules = require("../Rules");
+var _entitlementPass = require("../Discount/entitlementPass");
 var _types2 = require("../Rules/types");
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _lodashEs = require("lodash-es");
@@ -40,9 +41,27 @@ function isSameDiscountList(left, right) {
 function isManualProductDiscountProduct(product) {
   return (0, _manualProductDiscount.hasManualProductDiscountFlag)(product?.metadata) || (product?.discount_list || []).some(item => item?.type === 'product');
 }
+function syncReducedEntitlementPassUsageCount(discountList, previousQuantity, nextQuantity) {
+  if (!Array.isArray(discountList)) return discountList;
+  const previousCount = (0, _utils3.getSafeProductNum)(previousQuantity);
+  const nextCount = (0, _utils3.getSafeProductNum)(nextQuantity);
+  if (nextCount >= previousCount) return discountList;
+  return discountList.map(discount => {
+    if (!(0, _entitlementPass.isEntitlementPass)(discount)) return discount;
+    const rawUsageCount = Number(discount?.metadata?.num ?? previousCount);
+    const usageCount = Number.isFinite(rawUsageCount) ? Math.max(Math.floor(rawUsageCount), 0) : previousCount;
+    return {
+      ...discount,
+      metadata: {
+        ...(discount?.metadata || {}),
+        num: Math.min(usageCount, nextCount)
+      }
+    };
+  });
+}
 const ORDER_PAYMENT_STATUS_PAID = 'paid';
 const ORDER_PAYMENT_STATUS_PENDING = 'payment_pending';
-const CUSTOMER_PROMOTION_DISCOUNT_TAGS = new Set(['good_pass', 'product_discount_card', 'discount_card']);
+const CUSTOMER_PROMOTION_DISCOUNT_TAGS = new Set(['entitlement_pass', 'good_pass', 'product_discount_card', 'discount_card']);
 function isCustomerPromotionDiscount(discount) {
   return CUSTOMER_PROMOTION_DISCOUNT_TAGS.has(String(discount?.tag || discount?.type || '').toLowerCase());
 }
@@ -72,6 +91,28 @@ function getVoucherPaymentLifecycleKey(payment) {
   if (!isVoucherPaymentRecord(payment)) return null;
   return `${String(payment.voucher_id)}::${String(payment.status || '')}`;
 }
+function getDiscountIdentityKey(discount) {
+  const id = discount?.id;
+  if (id === undefined || id === null || id === '') return null;
+  return String(id);
+}
+function mergeCommittedEntitlementWithRuntime(committed, runtime) {
+  const committedAppliedProductDetails = committed.committedAppliedProductDetails?.length ? committed.committedAppliedProductDetails : committed.appliedProductDetails || [];
+  return {
+    ...committed,
+    ...runtime,
+    id: runtime.id ?? committed.id,
+    tag: runtime.tag || committed.tag,
+    type: runtime.type || committed.type,
+    isEditMode: false,
+    isDisabled: runtime.isDisabled ?? false,
+    isSelected: runtime.isSelected ?? committed.isSelected,
+    isUsed: committed.isUsed || runtime.isUsed,
+    committedAppliedProductDetails: [...committedAppliedProductDetails],
+    applicableProductDetails: [...(committed.applicableProductDetails || []), ...(runtime.applicableProductDetails || [])],
+    appliedProductDetails: [...committedAppliedProductDetails, ...(runtime.appliedProductDetails || [])]
+  };
+}
 class OrderModule extends _BaseModule.BaseModule {
   defaultName = 'order';
   defaultVersion = '1.0.0';
@@ -131,7 +172,10 @@ class OrderModule extends _BaseModule.BaseModule {
           original_amount: String(item?.discount?.original_amount ?? item?.amount ?? '0'),
           num: Number(item?.metadata?.num ?? product?.num ?? product?.product_quantity ?? 1) || 1,
           metadata: item?.metadata,
-          discount: item?.discount,
+          discount: {
+            ...(item?.discount || {}),
+            product_id: item?.discount?.product_id ?? product?.product_id
+          },
           _num: Number(item?.metadata?.num ?? product?.num ?? product?.product_quantity ?? 1) || 1
         };
         const existed = discountMap.get(key);
@@ -463,6 +507,7 @@ class OrderModule extends _BaseModule.BaseModule {
       with_available_wallet_flag: 1,
       with_available_wallet_pass_flag: 1,
       with_virtual_currency: 1,
+      with_entitlement_pass: 1,
       request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
       ...(orderId ? {
         order_id: orderId
@@ -479,17 +524,61 @@ class OrderModule extends _BaseModule.BaseModule {
     }
     if (discountList) {
       const currentDiscountList = this.store.discount?.getDiscountList() || [];
-      const currentEditDiscounts = currentDiscountList.filter(discount => discount?.isEditMode);
+      const currentCommittedDiscounts = currentDiscountList.filter(discount => discount?.isEditMode || discount?.committedAppliedProductDetails?.length);
       const currentScanDiscounts = currentDiscountList.filter(discount => discount?.isScan);
-      const currentScanDiscountIds = new Set(currentScanDiscounts.map(discount => discount?.id));
+      const currentScanDiscountById = new Map(currentScanDiscounts.flatMap(discount => {
+        const id = getDiscountIdentityKey(discount);
+        return id === null ? [] : [[id, discount]];
+      }));
+      const committedDiscountById = new Map(currentCommittedDiscounts.flatMap(discount => {
+        const id = getDiscountIdentityKey(discount);
+        return id === null ? [] : [[id, discount]];
+      }));
+      const mergedCommittedDiscountIds = new Set();
+      const refreshedScanDiscountIds = new Set();
       const runtimeDiscountIds = new Set();
-      const runtimeDiscounts = discountList.filter(discount => {
-        if (currentScanDiscountIds.has(discount?.id)) return false;
-        if (runtimeDiscountIds.has(discount?.id)) return false;
-        runtimeDiscountIds.add(discount?.id);
-        return true;
+      const runtimeDiscounts = discountList.flatMap(discount => {
+        const id = getDiscountIdentityKey(discount);
+        if (id === null) return [discount];
+        if (runtimeDiscountIds.has(id)) return [];
+        runtimeDiscountIds.add(id);
+        const currentScanDiscount = currentScanDiscountById.get(id);
+        if (currentScanDiscount && (!(0, _entitlementPass.isEntitlementPass)(currentScanDiscount) || !(0, _entitlementPass.isEntitlementPass)(discount))) {
+          return [];
+        }
+        const committedDiscount = committedDiscountById.get(id);
+        let nextDiscount = discount;
+        if (committedDiscount && (0, _entitlementPass.isEntitlementPass)(committedDiscount) && (0, _entitlementPass.isEntitlementPass)(discount)) {
+          mergedCommittedDiscountIds.add(id);
+          nextDiscount = mergeCommittedEntitlementWithRuntime(committedDiscount, discount);
+        }
+        if (currentScanDiscount) {
+          refreshedScanDiscountIds.add(id);
+          nextDiscount = {
+            ...nextDiscount,
+            isScan: true,
+            isSelected: currentScanDiscount.isSelected ?? nextDiscount.isSelected,
+            isManualSelect: currentScanDiscount.isManualSelect ?? nextDiscount.isManualSelect
+          };
+        }
+        return [nextDiscount];
       });
-      const mergedDiscountList = [...currentEditDiscounts, ...currentScanDiscounts, ...runtimeDiscounts];
+      const retainedCommittedDiscounts = currentCommittedDiscounts.filter(discount => {
+        const id = getDiscountIdentityKey(discount);
+        return id === null || !mergedCommittedDiscountIds.has(id);
+      }).map(discount => discount.committedAppliedProductDetails?.length ? {
+        ...discount,
+        isEditMode: true,
+        isDisabled: true,
+        isSelected: true,
+        isUsed: true,
+        appliedProductDetails: [...discount.committedAppliedProductDetails]
+      } : discount);
+      const retainedScanDiscounts = currentScanDiscounts.filter(discount => {
+        const id = getDiscountIdentityKey(discount);
+        return id === null || !refreshedScanDiscountIds.has(id);
+      });
+      const mergedDiscountList = [...retainedCommittedDiscounts, ...retainedScanDiscounts, ...runtimeDiscounts];
       await this.store.discount?.setOriginalDiscountList(mergedDiscountList);
       await this.store.discount?.setDiscountList(mergedDiscountList);
     }
@@ -1502,7 +1591,8 @@ class OrderModule extends _BaseModule.BaseModule {
     const sku = product?.product_sku || {};
     const metadata = product?.metadata || {};
     const discountTypes = (product?.discount_list || []).map(discount => discount?.type ?? discount?.tag);
-    const extensionType = product?.extension_type || (discountTypes.includes('good_pass') ? 'good_pass' : 'normal');
+    const fullCoveragePassType = discountTypes.find(type => ['entitlement_pass', 'good_pass'].includes(type));
+    const extensionType = product?.extension_type || fullCoveragePassType || 'normal';
     return {
       product_id: product?.product_id ?? null,
       product_variant_id: product?.product_variant_id ?? null,
@@ -1555,7 +1645,8 @@ class OrderModule extends _BaseModule.BaseModule {
     const sku = product?.product_sku || {};
     const metadata = product?.metadata || {};
     const discountTypes = (product?.discount_list || []).map(discount => discount?.type ?? discount?.tag);
-    const extensionType = product?.extension_type || (discountTypes.includes('good_pass') ? 'good_pass' : 'normal');
+    const fullCoveragePassType = discountTypes.find(type => ['entitlement_pass', 'good_pass'].includes(type));
+    const extensionType = product?.extension_type || fullCoveragePassType || 'normal';
     return {
       product_id: product?.product_id ?? null,
       product_variant_id: product?.product_variant_id ?? null,
@@ -2370,7 +2461,7 @@ class OrderModule extends _BaseModule.BaseModule {
   }
   isCustomerBoundDiscount(discount) {
     const type = discount?.type ?? discount?.tag;
-    return type === 'good_pass' || type === 'discount_card' || type === 'product_discount_card';
+    return type === 'entitlement_pass' || type === 'good_pass' || type === 'discount_card' || type === 'product_discount_card';
   }
   shouldKeepCustomerBoundDiscountAfterCustomerChange(discount) {
     return Boolean(discount?.isScan || discount?.isEditMode);
@@ -2999,17 +3090,35 @@ class OrderModule extends _BaseModule.BaseModule {
     }
     normalizedIncoming.discount_list = (0, _utils.normalizeOrderProductDiscountList)(normalizedIncoming.discount_list);
     const hasIncomingGoodPass = this.hasGoodPassDiscount(normalizedIncoming);
+    const hasIncomingEntitlementPass = this.hasEntitlementPassDiscount(normalizedIncoming);
+    const isIncomingEntitlementAppend = this.isRuntimeEntitlementAppend(productToAdd, tempOrder);
+    const isIncomingPersistedEntitlementPass = hasIncomingEntitlementPass && this.isPersistedProductLine(normalizedIncoming);
     const hasIncomingProductNote = this.hasOrderProductLineNote(normalizedIncoming);
     const hasIncomingManualProductDiscount = isManualProductDiscountProduct(normalizedIncoming);
     const hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
     const isIncomingCustomItem = productToAdd.metadata?.origin?.isCustomItem === true || productToAdd._origin?.isCustomItem === true;
-    const shouldForceNewLine = disableMerge || !!booking || hasIncomingProductNote || hasIncomingManualProductDiscount || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
-    const matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(item => {
+    const shouldForceNewLine = disableMerge || !!booking || hasIncomingGoodPass || isIncomingPersistedEntitlementPass || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
+    const matchedIndex = shouldForceNewLine ? -1 : tempOrder.products.findIndex(item => {
       if (this.hasGoodPassDiscount(item)) return false;
-      if (this.hasOrderProductLineNote(item)) return false;
-      if (isManualProductDiscountProduct(item)) return false;
-      if (item.order_detail_id !== undefined && item.order_detail_id !== null) return false;
-      if (item.metadata?.is_edit_for_runtime) return false;
+      const isRuntimeEntitlementPass = this.isRuntimeEntitlementAppend(item, tempOrder);
+      if (isIncomingEntitlementAppend !== isRuntimeEntitlementPass) {
+        return false;
+      }
+      if (isIncomingEntitlementAppend && this.isPersistedProductLine(item)) {
+        return false;
+      }
+      const hasExistingProductNote = this.hasOrderProductLineNote(item);
+      if ((hasIncomingProductNote || hasExistingProductNote) && (!isRuntimeEntitlementPass || String(normalizedIncoming.note || '').trim() !== String(item.note || '').trim())) {
+        return false;
+      }
+      const hasExistingManualProductDiscount = isManualProductDiscountProduct(item);
+      if (isRuntimeEntitlementPass && !this.hasSameEntitlementMergePriceConfig(normalizedIncoming, item)) {
+        return false;
+      }
+      if ((hasIncomingManualProductDiscount || hasExistingManualProductDiscount) && !isRuntimeEntitlementPass) {
+        return false;
+      }
+      if (this.isPersistedProductLine(item)) return false;
       if (item.product_id !== productToAdd.product_id) return false;
       if (item.product_variant_id !== productToAdd.product_variant_id) return false;
       const existedFingerprint = (0, _utils3.buildProductLineFingerprint)((0, _utils.getProductSkuOptions)(item), item.product_bundle);
@@ -3242,17 +3351,51 @@ class OrderModule extends _BaseModule.BaseModule {
     });
     return tempOrder.products;
   }
-  hasGoodPassDiscount(product) {
-    const hasMainGoodPass = (product.discount_list || []).some(item => item?.type === 'good_pass' || item?.tag === 'good_pass');
-    if (hasMainGoodPass) return true;
-    const bundleDiscountList = [];
+  getFullCoveragePassDiscounts(product) {
+    const discountList = [...(product.discount_list || [])];
     (product.product_bundle || []).forEach(item => {
-      bundleDiscountList.push(...(item?.discount_list || []));
+      discountList.push(...(item?.discount_list || []));
     });
     (product?._extend?.other?.bundle || []).forEach(item => {
-      bundleDiscountList.push(...(item?.discount_list || []));
+      discountList.push(...(item?.discount_list || []));
     });
-    return bundleDiscountList.some(item => item?.type === 'good_pass' || item?.tag === 'good_pass');
+    return discountList.filter(item => (0, _entitlementPass.isFullCoveragePass)(item));
+  }
+  hasEntitlementPassDiscount(product) {
+    return this.getFullCoveragePassDiscounts(product).some(item => (0, _entitlementPass.isEntitlementPass)(item));
+  }
+  hasGoodPassDiscount(product) {
+    return this.getFullCoveragePassDiscounts(product).some(item => !(0, _entitlementPass.isEntitlementPass)(item));
+  }
+  isPersistedProductLine(product) {
+    return product.order_detail_id !== undefined && product.order_detail_id !== null && product.order_detail_id !== '' || product.metadata?.is_edit_for_runtime === true;
+  }
+  isRuntimeEntitlementAppend(product, tempOrder) {
+    if (this.isPersistedProductLine(product)) return false;
+    const uid = product.metadata?.unique_identification_number ?? product.unique_identification_number;
+    const storedOrigin = uid !== undefined && uid !== null && uid !== '' ? tempOrder._extend?.productsByUid?.[String(uid)]?.origin : undefined;
+    return Boolean(product?._origin?.__entitlementPassRuntimeAppend === true || storedOrigin?.__entitlementPassRuntimeAppend === true);
+  }
+  hasSameEntitlementMergePriceConfig(incoming, existing) {
+    const buildPriceConfig = product => {
+      const metadata = product.metadata || {};
+      const bundle = (product.product_bundle || []).map(item => ({
+        bundle_id: item.bundle_id ?? item.id ?? null,
+        bundle_product_id: item.bundle_product_id ?? item._bundle_product_id ?? item.product_id ?? null,
+        bundle_variant_id: item.bundle_variant_id ?? item.product_variant_id ?? 0,
+        price_type: item.price_type ?? item.custom_price_type ?? '',
+        price_type_ext: item.price_type_ext ?? item.custom_price_type_ext ?? ''
+      })).sort((left, right) => JSON.stringify(left).localeCompare(JSON.stringify(right)));
+      return JSON.stringify({
+        original_price: this.normalizeFingerprintMoney(product.original_price),
+        source_product_price: this.normalizeFingerprintMoney(metadata.source_product_price),
+        main_product_original_price: this.normalizeFingerprintMoney(metadata.main_product_original_price),
+        price_override: this.normalizeFingerprintMoney(metadata.price_override),
+        is_manual_discount: Boolean(metadata.is_manual_discount),
+        bundle
+      });
+    };
+    return buildPriceConfig(incoming) === buildPriceConfig(existing);
   }
   getBundleRuntimeIdentity(bundle) {
     if (!bundle || typeof bundle !== 'object') return '';
@@ -3441,7 +3584,7 @@ class OrderModule extends _BaseModule.BaseModule {
     // normalizeOrderProduct 幂等：v2 metadata 存在 → 保留 main_product_* 折扣重算 composite；
     // 否则 → 把顶层 selling_price 视作 source，派生 main_product_* 并写 price_schema_version: 2。
     let normalizedProduct = this.normalizeVirtualSettlementProductIfEnabled((0, _utils.mergeOrderProductDisplayFields)(nextProduct, (0, _utils3.normalizeOrderProduct)(nextProduct)));
-    normalizedProduct.discount_list = (0, _utils.normalizeOrderProductDiscountList)(normalizedProduct.discount_list);
+    normalizedProduct.discount_list = (0, _utils.normalizeOrderProductDiscountList)(isPersistedOrderLine ? syncReducedEntitlementPassUsageCount(normalizedProduct.discount_list, targetProduct.num, normalizedProduct.num) : normalizedProduct.discount_list);
     const preservedBookingUid = nextProduct.booking_uid || nextProduct.metadata?.booking_uid || targetProduct.booking_uid || targetProduct.metadata?.booking_uid;
     if (!booking && preservedBookingUid) {
       normalizedProduct.booking_uid = preservedBookingUid;
@@ -3557,6 +3700,7 @@ class OrderModule extends _BaseModule.BaseModule {
       throw new Error('[Order] 目标商品不存在，无法更新数量');
     }
     const targetProduct = tempOrder.products[productIndex];
+    const isPersistedOrderLine = targetProduct.order_detail_id !== undefined && targetProduct.order_detail_id !== null;
     const normalizedProduct = this.normalizeVirtualSettlementProductIfEnabled((0, _utils3.normalizeOrderProduct)({
       ...targetProduct,
       num: (0, _utils3.getSafeProductNum)(num),
@@ -3565,7 +3709,7 @@ class OrderModule extends _BaseModule.BaseModule {
         unique_identification_number: targetProduct.metadata?.unique_identification_number || unique_identification_number
       }
     }));
-    normalizedProduct.discount_list = (0, _utils.normalizeOrderProductDiscountList)(normalizedProduct.discount_list);
+    normalizedProduct.discount_list = (0, _utils.normalizeOrderProductDiscountList)(isPersistedOrderLine ? syncReducedEntitlementPassUsageCount(normalizedProduct.discount_list, targetProduct.num, normalizedProduct.num) : normalizedProduct.discount_list);
     const settlementSnapshot = (0, _virtualSettlement.getSelectedSettlementSnapshot)(normalizedProduct);
     if (this.isMultiCurrencySettlementEnabled() && settlementSnapshot?.settlement_type === 'virtual_currency' && tempOrder.customer_id && Number(tempOrder.customer_id) !== 1) {
       const currencyProductId = Number(settlementSnapshot.currency_product_id);