@pisell/pisellos 2.3.49 → 2.3.51

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/BookingTicket/index.js

@@ -1093,7 +1093,11 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
    */
   scanGlobalListener(callback) {
     const localSearch = (v) => this.store.products.findProductsByCodeOrBarcode(v);
-    const scanCallback = (0, import_handleScan.handleGlobalScan)(this.request, localSearch);
+    const scanCallback = (0, import_handleScan.handleGlobalScan)(
+      this.request,
+      localSearch,
+      this.getSubmitOrderSalesChannel()
+    );
     const safeCallback = (d) => {
       try {
         callback(d);
@@ -1422,7 +1426,11 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     }
     try {
       const localSearch = (v) => this.store.products.findProductsByCodeOrBarcode(v);
-      const scanCallback = (0, import_handleScan.handleGlobalScan)(this.request, localSearch);
+      const scanCallback = (0, import_handleScan.handleGlobalScan)(
+        this.request,
+        localSearch,
+        this.getSubmitOrderSalesChannel()
+      );
       const raw = await scanCallback({ type: "nativeScanner", value: trimmed });
       const formatted = (0, import_formatGlobalScan.formatGlobalScanResult)(raw, trimmed);
       if (!formatted) {

package/lib/solution/BookingTicket/utils/scan/handleScan.d.ts

@@ -2,9 +2,11 @@ import { RequestPlugin } from '../../../../plugins';
 /**
  * 处理全局扫码
  * @param request 请求插件
+ * @param localSearch 本地商品搜索
+ * @param channel 当前销售渠道
  * @returns 处理结果
  */
-export declare const handleGlobalScan: (request: RequestPlugin, localSearch: (v: string) => any[]) => (scanResult: {
+export declare const handleGlobalScan: (request: RequestPlugin, localSearch: (v: string) => any[], channel?: string) => (scanResult: {
     type: string;
     value: string;
 }) => Promise<any>;

package/lib/solution/BookingTicket/utils/scan/handleScan.js

@@ -102,14 +102,14 @@ var handleScanFn = (getRequestList, localSearch) => {
     }
   };
 };
-var handleGlobalScan = (request, localSearch) => {
+var handleGlobalScan = (request, localSearch, channel) => {
   const getRequestList = (value) => {
     let requestList = [];
     if (value.startsWith("WL")) {
       requestList = [(0, import_cloudSearch.searchWallet)(request, value)];
     } else {
       requestList = [
-        (0, import_cloudSearch.searchOrder)(request, value),
+        ...channel === "kiosk" ? [] : [(0, import_cloudSearch.searchOrder)(request, value)],
         (0, import_cloudSearch.searchWalletPass)(request, value),
         (0, import_cloudSearch.searchWallet)(request, value),
         (0, import_cloudSearch.searchProduct)(request, value)

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

@@ -1,8 +1,9 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
-import { BaseModule } from '../../modules/BaseModule';
-import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderScanCodeResult } from './types';
+import { BaseSalesImpl } from '../BaseSales';
+import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderAllowAddItemsInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderReservationResourceSelectInfo, ScanOrderState, ScanOrderScanCodeResult, ScanOrderSyncAdditionalOrderResult } from './types';
 import type { UpdateOrderProductParams } from '../../modules/Order/types';
 import type { Discount } from '../../modules/Discount/types';
+import { RequestPlugin, WindowPlugin } from '../../plugins';
 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';
@@ -15,16 +16,16 @@ interface ScanOrderItemRuleRuntimeConfig {
     submissionIndex?: number;
     custom?: Record<string, any>;
 }
-export declare class ScanOrderImpl extends BaseModule implements Module {
+export declare class ScanOrderImpl extends BaseSalesImpl implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
     isSolution: boolean;
-    private initializeOptions;
-    private store;
-    private otherParams;
-    private cacheId;
-    private window;
-    private request;
+    protected initializeOptions: ModuleOptions;
+    protected store: ScanOrderState;
+    protected otherParams: Record<string, any>;
+    protected cacheId: string | undefined;
+    window: WindowPlugin;
+    request: RequestPlugin;
     private itemRuleEvaluator;
     private itemRuleConfigs;
     private itemRuleConfigsPromise;
@@ -53,9 +54,10 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private registerCustomerLoginListeners;
     private refreshOrderMarketingAfterLogin;
     constructor(name?: string, version?: string);
+    protected getRegisteredModuleNames(): readonly string[];
+    protected createSubModule(moduleName: string): Module | null;
     /** 与 `otherParams.cacheId` 一致，供宿主在 URL 变化时判断是否需要重新注册模块 */
     getCacheId(): string | undefined;
-    private destroyRegisteredChildModules;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     destroy(): Promise<void>;
     retryInit(): Promise<void>;
@@ -71,12 +73,14 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     };
     getTempOrder(): import("../../modules/Order/types").OrderTempOrder | null;
     updateTempOrderNote(note: string): string;
+    updateTempOrderNote(note: string, sync: true): Promise<string>;
+    updateTempOrderNote(note: string, sync: boolean): string | Promise<string>;
     setPickupReferenceMode(mode: 'counter_pickup' | 'table_service'): {
-        service_type: 'dine_in';
+        service_type: 'dine_in' | '';
         pickup_reference_mode: 'counter_pickup' | 'table_service';
     };
     setPickupRef(buzzer: string): string;
-    private ensureTempOrder;
+    private ensureScanOrderTempOrder;
     addNewOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
     restoreOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
     getOrderProducts(): import("../../modules/Order/types").OrderProduct[];
@@ -92,7 +96,10 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     }): Promise<void>;
     private findReservationRuleResource;
     private buildScanOrderResourceMetadata;
+    private prepareRetailAvailability;
     private buildSubmitPayloadEnhancer;
+    private isScanOrderMoreMode;
+    private submitScanOrderMore;
     submitScanOrder<T = any>(): Promise<T>;
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderProduct(params: UpdateOrderProductParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
@@ -117,8 +124,10 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     setItemRuleRuntimeConfig(config?: ScanOrderItemRuleRuntimeConfig): Promise<void>;
     private normalizeResourceState;
     private resolveResourceSelectType;
-    private fetchResourceOccupyDetailByResourceId;
-    checkResourceAvailable(resourceId: string, hasOrderId: boolean): Promise<ScanOrderAvailabilityInfo>;
+    private fetchResourceOccupyDetailsByResourceId;
+    private resolveAdditionalOrderFromOccupyDetail;
+    checkResourceAvailable(resourceId?: string | null, hasOrderId?: boolean): Promise<ScanOrderAvailabilityInfo>;
+    restorePreviousOrderData(): Promise<void>;
     getAdditionalOrderInfo(): Promise<{
         orderId: string;
         orderStatus: 'pending' | 'processing' | 'completed' | 'cancelled';
@@ -141,6 +150,9 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     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;