@pisell/pisellos 2.3.76 → 2.3.78

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

@@ -6,6 +6,16 @@ import type { BookingTicketState } from '../BookingTicket/types';
 export type { AvailabilityAbsoluteRange, AvailabilityAssignment, AvailabilityCell, AvailabilityDateRange, AvailabilityDisplayRange, AvailabilityErrorCode, AvailabilityId, AvailabilityMode, AvailabilityOccupancy, AvailabilityProduct, AvailabilityProductKind, AvailabilityProjection, AvailabilityProjectionInput, AvailabilityProjectionMeta, AvailabilityQuery, AvailabilityQueryResult, AvailabilityRequirementGroup, AvailabilityRequirementGroupResult, AvailabilityRequirementSelection, AvailabilityResource, AvailabilityResourceOption, AvailabilityResourceType, AvailabilityResourceWindow, AvailabilityScheduleMode, AvailabilityScheduleRef, AvailabilityScheduleRule, AvailabilitySelectionValidationParams, AvailabilitySelectionValidationResult, AvailabilitySessionRange, AvailabilityStatus, DateAvailabilityGroup, DateAvailabilityItem, DateAvailabilityQuery, DateAvailabilityQueryResult, GetProductTimeRangesRequest, ProductAvailabilityGroup, ProductAvailabilityItem, ProductAvailabilityQuery, ProductAvailabilityQueryResult, ProductTimeRange, ProductTimeRangeGroup, QueryAvailabilityBaseRequest, ResourceAvailabilityGroup, ResourceAvailabilityQuery, ResourceAvailabilityQueryResult, ResourceAvailabilityRangeGroup, TimeAvailabilityGroup, TimeAvailabilityItem, TimeAvailabilityQuery, TimeAvailabilityQueryResult, } from '../../modules/ResourcePlanner';
 export interface UnifiedBookingSalesState extends BookingTicketState {
 }
+export interface UnifiedBookingSalesPolicy {
+    id?: AvailabilityId;
+    title?: unknown;
+    content?: string;
+    [key: string]: unknown;
+}
+export interface UnifiedBookingSalesPolicyResponse {
+    data?: UnifiedBookingSalesPolicy;
+    [key: string]: unknown;
+}
 export declare enum UnifiedBookingSalesHooks {
     onAvailabilityProjectionPrepared = "unifiedBookingSales:onAvailabilityProjectionPrepared",
     onAvailabilitySelectionCommitted = "unifiedBookingSales:onAvailabilitySelectionCommitted",

package/lib/model/strategy/adapter/promotion/index.js

@@ -1 +1,46 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.ITEM_REWARD_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "PromotionAdapter", {
+  enumerable: true,
+  get: function () {
+    return _adapter.PromotionAdapter;
+  }
+});
+Object.defineProperty(exports, "PromotionEvaluator", {
+  enumerable: true,
+  get: function () {
+    return _evaluator.PromotionEvaluator;
+  }
+});
+Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function () {
+    return _adapter.default;
+  }
+});
+var _evaluator = require("./evaluator");
+var _adapter = _interopRequireWildcard(require("./adapter"));
+var _examples = require("./examples");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }

package/lib/modules/ResourcePlanner/planner.js

