@pisell/pisellos 0.0.556 → 0.0.558

package/lib/modules/ProductList/index.js

@@ -59,7 +59,8 @@ var ProductList = class extends import_BaseModule.BaseModule {
     schedule_datetime,
     schedule_date,
     cacheId,
-    with_schedule
+    with_schedule,
+    with_extra = []
   }, options) {
     var _a;
     let userPlugin = this.core.getPlugin("user");
@@ -69,45 +70,49 @@ var ProductList = class extends import_BaseModule.BaseModule {
     } catch (error) {
       console.error(error);
     }
-    const productsData = await this.request.post(
-      `/product/query`,
-      {
-        open_quotation: 1,
-        open_bundle: 0,
-        exclude_extension_type: [
-          "product_party",
-          "product_event",
-          "product_series_event",
-          "product_package_ticket",
-          "ticket",
-          "event_item"
-        ],
-        with: ["category", "collection", "resourceRelation"],
-        status: "published",
-        num: 500,
-        skip: 1,
-        customer_id,
-        category_ids,
-        ids: product_ids,
-        collection,
-        front_end_cache_id: cacheId,
-        menu_list_ids,
-        with_count,
-        // client_schedule_ids: schedule_ids,
-        schedule_date,
-        // application_code: this.otherParams?.channel === 'online_store' ? 'online-store' : this.otherParams?.channel,
-        application_code: "online-store",
-        with_schedule,
-        schedule_datetime,
-        // application_code: this.otherParams?.channel,
-        is_eject: 1
-      },
-      { osServer: true, callback: options == null ? void 0 : options.callback, subscriberId: options == null ? void 0 : options.subscriberId, useCache: true, customToast: () => {
-      } }
-    );
-    const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
-    this.addProduct(sortedList);
-    return sortedList;
+    try {
+      const productsData = await this.request.post(
+        `/product/query`,
+        {
+          open_quotation: 1,
+          open_bundle: 0,
+          exclude_extension_type: [
+            "product_party",
+            "product_event",
+            "product_series_event",
+            "product_package_ticket",
+            "ticket",
+            "event_item"
+          ],
+          with: ["category", "collection", "resourceRelation", ...with_extra],
+          status: "published",
+          num: 500,
+          skip: 1,
+          customer_id,
+          category_ids,
+          ids: product_ids,
+          collection,
+          front_end_cache_id: cacheId,
+          menu_list_ids,
+          with_count,
+          // client_schedule_ids: schedule_ids,
+          schedule_date,
+          schedule_datetime,
+          // application_code: this.otherParams?.channel === 'online_store' ? 'online-store' : this.otherParams?.channel,
+          application_code: "online-store",
+          with_schedule,
+          is_eject: 1,
+          open_deposit: 1
+        },
+        { osServer: true, callback: options == null ? void 0 : options.callback, subscriberId: options == null ? void 0 : options.subscriberId, useCache: true, customToast: () => {
+        } }
+      );
+      const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
+      this.addProduct(sortedList);
+      return sortedList;
+    } catch (error) {
+      return error;
+    }
   }
   async loadProductsPrice({
     ids = [],

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 5 | 3 | 2 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -373,7 +373,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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

@@ -72,7 +72,7 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     getTempOrder(): ScanOrderTempOrder | null;
     updateTempOrderNote(note: string): 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;
@@ -121,6 +121,7 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private fetchResourceOccupyDetailsByResourceId;
     private resolveAdditionalOrderFromOccupyDetail;
     checkResourceAvailable(resourceId?: string | null, hasOrderId?: boolean): Promise<ScanOrderAvailabilityInfo>;
+    restorePreviousOrderData(): Promise<void>;
     getAdditionalOrderInfo(): Promise<{
         orderId: string;
         orderStatus: 'pending' | 'processing' | 'completed' | 'cancelled';

package/lib/solution/ScanOrder/index.js

@@ -553,6 +553,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   // 存储 UI 层选择的取餐方式到 tempOrder.metadata.shop_service_data
   // service_type 在扫码点餐场景固定为 dine_in
   setPickupReferenceMode(mode) {
+    var _a;
     this.logMethodStart("setPickupReferenceMode", { mode });
     try {
       if (!this.store.order)
@@ -562,7 +563,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         ...tempOrder.metadata || {},
         shop_service_data: {
           ...(tempOrder.metadata || {}).shop_service_data || {},
-          service_type: "dine_in",
+          service_type: ((_a = this.otherParams) == null ? void 0 : _a.businessCode) === "dine_in" ? "dine_in" : "",
           pickup_reference_mode: mode
         }
       };
@@ -1601,7 +1602,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   // 通过 resource_id + 店铺配置
   // hasOrderId 表示 url 上是否有 orderid，如果是的话，后续的流程会走加单
   async checkResourceAvailable(resourceId, hasOrderId = false) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
     const normalizedResourceId = String(resourceId ?? "").trim();
     this.logMethodStart("checkResourceAvailable", {
       resourceId: normalizedResourceId
@@ -1693,14 +1694,19 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         cacheId: this.cacheId
       });
       if (Array.isArray(loaded)) {
-        this.enabledReservationRuleProducts = loaded;
-        const occupancyMinutes = (0, import_utils.pickFirstDurationMinutesFromProducts)(loaded);
+        const matchedRuleProduct = (0, import_utils.findReservationRuleProductByResourceId)(
+          loaded,
+          normalizedResourceId
+        );
+        const ruleProductsForResource = matchedRuleProduct ? [matchedRuleProduct] : [];
+        this.enabledReservationRuleProducts = ruleProductsForResource;
+        const occupancyMinutes = (0, import_utils.pickFirstDurationMinutesFromProducts)(ruleProductsForResource);
         if (occupancyMinutes !== void 0) {
           tempOrder.metadata.table_occupancy_duration = occupancyMinutes;
         }
-        if ((0, import_utils.hasCustomCapacityProduct)(loaded)) {
+        if ((0, import_utils.hasCustomCapacityProduct)(ruleProductsForResource)) {
           pendingRequestEntryPax = 1;
-          const paxBounds = (0, import_utils.pickFirstCustomCapacityPaxBounds)(loaded);
+          const paxBounds = (0, import_utils.pickFirstCustomCapacityPaxBounds)(ruleProductsForResource);
           if ((paxBounds == null ? void 0 : paxBounds.min) !== void 0)
             pendingRequestPaxMin = paxBounds.min;
           if ((paxBounds == null ? void 0 : paxBounds.max) !== void 0)
@@ -1799,17 +1805,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       if (isAdditionalOrderMode) {
         tempOrder.order_id = additionalOrderId;
       }
-      if (tempOrder.order_id) {
-        const res = await ((_j = this.store.order) == null ? void 0 : _j.getOrderInfoByRemote(tempOrder.order_id));
-        const entryPaxNumber = (_n = (_m = (_l = (_k = res == null ? void 0 : res.data) == null ? void 0 : _k.bookings) == null ? void 0 : _l.find((p) => {
-          var _a2;
-          return (_a2 = p.metadata) == null ? void 0 : _a2.collect_pax;
-        })) == null ? void 0 : _m.metadata) == null ? void 0 : _n.collect_pax;
-        if (entryPaxNumber) {
-          await this.setEntryPaxNumber(entryPaxNumber);
-        }
-      }
-      const lastOrderInfo = (_p = (_o = this.store.order) == null ? void 0 : _o.getLastOrderInfo) == null ? void 0 : _p.call(_o);
+      const lastOrderInfo = (_k = (_j = this.store.order) == null ? void 0 : _j.getLastOrderInfo) == null ? void 0 : _k.call(_j);
       const historicalItems = isAdditionalOrderMode && Array.isArray(lastOrderInfo == null ? void 0 : lastOrderInfo.products) ? lastOrderInfo.products.reduce((acc, p) => {
         if (typeof (p == null ? void 0 : p.product_id) !== "number")
           return acc;
@@ -1821,7 +1817,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         return acc;
       }, []) : [];
       await this.setItemRuleRuntimeConfig({
-        serviceType: (_q = this.otherParams) == null ? void 0 : _q.businessCode,
+        serviceType: (_l = this.otherParams) == null ? void 0 : _l.businessCode,
         submissionIndex: isAdditionalOrderMode ? 1 : 0,
         historicalItems
       });
@@ -1851,6 +1847,21 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  // 恢复之前订单的数据，读取 entrypax
+  async restorePreviousOrderData() {
+    var _a, _b, _c, _d, _e;
+    const tempOrder = this.ensureTempOrder();
+    if (tempOrder.order_id) {
+      const res = await ((_a = this.store.order) == null ? void 0 : _a.getOrderInfoByRemote(tempOrder.order_id));
+      const entryPaxNumber = (_e = (_d = (_c = (_b = res == null ? void 0 : res.data) == null ? void 0 : _b.bookings) == null ? void 0 : _c.find((p) => {
+        var _a2;
+        return (_a2 = p.metadata) == null ? void 0 : _a2.collect_pax;
+      })) == null ? void 0 : _d.metadata) == null ? void 0 : _e.collect_pax;
+      if (entryPaxNumber) {
+        await this.setEntryPaxNumber(entryPaxNumber);
+      }
+    }
+  }
   // 如果是加单的情况，提供返回当前订单相关信息的能力
   async getAdditionalOrderInfo() {
     this.logMethodStart("getAdditionalOrderInfo");

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

@@ -134,6 +134,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,7 @@ __export(utils_exports, {
   computeResourceIsFull: () => computeResourceIsFull,
   createEmptySummary: () => createEmptySummary,
   extractStrategyModelIdsFromTableConfig: () => extractStrategyModelIdsFromTableConfig,
+  findReservationRuleProductByResourceId: () => findReservationRuleProductByResourceId,
   getProductIdentityIndex: () => getProductIdentityIndex,
   getSafeProductNum: () => getSafeProductNum,
   getTopLevelProductId: () => getTopLevelProductId,
@@ -510,6 +511,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) {
@@ -613,6 +635,7 @@ function pickFirstCustomCapacityDimensionId(products) {
   computeResourceIsFull,
   createEmptySummary,
   extractStrategyModelIdsFromTableConfig,
+  findReservationRuleProductByResourceId,
   getProductIdentityIndex,
   getSafeProductNum,
   getTopLevelProductId,

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

@@ -3,6 +3,7 @@ import { BaseModule } from '../../modules/BaseModule';
 import { VenueBookingAddLogParams, VenueBookingSlotConfig, VenueDateSummaryItem, VenueSlotSelection, VenueTimeSlotGrid } from './types';
 import type { ScanOrderOrderProduct, ScanOrderOrderProductIdentity } from '../ScanOrder/types';
 import type { UpdateProductInOrderParams } from '../../modules/Order/types';
+import type { ScheduleItem } from '../../modules/Schedule/types';
 import type { OpenDataAvailabilityResult } from '../../modules/OpenData';
 import type { ProductData } from '../../modules/Product/types';
 import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
@@ -41,6 +42,10 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     private productsLoaded;
     private loadOpenDataConfigInFlight;
     private static readonly OPEN_DATA_CACHE_TTL;
+    /** 按日期缓存 slot 智能定价 Map，避免同周重复 resolveProducts */
+    private slotPriceMapCache;
+    /** loadProducts 后缓存的全量商品（venue + addon），供分段算价复用 */
+    private smartPricingProductCatalog;
     private getLoggerContext;
     private safeStringify;
     private pickErrorMessage;
@@ -75,6 +80,21 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
         passed: boolean | null;
         failures: QuantityCheckResult[];
     };
+    /** 清除 slot 价格分段缓存（商品重载 / 登录后 customerId 变化时调用） */
+    private clearSlotPriceMapCache;
+    /** 读取当前登录 customerId */
+    private resolveCustomerIdForSmartPricing;
+    /** 读取 schedule 全量列表，供智能定价 schedule_match 使用 */
+    private getScheduleListForSmartPricing;
+    /** 构建智能定价上下文，对齐 OS Server buildProductFormatterContext */
+    private buildSmartPricingContext;
+    /** venue + addon 全量商品，供智能定价评估 */
+    private getAllProductsForSmartPricing;
+    private getSlotPriceMapCacheKey;
+    /**
+     * 按 schedule 分段构建 slot 价格 Map，带实例级缓存。
+     */
+    private buildSlotPriceMapForDate;
     loadAllProducts(): Promise<{
         venueProducts: ProductData[];
         addonProducts: ProductData[];
@@ -147,8 +167,7 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     setSlotConfig(config: Partial<VenueBookingSlotConfig>): void;
     getSlotConfig(): VenueBookingSlotConfig;
     loadSchedules(): Promise<void>;
-    private injectScheduleResolverToQuotation;
-    getScheduleListByIds(ids: number[]): import("../../server").ScheduleItem[];
+    getScheduleListByIds(ids: number[]): ScheduleItem[];
     getTempOrder(): import("./types").ScanOrderTempOrder | null;
     updateTempOrderNote(note: string): string;
     updateTempOrderContactsInfo(contactsInfo: any[]): any[];
@@ -156,7 +175,7 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     onCustomerLogin(params: {
         customerId: number;
     }): Promise<void>;
-    private recalculateOrderPricesFromQuotation;
+    private recalculateOrderPricesFromSmartPricing;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
         discountList: import("../../modules/Discount").Discount[];