@pisell/pisellos 2.3.77 → 2.3.79

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",
@@ -141,6 +151,10 @@ export interface ContextualCommitAvailabilitySelectionParams {
     requirementSelections: AvailabilityRequirementSelection[];
     partySize: number;
     bookingCount?: number;
+    /** 编辑预约时，允许本次显式报价覆盖已落库订单行的历史价格。 */
+    allowBookingReprice?: boolean;
+    /** 编辑预约重报价后，允许订单模块重新应用已选编辑态折扣。 */
+    allowBookingDiscountReapply?: boolean;
 }
 export type UnifiedBookingSalesCommitAvailabilitySelectionParams = ContextualCommitAvailabilitySelectionParams;
 export interface UnifiedBookingSalesCommitAvailabilitySelectionResult {

package/lib/modules/ProductList/index.js

@@ -149,9 +149,15 @@ class ProductList extends _BaseModule.BaseModule {
       extension_type,
       strategy_context
     };
+    const originalCallback = options?.callback;
+    const subscriptionCallback = originalCallback ? async result => {
+      const products = Array.isArray(result?.data?.list) ? result.data.list : [];
+      await this.addProduct(products);
+      originalCallback(result);
+    } : undefined;
     const productsData = await this.request.post(`/product/query`, queryPayload, {
       osServer: true,
-      callback: options?.callback,
+      callback: subscriptionCallback,
       subscriberId: options?.subscriberId,
       customToast: () => {}
     });

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 | 1 | 2 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 1 | 2 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态
@@ -453,7 +453,19 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    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;
+    };
     /** 规格弹窗 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

@@ -980,6 +980,125 @@ function buildBookingFromAvailabilitySelection(params) {
     }
   };
 }
+const POS_OVERRIDABLE_AVAILABILITY_CONFLICT_CODES = new Set(['past', 'booking_cutoff', 'resource_full', 'resource_unavailable', 'resource_capacity_exceeded',
+// A required group whose selected resource is outside its window is surfaced
+// as missing_resource at group level. Structural validation below still
+// rejects a genuinely missing selection.
+'missing_resource']);
+function matchesForcedSelectionGroup(selection, group) {
+  const hasGroupId = typeof selection.requirementGroupId === 'string' && selection.requirementGroupId.trim().length > 0;
+  const hasFormId = selection.formId !== undefined && selection.formId !== null;
+  if (!hasGroupId && !hasFormId) return false;
+  if (hasGroupId && selection.requirementGroupId !== group.id) return false;
+  if (hasFormId && !sameAvailabilityId(selection.formId, group.formId)) return false;
+  return true;
+}
+
+/**
+ * POS may intentionally overbook a configured time/resource. Rebuild the
+ * assignments from the submitted, structurally valid resource identities so
+ * a full/unavailable option is not silently dropped by normal availability
+ * evaluation. This deliberately ignores capacity, occupancy and resource
+ * windows, while retaining product/group/resource identity and selection
+ * cardinality checks.
+ */
+function buildPosForcedAvailabilityAssignments(params) {
+  const {
+    product,
+    resources,
+    candidate,
+    requirementSelections,
+    partySize
+  } = params;
+  const groups = product.requirementGroups || [];
+  const conflicts = [];
+  const assignments = [];
+  const selectionsByGroup = new Map();
+  const addConflict = (code, message, details = {}) => conflicts.push({
+    code,
+    message,
+    productId: candidate.productId,
+    candidateKey: candidate.key,
+    ...details
+  });
+  requirementSelections.forEach(selection => {
+    const matchedGroups = groups.filter(group => matchesForcedSelectionGroup(selection, group));
+    if (matchedGroups.length !== 1) {
+      addConflict('invalid_requirement_group', '选择的资源组不属于当前商品', {
+        requirementGroupId: selection.requirementGroupId,
+        formId: selection.formId
+      });
+      return;
+    }
+    const group = matchedGroups[0];
+    if (selectionsByGroup.has(group.id)) {
+      addConflict('invalid_selection_count', `资源组 ${group.id} 被重复提交`, {
+        requirementGroupId: group.id,
+        formId: group.formId
+      });
+      return;
+    }
+    selectionsByGroup.set(group.id, selection);
+    if (!Array.isArray(selection.resourceIds)) {
+      addConflict('invalid_selection_count', `资源组 ${group.id} 的资源选择必须是数组`, {
+        requirementGroupId: group.id,
+        formId: group.formId
+      });
+      return;
+    }
+    const selectedResourceIds = Array.from(new Map(selection.resourceIds.map(resourceId => [String(resourceId), resourceId])).values());
+    const required = group.required !== false;
+    const min = Math.max(required ? 1 : 0, Number(group.min ?? (required ? 1 : 0)) || 0);
+    const max = Math.max(min, Number(group.max ?? Math.max(min, 1)) || Math.max(min, 1));
+    if (selectedResourceIds.length < min) {
+      addConflict('missing_resource', `资源组 ${group.id} 缺少已选资源`, {
+        requirementGroupId: group.id,
+        formId: group.formId
+      });
+      return;
+    }
+    if (selectedResourceIds.length > max) {
+      addConflict('invalid_selection_count', `资源组 ${group.id} 已选资源数量超出上限`, {
+        requirementGroupId: group.id,
+        formId: group.formId
+      });
+      return;
+    }
+    selectedResourceIds.forEach(resourceId => {
+      const resource = resources.find(item => sameAvailabilityId(item.id, resourceId));
+      const belongsToGroup = Boolean(resource && !(group.formId !== undefined && resource.formId !== undefined && !sameAvailabilityId(group.formId, resource.formId)) && !(group.resourceIds?.length && !group.resourceIds.some(id => sameAvailabilityId(id, resourceId))));
+      if (!resource || !belongsToGroup) {
+        addConflict('resource_unavailable', `资源 ${String(resourceId)} 不属于当前商品资源组`, {
+          requirementGroupId: group.id,
+          formId: group.formId,
+          resourceId
+        });
+        return;
+      }
+      assignments.push({
+        productId: product.id,
+        resourceId,
+        formId: group.formId ?? resource.formId,
+        startAt: candidate.bookingStartAt || candidate.startAt,
+        endAt: candidate.bookingEndAt || candidate.endAt,
+        capacityRequired: Math.max(1, partySize),
+        scheduleId: candidate.primaryScheduleRef?.scheduleId,
+        timeSlotId: candidate.primaryScheduleRef?.timeSlotId
+      });
+    });
+  });
+  groups.filter(group => group.required !== false).forEach(group => {
+    if (selectionsByGroup.has(group.id)) return;
+    addConflict('missing_resource', `资源组 ${group.id} 缺少已选资源`, {
+      requirementGroupId: group.id,
+      formId: group.formId
+    });
+  });
+  return {
+    assignments,
+    conflicts
+  };
+}
 class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
   defaultName = 'unifiedBookingSales';
   defaultVersion = '1.0.0';
