@pisell/pisellos 2.1.172 → 2.1.173

package/lib/solution/BookingByStep/index.js

@@ -1235,7 +1235,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       );
       cartItems2.forEach((item, index) => {
-        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
         const { currentCapacity } = (0, import_capacity.getCapacityInfoByCartItem)(item);
         const hasOriginTimeSlot = Boolean(item._origin.start_time) && Boolean(item._origin.end_time) && !(timeSlots == null ? void 0 : timeSlots.start_time);
         if (hasOriginTimeSlot) {
@@ -1368,7 +1368,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             const fastestResource = (0, import_timeslots.findFastestAvailableResource)({
               resources: targetRenderList,
               currentCapacity,
-              countMap: selectResourcesMap
+              countMap: selectResourcesMap,
+              targetDate: (_k = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _k.date,
+              durationMinutes: ((_l = item == null ? void 0 : item.duration) == null ? void 0 : _l.value) || ((_n = (_m = item == null ? void 0 : item._productOrigin) == null ? void 0 : _m.duration) == null ? void 0 : _n.value) || 10
             });
             const targetResource = fastestResource || targetRenderList[0];
             targetResource.capacity = currentCapacity;
@@ -1405,7 +1407,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     return { errorList };
   }
   // 从购物车中获取已经分配好第一步资源的所有时间片
-  getTimeSlotByAllResources(resources_code) {
+  getTimeSlotByAllResources(resources_code, split = 10) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     let dateRange = this.store.date.getDateRange();
     const resources = [];
@@ -1563,7 +1565,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       resourcesMap,
       duration,
       currentDate: dateRange[0].date,
-      split: 10,
+      split,
       resourcesUseableMap,
       capacity: maxCapacity,
       cut_off_time: maxCutOffTime,

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

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, ScheduleModule } from '../../modules';
+import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule } from '../../modules';
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -14,6 +14,8 @@ export interface BookingByStepState {
     currentProduct?: ProductData;
     currentProductMeta?: Record<string, any>;
     schedule: ScheduleModule;
+    salesSummary?: SalesSummaryModule;
+    scanOrderLogger?: ScanOrderLoggerModule;
 }
 export declare function createModule<T extends keyof BookingByStepState>(moduleName: T, solutionName: string, name?: string, version?: string): BookingByStepState[T];
 export declare enum BookingByStepHooks {

package/lib/solution/BookingByStep/types.js

@@ -36,6 +36,11 @@ function createModule(moduleName, solutionName, name, version) {
         `${solutionName}_${name || moduleName}`,
         version
       );
+    case "salesSummary":
+      return new import_modules.SalesSummaryModule(
+        `${solutionName}_${name || moduleName}`,
+        version
+      );
     case "step":
       return new import_modules.StepModule(
         `${solutionName}_${name || moduleName}`,
@@ -71,6 +76,11 @@ function createModule(moduleName, solutionName, name, version) {
         `${solutionName}_${name || moduleName}`,
         version
       );
+    case "scanOrderLogger":
+      return new import_modules.ScanOrderLoggerModule(
+        `${solutionName}_${name || moduleName}`,
+        version
+      );
     default:
       throw new Error(`Unknown module type: ${moduleName}`);
   }

package/lib/solution/BookingByStep/utils/timeslots.d.ts

@@ -19,10 +19,12 @@ export declare function calculateResourceAvailableTime({ resource, timeSlots, cu
  * @param countMap 已预约数量映射
  * @returns 最快可用的资源
  */
-export declare function findFastestAvailableResource({ resources, currentCapacity, countMap, }: {
+export declare function findFastestAvailableResource({ resources, currentCapacity, countMap, targetDate, durationMinutes, }: {
     resources: ResourceItem[];
     currentCapacity?: number;
     countMap?: Record<number, number>;
+    targetDate?: string | Dayjs;
+    durationMinutes?: number;
 }): ResourceItem | null;
 /**
  * 给定一个时间列表，通过开始和结束时间过滤出符合条件的时间段

package/lib/solution/BookingByStep/utils/timeslots.js

@@ -77,10 +77,15 @@ function calculateResourceAvailableTime({
 function findFastestAvailableResource({
   resources,
   currentCapacity = 1,
-  countMap = {}
+  countMap = {},
+  targetDate,
+  durationMinutes = 30
 }) {
   var _a, _b, _c;
   const currentTime = (0, import_dayjs.default)();
+  const resolvedDuration = durationMinutes > 0 ? durationMinutes : 30;
+  const targetDay = targetDate ? (0, import_dayjs.default)(targetDate) : currentTime;
+  const isTargetDayToday = targetDay.isSame(currentTime, "day");
   let fastestTime = null;
   let fastestResources = [];
   console.log("[TimeslotUtils] 查找最快可用资源:", {
@@ -90,19 +95,22 @@ function findFastestAvailableResource({
     countMap
   });
   for (const resource of resources) {
-    const todayTimes = resource.times.filter((time) => {
-      const isToday = (0, import_dayjs.default)(time.start_at).isSame(currentTime, "day");
-      const isStillWorking = (0, import_dayjs.default)(time.end_at).isAfter(currentTime);
-      return isToday && isStillWorking;
+    const targetDayTimes = resource.times.filter((time) => {
+      const isSameTargetDay = (0, import_dayjs.default)(time.start_at).isSame(targetDay, "day");
+      if (!isSameTargetDay)
+        return false;
+      if (!isTargetDayToday)
+        return true;
+      return (0, import_dayjs.default)(time.end_at).isAfter(currentTime);
     });
-    if (todayTimes.length === 0) {
+    if (targetDayTimes.length === 0) {
       console.log(`[TimeslotUtils] 资源 ${resource.id}(${resource.main_field}) 今日无可用时间段`);
       continue;
     }
-    for (const time of todayTimes) {
+    for (const time of targetDayTimes) {
       const workStartTime = (0, import_dayjs.default)(time.start_at);
       const workEndTime = (0, import_dayjs.default)(time.end_at);
-      let nextAvailableTime = currentTime.isBefore(workStartTime) ? workStartTime : currentTime;
+      let nextAvailableTime = isTargetDayToday && currentTime.isAfter(workStartTime) ? currentTime : workStartTime;
       console.log(`[TimeslotUtils] 检查资源 ${resource.id}(${resource.main_field}):`, {
         workTime: `${workStartTime.format("HH:mm")}-${workEndTime.format("HH:mm")}`,
         checkStartTime: nextAvailableTime.format("HH:mm:ss"),
@@ -126,7 +134,7 @@ function findFastestAvailableResource({
           pax: event.pax || 1
         });
         if (resource.resourceType === "single" || (resource.capacity || 1) === 1) {
-          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(30, "minute"))) {
+          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(resolvedDuration, "minute"))) {
             finalAvailableTime = eventEnd;
             console.log(`[TimeslotUtils] 发现时间冲突，调整到: ${finalAvailableTime.format("HH:mm:ss")}`);
           }
@@ -134,7 +142,7 @@ function findFastestAvailableResource({
           const totalCapacity = resource.capacity || 0;
           const currentUsedCapacity = countMap[resource.id] || 0;
           const eventUsedCapacity = event.pax || 1;
-          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(30, "minute"))) {
+          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(resolvedDuration, "minute"))) {
             const totalRequiredCapacity = currentUsedCapacity + currentCapacity + eventUsedCapacity;
             if (totalRequiredCapacity > totalCapacity) {
               finalAvailableTime = eventEnd;
@@ -143,7 +151,7 @@ function findFastestAvailableResource({
           }
         }
       }
-      if (finalAvailableTime.isAfter(workEndTime)) {
+      if (finalAvailableTime.add(resolvedDuration, "minute").isAfter(workEndTime)) {
         console.log(`[TimeslotUtils] 资源 ${resource.id} 可用时间超出工作时间，跳过`);
         continue;
       }

package/lib/solution/Checkout/index.js

@@ -222,7 +222,6 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           product_id: item.product_id,
           product_variant_id: item.product_variant_id,
           quantity: item.num,
-          is_price_include_tax: item.is_price_include_tax,
           // 商品是否含税：1；0
           is_charge_tax: item.is_charge_tax ?? 0,
           // 若商品不含税，计算得到的税费，单位（元）
@@ -247,7 +246,6 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           },
           product_bundle: (item.product_bundle || []).map((bundle) => {
             return {
-              is_price_include_tax: item.is_price_include_tax,
               bundle_id: bundle.bundle_id,
               bundle_product_id: bundle.bundle_product_id,
               bundle_variant_id: bundle.bundle_variant_id,

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

@@ -0,0 +1,158 @@
+import { Module, ModuleOptions, PisellCore } from '../../types';
+import { BaseModule } from '../../modules/BaseModule';
+import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderAllowAddItemsInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderReservationResourceSelectInfo, ScanOrderScanCodeResult, ScanOrderSyncAdditionalOrderResult, ScanOrderTempOrder } from './types';
+import type { UpdateProductInOrderParams } from '../../modules/Order/types';
+import type { Discount } from '../../modules/Discount/types';
+import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
+import type { StrategyConfig } from '../../model/strategy/type';
+import type { ProductData } from '../../modules/Product/types';
+export * from './types';
+interface ScanOrderItemRuleRuntimeConfig {
+    strategyConfigs?: StrategyConfig[];
+    pax?: Partial<PaxInfo>;
+    historicalItems?: CartItemSummary[];
+    serviceType?: string;
+    submissionIndex?: number;
+    custom?: Record<string, any>;
+}
+export declare class ScanOrderImpl extends BaseModule implements Module {
+    protected defaultName: string;
+    protected defaultVersion: string;
+    isSolution: boolean;
+    private initializeOptions;
+    private store;
+    private otherParams;
+    private cacheId;
+    private window;
+    private request;
+    private itemRuleEvaluator;
+    private itemRuleConfigs;
+    private itemRuleConfigsPromise;
+    private itemRulePrefillApplied;
+    private itemRuleRuntimeConfig;
+    /** 最近一次 checkResourceAvailable 从预约规则 link 拉取的商品快照 */
+    private enabledReservationRuleProducts;
+    private loginEffectDisposers;
+    private customerLoginRefreshInFlight;
+    private customerLoginRefreshIdInFlight;
+    private static readonly PISELL1_LOGIN_SUCCESS;
+    private getScanOrderLoggerContext;
+    private safeStringify;
+    private pickErrorMessage;
+    private serializeError;
+    private addScanOrderLog;
+    private logMethodStart;
+    private logMethodSuccess;
+    private logMethodError;
+    private assertProductListLoaded;
+    addLog(params: ScanOrderAddLogParams): Promise<void>;
+    private normalizeCustomerId;
+    private resolveCustomerIdFromLoginPayload;
+    private clearLoginEffectListeners;
+    private registerLoginEffect;
+    private registerCustomerLoginListeners;
+    private refreshOrderMarketingAfterLogin;
+    constructor(name?: string, version?: string);
+    /** 与 `otherParams.cacheId` 一致，供宿主在 URL 变化时判断是否需要重新注册模块 */
+    getCacheId(): string | undefined;
+    private destroyRegisteredChildModules;
+    initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
+    destroy(): Promise<void>;
+    retryInit(): Promise<void>;
+    refresh(): Promise<void>;
+    getStatus(): import("./types").ScanOrderStatus;
+    getEntryContext(): import("./types").ScanOrderEntryContext | null;
+    getConfig(): Record<string, any>;
+    getItemRuleQuantityLimits(): QuantityLimitResult[];
+    getCartValidationPassed(): boolean | null;
+    getCartValidation(): {
+        passed: boolean | null;
+        failures: QuantityCheckResult[];
+    };
+    getTempOrder(): ScanOrderTempOrder | null;
+    updateTempOrderNote(note: string): string;
+    setPickupReferenceMode(mode: 'counter_pickup' | 'table_service'): {
+        service_type: 'dine_in' | '';
+        pickup_reference_mode: 'counter_pickup' | 'table_service';
+    };
+    setPickupRef(buzzer: string): string;
+    private ensureTempOrder;
+    addNewOrder(): Promise<ScanOrderTempOrder>;
+    restoreOrder(): Promise<ScanOrderTempOrder>;
+    getOrderProducts(): ScanOrderOrderProduct[];
+    getSummary(): Promise<import("./types").ScanOrderSummary>;
+    getDiscountList(): Discount[];
+    scanCode(code: string, customerId?: number): Promise<ScanOrderScanCodeResult>;
+    setDiscountSelected(params: {
+        discountId: number;
+        isSelected: boolean;
+    }): Promise<void>;
+    onCustomerLogin(params: {
+        customerId: number;
+    }): Promise<void>;
+    private findReservationRuleResource;
+    private buildScanOrderResourceMetadata;
+    private prepareRetailAvailability;
+    private buildSubmitPayloadEnhancer;
+    submitScanOrder<T = any>(): Promise<T>;
+    addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
+    updateProductInOrder(params: UpdateProductInOrderParams): Promise<ScanOrderOrderProduct[]>;
+    /**
+     * 设置单行商品备注（与整单 `updateTempOrderNote` 区分）。
+     * 多行同 SKU 时必须传入与删除/更新一致的 identity（如 `identity_key`）。
+     */
+    setOrderProductLineNote(identity: ScanOrderOrderProductIdentity, note: string): Promise<ScanOrderOrderProduct[]>;
+    removeProductFromOrder(identity: ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
+    private loadRuntimeConfigs;
+    private syncItemRuleConfigsFromDineInConfig;
+    private fetchItemRuleConfigsByModelIds;
+    private buildPrefillProductSourceMap;
+    private getItemRuleRuntimeConfig;
+    private ensureItemRuleConfigsLoaded;
+    private refreshItemRuleQuantityLimits;
+    private applyPrefillByItemRule;
+    applyItemRulePrefill(): Promise<void>;
+    private evaluateCartValidationByItemRule;
+    private validateBeforeSubmitByItemRule;
+    private refreshCartValidationPassed;
+    setItemRuleRuntimeConfig(config?: ScanOrderItemRuleRuntimeConfig): Promise<void>;
+    private normalizeResourceState;
+    private resolveResourceSelectType;
+    private fetchResourceOccupyDetailsByResourceId;
+    private resolveAdditionalOrderFromOccupyDetail;
+    checkResourceAvailable(resourceId?: string | null, hasOrderId?: boolean): Promise<ScanOrderAvailabilityInfo>;
+    restorePreviousOrderData(): Promise<void>;
+    getAdditionalOrderInfo(): Promise<{
+        orderId: string;
+        orderStatus: 'pending' | 'processing' | 'completed' | 'cancelled';
+        orderTime: string;
+        orderAmount: number;
+        orderItems: any[];
+    }>;
+    getProductList(): Promise<ProductData[]>;
+    getOtherParams(): Record<string, any>;
+    setOtherParams(params: Record<string, any>, { cover }?: {
+        cover?: boolean;
+    }): Promise<void>;
+    private static readonly UI_STATE_KEY_PREFIX;
+    private getUIStateBucketKey;
+    private readUIStateBucket;
+    private writeUIStateBucket;
+    setUIState(key: string, value: any): void;
+    getUIState<T = any>(key: string): T | undefined;
+    deleteUIState(key: string): void;
+    clearUIState(): void;
+    setEntryPaxNumber(number: number): Promise<void>;
+    getEntryPaxNumber(): number | null;
+    syncAdditionalOrderFromResource(resourceId?: string | null): Promise<ScanOrderSyncAdditionalOrderResult>;
+    getReservationResourceSelectType(): ScanOrderReservationResourceSelectInfo;
+    checkAllowAddItems(): ScanOrderAllowAddItemsInfo;
+    getFulfillmentModes(): {
+        enablePickup: boolean;
+        enableTableService: boolean;
+    };
+    checkManualPickupRef(): {
+        enabled: boolean;
+        manualInputType?: string;
+    };
+}