@pisell/pisellos 0.0.568 → 0.0.570

package/lib/server/modules/products/types.d.ts

@@ -17,13 +17,29 @@ export interface FormattedProductData extends ProductData {
     /** 购物车详情值 */
     cartDetailValue?: any;
 }
+/**
+ * 商品轻量查询范围
+ */
+export interface ProductIdScope {
+    /** 是否返回全部商品 ID */
+    isAllProducts?: boolean;
+    /** 指定商品 ID */
+    productIds?: number[];
+    /** 指定商品集合 ID */
+    collectionIds?: number[];
+}
+export interface ProductSnapshot {
+    cover?: ProductData['cover'];
+    holder_config?: ProductData['holder_config'];
+}
 /**
  * 加载报价单商品价格参数
  */
 export interface LoadProductsPriceParams {
     ids: number[];
     schedule_date: string;
-    customer_id?: number;
+    schedule_datetime?: string;
+    customer_id?: number | string;
 }
 /**
  * 加载报价单商品价格返回数据
@@ -47,6 +63,7 @@ export interface LoadProductsPriceData {
             bundle_product_id: number;
             bundle_variant_id: number;
             price: number;
+            base_price?: number | string;
             price_type: string;
             price_type_ext: string;
         }[];
@@ -97,6 +114,8 @@ export interface ProductSyncMessage {
     change_types?: string[];
     /** 关联商品 ID（product_collection / product_category / product_quotation 变更时携带） */
     relation_product_ids?: number[];
+    /** 关联商品 ID（product_data_variant 变更时携带） */
+    product_ids?: number[];
     message_uuid?: string;
     timestamp?: string;
     /** 内部标记：来源频道 key */
