@pisell/pisellos 0.0.568 → 0.0.569

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

@@ -0,0 +1,227 @@
+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;
+}
+export interface ResourcePlannerEvent extends ResourcePlannerTimeRange {
+    resourceId?: number | string;
+    resource_id?: number | string;
+    pax?: number;
+    product_uid?: string;
+    source?: 'remote' | 'cart' | 'selection';
+    [key: string]: any;
+}
+export interface ResourcePlannerResourceRequirement {
+    formId?: number | string;
+    resourceIds?: Array<number | string>;
+    resourceType?: ResourcePlannerResourceType;
+    capacityRequired?: number;
+    required?: boolean;
+}
+export interface ResourcePlannerProduct {
+    id: number | string;
+    title?: string;
+    kind: ResourcePlannerProductKind;
+    durationMinutes?: number;
+    schedule?: ResourcePlannerTimeRange[];
+    resourceRequirements?: ResourcePlannerResourceRequirement[];
+    capacityRequired?: number;
+    quantity?: number;
+    price?: string | number | null;
+    raw?: Record<string, any>;
+}
+export interface ResourcePlannerResource {
+    id: number | string;
+    formId?: number | string;
+    name?: string;
+    resourceType: ResourcePlannerResourceType;
+    capacity: number;
+    times: Array<ResourcePlannerTimeRange & {
+        event_list?: ResourcePlannerEvent[];
+        [key: string]: any;
+    }>;
+    childResourceIds?: Array<number | string>;
+    raw?: Record<string, any>;
+}
+export interface ResourcePlannerContextInput {
+    products?: ResourcePlannerProduct[];
+    resources?: ResourcePlannerResource[];
+    externalEvents?: ResourcePlannerEvent[];
+    slotDurationMinutes?: number;
+    businessStartTime?: string;
+    businessEndTime?: string;
+}
+export interface ResourcePlannerQuery {
+    mode?: ResourcePlannerMode;
+    productIds?: Array<number | string>;
+    date?: string;
+    dateRange?: {
+        start: string;
+        end: string;
+    };
+    startTime?: string;
+    endTime?: string;
+    resourceIds?: Array<number | string>;
+    serviceObjectIds?: Array<number | string>;
+    holderIds?: Array<number | string>;
+    pax?: number;
+    slotDurationMinutes?: number;
+}
+export interface ResourcePlannerSelection {
+    productIds: Array<number | string>;
+    date?: string;
+    startTime?: string;
+    endTime?: string;
+    resourceIds: Array<number | string>;
+    assignments: ResourcePlannerAssignment[];
+    mode?: ResourcePlannerMode;
+}
+export interface ResourcePlannerSelectionPatch extends Partial<ResourcePlannerSelection> {
+    replaceAssignments?: boolean;
+}
+export interface ResourcePlannerDemandInterval {
+    id: string;
+    productId: number | string;
+    source: Extract<ResourcePlannerProductKind, 'duration' | 'session' | 'venue_slot'>;
+    date: string;
+    start_at: string;
+    end_at: string;
+    durationMinutes: number;
+    quantity: number;
+    capacityRequired: number;
+    resourceRequirements: ResourcePlannerResourceRequirement[];
+}
+export interface ResourcePlannerConflict {
+    type: 'outside_resource_time' | 'remote_event_overlap' | 'cart_overlap' | 'capacity_full' | 'missing_time' | 'missing_resource' | 'missing_assignment' | 'past';
+    message: string;
+    event?: ResourcePlannerEvent;
+    resourceId?: number | string;
+    productId?: number | string;
+}
+export interface ResourcePlannerAvailabilityCell {
+    key: string;
+    productId: number | string;
+    resourceId?: number | string;
+    date?: string;
+    start_at: string;
+    end_at: string;
+    startTime?: string;
+    endTime?: string;
+    durationMinutes?: number;
+    cellType: 'availability_range' | 'fixed_interval' | 'unavailable';
+    status: ResourcePlannerStatus;
+    remainingCapacity?: number;
+    maxCapacity?: number;
+    reasonCodes: string[];
+    conflicts: ResourcePlannerConflict[];
+}
+export interface ResourcePlannerProductOption {
+    productId: number | string;
+    title?: string;
+    status: ResourcePlannerStatus;
+    reasonCodes: string[];
+}
+export interface ResourcePlannerResourceOption {
+    resourceId: number | string;
+    resourceName?: string;
+    resourceFormId?: number | string;
+    resourceType: ResourcePlannerResourceType;
+    status: ResourcePlannerStatus;
+    remainingCapacity?: number;
+    maxCapacity?: number;
+    reasonCodes: string[];
+}
+export interface ResourcePlannerDateSummary {
+    date: string;
+    status: ResourcePlannerStatus;
+    availableCount: number;
+    totalCount: number;
+}
+export interface ResourcePlannerTimeSlot {
+    startTime: string;
+    endTime: string;
+    status: ResourcePlannerStatus;
+    resourceId: number | string;
+    productId?: number | string;
+    remainingCapacity?: number;
+    maxCapacity?: number;
+    reasonCodes: string[];
+}
+export interface ResourcePlannerTimeGridRow {
+    resourceId: number | string;
+    resourceName?: string;
+    resourceFormId?: number | string;
+    slots: ResourcePlannerTimeSlot[];
+}
+export interface ResourcePlannerTimeGrid {
+    date?: string;
+    timeLabels: string[];
+    resources: ResourcePlannerTimeGridRow[];
+}
+export interface ResourcePlannerProjection {
+    query: ResourcePlannerQuery;
+    demandIntervals: ResourcePlannerDemandInterval[];
+    productOptions: ResourcePlannerProductOption[];
+    resourceOptions: ResourcePlannerResourceOption[];
+    dateSummary: ResourcePlannerDateSummary[];
+    timeGrid: ResourcePlannerTimeGrid;
+    cells: ResourcePlannerAvailabilityCell[];
+}
+export interface ResourcePlannerAssignment {
+    productId: number | string;
+    resourceId: number | string;
+    start_at: string;
+    end_at: string;
+    capacityRequired?: number;
+}
+export interface ResourcePlannerAssignableSlotResource {
+    resourceId: number | string;
+    resourceName?: string;
+    resourceFormId?: number | string;
+    resourceType?: ResourcePlannerResourceType;
+    capacityRequired?: number;
+    remainingCapacity?: number;
+    maxCapacity?: number;
+}
+export interface ResourcePlannerAssignableSlot {
+    key: string;
+    productId: number | string;
+    date: string;
+    start_at: string;
+    end_at: string;
+    startTime: string;
+    endTime: string;
+    durationMinutes: number;
+    status: ResourcePlannerStatus;
+    resources: ResourcePlannerAssignableSlotResource[];
+    assignments: ResourcePlannerAssignment[];
+    conflicts: ResourcePlannerConflict[];
+}
+export interface ResourcePlannerAssignableSlotResult {
+    projection: ResourcePlannerProjection;
+    slots: ResourcePlannerAssignableSlot[];
+    conflicts: ResourcePlannerConflict[];
+}
+export interface ResourcePlannerAssignmentResult {
+    assignments: ResourcePlannerAssignment[];
+    conflicts: ResourcePlannerConflict[];
+}
+export interface ResourcePlannerValidationResult {
+    ok: boolean;
+    conflicts: ResourcePlannerConflict[];
+}
+export interface ResourcePlannerSnapshot {
+    context: Required<ResourcePlannerContextInput>;
+    selection: ResourcePlannerSelection;
+    projection: ResourcePlannerProjection | null;
+    version: number;
+}
+export interface ResourcePlannerState {
+    context: Required<ResourcePlannerContextInput>;
+    selection: ResourcePlannerSelection;
+    projection: ResourcePlannerProjection | null;
+    version: number;
+}

