@pisell/pisellos 2.2.278 → 2.2.280

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

@@ -35,6 +35,7 @@ export interface ScanOrderOrderProductIdentity {
     /** 参与合并/匹配；与 remove 通配语义见 isSkuOnlyDeleteIdentity */
     product_sku?: ScanOrderProductSku;
     product_bundle?: any[];
+    shop_id?: number | string;
 }
 export interface ScanOrderProductSku {
     option: any[];
@@ -207,7 +208,7 @@ export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platfo
     }>;
     products: ScanOrderSubmitProduct[];
 }
-export type ScanOrderAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'additional_order_with_code' | 'additional_order';
+export type ScanOrderAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'multiple_orders' | 'additional_order_with_code' | 'additional_order';
 export interface ScanOrderTableFormRecord {
     policy?: string | null;
     partyroom_booking?: string | null;
@@ -250,6 +251,10 @@ export interface ScanOrderResourceOccupyDetail {
     form_id?: number | string | null;
     order_id?: number | string | null;
     last_order_id?: number | string | null;
+    order_list?: Array<{
+        id?: number | string | null;
+        [key: string]: any;
+    }> | null;
     resource_capacity?: ScanOrderResourceCapacity[] | null;
     form_record?: ScanOrderTableFormRecord | null;
     [key: string]: any;
@@ -263,6 +268,21 @@ export interface ScanOrderResourceOccupyDetailApiResponse {
     } | null;
 }
 export type ScanOrderResourceSelectType = 'single' | 'multiple' | 'capacity';
+export interface ScanOrderReservationResourceSelectInfo {
+    resourceSelectType?: ScanOrderResourceSelectType;
+    isSingleReservation: boolean;
+    isMultipleReservation: boolean;
+    isCapacityReservation: boolean;
+}
+export interface ScanOrderAllowAddItemsInfo {
+    enabled: boolean;
+}
+export type ScanOrderSyncAdditionalOrderReason = 'missing_resource_id' | 'no_order' | 'multiple_orders' | 'add_items_disabled' | 'invalid_order_id';
+export interface ScanOrderSyncAdditionalOrderResult {
+    matched: boolean;
+    order_id?: string;
+    reason?: ScanOrderSyncAdditionalOrderReason;
+}
 export interface ScanOrderResourceState extends ScanOrderAvailabilityInfo {
     relationId?: string;
     tableFormId?: string;

package/lib/solution/ScanOrder/utils.d.ts

@@ -2,6 +2,7 @@ import { ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderResource
 import type { CartItemSummary, ItemRuleBusinessData, PaxInfo, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { StrategyConfig } from '../../model/strategy/type';
 import type { ProductData } from '../../modules/Product/types';
+import type { OrderSubmitProduct } from '../../modules/Order/types';
 /**
  * 构建金额全为 0 的空 summary。
  * 作为尚未计算金额时的兜底默认值，避免下游因 undefined 报错。
@@ -42,6 +43,8 @@ export declare function toNonNegativeNumber(value: unknown): number;
 export declare function toNonNegativeInt(value: unknown): number;
 export declare function toPriceString(value: unknown, fallback?: string): string;
 export declare function buildProductKey(productId: number, productVariantId: number): string;
+/** 加餐接口只提交本次新增商品，过滤掉首单预约占位规则行。 */
+export declare function filterProductsForScanOrderMore<T extends OrderSubmitProduct>(products?: T[]): T[];
 export declare function getTopLevelProductId(product: Record<string, any>): number | null;
 export declare function getTopLevelVariantId(product: Record<string, any>): number | null;
 export declare function buildQuantityLimitIndex(limits: QuantityLimitResult[]): {
@@ -134,6 +137,11 @@ export declare function normalizeOrderProduct(product: Partial<ScanOrderOrderPro
  * 从 reservation.enabled_reservation_rules 中收集 type=link 的商品 id。
  */
 export declare function collectLinkProductIdsFromReservationRules(rules: unknown): number[];
+/**
+ * 找到第一个归属指定桌台的预约规则商品。
+ * 归属判断基于商品资源中的 default_resource / optional_resource。
+ */
+export declare function findReservationRuleProductByResourceId(products: ProductData[], resourceId: string | number | null | undefined): ProductData | undefined;
 /**
  * 返回列表中第一个带有效 duration.value（分钟）的商品时长。
  */

package/lib/solution/ScanOrder/utils.js

@@ -39,6 +39,8 @@ __export(utils_exports, {
   computeResourceIsFull: () => computeResourceIsFull,
   createEmptySummary: () => createEmptySummary,
   extractStrategyModelIdsFromTableConfig: () => extractStrategyModelIdsFromTableConfig,
+  filterProductsForScanOrderMore: () => filterProductsForScanOrderMore,
+  findReservationRuleProductByResourceId: () => findReservationRuleProductByResourceId,
   getProductIdentityIndex: () => getProductIdentityIndex,
   getSafeProductNum: () => getSafeProductNum,
   getTopLevelProductId: () => getTopLevelProductId,
@@ -165,6 +167,12 @@ function toPriceString(value, fallback = "0.00") {
 function buildProductKey(productId, productVariantId) {
   return `${productId}_${productVariantId}`;
 }
+function filterProductsForScanOrderMore(products = []) {
+  return products.filter((product) => {
+    var _a;
+    return ((_a = product.metadata) == null ? void 0 : _a.is_rule) !== true;
+  });
+}
 function getTopLevelProductId(product) {
   const rawProductId = product.product_id ?? product.id;
   const productId = Number(rawProductId);
@@ -349,33 +357,44 @@ function attachItemRuleLimitsToTopLevelProducts(productList, limits) {
   return productList;
 }
 function buildProductLineFingerprint(productOptionItem, productBundle) {
-  const optArr = Array.isArray(productOptionItem) ? productOptionItem : [];
-  const normalizedOpts = optArr.map((item) => ({
-    option_group_item_id: Number(item == null ? void 0 : item.option_group_item_id) || 0,
-    option_group_id: Number(item == null ? void 0 : item.option_group_id) || 0,
-    num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
-    price: String((item == null ? void 0 : item.add_price) ?? (item == null ? void 0 : item.price) ?? "")
-  })).sort((p, q) => {
-    if (p.option_group_item_id !== q.option_group_item_id) {
-      return p.option_group_item_id - q.option_group_item_id;
-    }
-    if (p.option_group_id !== q.option_group_id)
-      return p.option_group_id - q.option_group_id;
-    if (p.num !== q.num)
-      return p.num - q.num;
-    return p.price.localeCompare(q.price);
-  });
+  const normalizeOptions = (options) => {
+    const optionArr = Array.isArray(options) ? options : [];
+    return optionArr.map((item) => ({
+      option_group_item_id: Number(item == null ? void 0 : item.option_group_item_id) || 0,
+      option_group_id: Number(item == null ? void 0 : item.option_group_id) || 0,
+      num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+      price: String((item == null ? void 0 : item.add_price) ?? (item == null ? void 0 : item.price) ?? "")
+    })).sort((p, q) => {
+      if (p.option_group_item_id !== q.option_group_item_id) {
+        return p.option_group_item_id - q.option_group_item_id;
+      }
+      if (p.option_group_id !== q.option_group_id) {
+        return p.option_group_id - q.option_group_id;
+      }
+      if (p.num !== q.num)
+        return p.num - q.num;
+      return p.price.localeCompare(q.price);
+    });
+  };
+  const normalizedOpts = normalizeOptions(productOptionItem);
   const bundleArr = Array.isArray(productBundle) ? productBundle : [];
   const normalizedBundles = bundleArr.map((item) => ({
     bundle_id: Number((item == null ? void 0 : item.bundle_id) ?? (item == null ? void 0 : item.id) ?? 0) || 0,
     product_id: Number(item == null ? void 0 : item.product_id) || 0,
-    num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1
+    product_variant_id: Number((item == null ? void 0 : item.bundle_variant_id) ?? (item == null ? void 0 : item.product_variant_id)) || 0,
+    num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+    option: normalizeOptions(item == null ? void 0 : item.option)
   })).sort((p, q) => {
     if (p.bundle_id !== q.bundle_id)
       return p.bundle_id - q.bundle_id;
     if (p.product_id !== q.product_id)
       return p.product_id - q.product_id;
-    return p.num - q.num;
+    if (p.product_variant_id !== q.product_variant_id) {
+      return p.product_variant_id - q.product_variant_id;
+    }
+    if (p.num !== q.num)
+      return p.num - q.num;
+    return JSON.stringify(p.option).localeCompare(JSON.stringify(q.option));
   });
   return JSON.stringify([normalizedOpts, normalizedBundles]);
 }
@@ -580,6 +599,27 @@ function collectLinkProductIdsFromReservationRules(rules) {
   }
   return [...new Set(ids)];
 }
+function findReservationRuleProductByResourceId(products, resourceId) {
+  var _a;
+  const numericResourceId = Number(resourceId);
+  if (!Number.isFinite(numericResourceId) || numericResourceId <= 0)
+    return void 0;
+  for (const product of products) {
+    const resources = (_a = product == null ? void 0 : product.product_resource) == null ? void 0 : _a.resources;
+    if (!Array.isArray(resources))
+      continue;
+    const hasMatchedResource = resources.some((resource) => {
+      const defaultResources = Array.isArray(resource == null ? void 0 : resource.default_resource) ? resource.default_resource : [];
+      const optionalResources = Array.isArray(resource == null ? void 0 : resource.optional_resource) ? resource.optional_resource : [];
+      return [...defaultResources, ...optionalResources].some(
+        (id) => Number(id) === numericResourceId
+      );
+    });
+    if (hasMatchedResource)
+      return product;
+  }
+  return void 0;
+}
 function pickFirstDurationMinutesFromProducts(products) {
   var _a;
   for (const product of products) {
@@ -683,6 +723,8 @@ function pickFirstCustomCapacityDimensionId(products) {
   computeResourceIsFull,
   createEmptySummary,
   extractStrategyModelIdsFromTableConfig,
+  filterProductsForScanOrderMore,
+  findReservationRuleProductByResourceId,
   getProductIdentityIndex,
   getSafeProductNum,
   getTopLevelProductId,

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

@@ -40,6 +40,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         discountList: Discount[];
     };
     setProductList(productList: Record<string, any>[]): void;
+    batchSearchByProductIds(productIds: number[]): Promise<Discount[]>;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
         productList: Record<string, any>[];

package/lib/solution/ShopDiscount/index.js

@@ -270,6 +270,20 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   setProductList(productList) {
     this.store.productList = productList;
   }
+  async batchSearchByProductIds(productIds) {
+    var _a;
+    let resultDiscountList = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearchByProductIds(productIds)) || [];
+    resultDiscountList = resultDiscountList.map((item) => {
+      return {
+        ...item,
+        discount_rule_uncheck_flag: true
+      };
+    });
+    const currentDiscountList = this.getDiscountList() || [];
+    const newDiscountList = [...currentDiscountList, ...resultDiscountList];
+    this.setDiscountList(newDiscountList);
+    return newDiscountList;
+  }
   // 扫码输入code
   async scanCode(code, customerId) {
     var _a, _b, _c;

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

@@ -0,0 +1,204 @@
+import type { Module } from '../../types';
+import type { ProductData } from '../../modules';
+import type { OpenDataConfig } from '../../modules/OpenData';
+import type { LoadScheduleAvailableDateParams, ScheduleItem } from '../../modules/Schedule/types';
+import type { ProductListLoadProductsParams } from '../../modules/ProductList';
+import type { ResourcePlannerAssignment, ResourcePlannerAssignableSlotResult, ResourcePlannerEvent, ResourcePlannerProduct, ResourcePlannerProjection, ResourcePlannerQuery, ResourcePlannerResource, ResourcePlannerSelectionPatch, ResourcePlannerSnapshot, ResourcePlannerValidationResult } from '../../modules/ResourcePlanner';
+import type { UnifiedBookingSalesCommitPlannerSelectionParams, UnifiedBookingSalesCommitResult, UnifiedBookingSalesAddRetailProductParams, UnifiedBookingSalesApplyPlannerDiscountsParams, UnifiedBookingSalesDiscountResult, UnifiedBookingSalesLoadProductsByScheduleDateParams, UnifiedBookingSalesLoadPlannerContextParams, UnifiedBookingSalesLoadOpenDataParams, UnifiedBookingSalesStagePlannerProductsParams, UnifiedBookingSalesStageRetailProductsParams, UnifiedBookingSalesState } from './types';
+import { BookingTicket } from '../BookingTicket';
+export * from './types';
+/**
+ * Converts Rules/Order discount internals into a small UI-facing diagnostic. The result keeps
+ * candidate-card state separate from line-level applications: a selected card is not proof that
+ * it actually discounted a planner product.
+ */
+export declare function buildPlannerDiscountResult(params: {
+    customerId: number | null;
+    discountList: Record<string, any>[];
+    products: Record<string, any>[];
+    summaryBefore?: unknown;
+    summaryAfter?: unknown;
+    status: UnifiedBookingSalesDiscountResult['status'];
+    preferredDiscountId?: number | string;
+    preferredDiscountFound?: boolean;
+}): UnifiedBookingSalesDiscountResult;
+/** Converts a ProductList record into the pure input shape consumed by ResourcePlanner. */
+export declare function normalizeProductForPlanner(product: ProductData | Record<string, any>): ResourcePlannerProduct;
+/**
+ * Materializes resource work windows locally from v2's schedule ids, then keeps its flat
+ * event_list as planner events. This deliberately avoids the older API's times -> event_list
+ * response nesting and lets one resource response serve any requested date range.
+ */
+export declare function buildPlannerResourcesFromV2(params: {
+    rawResources: Record<string, any>[];
+    scheduleList: ScheduleItem[];
+    dateRange?: ResourcePlannerQuery['dateRange'];
+}): {
+    resources: ResourcePlannerResource[];
+    externalEvents: ResourcePlannerEvent[];
+};
+/** Combines URL-locked resources with every resource referenced by the selected products. */
+export declare function collectPlannerResourceIds(products: ResourcePlannerProduct[], explicitResourceIds?: Array<number | string>): Array<number | string>;
+/** Convenience wrapper for the usual one-resource booking case. */
+export declare function buildBookingFromAssignment(params: {
+    assignment: ResourcePlannerAssignment;
+    product: ResourcePlannerProduct;
+}): Record<string, any>;
+/**
+ * Converts all resources needed by one product/time interval into the one booking expected by
+ * OrderModule. Callers must group assignments before this function so a multi-form booking does
+ * not become several competing bookings.
+ */
+export declare function buildBookingFromAssignments(params: {
+    assignments: ResourcePlannerAssignment[];
+    product: ResourcePlannerProduct;
+}): Record<string, any>;
+/** Builds the exact identity BaseSales needs to remove only this solution's order lines. */
+export declare function buildPlannerLineIdentity(product: Record<string, any>): Record<string, any>;
+export declare class UnifiedBookingSalesImpl extends BookingTicket {
+    protected defaultName: string;
+    protected defaultVersion: string;
+    protected store: UnifiedBookingSalesState;
+    private unifiedProductCatalog;
+    private openDataTarget;
+    private loadOpenDataInFlight;
+    private loadOpenDataInFlightTarget;
+    protected getSubmitOrderSalesChannel(): string;
+    protected isSessionStoragePersistEnabled(): boolean;
+    protected shouldUseSessionStorageForSubModule(moduleName?: string): boolean;
+    /**
+     * 读取与当前 cacheId 同分桶的 Solution 会话状态。
+     * 该状态独立于 otherParams，适合页面皮肤保存短生命周期 UI 状态。
+     */
+    getSessionStateValue<T = unknown>(key: string): T | undefined;
+    /**
+     * 写入与当前 cacheId 同分桶的 Solution 会话状态。
+     * value 为 undefined 时删除该 key；存储失败不阻断业务流程。
+     */
+    setSessionStateValue(key: string, value: unknown): void;
+    /**
+     * 清除当前 cacheId 的可恢复订单快照，同时保留 Solution UI sessionState。
+     * 用于支付跳转等终态场景，避免浏览器返回时恢复已提交订单。
+     */
+    clearSessionStorageOrderSnapshot(): void;
+    /**
+     * Kiosk 不能把已收款订单留在本地等待重试：默认直接等待云端 checkout。
+     * 兼容仍需要 WebPOS 待同步模式的入口可显式传 checkoutSyncTaskEnabled: true。
+     */
+    protected shouldUseCheckoutSyncTask(): boolean;
+    /** UnifiedBookingSales 的真实结账默认请求收据数据，供云端确认后再本地打印。 */
+    protected getDefaultCheckoutSmallTicketDataFlag(): number;
+    protected getRegisteredModuleNames(): readonly string[];
+    protected createSubModule(moduleName: string): Module | null;
+    addNewOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
+    syncAuthenticatedOrderCustomer(): Promise<boolean>;
+    private isAuthenticatedCustomerUserPlatform;
+    private resolveDiscountOrderIdentity;
+    private resolveDiscountAction;
+    private resetCachedCustomerDiscountState;
+    private refreshLegacySessionCustomerDiscounts;
+    /**
+     * Loads OpenData without borrowing BookingTicket. Cache ownership is tied to the exact
+     * business/channel target so a reused solution instance cannot leak another entry's menus.
+     */
+    loadOpenData(params: UnifiedBookingSalesLoadOpenDataParams): Promise<OpenDataConfig>;
+    getOpenData(): Promise<OpenDataConfig | null>;
+    /**
+     * 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.
+     */
+    loadProducts(params?: ProductListLoadProductsParams, options?: {
+        callback?: (result: any) => void;
+        subscriberId?: string;
+    }): Promise<ProductData[]>;
+    /** Date-first entry point. It delegates protocol details and cache ownership to ScheduleModule. */
+    loadScheduleAvailableDate(params: LoadScheduleAvailableDateParams): Promise<import("../../modules/Date/types").ITime[]>;
+    /**
+     * Implements the date-first product pool: the chosen date's product ids plus globally sellable
+     * other_product_ids. If a batch product query is unexpectedly empty, retry one id at a time so
+     * a partial backend incompatibility does not hide the entire date's catalog.
+     */
+    loadProductsByScheduleDate(params: UnifiedBookingSalesLoadProductsByScheduleDateParams): Promise<ProductData[]>;
+    /** Returns a copy so UI consumers cannot accidentally mutate the solution's product cache. */
+    getProductCatalog(): {
+        products: ProductData[];
+    };
+    /**
+     * Read-only compatibility view for salesSdk skins. It reconnects a booking to its product but
+     * must not be used to mutate tempOrder; all writes go through BaseSales / planner APIs.
+     */
+    /**
+     * Loads the current customer's product coupons and discount cards after planner lines exist,
+     * then optionally lets the existing Rules engine select the best valid combination. This is a
+     * diagnostic boundary for new booking skins: no pricing logic is duplicated in the planner.
+     */
+    applyPlannerDiscounts(params?: UnifiedBookingSalesApplyPlannerDiscountsParams): Promise<UnifiedBookingSalesDiscountResult>;
+    /** ResourcePlanner is a required child module; fail early instead of producing partial availability. */
+    private getPlanner;
+    private buildUnifiedOrderProduct;
+    /** Replacing a staged selection is idempotent and never removes unrelated cart lines. */
+    private removeExistingStagedLines;
+    private stageProducts;
+    /**
+     * Adds the current product choice to an otherwise clean planner cart without creating bookings.
+     * This separates "what the customer wants" from the later time/resource confirmation step.
+     */
+    stagePlannerProducts(params: UnifiedBookingSalesStagePlannerProductsParams): Promise<Record<string, any> | null>;
+    /**
+     * Adds ordinary retail products without asking ResourcePlanner for booking facts.
+     * Its staged lines have separate ownership so planner and retail skins can coexist safely.
+     */
+    stageRetailProducts(params: UnifiedBookingSalesStageRetailProductsParams): Promise<Record<string, any> | null>;
+    /**
+     * Adds one retail line without replacing the cart's existing retail selection.
+     * This is intentionally separate from stageRetailProducts(), whose contract is
+     * "replace the staged selection" for demo and wizard-like callers.
+     */
+    addRetailProduct(params: UnifiedBookingSalesAddRetailProductParams): Promise<Record<string, any>[]>;
+    /** Normalizes caller-provided products or loads the catalog before any resource request is made. */
+    private loadPlannerProducts;
+    /** Loads the reusable store-level schedule catalog on demand. */
+    private ensurePlannerSchedulesLoaded;
+    /**
+     * v2 resources reference schedule ids rather than expanded work times. Refresh once when the
+     * cached schedule catalog cannot materialize all referenced ids.
+     */
+    private ensurePlannerSchedulesForResources;
+    /**
+     * Fetches resource metadata plus flat occupied events. Work windows are intentionally derived
+     * locally in buildPlannerResourcesFromV2 from /schedule, rather than requested from the legacy
+     * resource dates endpoint.
+     */
+    private fetchPlannerResourcesV2;
+    /**
+     * Resolves the Planner context in precedence order: explicit normalized context, test raw data,
+     * then the v2 resource API inferred from selected product requirements and any URL lock.
+     */
+    private loadPlannerResources;
+    /**
+     * Boundary between IO and pure planning. Once this returns, all later availability/slot calls
+     * operate on the ResourcePlanner snapshot and do not issue resource requests themselves.
+     */
+    loadPlannerContext(params?: UnifiedBookingSalesLoadPlannerContextParams): Promise<ResourcePlannerSnapshot>;
+    /** Returns cells, date summaries and a derived grid; cells are continuous ranges, not UI slots. */
+    queryPlannerAvailability(query?: ResourcePlannerQuery): Promise<ResourcePlannerProjection>;
+    /** Turns compatible availability ranges into user-selectable intervals and ready-to-commit assignments. */
+    resolveAssignableSlots(query?: ResourcePlannerQuery): ResourcePlannerAssignableSlotResult;
+    /** Stores a UI choice only. It is deliberately side-effect free with respect to tempOrder. */
+    setPlannerSelection(patch: ResourcePlannerSelectionPatch): ResourcePlannerSnapshot;
+    /**
+     * Legacy-friendly automatic assignment for already fixed intervals. Duration products without a
+     * start time intentionally remain unresolved; callers offering a picker should use slots.
+     */
+    autoAssignPlanner(query?: ResourcePlannerQuery): Promise<ResourcePlannerSnapshot>;
+    /** Rechecks remote events, capacity and conflicts among the current selection before committing. */
+    validatePlannerSelection(): ResourcePlannerValidationResult;
+    /** Read-only snapshot for UI diagnostics and progressive flow steps. */
+    getPlannerSnapshot(): ResourcePlannerSnapshot;
+    /**
+     * Validates then writes assignments to tempOrder. Real order submission is opt-in so UI callers
+     * can safely preview the cart; pass submitAfterCommit only after an explicit confirmation.
+     */
+    commitPlannerSelection(params?: UnifiedBookingSalesCommitPlannerSelectionParams): Promise<UnifiedBookingSalesCommitResult>;
+}
+export declare const UnifiedBookingSales: typeof UnifiedBookingSalesImpl;