@pisell/pisellos 2.3.78 → 2.3.80

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

@@ -18,6 +18,19 @@ export declare class ProductList extends BaseModule implements Module {
      * productList.updateOtherParams({ channel: 'pos' });
      */
     updateOtherParams(params: Record<string, any>): void;
+    /**
+     * 判断当前商品查询是否会被本地 OS Server 接管。
+     *
+     * 不能只看请求参数中的 osServer=true：H5 RequestPlugin 会透传该参数，但仍然直接请求远端接口。
+     * 这里按 RequestPlugin 实际使用的 baseUrl 检查已注册路由，避免 OS Server 与客户端重复执行
+     * Data Variant 评估。
+     */
+    private isProductQueryHandledByOsServer;
+    /**
+     * 未启用商品 OS 路由时，在客户端补做 Data Variant 解析。
+     * OS Server 已接管时直接信任服务端结果，确保同一批商品只评估一次。
+     */
+    private resolveClientDataVariants;
     storeChange(path?: string, value?: any): Promise<void>;
     /**
      * 获取加时商品列表。
@@ -25,11 +38,11 @@ export declare class ProductList extends BaseModule implements Module {
      * @example
      * const products = await productList.getAddTimeProducts({ schedule_date: '2026-06-16' });
      */
-    getAddTimeProducts(params?: ProductListLoadProductsParams): Promise<any>;
+    getAddTimeProducts(params?: ProductListLoadProductsParams): Promise<ProductData[]>;
     loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, extension_type, status, strategy_context, }?: ProductListLoadProductsParams, options?: {
         callback?: (result: any) => void;
         subscriberId?: string;
-    }): Promise<any>;
+    }): Promise<ProductData[]>;
     loadProductsPrice({ ids, customer_id, schedule_date, channel, }: {
         ids?: number[];
         customer_id?: number;

package/lib/modules/ProductList/index.js

@@ -55,6 +55,58 @@ class ProductList extends _BaseModule.BaseModule {
   updateOtherParams(params) {
     this.otherParams = params || {};
   }
+
+  /**
+   * 判断当前商品查询是否会被本地 OS Server 接管。
+   *
+   * 不能只看请求参数中的 osServer=true：H5 RequestPlugin 会透传该参数，但仍然直接请求远端接口。
+   * 这里按 RequestPlugin 实际使用的 baseUrl 检查已注册路由，避免 OS Server 与客户端重复执行
+   * Data Variant 评估。
+   */
+  isProductQueryHandledByOsServer() {
+    const server = this.core?.server;
+    if (!server || typeof server.hasRoute !== 'function') return false;
+    const requestBaseUrl = String(this.request?.baseUrl || '/shop').replace(/\/+$/, '');
+    const routePath = `${requestBaseUrl}/product/query`;
+    return server.hasRoute('post', routePath) === true;
+  }
+
+  /**
+   * 未启用商品 OS 路由时，在客户端补做 Data Variant 解析。
+   * OS Server 已接管时直接信任服务端结果，确保同一批商品只评估一次。
+   */
+  resolveClientDataVariants(products, queryPayload, handledByOsServer) {
+    if (handledByOsServer || products.length === 0) return products;
+    const evaluator = this.core?.context?.dataVariantEvaluator;
+    if (!evaluator || typeof evaluator.resolveProducts !== 'function') {
+      return products;
+    }
+    const strategyContext = queryPayload.strategy_context && typeof queryPayload.strategy_context === 'object' ? queryPayload.strategy_context : {};
+    const fatherModule = String(this.otherParams?.fatherModule || '').trim();
+    const scheduleModule = (fatherModule ? this.core.getModule(`${fatherModule}_schedule`) : null) || this.core.getModule('schedule');
+    const scheduleList = scheduleModule?.getScheduleList?.();
+    const contextScheduleList = this.core?.context?.scheduleList;
+    const contextMenuList = this.core?.context?.menuList;
+    const businessData = {
+      products,
+      scheduleDateTime: queryPayload.schedule_datetime || queryPayload.schedule_date,
+      scheduleList: Array.isArray(scheduleList) ? scheduleList : Array.isArray(contextScheduleList) ? contextScheduleList : [],
+      menuList: Array.isArray(this.otherParams?.menuList) ? this.otherParams.menuList : Array.isArray(contextMenuList) ? contextMenuList : [],
+      customerId: queryPayload.customer_id,
+      channel: strategyContext.channel,
+      orderType: strategyContext.orderType || strategyContext.order_type,
+      businessCode: strategyContext.business_code ?? strategyContext.businessCode,
+      availableWalletIds: strategyContext.available_wallet_ids,
+      custom: strategyContext
+    };
+    try {
+      const result = evaluator.resolveProducts(businessData);
+      return Array.isArray(result?.products) ? result.products : products;
+    } catch (error) {
+      console.error('[ProductList] Data Variant 客户端解析失败', error);
+      return products;
+    }
+  }
   async storeChange(path, value) {
     // No longer needed - products are stored as plain objects instead of Product instances
   }
@@ -149,13 +201,32 @@ class ProductList extends _BaseModule.BaseModule {
       extension_type,
       strategy_context
     };
+    const handledByOsServer = this.isProductQueryHandledByOsServer();
+    const originalCallback = options?.callback;
+    const subscriptionCallback = typeof originalCallback === 'function' ? async result => {
+      const callbackList = result?.data?.list;
+      if (!Array.isArray(callbackList)) {
+        originalCallback(result);
+        return;
+      }
+      const products = this.resolveClientDataVariants(callbackList, queryPayload, handledByOsServer);
+      await this.addProduct(products);
+      originalCallback(handledByOsServer ? result : {
+        ...result,
+        data: {
+          ...result.data,
+          list: products
+        }
+      });
+    } : undefined;
     const productsData = await this.request.post(`/product/query`, queryPayload, {
       osServer: true,
-      callback: options?.callback,
+      callback: subscriptionCallback,
       subscriberId: options?.subscriberId,
       customToast: () => {}
     });
-    const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
+    const resolvedList = this.resolveClientDataVariants(productsData.data.list || [], queryPayload, handledByOsServer);
+    const sortedList = resolvedList.slice().sort((a, b) => Number(b.sort) - Number(a.sort));
     // if (sortedList.length) {
     //   sortedList.forEach((n: any) => {
     //     if (n.is_eject !== 1 && n['schedule.ids'] && n['schedule.ids'].length) {

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

@@ -495,7 +495,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     getUnfulfilledPromotions(): OrderUnfulfilledPromotion[];
     /** 最近一次促销计算输出的赠品操作 diff。 */
     getLastGiftActions(): OrderLastGiftActions | null;
-    getProductList(): Promise<any>;
+    getProductList(): Promise<import("../..").ProductData[] | undefined>;
     getOtherParams(): Record<string, any>;
     setOtherParams(params: Record<string, any>, { cover }?: {
         cover?: boolean;

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

@@ -67,7 +67,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         product_ids?: number[];
         collection?: number | string[];
         schedule_date?: string;
-    }): Promise<any>;
+    }): Promise<ProductData[]>;
     /**
      * 通过 schedule 来读取商品，适用于 session 类商品
      *
@@ -87,7 +87,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         product_ids?: number[];
         category_ids?: number[];
-    }): Promise<any>;
+    }): Promise<ProductData[]>;
     /**
      * 更新完商品数据、切换日期、或者在较后的流程里登录了，检测当前购物车里是否有商品，如果有，则需要更新购物车里的商品价格
      *
@@ -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 | 5 | 2 | 3 | 4 | 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: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -128,7 +128,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     loadProducts(params?: ILoadProductsParams, options?: {
         callback?: (result: any) => void;
         subscriberId?: string;
-    }): Promise<any>;
+    }): Promise<ProductData[]>;
     /**
      * 获取加时商品列表。
      *
@@ -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.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';
@@ -1529,7 +1648,11 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     if (!normalizedPolicyId) {
       throw new Error('[UnifiedBookingSales] getProtocol 需要 policyId');
     }
-    return this.request.get(`/shop-policy/${encodeURIComponent(normalizedPolicyId)}`);
+    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)}`);
   }
 
   /**
@@ -1721,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,
@@ -1737,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;
@@ -2901,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 || '缓存重校验后资源已不可提交', {
@@ -2944,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) {
@@ -3004,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

@@ -151,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.78",
+  "version": "2.3.80",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",