@@ -1521,6 +1640,21 @@ 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');
+    }
+    let policyUrl = 'shop-policy';
+    if (this.otherParams.platform === 'kiosk' || this.otherParams.platform === 'pos' || this.otherParams.platform === 'shop') {
+      policyUrl = 'policy';
+    }
+    return this.request.get(`/${policyUrl}/${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.
@@ -1710,6 +1844,7 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
   }
   buildUnifiedOrderProduct(sourceProduct, ownershipKey, product) {
     const normalizedProductRaw = product?.raw || {};
+    const quotationShelfId = sourceProduct._extend?.quotation_shelf_id ?? sourceProduct.quotation_shelf_id ?? sourceProduct.metadata?.quotation_shelf_id;
     const orderProduct = this.transformBaseProductToOrderProduct({
       payload: {
         ...sourceProduct,
@@ -1726,11 +1861,14 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
       sourceProduct
     });
     if (orderProduct && typeof orderProduct === 'object') {
-      // BaseSales may rebuild metadata from its price source. Stamp ownership after that transform
-      // so each UnifiedBookingSales entry point can replace only its own temporary lines.
+      // BaseSales may rebuild metadata from its price source. Stamp ownership and the selected
+      // quotation shelf after that transform so neither booking adds nor edits lose quote identity.
       orderProduct.metadata = {
         ...(orderProduct.metadata || {}),
-        [ownershipKey]: true
+        [ownershipKey]: true,
+        ...(quotationShelfId !== undefined ? {
+          quotation_shelf_id: quotationShelfId
+        } : {})
       };
     }
     return orderProduct;
@@ -2890,12 +3028,39 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
           refreshedSnapshotId: refreshedProjection.meta.snapshotId
         });
       }
-      const validation = (0, _ResourcePlanner.validateAvailabilitySelection)(refreshedProjection, {
+      const product = refreshedProjection.products.find(item => sameAvailabilityId(item.id, refreshedCandidateBase.productId));
+      if (!product) {
+        throw new _ResourcePlanner.AvailabilityError('REVALIDATION_FAILED', '缓存重校验后商品不在 projection 中', {
+          productId: refreshedCandidateBase.productId
+        });
+      }
+      let validation = (0, _ResourcePlanner.validateAvailabilitySelection)(refreshedProjection, {
         candidate: refreshedCandidateBase,
         requirementSelections: params.requirementSelections,
         partySize,
         bookingCount
       });
+      const allowPosAvailabilityOverride = String(this.otherParams?.platform ?? '').trim().toLowerCase() === 'pos';
+      if (allowPosAvailabilityOverride && !validation.ok && validation.conflicts.every(conflict => POS_OVERRIDABLE_AVAILABILITY_CONFLICT_CODES.has(conflict.code))) {
+        const forced = buildPosForcedAvailabilityAssignments({
+          product,
+          resources: refreshedProjection.resources,
+          candidate: refreshedCandidateBase,
+          requirementSelections: params.requirementSelections,
+          partySize
+        });
+        validation = forced.conflicts.length > 0 ? {
+          ...validation,
+          assignments: [],
+          conflicts: forced.conflicts
+        } : {
+          ...validation,
+          ok: true,
+          status: validation.availability.status,
+          assignments: forced.assignments,
+          conflicts: []
+        };
+      }
       if (!validation.ok) {
         const capacityConflict = validation.conflicts.find(conflict => conflict.code === 'resource_capacity_exceeded');
         throw new _ResourcePlanner.AvailabilityError('REVALIDATION_FAILED', capacityConflict?.message || '缓存重校验后资源已不可提交', {
@@ -2933,12 +3098,6 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
         expectedOrderRevision: revalidationEntry.orderRevision
       };
       const refreshedCandidate = this.decorateAvailabilityCandidate(normalizedContextId, revalidatedContext.activeVersion, refreshedCandidateBase);
-      const product = refreshedProjection.products.find(item => sameAvailabilityId(item.id, refreshedCandidate.productId));
-      if (!product) {
-        throw new _ResourcePlanner.AvailabilityError('REVALIDATION_FAILED', '缓存重校验后商品不在 projection 中', {
-          productId: refreshedCandidate.productId
-        });
-      }
       const existingBooking = editingLine ? this.findLinkedBooking(editingLine) : undefined;
       const existingBookingUid = existingBooking ? getBookingUid(existingBooking) : '';
       if (params.mode === 'edit' && !existingBookingUid) {
@@ -2993,7 +3152,13 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
           product_variant_id: transformed.product_variant_id ?? editingLine.product_variant_id ?? 0,
           unique_identification_number: params.productLineUid,
           updates: transformed,
-          booking
+          booking,
+          ...(params.allowBookingReprice !== undefined ? {
+            allow_booking_reprice: params.allowBookingReprice
+          } : {}),
+          ...(params.allowBookingDiscountReapply !== undefined ? {
+            allow_booking_discount_reapply: params.allowBookingDiscountReapply
+          } : {})
         });
         productLineUid = params.productLineUid;
         bookingUid = existingBookingUid;

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",
@@ -141,6 +151,10 @@ export interface ContextualCommitAvailabilitySelectionParams {
     requirementSelections: AvailabilityRequirementSelection[];
     partySize: number;
     bookingCount?: number;
+    /** 编辑预约时，允许本次显式报价覆盖已落库订单行的历史价格。 */
+    allowBookingReprice?: boolean;
+    /** 编辑预约重报价后，允许订单模块重新应用已选编辑态折扣。 */
+    allowBookingDiscountReapply?: boolean;
 }
 export type UnifiedBookingSalesCommitAvailabilitySelectionParams = ContextualCommitAvailabilitySelectionParams;
 export interface UnifiedBookingSalesCommitAvailabilitySelectionResult {

package/package.json

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