@pisell/pisellos 2.2.252 → 2.2.254

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

@@ -46,6 +46,9 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     // 是否已注册内置价格格式化器
     this.isPriceFormatterRegistered = false;
     this.quotationBridgeLoadedKey = "";
+    this.quotationScheduleCache = /* @__PURE__ */ new Map();
+    this.quotationScheduleCacheSource = null;
+    this.quotationScheduleCacheLoaded = false;
     this.pendingSyncMessages = [];
     /** 最近一次 SSE 全量拉取完成时间 */
     this.lastServerFullFetchAtMs = 0;
@@ -198,25 +201,30 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       this.quotationPriceBridge = quotation;
     }
     if (params.scheduleModule) {
-      const scheduleCache = /* @__PURE__ */ new Map();
-      let hasLoadedScheduleList = false;
+      if (this.quotationScheduleCacheSource !== params.scheduleModule) {
+        this.quotationScheduleCache.clear();
+        this.quotationScheduleCacheLoaded = false;
+        this.quotationScheduleCacheSource = params.scheduleModule;
+      }
       this.quotationPriceBridge.setScheduleResolver((id) => {
         var _a2, _b, _c, _d, _e, _f;
         const scheduleId = String(id);
-        if (scheduleCache.has(scheduleId))
-          return scheduleCache.get(scheduleId);
-        if (!hasLoadedScheduleList) {
+        if (this.quotationScheduleCache.has(scheduleId)) {
+          return this.quotationScheduleCache.get(scheduleId);
+        }
+        if (!this.quotationScheduleCacheLoaded) {
           const scheduleList = ((_b = (_a2 = params.scheduleModule).getScheduleList) == null ? void 0 : _b.call(_a2)) || [];
           for (const schedule of scheduleList) {
-            scheduleCache.set(String(schedule.id), schedule);
+            this.quotationScheduleCache.set(String(schedule.id), schedule);
           }
-          hasLoadedScheduleList = true;
+          this.quotationScheduleCacheLoaded = true;
+        }
+        if (this.quotationScheduleCache.has(scheduleId)) {
+          return this.quotationScheduleCache.get(scheduleId);
         }
-        if (scheduleCache.has(scheduleId))
-          return scheduleCache.get(scheduleId);
         const schedules = ((_d = (_c = params.scheduleModule).getScheduleListByIds) == null ? void 0 : _d.call(_c, [id])) || ((_f = (_e = params.scheduleModule).getScheduleByIds) == null ? void 0 : _f.call(_e, [id])) || [];
         if (schedules[0])
-          scheduleCache.set(scheduleId, schedules[0]);
+          this.quotationScheduleCache.set(scheduleId, schedules[0]);
         return schedules[0];
       });
     }
@@ -266,12 +274,30 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
   getQuotationBridgeScopeKey() {
     return this.quotationBridgeChannel || "";
   }
-  buildPriceDataFromQuotation(product, datetime, customerId) {
+  getQuotedPrice(params) {
     var _a;
-    const quotedPrice = (_a = this.quotationPriceBridge) == null ? void 0 : _a.getPriceForProduct({
+    const quotation = this.quotationPriceBridge;
+    if (!quotation)
+      return null;
+    const query = {
+      productId: params.productId,
+      variantId: params.variantId,
+      datetime: params.datetime,
+      customer_id: params.customerId
+    };
+    if (typeof quotation.getQuotationMatchForProduct === "function") {
+      return ((_a = quotation.getQuotationMatchForProduct(query)) == null ? void 0 : _a.price) ?? null;
+    }
+    if (typeof quotation.getPriceForProduct === "function") {
+      return quotation.getPriceForProduct(query);
+    }
+    return null;
+  }
+  buildPriceDataFromQuotation(product, datetime, customerId) {
+    const quotedPrice = this.getQuotedPrice({
       productId: product.id,
       datetime,
-      customer_id: customerId
+      customerId
     });
     const productPrice = quotedPrice ?? product.price;
     const productBasePrice = quotedPrice ?? product.base_price ?? product.price ?? 0;
@@ -287,12 +313,11 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     if (!Array.isArray(product.variant))
       return [];
     return product.variant.map((variant) => {
-      var _a;
-      const quotedPrice = (_a = this.quotationPriceBridge) == null ? void 0 : _a.getPriceForProduct({
+      const quotedPrice = this.getQuotedPrice({
         productId: product.id,
         variantId: Number(variant.id),
         datetime,
-        customer_id: customerId
+        customerId
       });
       const price = quotedPrice ?? variant.price ?? product.price ?? 0;
       const basePrice = quotedPrice ?? variant.base_price ?? variant.price ?? product.base_price ?? product.price ?? 0;
@@ -310,14 +335,13 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     return product.bundle_group.map((group) => ({
       id: Number(group.id),
       bundle_item: (group.bundle_item || []).map((item) => {
-        var _a;
         const bundleProductId = Number(item.bundle_product_id);
         const bundleVariantId = Number(item.bundle_variant_id || 0);
-        const quotedPrice = (_a = this.quotationPriceBridge) == null ? void 0 : _a.getPriceForProduct({
+        const quotedPrice = this.getQuotedPrice({
           productId: bundleProductId,
           variantId: bundleVariantId,
           datetime,
-          customer_id: customerId
+          customerId
         });
         const price = quotedPrice ?? item.price ?? 0;
         const basePrice = quotedPrice ?? item.base_price ?? item.price ?? 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

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/server/modules/quotation/index.ts
@@ -23,11 +33,16 @@ __export(quotation_exports, {
 });
 module.exports = __toCommonJS(quotation_exports);
 var import_lodash_es = require("lodash-es");
+var import_dayjs = __toESM(require("dayjs"));
+var import_isSameOrBefore = __toESM(require("dayjs/plugin/isSameOrBefore"));
+var import_isSameOrAfter = __toESM(require("dayjs/plugin/isSameOrAfter"));
 var import_BaseModule = require("../../../modules/BaseModule");
 var import_types = require("./types");
+var import_getDateIsInSchedule = require("../../../modules/Schedule/getDateIsInSchedule");
+import_dayjs.default.extend(import_isSameOrBefore.default);
+import_dayjs.default.extend(import_isSameOrAfter.default);
 var INDEXDB_STORE_NAME = "quotation";
 var QuotationModule = class extends import_BaseModule.BaseModule {
-  // IndexDBManager 实例
   constructor(name, version) {
     super(name, version);
     this.defaultName = "quotation";
@@ -95,6 +110,97 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
   getQuotationList() {
     return this.store.quotationList;
   }
+  async loadQuotations(params) {
+    var _a;
+    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 == null ? void 0 : params.channel)
+      query.channel = params.channel;
+    if ((params == null ? void 0 : params.channel) === "online_store")
+      query.channel = "online-store";
+    const res = await this.request.get(
+      "/quotation/available",
+      query,
+      { useCache: false, osServer: true }
+    );
+    const list = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || (res == null ? void 0 : 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(import_types.QuotationHooks.onQuotationLoaded, this.store.quotationList);
+  }
+  setScheduleResolver(resolver) {
+    this.scheduleResolver = resolver;
+  }
+  getPriceForProduct(params) {
+    var _a;
+    return ((_a = this.getQuotationMatchForProduct(params)) == null ? void 0 : _a.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 === void 0 || value === null || value === "")
+        continue;
+      return {
+        price: String(value),
+        quotationShelfId: Number(quotation.id) || 0
+      };
+    }
+    return null;
+  }
+  getQuotationShelfId(params) {
+    var _a;
+    return ((_a = this.getQuotationMatchForProduct(params)) == null ? void 0 : _a.quotationShelfId) ?? 0;
+  }
+  getQuotationCustomerScopeInfo() {
+    const customerById = /* @__PURE__ */ new Map();
+    const quotationScopes = this.store.quotationList.filter((quotation) => Array.isArray(quotation == null ? void 0 : quotation.customer) && quotation.customer.length > 0).map((quotation) => {
+      const customerIds = [];
+      const customers = [];
+      const localSeen = /* @__PURE__ */ new Set();
+      (quotation.customer || []).forEach((customer) => {
+        const customerId = this.normalizeCustomerId(customer == null ? void 0 : 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;
+  }
   /**
    * 清空缓存
    */
@@ -110,6 +216,78 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
     }
     console.log("[Quotation] 缓存已清空");
   }
+  normalizeCustomerId(customerId) {
+    if (customerId === void 0 || customerId === null || customerId === "")
+      return null;
+    return String(customerId);
+  }
+  hasValidCustomerId(customerId) {
+    if (customerId === void 0 || 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) => {
+      var _a;
+      const full = (_a = this.scheduleResolver) == null ? void 0 : _a.call(this, 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) => {
+      var _a;
+      const full = (_a = this.scheduleResolver) == null ? void 0 : _a.call(this, id);
+      if (full)
+        scheduleItems.push(full);
+    });
+    if (!scheduleItems.length)
+      return false;
+    return (0, import_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 加载报价单数据
    * @private

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 数量

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

@@ -42,12 +42,13 @@ import_dayjs.default.extend(import_isSameOrBefore.default);
 import_dayjs.default.extend(import_isSameOrAfter.default);
 var SCHEDULE_STORE_NAME = "schedule";
 var ScheduleModuleEx = class extends import_BaseModule.BaseModule {
-  // LoggerManager 实例
   constructor(name, version) {
     super(name, version);
     this.defaultName = "schedule";
     this.defaultVersion = "1.1.0";
     this.store = {};
+    // LoggerManager 实例
+    this.hasLoadedScheduleList = false;
   }
   /**
    * 记录信息日志
@@ -110,9 +111,11 @@ var ScheduleModuleEx = class extends import_BaseModule.BaseModule {
     if (options.initialState) {
       this.store.scheduleList = options.initialState.scheduleList;
       this.syncScheduleMap();
+      this.hasLoadedScheduleList = Array.isArray(options.initialState.scheduleList);
     } else {
       this.store.scheduleList = [];
       this.store.map = /* @__PURE__ */ new Map();
+      this.hasLoadedScheduleList = false;
     }
     const appPlugin = core.getPlugin("app");
     if (appPlugin) {
@@ -165,6 +168,7 @@ var ScheduleModuleEx = class extends import_BaseModule.BaseModule {
   }
   setScheduleList(list) {
     this.store.scheduleList = list;
+    this.hasLoadedScheduleList = true;
     this.syncScheduleMap();
   }
   /**
@@ -173,6 +177,9 @@ var ScheduleModuleEx = class extends import_BaseModule.BaseModule {
   getScheduleList() {
     return this.store.scheduleList;
   }
+  isScheduleListLoaded() {
+    return this.hasLoadedScheduleList;
+  }
   /**
    * 根据 schedule IDs 获取日程数据
    * 使用 Map 快速查询，时间复杂度 O(m)，m 为 ids 数量

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

@@ -1,6 +1,6 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
-import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesUpdateOrderProductQuantityParams, BaseSalesCalculateProductBookingPriceParams, BaseSalesProductBookingPriceResult, BaseSalesScanCodeResult } from './types';
+import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesUpdateOrderProductQuantityParams, BaseSalesCalculateProductBookingPriceParams, BaseSalesPriceRecalculationContextChange, BaseSalesProductBookingPriceResult, BaseSalesQuotationCustomerScopeInfo, BaseSalesScanCodeResult } from './types';
 import { OrderModule } from '../../modules/Order';
 import type { AddProductBookingInput, LoadSalesDetailParams, OrderPaymentData, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions } from '../../modules/Order/types';
 import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
@@ -44,6 +44,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     protected currentSalesDetail: ISalesDetail | null;
     protected discountConfigCacheKey: string | null;
     protected hasManualDiscountSelection: boolean;
+    private readonly reusedSharedSubModuleNames;
     private paymentMethodsCache;
     constructor(name?: string, version?: string);
     /**
@@ -51,6 +52,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * 默认包含通用销售模块：products / order / salesSummary / schedule / payment / quotation。
      */
     protected getRegisteredModuleNames(): readonly string[];
+    private getReusableSharedSubModule;
+    private isScheduleListLoaded;
     /**
      * 记录信息日志
      */
@@ -66,10 +69,12 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private hydrateOrderPaymentNames;
     get payment(): PaymentModule | undefined;
     private getCurrentOrderCustomerId;
+    private normalizePriceContextCustomerId;
     private applyQuotationScheduleResolver;
     private loadQuotationForPriceQuery;
     private getPriceQueryProductId;
     private getPriceQuerySchedule;
+    private loadProductsForPriceQuery;
     private loadProductForPriceQuery;
     private getAuthoritativeBundleItems;
     private findAuthoritativeBundleItem;
@@ -268,8 +273,12 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     }): Promise<T>;
     transformBaseProductToOrderProduct(params: TransformBaseProductToOrderProductParams): import("./utils/transformBaseProductToOrderProduct").BaseProductOrderProductInput | null;
     calculateProductBookingPrice(params: BaseSalesCalculateProductBookingPriceParams): Promise<BaseSalesProductBookingPriceResult>;
+    getQuotationCustomerScopeInfo(): BaseSalesQuotationCustomerScopeInfo;
+    shouldRecalculateProductBookingPricesForContextChange(params: BaseSalesPriceRecalculationContextChange): boolean;
+    calculateProductBookingPrices(paramsList: BaseSalesCalculateProductBookingPriceParams[]): Promise<BaseSalesProductBookingPriceResult[]>;
     addProductToOrder(product: Partial<BaseSalesOrderProduct> & BaseSalesOrderProductIdentity, booking?: AddProductBookingInput): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderProduct(params: UpdateOrderProductParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
+    updateOrderProducts(paramsList: UpdateOrderProductParams[]): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderProductQuantity(params: BaseSalesUpdateOrderProductQuantityParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderBooking(params: UpdateOrderBookingParams): any[];
     /**