@pisell/pisellos 0.0.568 → 0.0.570

package/dist/effects/index.d.ts

@@ -1,8 +1,8 @@
-type EffectCallback = (payload: any) => void | Promise<void | {
+declare type EffectCallback = (payload: any) => void | Promise<void | {
     status: boolean;
     message?: string;
 }>;
-type UnsubscribeFunction = () => void;
+declare type UnsubscribeFunction = () => void;
 declare class EffectsManager {
     private listeners;
     on(event: string, callback: EffectCallback): UnsubscribeFunction;

package/dist/model/strategy/adapter/dataVariant/type.d.ts

@@ -8,7 +8,7 @@ import type { ScheduleItem } from '../../../../modules/Schedule/types';
 export declare const DATA_VARIANT_ACTION_TYPES: {
     readonly APPLY: "DATA_VARIANT_APPLY";
 };
-export type DataVariantActionType = (typeof DATA_VARIANT_ACTION_TYPES)[keyof typeof DATA_VARIANT_ACTION_TYPES];
+export declare type DataVariantActionType = (typeof DATA_VARIANT_ACTION_TYPES)[keyof typeof DATA_VARIANT_ACTION_TYPES];
 /**
  * Data Variant 规则元数据。
  *
@@ -116,7 +116,7 @@ export interface EffectiveRuleInfo {
     productRules: ConditionRule[];
     globalResult: EvaluationResult;
 }
-export type GlobalEffectiveRuleMap = Map<string, EffectiveRuleInfo>;
+export declare type GlobalEffectiveRuleMap = Map<string, EffectiveRuleInfo>;
 /**
  * 单条商品命中的变体覆盖信息。
  */
@@ -145,4 +145,4 @@ export interface ResolvedDataVariantResult {
     scheduleTimePoints: string[];
     rawResults: EvaluationResult[];
 }
-export type ConditionScope = 'global' | 'product';
+export declare type ConditionScope = 'global' | 'product';

package/dist/model/strategy/adapter/itemRule/type.d.ts

@@ -5,7 +5,7 @@ export declare const ITEM_RULE_ACTION_TYPES: {
     /** 预填购物车 */
     readonly PREFILL_CART: "PREFILL_CART";
 };
-export type ItemRuleActionType = (typeof ITEM_RULE_ACTION_TYPES)[keyof typeof ITEM_RULE_ACTION_TYPES];
+export declare type ItemRuleActionType = (typeof ITEM_RULE_ACTION_TYPES)[keyof typeof ITEM_RULE_ACTION_TYPES];
 export declare const ITEM_RULE_TEMPLATES: {
     /** 空白规则 */
     readonly BLANK: "blank";
@@ -16,15 +16,15 @@ export declare const ITEM_RULE_TEMPLATES: {
     /** 必选商品 */
     readonly MUST_INCLUDE: "must_include";
 };
-export type ItemRuleTemplate = (typeof ITEM_RULE_TEMPLATES)[keyof typeof ITEM_RULE_TEMPLATES];
+export declare type ItemRuleTemplate = (typeof ITEM_RULE_TEMPLATES)[keyof typeof ITEM_RULE_TEMPLATES];
 /** 数量比较类型 */
-export type QuantityComparison = 'minimum' | 'maximum' | 'exact' | 'must_include';
+export declare type QuantityComparison = 'minimum' | 'maximum' | 'exact' | 'must_include';
 /** 数量来源 */
-export type QuantitySource = 'total_pax' | 'adult_pax' | 'fixed';
+export declare type QuantitySource = 'total_pax' | 'adult_pax' | 'fixed';
 /** 目标类型（当前仅支持按商品） */
-export type TargetType = 'product';
+export declare type TargetType = 'product';
 /** 作用范围 */
-export type RuleScope = 'each_submission' | 'first_submission_only' | 'subsequent_only' | 'cumulative';
+export declare type RuleScope = 'each_submission' | 'first_submission_only' | 'subsequent_only' | 'cumulative';
 /**
  * 单条数量规则
  *

package/dist/model/strategy/adapter/promotion/evaluator.js

@@ -747,9 +747,10 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
         return b.price - a.price;
       });
 
-      // 3. 计算可以凑成多少组
+      // 3. 计算可以凑成多少组（cumulative 缺省视为 true，与 adapter 一致）
       var totalUnits = unitProducts.length;
-      var groupCount = cumulative ? Math.floor(totalUnits / x) : totalUnits >= x ? 1 : 0;
+      var isCumulative = cumulative !== false;
+      var groupCount = isCumulative ? Math.floor(totalUnits / x) : totalUnits >= x ? 1 : 0;
       var promotionUnits = groupCount * x;
 
       // 4. 分离参与促销的和不参与的商品

package/dist/model/strategy/adapter/promotion/type.d.ts

@@ -17,7 +17,7 @@ export declare const PROMOTION_ACTION_TYPES: {
     /** 固定减价 */
     readonly DEDUCT_AMOUNT: "DEDUCT_AMOUNT";
 };
-export type PromotionActionType = (typeof PROMOTION_ACTION_TYPES)[keyof typeof PROMOTION_ACTION_TYPES];
+export declare type PromotionActionType = (typeof PROMOTION_ACTION_TYPES)[keyof typeof PROMOTION_ACTION_TYPES];
 /**
  * X件Y元 - Action Value
  *
@@ -54,7 +54,7 @@ export interface BuyXGetYFreeValue {
 /**
  * 赠品选择模式
  */
-export type GiftSelectionMode = 'user_select' | 'auto' | 'cheapest';
+export declare type GiftSelectionMode = 'user_select' | 'auto' | 'cheapest';
 /**
  * 买X送Y - Action Config
  */
@@ -105,7 +105,7 @@ export interface BuyXGetYFreeAction extends Omit<ActionEffect, 'type' | 'value'
 /**
  * 促销活动 Action 联合类型
  */
-export type PromotionAction = XItemsForYPriceAction | BuyXGetYFreeAction;
+export declare type PromotionAction = XItemsForYPriceAction | BuyXGetYFreeAction;
 /**
  * 促销相关运算符
  */
@@ -135,7 +135,7 @@ export interface PromotionBusinessData {
     /** 自定义属性 */
     custom?: Record<string, any>;
 }
-type ProductBundleItem = {
+declare type ProductBundleItem = {
     /** 主商品ID */
     product_id: number;
     /** 变体ID（0 表示无变体） */
@@ -195,7 +195,7 @@ export interface PromotionTransformResult {
 /**
  * Action 详情联合类型
  */
-export type PromotionActionDetail = XItemsForYPriceActionDetail | BuyXGetYFreeActionDetail;
+export declare type PromotionActionDetail = XItemsForYPriceActionDetail | BuyXGetYFreeActionDetail;
 /**
  * X件Y元 Action 详情
  */

package/dist/model/strategy/adapter/walletPass/utils.js

@@ -491,7 +491,7 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
     // ======================================================================================
 
     // 计算本次抵扣金额（使用同样的 usageAmount）
-    var maxDeduction = Decimal.min(new Decimal(usageAmount), new Decimal(maxDeductionAmount));
+    var maxDeduction = Decimal.min(new Decimal(usageAmount), new Decimal(maxDeductionAmount), remainingOrderAmount);
     var deductionLeft = maxDeduction;
     var deductionDetails = [];
     if (allowCrossProduct) {
@@ -674,6 +674,7 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
 
   // 第一步：按顺序应用已选中的券，计算实际抵扣
   selectedVouchers.forEach(function (selectedVoucher) {
+    var _selectedVoucher$_ava;
     var config = selectedVoucher.config,
       id = selectedVoucher.id;
     var maxDeductionAmount = config.maxDeductionAmount,
@@ -707,9 +708,11 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
       return;
     }
 
-    // 计算本次抵扣金额
-    // 优先使用用户手动编辑的金额，否则根据 deductTaxAndFee 配置获取推荐金额
-    var usageAmount = typeof selectedVoucher.edit_current_amount === 'number' ? selectedVoucher.edit_current_amount : getRecommendedAmount(selectedVoucher);
+    // 计算本次抵扣金额：
+    // - 用户手动编辑时以编辑金额为准；
+    // - 自动推荐/重算时沿用上一轮基于剩余待付金额算出的 _available_max_amount，
+    //   避免 recalculateVouchers 又回退到后端单券 recommended_usage_amount 造成超付。
+    var usageAmount = typeof selectedVoucher.edit_current_amount === 'number' ? selectedVoucher.edit_current_amount : (_selectedVoucher$_ava = selectedVoucher._available_max_amount) !== null && _selectedVoucher$_ava !== void 0 ? _selectedVoucher$_ava : getRecommendedAmount(selectedVoucher);
     var maxDeduction = Decimal.min(new Decimal(usageAmount), new Decimal(maxDeductionAmount), remainingOrderAmount);
     var deductionLeft = maxDeduction;
     var deductionDetails = [];

package/dist/model/strategy/type.d.ts

@@ -242,4 +242,4 @@ export interface EngineOptions {
 /**
  * 运算符处理器
  */
-export type OperatorHandler = (fieldValue: any, compareValue: any, rule: ConditionRule) => boolean;
+export declare type OperatorHandler = (fieldValue: any, compareValue: any, rule: ConditionRule) => boolean;

package/dist/modules/BaseModule.d.ts

@@ -14,9 +14,9 @@ export declare class BaseModule {
         store: any;
         cacheKey: string[];
     }): void;
-    effectsOn(eventType: string, callback: (payload: any) => void, force?: boolean): void;
+    effectsOn(eventType: string, callback: (payload: any) => void): () => void;
     effectsOff(eventType: string, callback: (payload: any) => void): void;
-    effectsOnce(eventType: string, callback: (payload: any) => void, force?: boolean): void;
+    effectsOnce(eventType: string, callback: (payload: any) => void): void;
     effectsEmit(eventType: string, payload: any): Promise<{
         status: boolean;
         data: any;

package/dist/modules/BaseModule.js

@@ -68,8 +68,8 @@ export var BaseModule = /*#__PURE__*/function () {
     }
   }, {
     key: "effectsOn",
-    value: function effectsOn(eventType, callback, force) {
-      return this.core.effects.on("".concat(this.name, ":").concat(eventType), callback, force);
+    value: function effectsOn(eventType, callback) {
+      return this.core.effects.on("".concat(this.name, ":").concat(eventType), callback);
     }
   }, {
     key: "effectsOff",
@@ -78,8 +78,8 @@ export var BaseModule = /*#__PURE__*/function () {
     }
   }, {
     key: "effectsOnce",
-    value: function effectsOnce(eventType, callback, force) {
-      return this.core.effects.once("".concat(this.name, ":").concat(eventType), callback, force);
+    value: function effectsOnce(eventType, callback) {
+      return this.core.effects.once("".concat(this.name, ":").concat(eventType), callback);
     }
   }, {
     key: "effectsEmit",

package/dist/modules/BookingContext/index.d.ts

@@ -0,0 +1,48 @@
+import { Module, ModuleOptions, PisellCore } from '../../types';
+import { BaseModule } from '../BaseModule';
+import { BookingContextConfig, BookingContextDateInput, BookingContextModuleAPI, BookingContextResource, BookingContextResourceMap, BookingContextState, InitBookingContextParams, LoadBookingConfigParams, LoadBookingResourcesParams } from './types';
+export * from './types';
+export * from './utils';
+/**
+ * 清理跨实例共享缓存，仅供单元测试隔离使用。
+ *
+ * @example
+ * __clearBookingContextSharedCacheForTest();
+ */
+export declare function __clearBookingContextSharedCacheForTest(): void;
+/** 稳定序列化 config 查询参数，用于判断是否与上次 loadBookingConfig 一致。 */
+export declare function buildBookingConfigQueryKey(params?: LoadBookingConfigParams): string;
+/** 稳定序列化资源列表查询（date + bookingIds），用于跳过重复 loadResources。 */
+export declare function buildBookingResourcesQueryKey(params?: LoadBookingResourcesParams): string;
+export declare class BookingContextModule extends BaseModule implements Module, BookingContextModuleAPI {
+    protected defaultName: string;
+    protected defaultVersion: string;
+    private request;
+    private store;
+    /** 上次成功 loadBookingConfig 的 query key；命中则不再请求。 */
+    private lastConfigQueryKey;
+    /** 上次成功 loadResources 的 query key（date|bookingIds）；命中则不再请求。 */
+    private lastResourcesQueryKey;
+    constructor(name?: string, version?: string);
+    initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
+    loadBookingConfig(params?: LoadBookingConfigParams, options?: {
+        forceRefresh?: boolean;
+    }): Promise<BookingContextConfig | null>;
+    loadResources(params?: LoadBookingResourcesParams, options?: {
+        forceRefresh?: boolean;
+    }): Promise<BookingContextResource[]>;
+    /**
+     * store 内是否已具备与本次 init 入参等价的 config / resources（不再打接口）。
+     */
+    isBookingContextReady(params?: InitBookingContextParams): boolean;
+    initBookingContext(params?: InitBookingContextParams): Promise<BookingContextState>;
+    setBookingConfig(config: BookingContextConfig | null): void;
+    getBookingConfig(): BookingContextConfig | null;
+    setResources(resources: BookingContextResource[] | null | undefined): void;
+    getResourcesOrigin(): BookingContextResource[];
+    getResourcesOriginMap(): BookingContextResourceMap;
+    setDate(date: BookingContextDateInput): void;
+    getDate(): string | null;
+    getState(): BookingContextState;
+    clear(): void;
+}