@@ -107,12 +126,26 @@ export interface ProductSyncMessage {
  */
 export interface ProductFormatterContext {
     schedule_date: string;
+    schedule_datetime?: string;
+    customer_id?: number | string;
     priceData?: LoadProductsPriceData[];
     scheduleModule?: any;
+    /** 全量餐牌列表，供智能定价 menu_match 等条件判断使用 */
+    menuList?: any[];
+    /** 全量日程列表，供智能定价 schedule_match 等条件判断使用 */
+    scheduleList?: any[];
+    /** 外部传入的策略上下文，仅承载定价条件，不参与商品集合筛选 */
+    strategy_context?: Record<string, any>;
+    /** 智能定价评估器，由宿主统一注入到 PisellOS context */
+    dataVariantEvaluator?: {
+        resolveProducts: (businessData: any) => {
+            products: ProductData[];
+        };
+    };
     locale?: string;
 }
 /**
  * 商品格式化器类型
  * 用于对商品数据进行处理和格式化（包括价格应用、字段扩展等）
  */
-export type ProductFormatter = (products: ProductData[], context: ProductFormatterContext) => ProductData[] | Promise<ProductData[]>;
+export declare type ProductFormatter = (products: ProductData[], context: ProductFormatterContext) => ProductData[] | Promise<ProductData[]>;

package/lib/server/modules/products/types.js

@@ -10,6 +10,9 @@ exports.ProductsHooks = void 0;
 /**
  * 商品格式化后数据
  */
+/**
+ * 商品轻量查询范围
+ */
 /**
  * 加载报价单商品价格参数
  */

package/lib/server/modules/quotation/index.d.ts

@@ -1,6 +1,8 @@
 import { Module, PisellCore, ModuleOptions } from '../../../types';
 import { BaseModule } from '../../../modules/BaseModule';
 import { QuotationData } from './types';
+import type { ScheduleItem } from '../../../modules/Schedule/types';
+import type { QuotationCustomerScopeInfo } from '../../../modules/Quotation/types';
 /**
  * 报价单模块 - 用于管理报价单数据和计算商品价格
  */
@@ -10,6 +12,7 @@ export declare class QuotationModule extends BaseModule implements Module {
     private request;
     private store;
     private dbManager;
+    private scheduleResolver?;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /**
@@ -25,10 +28,46 @@ export declare class QuotationModule extends BaseModule implements Module {
      * 获取报价单列表
      */
     getQuotationList(): QuotationData[];
+    loadQuotations(params?: {
+        channel?: string;
+        customer_id?: number | string;
+    }): Promise<void>;
+    setScheduleResolver(resolver: (id: number) => ScheduleItem | undefined): void;
+    getPriceForProduct(params: {
+        productId: number;
+        variantId?: number;
+        datetime: string;
+        channel?: string;
+        customer_id?: number | string;
+    }): string | null;
+    getQuotationMatchForProduct(params: {
+        productId: number;
+        variantId?: number;
+        datetime: string;
+        channel?: string;
+        customer_id?: number | string;
+    }): {
+        price: string | null;
+        quotationShelfId: number;
+    } | null;
+    getQuotationShelfId(params: {
+        productId: number;
+        variantId?: number;
+        datetime: string;
+        channel?: string;
+        customer_id?: number | string;
+    }): number;
+    getQuotationCustomerScopeInfo(): QuotationCustomerScopeInfo;
     /**
      * 清空缓存
      */
     clear(): Promise<void>;
+    private normalizeCustomerId;
+    private hasValidCustomerId;
+    private isQuotationVisibleForCustomer;
+    private isQuotationVisibleForChannel;
+    private isQuotationActiveAt;
+    private findProductData;
     /**
      * 从 IndexDB 加载报价单数据
      * @private

package/lib/server/modules/quotation/index.js

@@ -5,8 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.QuotationModule = void 0;
 var _lodashEs = require("lodash-es");
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _isSameOrBefore = _interopRequireDefault(require("dayjs/plugin/isSameOrBefore"));
+var _isSameOrAfter = _interopRequireDefault(require("dayjs/plugin/isSameOrAfter"));
 var _BaseModule = require("../../../modules/BaseModule");
 var _types = require("./types");
+var _getDateIsInSchedule = require("../../../modules/Schedule/getDateIsInSchedule");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+_dayjs.default.extend(_isSameOrBefore.default);
+_dayjs.default.extend(_isSameOrAfter.default);
+
 /**
  * IndexDB 存储名称
  */
@@ -21,7 +29,7 @@ class QuotationModule extends _BaseModule.BaseModule {
   request;
   store;
   dbManager; // IndexDBManager 实例
-
+  scheduleResolver;
   constructor(name, version) {
     super(name, version);
   }
@@ -90,6 +98,87 @@ class QuotationModule extends _BaseModule.BaseModule {
   getQuotationList() {
     return this.store.quotationList;
   }
+  async loadQuotations(params) {
+    if (Array.isArray(this.store.quotationList) && this.store.quotationList.length > 0) {
+      this.store.quotationList.sort((a, b) => Number(a.sort ?? a.priority ?? 0) - Number(b.sort ?? b.priority ?? 0));
+      return;
+    }
+    const query = {};
+    if (params?.channel) query.channel = params.channel;
+    if (params?.channel === 'online_store') query.channel = 'online-store';
+    const res = await this.request.get('/quotation/available', query, {
+      useCache: false,
+      osServer: true
+    });
+    const list = res?.data?.list || res?.list || [];
+    list.sort((a, b) => Number(a.sort ?? a.priority ?? 0) - Number(b.sort ?? b.priority ?? 0));
+    this.store.quotationList = list;
+    await this.core.effects.emit(_types.QuotationHooks.onQuotationLoaded, this.store.quotationList);
+  }
+  setScheduleResolver(resolver) {
+    this.scheduleResolver = resolver;
+  }
+  getPriceForProduct(params) {
+    return this.getQuotationMatchForProduct(params)?.price ?? null;
+  }
+  getQuotationMatchForProduct(params) {
+    const {
+      productId,
+      variantId,
+      datetime,
+      channel,
+      customer_id
+    } = params;
+    for (const quotation of this.store.quotationList) {
+      if (!this.isQuotationVisibleForChannel(quotation, channel)) continue;
+      if (!this.isQuotationVisibleForCustomer(quotation, customer_id)) continue;
+      if (!this.isQuotationActiveAt(quotation, datetime)) continue;
+      const match = this.findProductData(quotation, productId, variantId);
+      if (!match) continue;
+      const value = match.value ?? match.final_price ?? match.discount_value;
+      if (Number(value) === 0) continue;
+      if (value === undefined || value === null || value === '') continue;
+      return {
+        price: String(value),
+        quotationShelfId: Number(quotation.id) || 0
+      };
+    }
+    return null;
+  }
+  getQuotationShelfId(params) {
+    return this.getQuotationMatchForProduct(params)?.quotationShelfId ?? 0;
+  }
+  getQuotationCustomerScopeInfo() {
+    const customerById = new Map();
+    const quotationScopes = this.store.quotationList.filter(quotation => Array.isArray(quotation?.customer) && quotation.customer.length > 0).map(quotation => {
+      const customerIds = [];
+      const customers = [];
+      const localSeen = new Set();
+      (quotation.customer || []).forEach(customer => {
+        const customerId = this.normalizeCustomerId(customer?.id);
+        if (!customerId || localSeen.has(customerId)) return;
+        localSeen.add(customerId);
+        customerIds.push(customerId);
+        customers.push(customer);
+        if (!customerById.has(customerId)) customerById.set(customerId, customer);
+      });
+      return {
+        quotationId: Number(quotation.id),
+        quotationName: String(quotation.name || ''),
+        customerIds,
+        customers
+      };
+    });
+    const result = {
+      quotationCount: this.store.quotationList.length,
+      hasCustomerScopedQuotations: quotationScopes.length > 0,
+      allQuotationsCustomerScoped: this.store.quotationList.length > 0 && quotationScopes.length === this.store.quotationList.length,
+      customerIds: Array.from(customerById.keys()),
+      customers: Array.from(customerById.values()),
+      quotationScopes
+    };
+    return result;
+  }
   /**
    * 清空缓存
    */
@@ -105,6 +194,61 @@ class QuotationModule extends _BaseModule.BaseModule {
       }
     }
   }
+  normalizeCustomerId(customerId) {
+    if (customerId === undefined || customerId === null || customerId === '') return null;
+    return String(customerId);
+  }
+  hasValidCustomerId(customerId) {
+    if (customerId === undefined || customerId === null || customerId === '') return false;
+    return Number(customerId) > 0;
+  }
+  isQuotationVisibleForCustomer(quotation, customerId) {
+    const customers = quotation.customer || [];
+    if (!Array.isArray(customers) || customers.length === 0) return true;
+    if (!this.hasValidCustomerId(customerId)) return false;
+    return customers.some(customer => String(customer.id) === String(customerId));
+  }
+  isQuotationVisibleForChannel(quotation, channel) {
+    if (!channel) return true;
+    const normalizedChannel = channel === 'online_store' ? 'online-store' : channel;
+    const channels = quotation.channel;
+    if (!Array.isArray(channels) || channels.length === 0) return true;
+    return channels.some(item => String(item) === normalizedChannel);
+  }
+  isQuotationActiveAt(quotation, datetime) {
+    const quotationSchedules = Array.isArray(quotation.schedule) ? quotation.schedule : [];
+    const scheduleIds = Array.isArray(quotation.schedule_ids) ? quotation.schedule_ids : [];
+    if (!quotationSchedules.length && !scheduleIds.length) return false;
+    const scheduleItems = [];
+    quotationSchedules.forEach(schedule => {
+      const full = this.scheduleResolver?.(schedule.id);
+      if (full) {
+        scheduleItems.push(full);
+        return;
+      }
+      if (this.scheduleResolver) return;
+      scheduleItems.push({
+        ...schedule,
+        repeat_type: schedule.repeat_type || 'none',
+        repeat_rule: schedule.repeat_rule || null,
+        time_slot: schedule.time_slot || []
+      });
+    });
+    scheduleIds.forEach(id => {
+      const full = this.scheduleResolver?.(id);
+      if (full) scheduleItems.push(full);
+    });
+    if (!scheduleItems.length) return false;
+    return (0, _getDateIsInSchedule.getDateIsInSchedule)(datetime, scheduleItems);
+  }
+  findProductData(quotation, productId, variantId) {
+    const productData = Array.isArray(quotation.product_data) ? quotation.product_data : Array.isArray(quotation.product_prices) ? quotation.product_prices : [];
+    if (variantId && variantId !== 0) {
+      const variantMatch = productData.find(item => Number(item.product_id) === productId && Number(item.variant_id || 0) === variantId);
+      if (variantMatch) return variantMatch;
+    }
+    return productData.find(item => Number(item.product_id) === productId && Number(item.variant_id || 0) === 0);
+  }
 
   /**
    * 从 IndexDB 加载报价单数据

package/lib/server/modules/resource/index.d.ts

@@ -50,20 +50,19 @@ export declare class ResourceModule extends BaseModule implements Module {
     /**
      * 创建预订
      */
-    createBooking(booking: Partial<ResourceBooking>): ResourceBooking;
     /**
      * 更新预订
      */
-    updateBooking(id: ResourceId, data: Partial<ResourceBooking>): ResourceBooking | undefined;
     /**
      * 删除预订
      */
-    deleteBooking(id: ResourceId): boolean;
     /**
      * 清空缓存
      */
     clear(): Promise<void>;
     private attachBookingsToResource;
+    private normalizeIntegerIdValue;
+    private normalizeResourceIdFields;
     private normalizeResource;
     private safeEmit;
     private syncResourcesMap;

package/lib/server/modules/resource/index.js

@@ -75,7 +75,6 @@ class ResourceModule extends _BaseModule.BaseModule {
       this.logger = app.logger;
     }
     this.initResourceDataSource();
-    this.setupResourceSync();
   }
   logInfo(title, metadata) {
     if (this.logger) {
@@ -96,6 +95,7 @@ class ResourceModule extends _BaseModule.BaseModule {
     }
   }
   async preload() {
+    await this.setupResourceSync();
     const cachedResources = await this.loadResourcesFromSQLite();
     if (cachedResources.length > 0) {
       this.store.list = (0, _lodashEs.cloneDeep)(cachedResources).map(item => this.normalizeResource(item));
@@ -220,56 +220,57 @@ class ResourceModule extends _BaseModule.BaseModule {
   /**
    * 创建预订
    */
-  createBooking(booking) {
-    const id = booking?.id ?? Date.now();
-    const normalized = {
-      id,
-      ...booking
-    };
-    this.store.bookings.push(normalized);
-    const rid = normalized.resource_id ?? normalized.resourceId;
-    if (rid !== undefined) {
-      const existing = this.resourceIdIndex.get(rid) || [];
-      existing.push(normalized);
-      this.resourceIdIndex.set(rid, existing);
-    }
+  // createBooking(booking: Partial<ResourceBooking>): ResourceBooking {
+  //   const id = booking?.id ?? Date.now()
+  //   const normalized: ResourceBooking = {
+  //     id,
+  //     ...booking,
+  //   } as ResourceBooking
+
+  //   this.store.bookings.push(normalized)
+
+  //   const rid = normalized.resource_id ?? normalized.resourceId
+  //   if (rid !== undefined) {
+  //     const existing = this.resourceIdIndex.get(rid) || []
+  //     existing.push(normalized)
+  //     this.resourceIdIndex.set(rid, existing)
+  //   }
 
-    // this.saveBookingsToSQLite(this.store.bookings).catch(() => {})
-    this.safeEmit(_types.ResourceHooks.onBookingsChanged, this.store.bookings);
-    return normalized;
-  }
+  //   this.saveBookingsToSQLite(this.store.bookings).catch(() => {})
+  //   this.safeEmit(ResourceHooks.onBookingsChanged, this.store.bookings)
+  //   return normalized
+  // }
 
   /**
    * 更新预订
    */
-  updateBooking(id, data) {
-    const index = this.store.bookings.findIndex(b => this.getIdKey(b.id) === this.getIdKey(id));
-    if (index === -1) return undefined;
-    const old = this.store.bookings[index];
-    const updated = {
-      ...old,
-      ...data,
-      id: old.id
-    };
-    this.store.bookings[index] = updated;
-    this.rebuildBookingsIndex();
-    // this.saveBookingsToSQLite(this.store.bookings).catch(() => {})
-    this.safeEmit(_types.ResourceHooks.onBookingsChanged, this.store.bookings);
-    return updated;
-  }
+  // updateBooking(id: ResourceId, data: Partial<ResourceBooking>): ResourceBooking | undefined {
+  //   const index = this.store.bookings.findIndex(b => this.getIdKey(b.id) === this.getIdKey(id))
+  //   if (index === -1) return undefined
+
+  //   const old = this.store.bookings[index]
+  //   const updated: ResourceBooking = { ...old, ...data, id: old.id } as ResourceBooking
+  //   this.store.bookings[index] = updated
+
+  //   this.rebuildBookingsIndex()
+  //   this.saveBookingsToSQLite(this.store.bookings).catch(() => {})
+  //   this.safeEmit(ResourceHooks.onBookingsChanged, this.store.bookings)
+  //   return updated
+  // }
 
   /**
    * 删除预订
    */
-  deleteBooking(id) {
-    const index = this.store.bookings.findIndex(b => this.getIdKey(b.id) === this.getIdKey(id));
-    if (index === -1) return false;
-    this.store.bookings.splice(index, 1);
-    this.rebuildBookingsIndex();
-    // this.saveBookingsToSQLite(this.store.bookings).catch(() => {})
-    this.safeEmit(_types.ResourceHooks.onBookingsChanged, this.store.bookings);
-    return true;
-  }
+  // deleteBooking(id: ResourceId): boolean {
+  //   const index = this.store.bookings.findIndex(b => this.getIdKey(b.id) === this.getIdKey(id))
+  //   if (index === -1) return false
+
+  //   this.store.bookings.splice(index, 1)
+  //   this.rebuildBookingsIndex()
+  //   this.saveBookingsToSQLite(this.store.bookings).catch(() => {})
+  //   this.safeEmit(ResourceHooks.onBookingsChanged, this.store.bookings)
+  //   return true
+  // }
 
   /**
    * 清空缓存
@@ -301,11 +302,33 @@ class ResourceModule extends _BaseModule.BaseModule {
       bookings: this.getBookingsByResourceId(resource.id)
     };
   }
+  normalizeIntegerIdValue(value) {
+    if (typeof value !== 'string') return value;
+    const matched = value.match(/^(-?\d+)\.0+$/);
+    if (!matched) return value;
+    return matched[1];
+  }
+  normalizeResourceIdFields(resource) {
+    resource.id = this.normalizeIntegerIdValue(resource.id);
+    if (resource.form_record_id !== undefined) {
+      resource.form_record_id = this.normalizeIntegerIdValue(resource.form_record_id);
+    }
+    if (resource.form_id !== undefined) {
+      resource.form_id = this.normalizeIntegerIdValue(resource.form_id);
+    }
+    if (resource.resource_form_id !== undefined) {
+      resource.resource_form_id = this.normalizeIntegerIdValue(resource.resource_form_id);
+    }
+    if (resource.resource_id !== undefined) {
+      resource.resource_id = this.normalizeIntegerIdValue(resource.resource_id);
+    }
+    return resource;
+  }
   normalizeResource(resource) {
-    const normalized = {
+    const normalized = this.normalizeResourceIdFields({
       ...resource,
-      id: resource?.id ?? resource?.form_record_id ?? ''
-    };
+      id: this.normalizeIntegerIdValue(resource?.id ?? resource?.form_record_id ?? '')
+    });
     if (normalized.form_record_id === undefined && normalized.id !== '') {
       normalized.form_record_id = normalized.id;
     }
@@ -473,6 +496,9 @@ class ResourceModule extends _BaseModule.BaseModule {
     }).catch(() => {
       // 忽略同步初始化异常
     });
+    this.logInfo('setupResourceSync: 资源列表查询结果', {
+      result
+    });
     if (result?.data?.list?.length) {
       await this.mergeResourcesToStore(result?.data?.list);
     }

package/lib/server/modules/resource/types.d.ts

@@ -1,7 +1,7 @@
 /**
  * Resource 模块主键类型
  */
-export type ResourceId = number | string;
+export declare type ResourceId = number | string;
 /**
  * Sales / ScheduleEventResource：预约条目内关联资源（仅 ID 与占用，详情由设备端基准数据解析）
  * @see 统一 Sales 数据协议 3.4.1 resources

package/lib/server/modules/schedule/index.d.ts

@@ -12,6 +12,7 @@ export declare class ScheduleModuleEx extends BaseModule implements Module, Sche
     private store;
     private dbManager;
     private logger;
+    private hasLoadedScheduleList;
     constructor(name?: string, version?: string);
     /**
      * 记录信息日志
@@ -41,6 +42,7 @@ export declare class ScheduleModuleEx extends BaseModule implements Module, Sche
      * 获取所有日程列表
      */
     getScheduleList(): ScheduleItem[];
+    isScheduleListLoaded(): boolean;
     /**
      * 根据 schedule IDs 获取日程数据
      * 使用 Map 快速查询，时间复杂度 O(m)，m 为 ids 数量
@@ -64,15 +66,15 @@ export declare class ScheduleModuleEx extends BaseModule implements Module, Sche
      */
     getDateIsInSchedule(date: string, scheduleList: (ScheduleItem | number)[]): boolean;
     /**
-     * 从 IndexDB 加载日程数据
+     * 从 SQLite 加载日程数据
      * @private
      */
-    private loadScheduleFromIndexDB;
+    private loadScheduleFromSQLite;
     /**
-     * 保存日程数据到 IndexDB
+     * 保存日程数据到 SQLite
      * @private
      */
-    private saveScheduleToIndexDB;
+    private saveScheduleToSQLite;
     /**
      * 预加载模块数据（统一接口）
      * 在模块注册后自动调用