@pisell/pisellos 0.0.571 → 0.0.572

package/lib/modules/Discount/index.js

@@ -8,6 +8,8 @@ var _utils = require("../../solution/ShopDiscount/utils");
 var _BaseModule = require("../BaseModule");
 var _types = require("./types");
 var _decimal = _interopRequireDefault(require("decimal.js"));
+var _entitlementPass = require("./entitlementPass");
+var _availability = require("./availability");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class DiscountModule extends _BaseModule.BaseModule {
   defaultName = 'discount';
@@ -82,10 +84,13 @@ class DiscountModule extends _BaseModule.BaseModule {
       with_available_wallet_flag: params.with_available_wallet_flag ?? 1,
       with_available_wallet_pass_flag: params.with_available_wallet_pass_flag ?? 1
     });
-    const rawDiscountList = [...(prepareConfig?.data?.good_pass_list || []), ...(prepareConfig?.data?.discount_card_list || [])];
+    const entitlementPassList = params.with_entitlement_pass ? prepareConfig?.data?.entitlement_pass_list || [] : [];
+    const ids = new Set(entitlementPassList.map(item => String(item.id)));
+    const rawDiscountList = [...entitlementPassList, ...(prepareConfig?.data?.good_pass_list || []).filter(item => !ids.has(String(item.id))), ...(prepareConfig?.data?.discount_card_list || []).filter(item => !ids.has(String(item.id)))].filter(item => params.with_entitlement_pass || !(0, _entitlementPass.isEntitlementPass)(item));
     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)]);
+    if (params.with_entitlement_pass) await this.setOriginalDiscountList(rawDiscountList);
     const goodPassList = this.filterEnabledDiscountList(rawDiscountList) || [];
 
     // this.setDiscountList(goodPassList);
@@ -102,16 +107,19 @@ class DiscountModule extends _BaseModule.BaseModule {
     const walletPassProductIds = availableWalletPassList.map(item => Number(item?.product_id)).filter(id => Number.isFinite(id) && id > 0);
     return Array.from(new Set([...walletIds, ...walletPassProductIds]));
   }