@@ -1319,6 +1319,7 @@ function evaluateCandidate(projection, candidate, request) {
           resourceId: resource.id,
           resourceName: resource.name,
           resourceFormId: resource.formId,
+          policyId: resource.raw?.policy_id,
           resourceType: resource.resourceType,
           status: isPast ? 'past' : 'unavailable',
           maxPartySize: 0,
@@ -1341,6 +1342,7 @@ function evaluateCandidate(projection, candidate, request) {
         resourceId: resource.id,
         resourceName: resource.name,
         resourceFormId: resource.formId,
+        policyId: resource.raw?.policy_id,
         resourceType: resource.resourceType,
         status,
         remainingCapacity,

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

@@ -258,6 +258,7 @@ export interface AvailabilityResourceOption {
     resourceId: AvailabilityId;
     resourceName?: string;
     resourceFormId?: AvailabilityId;
+    policyId?: AvailabilityId;
     resourceType: AvailabilityResourceType;
     status: AvailabilityStatus;
     remainingCapacity?: number;

package/lib/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 5 | 4 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "lots_of_space" | "filling_up_fast" | "sold_out";
+        status: "sold_out" | "lots_of_space" | "filling_up_fast";
     }[];
     /**
      * 找到多个资源的公共可用时间段

package/lib/solution/BookingTicket/index.d.ts

@@ -334,7 +334,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态
@@ -453,19 +453,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
-        action: "reloadCatalog";
-    } | {
-        action: "add";
-        cacheItem: any;
-    } | {
-        action: "requiresDetail";
-        payload: AddProductRequiresDetailPayload;
-    } | {
-        action: "requiresBookingEdit";
-        cacheItem: any;
-        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
-    };
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/lib/solution/UnifiedBookingSales/index.d.ts

@@ -4,7 +4,7 @@ import type { OpenDataConfig } from '../../modules/OpenData';
 import type { LoadScheduleAvailableDateParams, ScheduleItem } from '../../modules/Schedule/types';
 import type { ProductListLoadProductsParams } from '../../modules/ProductList';
 import type { AvailabilityDateRange, AvailabilityOccupancy, AvailabilityProduct, AvailabilityResource, GetProductTimeRangesRequest } from '../../modules/ResourcePlanner';
-import type { AvailabilityContextRef, ContextualAvailabilityQuery, ContextualAvailabilityQueryResult, ContextualCommitAvailabilitySelectionParams, ContextualProductTimeRangeGroup, UnifiedBookingSalesAddRetailProductParams, UnifiedBookingSalesApplyPlannerDiscountsParams, UnifiedBookingSalesCommitAvailabilitySelectionResult, UnifiedBookingSalesDiscountResult, UnifiedBookingSalesLoadProductsByScheduleDateParams, UnifiedBookingSalesLoadOpenDataParams, UnifiedBookingSalesPrepareAvailabilityProjectionParams, UnifiedBookingSalesStageRetailProductsParams, UnifiedBookingSalesState } from './types';
+import type { AvailabilityContextRef, ContextualAvailabilityQuery, ContextualAvailabilityQueryResult, ContextualCommitAvailabilitySelectionParams, ContextualProductTimeRangeGroup, UnifiedBookingSalesAddRetailProductParams, UnifiedBookingSalesApplyPlannerDiscountsParams, UnifiedBookingSalesCommitAvailabilitySelectionResult, UnifiedBookingSalesDiscountResult, UnifiedBookingSalesLoadProductsByScheduleDateParams, UnifiedBookingSalesLoadOpenDataParams, UnifiedBookingSalesPrepareAvailabilityProjectionParams, UnifiedBookingSalesPolicyResponse, UnifiedBookingSalesStageRetailProductsParams, UnifiedBookingSalesState } from './types';
 import { BookingTicket } from '../BookingTicket';
 export * from './types';
 export { AvailabilityError } from '../../modules/ResourcePlanner';
@@ -147,6 +147,10 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      */
     loadOpenData(params: UnifiedBookingSalesLoadOpenDataParams): Promise<OpenDataConfig>;
     getOpenData(): Promise<OpenDataConfig | null>;
+    /**
+     * Load a resource policy without depending on the legacy appointmentBooking solution.
+     */
+    getProtocol(policyId: string | number): Promise<UnifiedBookingSalesPolicyResponse>;
     /**
      * Loads the product catalog used by both UI and Planner. Schedule data is requested with each
      * product because session products carry their fixed intervals there.

package/lib/solution/UnifiedBookingSales/index.js

@@ -906,7 +906,9 @@ function buildBookingFromAvailabilitySelection(params) {
     candidate,
     product,
     resources = [],
-    bookingUid
+    bookingUid,
+    holder,
+    holderIds
   } = params;
   const bookingStartAt = candidate.bookingStartAt || candidate.startAt;
   const bookingEndAt = candidate.bookingEndAt || candidate.endAt;
@@ -921,6 +923,8 @@ function buildBookingFromAvailabilitySelection(params) {
       scheduleRefs: candidate.scheduleRefs
     });
   }
+  const normalizedHolder = holder && typeof holder === 'object' ? (0, _lodashEs.cloneDeep)(holder) : undefined;
+  const normalizedHolderIds = Array.isArray(holderIds) ? (0, _lodashEs.cloneDeep)(holderIds) : holderIds;
   return {
     start_date: bookingStartAt.slice(0, 10),
     start_time: bookingStartAt.slice(11, 16),
@@ -929,6 +933,9 @@ function buildBookingFromAvailabilitySelection(params) {
     duration: Math.max(1, Math.trunc((endScalar - startScalar) / (60 * 1000))),
     like_status: 'common',
     schedule_id: scheduleId ?? 0,
+    ...(normalizedHolder ? {
+      holder: normalizedHolder
+    } : {}),
     resources: assignments.map(assignment => {
       // requirementSelections 的提交协议只携带资源 ID；购物车展示则需要名称。
       // commit 此时仍持有本次不可变 projection，因此直接按 ID 取回名称并
@@ -963,7 +970,13 @@ function buildBookingFromAvailabilitySelection(params) {
       ...(timeSlotId == null ? {} : {
         time_slot_id: timeSlotId
       }),
-      product_kind: product.kind
+      product_kind: product.kind,
+      ...(normalizedHolderIds === undefined ? {} : {
+        holder_id: normalizedHolderIds
+      }),
+      ...(normalizedHolder ? {
+        holder: (0, _lodashEs.cloneDeep)(normalizedHolder)
+      } : {})
     }
   };
 }
@@ -1508,6 +1521,17 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     });
   }
 
+  /**
+   * Load a resource policy without depending on the legacy appointmentBooking solution.
+   */
+  async getProtocol(policyId) {
+    const normalizedPolicyId = String(policyId ?? '').trim();
+    if (!normalizedPolicyId) {
+      throw new Error('[UnifiedBookingSales] getProtocol 需要 policyId');
+    }
+    return this.request.get(`/shop-policy/${encodeURIComponent(normalizedPolicyId)}`);
+  }
+
   /**
    * Loads the product catalog used by both UI and Planner. Schedule data is requested with each
    * product because session products carry their fixed intervals there.
@@ -2939,7 +2963,9 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
         candidate: refreshedCandidate,
         product,
         resources: refreshedProjection.resources,
-        bookingUid: existingBookingUid || undefined
+        bookingUid: existingBookingUid || undefined,
+        holder: params.orderProduct?._extend?.holder ?? existingBooking?.holder ?? existingBooking?.metadata?.holder,
+        holderIds: params.orderProduct?._extend?.holder_id ?? params.orderProduct?._extend?.holder?.form_record ?? existingBooking?.metadata?.holder_id ?? existingBooking?.holder?.form_record
       });
       const transformed = this.buildUnifiedOrderProduct({
         ...params.orderProduct,

package/lib/solution/UnifiedBookingSales/types.d.ts

@@ -6,6 +6,16 @@ import type { BookingTicketState } from '../BookingTicket/types';
 export type { AvailabilityAbsoluteRange, AvailabilityAssignment, AvailabilityCell, AvailabilityDateRange, AvailabilityDisplayRange, AvailabilityErrorCode, AvailabilityId, AvailabilityMode, AvailabilityOccupancy, AvailabilityProduct, AvailabilityProductKind, AvailabilityProjection, AvailabilityProjectionInput, AvailabilityProjectionMeta, AvailabilityQuery, AvailabilityQueryResult, AvailabilityRequirementGroup, AvailabilityRequirementGroupResult, AvailabilityRequirementSelection, AvailabilityResource, AvailabilityResourceOption, AvailabilityResourceType, AvailabilityResourceWindow, AvailabilityScheduleMode, AvailabilityScheduleRef, AvailabilityScheduleRule, AvailabilitySelectionValidationParams, AvailabilitySelectionValidationResult, AvailabilitySessionRange, AvailabilityStatus, DateAvailabilityGroup, DateAvailabilityItem, DateAvailabilityQuery, DateAvailabilityQueryResult, GetProductTimeRangesRequest, ProductAvailabilityGroup, ProductAvailabilityItem, ProductAvailabilityQuery, ProductAvailabilityQueryResult, ProductTimeRange, ProductTimeRangeGroup, QueryAvailabilityBaseRequest, ResourceAvailabilityGroup, ResourceAvailabilityQuery, ResourceAvailabilityQueryResult, ResourceAvailabilityRangeGroup, TimeAvailabilityGroup, TimeAvailabilityItem, TimeAvailabilityQuery, TimeAvailabilityQueryResult, } from '../../modules/ResourcePlanner';
 export interface UnifiedBookingSalesState extends BookingTicketState {
 }
+export interface UnifiedBookingSalesPolicy {
+    id?: AvailabilityId;
+    title?: unknown;
+    content?: string;
+    [key: string]: unknown;
+}
+export interface UnifiedBookingSalesPolicyResponse {
+    data?: UnifiedBookingSalesPolicy;
+    [key: string]: unknown;
+}
 export declare enum UnifiedBookingSalesHooks {
     onAvailabilityProjectionPrepared = "unifiedBookingSales:onAvailabilityProjectionPrepared",
     onAvailabilitySelectionCommitted = "unifiedBookingSales:onAvailabilitySelectionCommitted",

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.3.76",
+  "version": "2.3.78",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",