@pisell/pisellos 2.1.151 → 2.1.152

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

@@ -91,8 +91,14 @@ export function findFastestAvailableResource(_ref2) {
     _ref2$currentCapacity = _ref2.currentCapacity,
     currentCapacity = _ref2$currentCapacity === void 0 ? 1 : _ref2$currentCapacity,
     _ref2$countMap = _ref2.countMap,
-    countMap = _ref2$countMap === void 0 ? {} : _ref2$countMap;
+    countMap = _ref2$countMap === void 0 ? {} : _ref2$countMap,
+    targetDate = _ref2.targetDate,
+    _ref2$durationMinutes = _ref2.durationMinutes,
+    durationMinutes = _ref2$durationMinutes === void 0 ? 30 : _ref2$durationMinutes;
   var currentTime = dayjs();
+  var resolvedDuration = durationMinutes > 0 ? durationMinutes : 30;
+  var targetDay = targetDate ? dayjs(targetDate) : currentTime;
+  var isTargetDayToday = targetDay.isSame(currentTime, 'day');
   var fastestTime = null;
   var fastestResources = [];
   console.log('[TimeslotUtils] 查找最快可用资源:', {
@@ -108,17 +114,18 @@ export function findFastestAvailableResource(_ref2) {
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var _resource = _step2.value;
-      // 获取资源当天且还在工作时间内的时间段
-      var todayTimes = _resource.times.filter(function (time) {
-        var isToday = dayjs(time.start_at).isSame(currentTime, 'day');
-        var isStillWorking = dayjs(time.end_at).isAfter(currentTime);
-        return isToday && isStillWorking;
+      // 获取资源在目标日期且还在工作时间内的时间段
+      var targetDayTimes = _resource.times.filter(function (time) {
+        var isSameTargetDay = dayjs(time.start_at).isSame(targetDay, 'day');
+        if (!isSameTargetDay) return false;
+        if (!isTargetDayToday) return true;
+        return dayjs(time.end_at).isAfter(currentTime);
       });
-      if (todayTimes.length === 0) {
+      if (targetDayTimes.length === 0) {
         console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(_resource.id, "(").concat(_resource.main_field, ") \u4ECA\u65E5\u65E0\u53EF\u7528\u65F6\u95F4\u6BB5"));
         continue;
       }
-      var _iterator4 = _createForOfIteratorHelper(todayTimes),
+      var _iterator4 = _createForOfIteratorHelper(targetDayTimes),
         _step4;
       try {
         var _loop = function _loop() {
@@ -128,7 +135,7 @@ export function findFastestAvailableResource(_ref2) {
             var workEndTime = dayjs(time.end_at);
 
             // 确定检查的起始时间（当前时间 vs 工作开始时间）
-            var nextAvailableTime = currentTime.isBefore(workStartTime) ? workStartTime : currentTime;
+            var nextAvailableTime = isTargetDayToday && currentTime.isAfter(workStartTime) ? currentTime : workStartTime;
             console.log("[TimeslotUtils] \u68C0\u67E5\u8D44\u6E90 ".concat(_resource.id, "(").concat(_resource.main_field, "):"), {
               workTime: "".concat(workStartTime.format('HH:mm'), "-").concat(workEndTime.format('HH:mm')),
               checkStartTime: nextAvailableTime.format('HH:mm:ss'),
@@ -165,7 +172,7 @@ export function findFastestAvailableResource(_ref2) {
                 // 检查资源类型和容量
                 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] \u53D1\u73B0\u65F6\u95F4\u51B2\u7A81\uFF0C\u8C03\u6574\u5230: ".concat(finalAvailableTime.format('HH:mm:ss')));
@@ -177,7 +184,7 @@ export function findFastestAvailableResource(_ref2) {
                   var eventUsedCapacity = _event.pax || 1;
 
                   // 如果在事件时间范围内，检查容量是否足够
-                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(30, 'minute'))) {
+                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(resolvedDuration, 'minute'))) {
                     var totalRequiredCapacity = currentUsedCapacity + currentCapacity + eventUsedCapacity;
                     if (totalRequiredCapacity > totalCapacity) {
                       // 容量不足，使用事件结束时间
@@ -194,7 +201,7 @@ export function findFastestAvailableResource(_ref2) {
             } finally {
               _iterator5.f();
             }
-            if (finalAvailableTime.isAfter(workEndTime)) {
+            if (finalAvailableTime.add(resolvedDuration, 'minute').isAfter(workEndTime)) {
               console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(_resource.id, " \u53EF\u7528\u65F6\u95F4\u8D85\u51FA\u5DE5\u4F5C\u65F6\u95F4\uFF0C\u8DF3\u8FC7"));
               return 0; // continue
             }

package/dist/solution/Checkout/index.js

@@ -403,7 +403,6 @@ export var CheckoutImpl = /*#__PURE__*/function (_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 = item.is_charge_tax) !== null && _item$is_charge_tax !== void 0 ? _item$is_charge_tax : 0,
             // 若商品不含税，计算得到的税费，单位（元）
@@ -428,7 +427,6 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             },
             product_bundle: (item.product_bundle || []).map(function (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/dist/solution/ScanOrder/index.d.ts

@@ -0,0 +1,152 @@
+import { Module, ModuleOptions, PisellCore } from '../../types';
+import { BaseModule } from '../../modules/BaseModule';
+import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderScanCodeResult } 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(): import("./types").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<import("./types").ScanOrderTempOrder>;
+    restoreOrder(): Promise<import("./types").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 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 fetchResourceOccupyDetailByResourceId;
+    checkResourceAvailable(resourceId: string, hasOrderId: boolean): Promise<ScanOrderAvailabilityInfo>;
+    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;
+    getFulfillmentModes(): {
+        enablePickup: boolean;
+        enableTableService: boolean;
+    };
+    checkManualPickupRef(): {
+        enabled: boolean;
+        manualInputType?: string;
+    };
+}