-  async batchSearch(code, options) {
+  async batchSearch(code, customerIdOrOptions) {
     const {
       customerId,
-      orderId
-    } = options || {};
-    const result = await this.request.get(`/machinecode/batch-search`, {
+      orderId,
+      withEntitlementPass
+    } = typeof customerIdOrOptions === 'number' ? {
+      customerId: customerIdOrOptions,
+      orderId: undefined,
+      withEntitlementPass: false
+    } : customerIdOrOptions || {};
+    const params = {
       code,
       translate_flag: 1,
-      tags: ['good_pass', 'product_discount_card'],
-      // available: 1,
       relation_product: 1,
       with: ['extensionData', 'customScheduleSnapshot', 'holder.detail'],
       order_behavior_count: 1,
@@ -121,9 +129,42 @@ class DiscountModule extends _BaseModule.BaseModule {
         order_behavior_count_order_id: orderId
       } : {}),
       request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
-    });
-    const resultDiscountWithReason = this.filterEnabledDiscountListWithReason(result?.data || []) || [];
-    return resultDiscountWithReason;
+    };
+    if (!withEntitlementPass) {
+      const result = await this.request.get(`/machinecode/batch-search`, {
+        ...params,
+        tags: ['good_pass', 'product_discount_card']
+      });
+      return this.filterEnabledDiscountListWithReason((result?.data || []).filter(item => !(0, _entitlementPass.isEntitlementPass)(item)));
+    }
+    // 保留 develop 的旧券查询参数，多次卡单独查询并携带跨店状态。
+    const search = query => this.request.get(`/machinecode/batch-search`, query).then(value => ({
+      status: 'fulfilled',
+      value
+    }), reason => ({
+      status: 'rejected',
+      reason
+    }));
+    const [legacy, entitlement] = await Promise.all([search({
+      ...params,
+      tags: ['good_pass', 'product_discount_card']
+    }), search({
+      ...params,
+      tags: ['entitlement_pass'],
+      with_franchisor_data: 1,
+      unified_status_info_flag: 1,
+      with: [...params.with, 'franchiseeWalletPass:shop_id,source_shop_id,product_id,use']
+    })]);
+    const entitlementList = (entitlement.status === 'fulfilled' ? entitlement.value?.data || [] : []).filter(_entitlementPass.isEntitlementPass);
+    const legacyList = legacy.status === 'fulfilled' ? legacy.value?.data || [] : [];
+    const ids = new Set(entitlementList.map(item => String(item.id)));
+    const result = this.filterEnabledDiscountListWithReason([...entitlementList, ...legacyList.filter(item => !(0, _entitlementPass.isEntitlementPass)(item) && !ids.has(String(item.id)))]);
+    // 任一类型查到可用卡即可继续，另一类型的查询失败不阻断该卡。
+    if (!result.discountList.length) {
+      if (legacy.status === 'rejected') throw legacy.reason;
+      if (entitlement.status === 'rejected') throw entitlement.reason;
+    }
+    return result;
   }
   async batchSearchByProductIds(productIds) {
     const result = await this.request.get(`/machinecode/batch-search`, {
@@ -135,7 +176,7 @@ class DiscountModule extends _BaseModule.BaseModule {
     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 => (0, _entitlementPass.isEntitlementPass)(discount) ? !(0, _availability.getDiscountLifecycleReason)(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));
   }
 
   // 检查使用次数限制
@@ -195,7 +236,8 @@ class DiscountModule extends _BaseModule.BaseModule {
 
   // 过滤启用且可用的优惠券，并返回校验失败原因
   filterEnabledDiscountListWithReason(discountList) {
-    let lists = discountList.filter(discount => discount.limit_status === 'enable').filter(discount => {
+    const entitlementPasses = discountList.filter(item => (0, _entitlementPass.isEntitlementPass)(item) && !(0, _availability.getDiscountLifecycleReason)(item));
+    let lists = discountList.filter(item => !(0, _entitlementPass.isEntitlementPass)(item)).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 => {
@@ -211,8 +253,11 @@ class DiscountModule extends _BaseModule.BaseModule {
     // 不可用数据
     const currentFailDiscount = lists.find(item => item.usageLimitFailKey);
     return {
-      discountList: availableLists,
-      unavailableReasonKey: currentFailDiscount?.usageLimitFailKey
+      discountList: [...entitlementPasses.map(item => ({
+        ...item,
+        usageLimitFailKey: (0, _availability.getDiscountUsageLimitFailKey)(item)
+      })), ...availableLists],
+      unavailableReasonKey: currentFailDiscount?.usageLimitFailKey || discountList.filter(_entitlementPass.isEntitlementPass).map(_availability.getDiscountLifecycleReason).find(Boolean) || null
     };
   }
 

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

@@ -45,6 +45,8 @@ interface ApplicableProductDetails {
     num: number;
     metadata?: {
         product_discount_difference?: number;
+        num?: number;
+        custom_product_bundle_map_id?: string;
     };
     discount?: {
         fixed_amount?: number;
@@ -63,10 +65,17 @@ interface UsageCreditsValue {
     max_per_week: number;
     max_per_month: number;
 }
-export declare type DiscountFilterRejectKey = 'total_credits' | 'per_user_limit' | 'max_per_day' | 'max_per_week' | 'max_per_month';
+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[];
-    unavailableReasonKey: DiscountFilterRejectKey | null;
+    unavailableReasonKey: DiscountFilterRejectKey | string | null;
 }
 export interface DiscountPrepareConfigResult {
     discountList: Discount[];
@@ -97,20 +106,34 @@ export interface Discount {
     used_par_value: string;
     limit_status: string;
     limited_relation_product_data: Limitedrelationproductdata;
-    balance: string;
+    balance?: string | number | null;
     format_title: Formattitle;
     metadata?: {
         num?: number;
         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';
+    shop_id?: number;
+    holder?: {
+        holder_type?: string;
+        holder_id?: number | string | Array<number | string>;
+        [key: string]: any;
+    };
+    reason?: string;
+    reasonCode?: string;
+    is_franchisor_pass?: number;
+    franchisee_wallet_pass?: {
+        use?: string;
+    };
+    committedAppliedProductDetails?: ApplicableProductDetails[];
     resource_id?: number;
     savedAmount?: number;
     isEditMode?: boolean;

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

@@ -39,7 +39,7 @@ export interface IFormItemData {
 /**
  * form_id 为 key 的 map 结构，如 948: { records: [], form: {} }
  */
-export declare type HolderFormMap = Record<string, IFormItemData>;
+export type HolderFormMap = Record<string, IFormItemData>;
 /**
  * Holder 模块 reactive store，仅 holderMap 会触发 changed 事件
  */

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

@@ -61,7 +61,7 @@ export interface OpenDataApiResponse {
     message: string;
     data: OpenDataConfig;
 }
-export declare type OpenDataUnavailableReason = 'shop_disabled' | 'paused' | 'closed' | 'reservation_disabled';
+export type OpenDataUnavailableReason = 'shop_disabled' | 'paused' | 'closed' | 'reservation_disabled';
 export interface OpenDataAvailabilityResult {
     available: boolean;
     reason: OpenDataUnavailableReason | null;

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

@@ -69,7 +69,7 @@ export interface OrderGiftSelectResult {
  *
  * 返回数组时沿用旧协议，只写 tempOrder.products；返回对象时可同时写入预约 bookings。
  */
-export declare type OrderGiftSelectResolver = (ctx: OrderGiftSelectContext) => Promise<Partial<OrderProduct>[] | OrderGiftSelectResult | null>;
+export type OrderGiftSelectResolver = (ctx: OrderGiftSelectContext) => Promise<Partial<OrderProduct>[] | OrderGiftSelectResult | null>;
 /** 未满足的促销策略（购物车底部 alert 渲染源） */
 export interface OrderUnfulfilledPromotion {
     strategyId: string;
@@ -318,7 +318,7 @@ export interface ReplaceTempOrderOptions {
     persist?: boolean;
     saveDraft?: boolean;
 }
-export declare type AddProductBookingInput = Record<string, any>;
+export type AddProductBookingInput = Record<string, any>;
 /** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 unique_identification_number / 选项指纹等 */
 export interface UpdateOrderProductParams {
     product_id: number | null;
@@ -376,7 +376,7 @@ export interface OrderProductMergeDecisionContext {
     booking?: AddProductBookingInput;
     defaultShouldMerge: boolean;
 }
-export declare type OrderProductMergeDecisionResult = boolean | {
+export type OrderProductMergeDecisionResult = boolean | {
     shouldMerge: boolean;
     reason?: string;
     [key: string]: any;
@@ -524,11 +524,11 @@ export interface OrderPaymentData {
     created_at?: string;
     updated_at?: string;
 }
-export declare type OrderPaymentSource = PaymentItem | OrderPaymentData | Record<string, any>;
+export type OrderPaymentSource = PaymentItem | OrderPaymentData | Record<string, any>;
 export interface MapOrderPaymentsOptions {
     includeVoided?: boolean;
 }
-export declare type OrderSyncState = 'local' | 'submitting' | 'submitted' | 'failed' | 'remoteLoaded';
+export type OrderSyncState = 'local' | 'submitting' | 'submitted' | 'failed' | 'remoteLoaded';
 export interface LoadSalesDetailParams {
     orderId?: number | string;
     orderNumber?: string;

package/lib/modules/Order/utils/bundleDiscountHydration.d.ts

@@ -1,5 +1,5 @@
 import type { OrderProductDiscountItem } from '../types';
-declare type NormalizeDiscountList = (discountList?: unknown[] | null) => OrderProductDiscountItem[];
+type NormalizeDiscountList = (discountList?: unknown[] | null) => OrderProductDiscountItem[];
 export declare function restoreHydratedBundleDiscounts<T extends Record<string, any>>(product: T, normalizeDiscountList: NormalizeDiscountList): T;
 export declare function expandHydratedProductsForDiscountCollection(products: any[] | undefined | null): any[];
 export {};

package/lib/modules/Order/utils/orderCollectionIdentity.d.ts

@@ -1,4 +1,4 @@
-export declare type OrderCollectionKind = 'product' | 'booking' | 'payment';
+export type OrderCollectionKind = 'product' | 'booking' | 'payment';
 export interface OrderCollectionIdentityStats {
     backfilledUidCount: number;
     collapsedDuplicateCount: number;

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

@@ -209,7 +209,7 @@ export interface SubmitPayloadEnhancerContext {
     bookingUuid: string;
     now: Date;
 }
-export declare type SubmitPayloadEnhancer = (payload: OrderSubmitPayload, ctx: SubmitPayloadEnhancerContext) => OrderSubmitPayload;
+export type SubmitPayloadEnhancer = (payload: OrderSubmitPayload, ctx: SubmitPayloadEnhancerContext) => OrderSubmitPayload;
 export declare function buildSubmitPayload(params: {
     tempOrder: OrderTempOrder;
     cacheId?: string;

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

@@ -629,12 +629,12 @@ export declare enum PaymentHooks {
     OnOrderAmountChanged = "payment:onOrderAmountChanged",
     OnPaymentSyncError = "payment:onPaymentSyncError",
     OnPaymentSyncSuccess = "payment:onPaymentSyncSuccess",
-    OnWalletRecommendListUpdated = 0,
-    OnWalletRecommendListCleared = 0,
-    OnUserIdentificationCodesUpdated = 0,
-    OnUserIdentificationCodesCleared = 0,
-    OnWalletCacheCleared = 0,
-    OnSearchIdentificationCodeCompleted = 0
+    OnWalletRecommendListUpdated = "wallet:onWalletRecommendListUpdated",
+    OnWalletRecommendListCleared = "wallet:onWalletRecommendListCleared",
+    OnUserIdentificationCodesUpdated = "wallet:onUserIdentificationCodesUpdated",
+    OnUserIdentificationCodesCleared = "wallet:onUserIdentificationCodesCleared",
+    OnWalletCacheCleared = "wallet:onWalletCacheCleared",
+    OnSearchIdentificationCodeCompleted = "wallet:onSearchIdentificationCodeCompleted"
 }
 /**
  * 钱包推荐扣款请求参数
@@ -797,7 +797,7 @@ export interface SearchIdentificationCodeResponse {
 /**
  * 搜索识别码结果类型
  */
-export declare type SearchIdentificationCodeResult = {
+export type SearchIdentificationCodeResult = {
     type: 'walletCode';
     data: SearchIdentificationCodeItem[];
 } | {

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

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

@@ -1,7 +1,7 @@
-export declare type ResourcePlannerMode = 'appointment' | 'scan_order' | 'venue_grid';
-export declare type ResourcePlannerProductKind = 'normal' | 'duration' | 'session' | 'venue_slot';
-export declare type ResourcePlannerResourceType = 'single' | 'multiple' | 'capacity';
-export declare type ResourcePlannerStatus = 'available' | 'limited' | 'full' | 'conflict' | 'unavailable' | 'past';
+export type ResourcePlannerMode = 'appointment' | 'scan_order' | 'venue_grid';
+export type ResourcePlannerProductKind = 'normal' | 'duration' | 'session' | 'venue_slot';
+export type ResourcePlannerResourceType = 'single' | 'multiple' | 'capacity';
+export type ResourcePlannerStatus = 'available' | 'limited' | 'full' | 'conflict' | 'unavailable' | 'past';
 export interface ResourcePlannerTimeRange {
     start_at: string;
     end_at: string;

package/lib/modules/Rules/entitlementLines.d.ts

@@ -0,0 +1,8 @@
+import type { RulesParamsHooks } from './types';
+export declare function isEntitlementRuntimeLine(product: any, mappedProduct?: any): boolean;
+/** 仅同步本次多次卡行的数量与价格，沿用 Rules 的主商品、套餐计算结果。 */
+export declare function rebuildEntitlementLine(origin: any, bundle: any[], hooks: RulesParamsHooks, count?: number): any;
+/** 重算只还原本次多次卡；套餐和多 Holder 按父商品份数计算，不再合并商品行。 */
+export declare function prepareEntitlementLines(products: any[], hooks: RulesParamsHooks, canUseEntitlement: (product: any) => boolean): any[];
+/** 客户端钩子可能保留原 _id，只给新增的重复行补标识，保留拆分结果。 */
+export declare function finalizeEntitlementLines(products: any[], hooks: RulesParamsHooks): any[];

package/lib/modules/Rules/entitlementLines.js

@@ -0,0 +1,128 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.finalizeEntitlementLines = finalizeEntitlementLines;
+exports.isEntitlementRuntimeLine = isEntitlementRuntimeLine;
+exports.prepareEntitlementLines = prepareEntitlementLines;
+exports.rebuildEntitlementLine = rebuildEntitlementLine;
+var _lodashEs = require("lodash-es");
+var _decimal = _interopRequireDefault(require("decimal.js"));
+var _entitlementPass = require("../Discount/entitlementPass");
+var _entitlementState = require("../Discount/entitlementState");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const SOURCE = 'entitlement_source_identity';
+function isManualDiscount(data) {
+  return data.isManualDiscount ?? (data.total != data.origin_total && (data.bundle || []).every(item => !item.discount_list?.length) && (!data.discount_list?.length || data.discount_list.every(item => item.type === 'product')));
+}
+function isEntitlementRuntimeLine(product, mappedProduct) {
+  return product.metadata?.[SOURCE] != null && !(0, _entitlementState.isPersistedEntitlementLine)(product, mappedProduct) && !isManualDiscount(mappedProduct ?? product);
+}
+
+/** 仅同步本次多次卡行的数量与价格，沿用 Rules 的主商品、套餐计算结果。 */
+function rebuildEntitlementLine(origin, bundle, hooks, count) {
+  const data = hooks.getProduct(origin);
+  const quantity = count ?? data.quantity ?? data.num ?? 1;
+  const discounts = (data.discount_list || []).map(item => (0, _entitlementPass.isEntitlementPass)(item) && !item.metadata?.custom_product_bundle_map_id ? {
+    ...item,
+    _num: quantity,
+    metadata: {
+      ...item.metadata,
+      num: quantity
+    }
+  } : item);
+  const mainDiscount = discounts.filter(item => !item.metadata?.custom_product_bundle_map_id).reduce((sum, item) => sum.plus(item.metadata?.mainProductDiscountAmount ?? item.amount ?? 0), new _decimal.default(0));
+  const originalPrice = new _decimal.default(data.original_price ?? data.price ?? 0);
+  const sourceSellingPrice = originalPrice.minus(mainDiscount).toNumber();
+  const optionPrice = (data.options || []).reduce((sum, item) => sum.plus(new _decimal.default(item.price ?? item.add_price ?? 0).times(item.num ?? item.quantity ?? 1)), new _decimal.default(0));
+  const bundleTotal = bundle.reduce((sum, item) => sum.plus(new _decimal.default(item.price || 0).times(item.num || 1)), new _decimal.default(0));
+  const bundleOriginalTotal = bundle.reduce((sum, item) => sum.plus(new _decimal.default(item.original_price ?? item.price ?? 0).times(item.num || 1)), new _decimal.default(0));
+  return hooks.setProduct(origin, {
+    quantity,
+    discount_list: discounts,
+    bundle,
+    price: sourceSellingPrice,
+    main_product_selling_price: sourceSellingPrice,
+    total: new _decimal.default(sourceSellingPrice).plus(optionPrice).plus(bundleTotal).toNumber(),
+    origin_total: originalPrice.plus(optionPrice).plus(bundleOriginalTotal).toNumber()
+  });
+}
+function setLineIdentity(row, id) {
+  row._id = id;
+  row.metadata = {
+    ...row.metadata,
+    unique_identification_number: id
+  };
+  if (row._extend) row._extend.unique_identification_number = id;
+  return row;
+}
+
+/** 重算只还原本次多次卡；套餐和多 Holder 按父商品份数计算，不再合并商品行。 */
+function prepareEntitlementLines(products, hooks, canUseEntitlement) {
+  return products.flatMap(original => {
+    const data = hooks.getProduct(original);
+    if ((0, _entitlementState.isPersistedEntitlementLine)(original, data) || isManualDiscount(data)) return [original];
+    const applicable = canUseEntitlement(original);
+    if (!original.metadata?.[SOURCE] && !(0, _entitlementState.hasEntitlementDiscount)(data) && !applicable) return [original];
+    const origin = (0, _lodashEs.cloneDeep)(original);
+    origin.metadata = {
+      ...origin.metadata,
+      [SOURCE]: origin.metadata?.[SOURCE] ?? data._id
+    };
+    const bundle = (data.bundle || []).map(item => {
+      const entitlement = (item.discount_list || []).find(_entitlementPass.isEntitlementPass);
+      if (!entitlement) return item;
+      const discounts = (item.discount_list || []).filter(discount => !(0, _entitlementPass.isEntitlementPass)(discount));
+      const originalPrice = item.original_price ?? entitlement.discount?.original_amount ?? item.product_price ?? item.price ?? 0;
+      const amount = discounts.reduce((sum, discount) => sum.plus(discount.amount || 0), new _decimal.default(0));
+      const price = new _decimal.default(originalPrice).minus(amount.div(item.num || 1)).toNumber();
+      return {
+        ...item,
+        original_price: originalPrice,
+        price,
+        bundle_selling_price: price,
+        discount_list: discounts
+      };
+    });
+    const mainEntitlement = data.discount_list?.find(_entitlementPass.isEntitlementPass);
+    const restored = hooks.setProduct(origin, {
+      original_price: data.original_price ?? mainEntitlement?.discount?.original_amount ?? data.price,
+      discount_list: (data.discount_list || []).filter(item => !(0, _entitlementPass.isEntitlementPass)(item)),
+      bundle
+    });
+    const row = rebuildEntitlementLine(restored, bundle, hooks);
+    const count = Math.max(1, Math.floor(Number(data.quantity || data.num || 1)));
+    if (!applicable || count <= 1 || !bundle.length && !Array.isArray(data.holder_id)) return [row];
+    return Array.from({
+      length: count
+    }, (_, index) => {
+      const unit = (0, _lodashEs.cloneDeep)(row);
+      // booking 使用 _extend.holder_id，appointmentBooking 使用购物车 Holder。
+      for (const source of [unit, unit._extend]) {
+        if (Array.isArray(source?.holder_id)) source.holder_id = source.holder_id.slice(index, index + 1);
+      }
+      if (Array.isArray(unit._origin?.holder?.form_record)) {
+        const records = unit._origin.holder.form_record;
+        // 单 Holder 的多份商品仍归属同一人；多个 Holder 才按份对应。
+        if (records.length > 1) unit._origin.holder.form_record = records.slice(index, index + 1);
+      }
+      return setLineIdentity(rebuildEntitlementLine(unit, hooks.getProduct(unit).bundle || [], hooks, 1), `${data._id}:entitlement-unit:${index}`);
+    });
+  });
+}
+
+/** 客户端钩子可能保留原 _id，只给新增的重复行补标识，保留拆分结果。 */
+function finalizeEntitlementLines(products, hooks) {
+  const runtime = item => isEntitlementRuntimeLine(item, hooks.getProduct(item));
+  const seen = new Set(products.filter(item => !runtime(item)).map(item => String(item._id)));
+  return products.map((origin, index) => {
+    if (!runtime(origin)) return origin;
+    const base = String(origin._id ?? hooks.getProduct(origin)._id);
+    let id = base;
+    let ordinal = index;
+    while (seen.has(id)) id = `${base}:entitlement-split:${ordinal++}`;
+    seen.add(id);
+    return id === String(origin._id) ? origin : setLineIdentity((0, _lodashEs.cloneDeep)(origin), id);
+  });
+}

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

@@ -2,6 +2,7 @@ import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
 import { Rules, RulesModuleAPI, DiscountResult, RulesFormSubject, RulesCalcDiscountOptions, UnavailableReason } from './types';
 import { Discount } from '../Discount/types';
+import { WalletPassEvaluator } from '../../model/strategy/adapter/walletPass/evaluator';
 import { WindowPlugin } from '../../plugins';
 export declare class RulesModule extends BaseModule implements Module, RulesModuleAPI {
     protected defaultName: string;
@@ -9,11 +10,19 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     private store;
     window: WindowPlugin;
     private hooks;
+    private entitlementPassEnabled;
+    private defaultWalletPassEvaluator?;
+    setEntitlementPassEnabled(enabled: boolean): void;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setRulesList(rulesList: Rules[]): Promise<void>;
     getRulesList(): Rules[];
-    getWalletPassEvaluator(): import("../..").WalletPassEvaluator | undefined;
+    getWalletPassEvaluator(): WalletPassEvaluator | undefined;
+    private normalizeHolderRecordIds;
+    /**
+     * 商品未开启 Holder 选择时跳过匹配；已开启时，特定 form Holder 卡
+     * 只适用于同一 Holder Record，是否必填不影响匹配规则。
+     */
     private checkHolderMatch;
     isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, orderTotalAmount, holders, isFormSubject, }: {
         oldDiscountList: Discount[];
@@ -21,7 +30,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         productList: any[];
         orderTotalAmount: number;
         holders: {
-            form_record_id: number;
+            form_record_id: number | string;
         }[];
         isFormSubject: RulesFormSubject;
     }): {
@@ -29,6 +38,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         discountList: Discount[];
         productList: any[];
         unavailableReason?: UnavailableReason;
+        evaluatedDiscountList?: Discount[];
     };
     filterDiscountListByType(discountList: Discount[], type: string): Discount[];
     /** 剔除指定 type/tag 的折扣项，保留手动改价(type=product) / 券等 */
@@ -40,7 +50,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         discountList: Discount[];
         productList: any[];
         holders: {
-            form_record_id: number;
+            form_record_id: number | string;
         }[];
         isFormSubject: RulesFormSubject;
         orderTotalAmount: number;