package/lib/modules/ResourcePlanner/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

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

@@ -1,8 +1,7 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Rules, RulesModuleAPI, DiscountResult, UnavailableReason } from './types';
+import { Rules, RulesModuleAPI, DiscountResult, RulesFormSubject, RulesCalcDiscountOptions, UnavailableReason } from './types';
 import { Discount } from '../Discount/types';
-import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 import { WindowPlugin } from '../../plugins';
 export declare class RulesModule extends BaseModule implements Module, RulesModuleAPI {
     protected defaultName: string;
@@ -24,7 +23,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         holders: {
             form_record_id: number;
         }[];
-        isFormSubject: boolean;
+        isFormSubject: RulesFormSubject;
     }): {
         isAvailable: boolean;
         discountList: Discount[];
@@ -32,6 +31,10 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         unavailableReason?: UnavailableReason;
     };
     filterDiscountListByType(discountList: Discount[], type: string): Discount[];
+    /** 剔除指定 type/tag 的折扣项，保留手动改价(type=product) / 券等 */
+    excludeDiscountListByType(discountList: Discount[], type: string): Discount[];
+    /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
+    resolveDiscountListForManualOverride(discountList: Discount[]): Discount[];
     private getUnavailableReason;
     calcDiscount({ discountList, productList, holders, isFormSubject, orderTotalAmount }: {
         discountList: Discount[];
@@ -39,14 +42,9 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         holders: {
             form_record_id: number;
         }[];
-        isFormSubject: boolean;
+        isFormSubject: RulesFormSubject;
         orderTotalAmount: number;
-    }, options?: {
-        isSelected?: boolean;
-        discountId?: number;
-        selectedList?: SetDiscountSelectedParams[];
-        scan?: boolean;
-    }): DiscountResult;
+    }, options?: RulesCalcDiscountOptions): DiscountResult;
     /**
      * 检查优惠是否符合 PackageSubItemUsageRules 配置
      * @param discount 优惠券