@pisell/pisellos 0.0.568 → 0.0.570

package/dist/solution/VenueBooking/sales-section-4-annotated.json

@@ -71,8 +71,6 @@
         "num__comment": "数量；int；↕；必填。统一使用 num，不再使用 product_quantity。",
         "product_variant_id": 0,
         "product_variant_id__comment": "多规格 ID；int；↕；可选。",
-        "product_option_item": [],
-        "product_option_item__comment": "选项配置；array；↕；可选。",
         "selling_price": "50.00",
         "selling_price__comment": "销售单价（交易快照）；string；←；服务端返回，不能依赖基准数据回填。",
         "original_price": "60.00",

package/dist/solution/VenueBooking/types.d.ts

@@ -11,7 +11,7 @@ export declare enum VenueBookingHooks {
     /** 登录客户的智能定价、营销配置与订单汇总已完成刷新 */
     onSmartPricingUpdated = "venueBooking:onSmartPricingUpdated"
 }
-export type VenueBookingStatus = 'idle' | 'initializing' | 'ready' | 'error';
+export declare type VenueBookingStatus = 'idle' | 'initializing' | 'ready' | 'error';
 export interface VenueBookingEntryContext {
     biz: string;
     venueId?: string;

package/dist/solution/VenueBooking/utils/slotMerge.d.ts

@@ -5,6 +5,12 @@ export declare function mergeConsecutiveSlots(slots: VenueSlotSelection[]): Merg
 export declare function buildPriceBreakdown(params: {
     group: MergedSlotGroup;
     productId: number;
+    quotation?: {
+        getQuotationShelfId: (p: {
+            productId: number;
+            datetime: string;
+        }) => number;
+    };
 }): PriceBreakdownEntry[];
 export interface BuildVenueBookingParams {
     group: MergedSlotGroup;

package/dist/solution/VenueBooking/utils/slotMerge.js

@@ -51,7 +51,9 @@ export function mergeConsecutiveSlots(slots) {
   return groups;
 }
 export function buildPriceBreakdown(params) {
-  var group = params.group;
+  var group = params.group,
+    productId = params.productId,
+    quotation = params.quotation;
   if (!group.slots.length) return [];
   var entries = [];
   var _iterator = _createForOfIteratorHelper(group.slots),
@@ -60,10 +62,14 @@ export function buildPriceBreakdown(params) {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var slot = _step.value;
       var unitPrice = Number(slot.price || '0');
+      var shelfId = quotation ? quotation.getQuotationShelfId({
+        productId: productId,
+        datetime: slot.startTime
+      }) : 0;
       var startHm = dayjs(slot.startTime, 'YYYY-MM-DD HH:mm').format('YYYY-MM-DD HH:mm');
       var endHm = dayjs(slot.endTime, 'YYYY-MM-DD HH:mm').format('YYYY-MM-DD HH:mm');
       var last = entries[entries.length - 1];
-      if (last && last.unit_price === unitPrice && last.quotation_shelf_id === 0 && last.end_time === startHm) {
+      if (last && last.unit_price === unitPrice && last.quotation_shelf_id === shelfId && last.end_time === startHm) {
         last.end_time = endHm;
         last.quantity += 1;
       } else {
@@ -71,7 +77,7 @@ export function buildPriceBreakdown(params) {
           start_time: startHm,
           end_time: endHm,
           unit_price: unitPrice,
-          quotation_shelf_id: 0,
+          quotation_shelf_id: shelfId,
           quantity: 1
         });
       }

package/dist/solution/index.d.ts

@@ -6,4 +6,6 @@ export * from './RegisterAndLogin';
 export * from './Checkout';
 export * from './Sales';
 export * from './ScanOrder';
+export * from './BaseSales';
 export * from './VenueBooking';
+export * from './UnifiedBookingSales';

package/dist/solution/index.js

@@ -6,4 +6,6 @@ export * from "./RegisterAndLogin";
 export * from "./Checkout";
 export * from "./Sales";
 export * from "./ScanOrder";
-export * from "./VenueBooking";
+export * from "./BaseSales";
+export * from "./VenueBooking";
+export * from "./UnifiedBookingSales";

package/dist/types/index.d.ts

@@ -15,6 +15,16 @@ export interface Module {
     name: string;
     version: string;
     initialize: (core: PisellCore, options: ModuleOptions) => Promise<void> | void;
+    /**
+     * 父级解决方案运行时更新 otherParams 后，显式通知子模块刷新自己的运行态参数。
+     *
+     * @example
+     * await module.updateOtherParams?.({ channel: 'pos' }, { changedParams: { channel: 'pos' } });
+     */
+    updateOtherParams?: (params: Record<string, any>, meta?: {
+        changedParams?: Record<string, any>;
+        cover?: boolean;
+    }) => Promise<void> | void;
     destroy?: () => Promise<void> | void;
     exports?: Record<string, any>;
     isSolution?: boolean;
@@ -28,7 +38,7 @@ export interface ModuleOptions {
     initialState?: Record<string, any>;
     otherParams?: Record<string, any>;
 }
-export type EventHandler = (data?: any) => void;
+export declare type EventHandler = (data?: any) => void;
 export interface PisellCore {
     registerPlugin: (plugin: Plugin, options?: PluginOptions) => void;
     getPlugin: <T extends Plugin>(name: string) => T | null;
@@ -39,7 +49,7 @@ export interface PisellCore {
     getModuleExports: <T = any>(name: string) => T | null;
     hasModule: (name: string) => boolean;
     effects: {
-        on: (event: string, callback: (payload: any) => void, force?: boolean) => void;
+        on: (event: string, callback: (payload: any) => void) => () => void;
         once: (event: string, callback: (payload: any) => void, force?: boolean) => void;
         only: (event: string, callback: (payload: any) => void) => () => void;
         off: (event: string, callback: (payload: any) => void) => void;

package/dist/utils/task.d.ts

@@ -1,5 +1,5 @@
-type Action = (...args: any[]) => Promise<any>;
-type Task = {
+declare type Action = (...args: any[]) => Promise<any>;
+declare type Task = {
     uuid: string;
     type: string;
     actionParams?: Record<string, any>;

package/dist/utils/watch.d.ts

@@ -2,8 +2,8 @@
  * 监听模块
  *
  */
-export type WatchEventCallback = (...args: any[]) => void;
-export type WatchEventItem = {
+export declare type WatchEventCallback = (...args: any[]) => void;
+export declare type WatchEventItem = {
     key: string;
     callback: WatchEventCallback;
 };

package/lib/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/lib/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/lib/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/lib/model/strategy/adapter/promotion/evaluator.js

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

package/lib/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/lib/model/strategy/adapter/walletPass/utils.js

@@ -444,7 +444,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
     // ======================================================================================
 
     // 计算本次抵扣金额（使用同样的 usageAmount）
-    const maxDeduction = _decimal.default.min(new _decimal.default(usageAmount), new _decimal.default(maxDeductionAmount));
+    const maxDeduction = _decimal.default.min(new _decimal.default(usageAmount), new _decimal.default(maxDeductionAmount), remainingOrderAmount);
     let deductionLeft = maxDeduction;
     const deductionDetails = [];
     if (allowCrossProduct) {
@@ -649,9 +649,11 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
       return;
     }
 
-    // 计算本次抵扣金额
-    // 优先使用用户手动编辑的金额，否则根据 deductTaxAndFee 配置获取推荐金额
-    const usageAmount = typeof selectedVoucher.edit_current_amount === 'number' ? selectedVoucher.edit_current_amount : getRecommendedAmount(selectedVoucher);
+    // 计算本次抵扣金额：
+    // - 用户手动编辑时以编辑金额为准；
+    // - 自动推荐/重算时沿用上一轮基于剩余待付金额算出的 _available_max_amount，
+    //   避免 recalculateVouchers 又回退到后端单券 recommended_usage_amount 造成超付。
+    const usageAmount = typeof selectedVoucher.edit_current_amount === 'number' ? selectedVoucher.edit_current_amount : selectedVoucher._available_max_amount ?? getRecommendedAmount(selectedVoucher);
     const maxDeduction = _decimal.default.min(new _decimal.default(usageAmount), new _decimal.default(maxDeductionAmount), remainingOrderAmount);
     let deductionLeft = maxDeduction;
     const deductionDetails = [];

package/lib/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/lib/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/lib/modules/BaseModule.js

@@ -64,14 +64,14 @@ class BaseModule {
       }
     }
   }
-  effectsOn(eventType, callback, force) {
-    return this.core.effects.on(`${this.name}:${eventType}`, callback, force);
+  effectsOn(eventType, callback) {
+    return this.core.effects.on(`${this.name}:${eventType}`, callback);
   }
   effectsOff(eventType, callback) {
     return this.core.effects.off(`${this.name}:${eventType}`, callback);
   }
-  effectsOnce(eventType, callback, force) {
-    return this.core.effects.once(`${this.name}:${eventType}`, callback, force);
+  effectsOnce(eventType, callback) {
+    return this.core.effects.once(`${this.name}:${eventType}`, callback);
   }
   effectsEmit(eventType, payload) {
     return this.core.effects.emit(`${this.name}:${eventType}`, payload);

package/lib/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;
+}