@pisell/pisellos 2.2.148 → 2.2.150

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

@@ -23,7 +23,7 @@ __export(products_exports, {
 });
 module.exports = __toCommonJS(products_exports);
 var import_BaseModule = require("../../../modules/BaseModule");
-var import_plugins = require("../../../plugins");
+var import_Quotation = require("../../../modules/Quotation");
 var import_types = require("./types");
 var import_product = require("../../utils/product");
 var INDEXDB_STORE_NAME = "products";
@@ -137,38 +137,30 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    */
   async loadProductsPrice({
     ids = [],
-    customer_id,
-    schedule_date
+    schedule_date,
+    schedule_datetime,
+    customer_id
   }) {
-    var _a;
     this.logInfo("开始加载商品价格", {
       productCount: ids.length,
       schedule_date,
+      schedule_datetime,
       customer_id
     });
     const startTime = Date.now();
+    const datetime = schedule_datetime || schedule_date;
     try {
-      const productsData = await this.request.post(
-        `/product/query/price`,
-        {
-          ids,
-          customer_id,
-          schedule_date
-        },
-        {
-          cache: {
-            mode: import_plugins.RequestModeENUM.REMOTE_LOCAL,
-            type: "memory"
-          }
-        }
-      );
+      await this.ensureQuotationBridgeReady(customer_id);
+      const idSet = new Set(ids);
+      const products = this.getProductsRef().filter((product) => idSet.has(product.id));
+      const priceData = products.map((product) => this.buildPriceDataFromQuotation(product, datetime, customer_id));
       const duration = Date.now() - startTime;
       this.logInfo("加载商品价格成功", {
         productCount: ids.length,
-        priceDataCount: ((_a = productsData.data) == null ? void 0 : _a.length) ?? 0,
+        priceDataCount: priceData.length,
         duration: `${duration}ms`
       });
-      return productsData.data;
+      return priceData;
     } catch (error) {
       const duration = Date.now() - startTime;
       const errorMessage = error instanceof Error ? error.message : String(error);
@@ -180,6 +172,152 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       return [];
     }
   }
+  /**
+   * 设置报价单价格桥接器。
+   * Server 层负责传入完整 schedule 模块，Products 只负责把报价单计算结果转成价格响应形状。
+   */
+  async setupQuotationPriceBridge(params) {
+    var _a, _b, _c;
+    if (!this.core) {
+      this.logWarning("setupQuotationPriceBridge: core 尚未初始化");
+      return;
+    }
+    const channel = params.channel || ((_a = this.otherParams) == null ? void 0 : _a.channel);
+    this.quotationBridgeChannel = channel;
+    if (!this.quotationPriceBridge) {
+      const quotation = new import_Quotation.QuotationModule(`${this.name}_quotation_price_bridge`);
+      await quotation.initialize(this.core, {});
+      this.quotationPriceBridge = quotation;
+    }
+    if (params.scheduleModule) {
+      const scheduleList = ((_c = (_b = params.scheduleModule).getScheduleList) == null ? void 0 : _c.call(_b)) || [];
+      const scheduleMap = new Map(
+        scheduleList.map((schedule) => [schedule.id, schedule])
+      );
+      this.quotationPriceBridge.setScheduleResolver((id) => {
+        var _a2, _b2;
+        if (scheduleMap.has(id))
+          return scheduleMap.get(id);
+        const schedules = ((_b2 = (_a2 = params.scheduleModule).getScheduleByIds) == null ? void 0 : _b2.call(_a2, [id])) || [];
+        return schedules[0];
+      });
+    }
+    await this.refreshQuotationPriceBridge({ customer_id: params.customer_id });
+  }
+  /**
+   * 刷新桥接器内的报价单列表。
+   */
+  async refreshQuotationPriceBridge(params) {
+    if (!this.quotationPriceBridge)
+      return;
+    const customerId = params && "customer_id" in params ? params.customer_id : this.quotationBridgeCustomerId;
+    const refreshKey = this.getQuotationBridgeScopeKey(customerId);
+    if (this.quotationBridgeRefreshPromise && this.quotationBridgeRefreshKey === refreshKey) {
+      await this.quotationBridgeRefreshPromise;
+      return;
+    }
+    if (this.quotationBridgeRefreshPromise) {
+      await this.quotationBridgeRefreshPromise;
+    }
+    this.quotationBridgeRefreshKey = refreshKey;
+    this.quotationBridgeRefreshPromise = this.quotationPriceBridge.loadQuotations({
+      channel: this.quotationBridgeChannel,
+      customer_id: customerId
+    }).then(() => {
+      this.quotationBridgeCustomerId = customerId;
+    }).finally(() => {
+      this.quotationBridgeRefreshPromise = void 0;
+      this.quotationBridgeRefreshKey = void 0;
+    });
+    await this.quotationBridgeRefreshPromise;
+  }
+  async ensureQuotationBridgeReady(customerId) {
+    var _a;
+    if (!this.quotationPriceBridge) {
+      await this.setupQuotationPriceBridge({
+        channel: (_a = this.otherParams) == null ? void 0 : _a.channel,
+        customer_id: customerId
+      });
+      return;
+    }
+    if (this.quotationBridgeRefreshPromise) {
+      await this.quotationBridgeRefreshPromise;
+    }
+    if (this.getQuotationBridgeScopeKey(customerId) !== this.getQuotationBridgeScopeKey(this.quotationBridgeCustomerId)) {
+      await this.refreshQuotationPriceBridge({ customer_id: customerId });
+    }
+  }
+  getQuotationBridgeScopeKey(customerId) {
+    return `${this.quotationBridgeChannel || ""}:${customerId ?? ""}`;
+  }
+  buildPriceDataFromQuotation(product, datetime, customerId) {
+    var _a;
+    const quotedPrice = (_a = this.quotationPriceBridge) == null ? void 0 : _a.getPriceForProduct({
+      productId: product.id,
+      datetime,
+      customer_id: customerId
+    });
+    const productPrice = quotedPrice ?? product.price;
+    return {
+      id: product.id,
+      price: String(productPrice ?? 0),
+      base_price: String(product.base_price ?? product.price ?? 0),
+      variant: this.buildVariantPriceData(product, datetime, customerId),
+      bundle_group: this.buildBundleGroupPriceData(product, datetime, customerId)
+    };
+  }
+  buildVariantPriceData(product, datetime, customerId) {
+    if (!Array.isArray(product.variant))
+      return [];
+    return product.variant.map((variant) => {
+      var _a;
+      const quotedPrice = (_a = this.quotationPriceBridge) == null ? void 0 : _a.getPriceForProduct({
+        productId: product.id,
+        variantId: Number(variant.id),
+        datetime,
+        customer_id: customerId
+      });
+      const price = quotedPrice ?? variant.price ?? product.price ?? 0;
+      const basePrice = variant.base_price ?? variant.price ?? product.base_price ?? product.price ?? 0;
+      return {
+        id: Number(variant.id),
+        product_id: Number(variant.product_id ?? product.id),
+        base_price: Number(basePrice),
+        price: Number(price)
+      };
+    });
+  }
+  buildBundleGroupPriceData(product, datetime, customerId) {
+    if (!Array.isArray(product.bundle_group))
+      return [];
+    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({
+          productId: bundleProductId,
+          variantId: bundleVariantId,
+          datetime,
+          customer_id: customerId
+        });
+        const price = quotedPrice ?? item.price ?? 0;
+        const basePrice = item.base_price ?? item.price ?? 0;
+        return {
+          id: Number(item.id),
+          product_id: Number(item.product_id ?? product.id),
+          group_id: Number(item.group_id ?? group.id),
+          bundle_product_id: bundleProductId,
+          bundle_variant_id: bundleVariantId,
+          price: Number(price),
+          base_price: basePrice,
+          price_type: item.price_type,
+          price_type_ext: item.price_type_ext
+        };
+      })
+    }));
+  }
   /**
    * 获取应用了价格的商品列表（带缓存）
    * 使用日期作为缓存 key，同一天的商品价格会被缓存
@@ -192,7 +330,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    */
   async getProductsWithPrice(schedule_date, extraContext, options) {
     const t0 = performance.now();
-    const cacheKey = schedule_date;
+    const cacheKey = this.getProductsPriceCacheKey(schedule_date, extraContext);
     const changedIds = options == null ? void 0 : options.changedIds;
     if (this.productsPriceCache.has(cacheKey)) {
       const cachedProducts = this.productsPriceCache.get(cacheKey);
@@ -313,12 +451,16 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       const tPrice = performance.now();
       const priceData = await this.loadProductsPrice({
         ids,
-        schedule_date
+        schedule_date,
+        schedule_datetime: extraContext == null ? void 0 : extraContext.schedule_datetime,
+        customer_id: extraContext == null ? void 0 : extraContext.customer_id
       });
       (0, import_product.perfMark)("prepareProducts.loadPrice", performance.now() - tPrice, { count: ids.length });
       this.logInfo("获取商品报价单价格成功", { priceDataCount: (priceData == null ? void 0 : priceData.length) ?? 0 });
       const context = {
         schedule_date,
+        schedule_datetime: extraContext == null ? void 0 : extraContext.schedule_datetime,
+        customer_id: extraContext == null ? void 0 : extraContext.customer_id,
         priceData,
         locale: (_b = (_a = this.core) == null ? void 0 : _a.context) == null ? void 0 : _b.locale,
         ...extraContext
@@ -357,6 +499,10 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     }
     return [];
   }
+  getProductsPriceCacheKey(schedule_date, extraContext) {
+    const datetime = (extraContext == null ? void 0 : extraContext.schedule_datetime) || schedule_date;
+    return `${datetime}:customer:${(extraContext == null ? void 0 : extraContext.customer_id) ?? ""}`;
+  }
   /**
    * 应用所有已注册的格式化器
    * @param products 商品列表
@@ -1021,6 +1167,12 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       return;
     }
     if (shouldClearPriceCache) {
+      try {
+        await this.refreshQuotationPriceBridge();
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        this.logError("报价单桥接刷新失败，将继续清理价格缓存", { error: errorMessage });
+      }
       this.clearPriceCache();
     }
     await this.core.effects.emit(import_types.ProductsHooks.onProductsSyncCompleted, {

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

@@ -23,7 +23,8 @@ export interface FormattedProductData extends ProductData {
 export interface LoadProductsPriceParams {
     ids: number[];
     schedule_date: string;
-    customer_id?: number;
+    schedule_datetime?: string;
+    customer_id?: number | string;
 }
 /**
  * 加载报价单商品价格返回数据
@@ -47,6 +48,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;
         }[];
@@ -107,6 +109,8 @@ export interface ProductSyncMessage {
  */
 export interface ProductFormatterContext {
     schedule_date: string;
+    schedule_datetime?: string;
+    customer_id?: number | string;
     priceData?: LoadProductsPriceData[];
     scheduleModule?: any;
     locale?: string;

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

@@ -0,0 +1,175 @@
+import { Module, ModuleOptions, PisellCore } from '../../types';
+import { BaseModule } from '../../modules/BaseModule';
+import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesScanCodeResult } from './types';
+import { OrderModule } from '../../modules/Order';
+import type { AddProductBookingInput, LoadSalesDetailParams, OrderPaymentData, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateProductInOrderParams } from '../../modules/Order/types';
+import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
+import type { Discount } from '../../modules/Discount/types';
+import { RequestPlugin, WindowPlugin } from '../../plugins';
+export * from './types';
+import { ProductList } from '../../modules/ProductList';
+import type { SalesSummaryModule } from '../../modules/SalesSummary';
+import type { ScheduleModule } from '../../modules/Schedule';
+import type { ISalesDetail, ISalesDetailHeader, ISalesBooking, ISalesPayment, ISalesSurcharge } from './utils/parseSalesResponse';
+export interface BaseSalesState {
+    order?: OrderModule;
+    products?: ProductList;
+    salesSummary?: SalesSummaryModule;
+    schedule?: ScheduleModule;
+}
+export declare class BaseSalesImpl extends BaseModule implements Module {
+    protected defaultName: string;
+    protected defaultVersion: string;
+    isSolution: boolean;
+    protected initializeOptions: ModuleOptions;
+    protected store: BaseSalesState;
+    protected otherParams: Record<string, any>;
+    protected cacheId: string | undefined;
+    /**
+     * window / request 暴露为 public：现存外部工具（如 BookingTicket Scan）通过
+     * `solution.window` / `solution.request` 直接访问插件，保持原有契约不破坏。
+     */
+    window: WindowPlugin;
+    request: RequestPlugin;
+    protected currentSalesDetail: ISalesDetail | null;
+    constructor(name?: string, version?: string);
+    /**
+     * 子类可覆盖此方法以追加/收敛要注册的子模块。
+     * 默认包含通用销售模块：products / order / salesSummary / schedule。
+     */
+    protected getRegisteredModuleNames(): readonly string[];
+    /**
+     * 工厂入口：根据子模块名实例化对应模块。
+     * 默认使用 BookingByStep 公共 `createModule`。子类若需引入额外类型（如 customer），
+     * 可覆盖此方法并把未识别的 name 委托给 `super.createSubModule(name)`。
+     */
+    protected createSubModule(moduleName: string): Module | null;
+    /**
+     * 读取 sessionStorage[this.name][cacheId]，作为子模块 initialState 的来源。
+     * sessionStorage 损坏时静默忽略，按空状态注册。
+     */
+    protected readSessionCacheData(): Record<string, any>;
+    initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
+    destroy(): Promise<void>;
+    /**
+     * 加载销售订单到统一 tempOrder 工作区。
+     * 有 app.sqlite 时优先读取本地记录；本地未命中或 forceRemote=true 时再拉云端。
+     *
+     * 子类可在 `super.loadSalesDetail` 之后基于返回的 `sales` 做业务侧装配
+     * （比如把 `sales.customer` 写入 CustomerModule、emit 业务 hook 等）。
+     */
+    loadSalesDetail(orderIdOrParams: number | string | LoadSalesDetailParams): Promise<ISalesDetail>;
+    /** 获取当前已加载的销售详情（只读快照）。未加载过则返回 null。 */
+    getSalesOrder(): ISalesDetail | null;
+    /** 获取销售详情顶部业务字段（订单号/状态/金额等通用字段集合）。 */
+    getOrderHeader(): ISalesDetailHeader | null;
+    /** 获取所有 booking（含 root + children），按服务端原始顺序输出。 */
+    getBookings(): ISalesBooking[];
+    /** 获取根 booking（is_next === 0 / is_root === 1），多个时取第一个。 */
+    getRootBooking(): ISalesBooking | null;
+    /** 按 product_uid 反查 booking 列表（用于商品行 ↔ booking 映射）。 */
+    getChildBookingsByProductUid(productUid: string): ISalesBooking[];
+    /** 获取支付列表（已支付/退款等明细）。 */
+    getPayments(): ISalesPayment[];
+    /** 获取附加费用（运费/服务费/税费等）。 */
+    getSurcharges(): ISalesSurcharge[];
+    getTempOrder(): import("../../modules/Order/types").OrderTempOrder | null;
+    getOrderIdentity(): import("../../modules/Order/types").OrderIdentitySnapshot | null;
+    getOrderSnapshot(): import("../../modules/Order/types").OrderSnapshot | null;
+    getOrderSyncState(): import("../../modules/Order/types").OrderSyncState;
+    getOrderAmountSnapshot(): import("../../modules/Order/types").OrderAmountSnapshot | null;
+    getTempOrderNote(): string;
+    updateTempOrderNote(note: string): string;
+    updateOrderShopDiscount(amount: string | number): string;
+    private ensureTempOrder;
+    addNewOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
+    saveDraft(): Promise<void>;
+    restoreOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
+    getOrderProducts(): import("../../modules/Order/types").OrderProduct[];
+    getSummary(): Promise<import("../../modules/Order/types").OrderSummary>;
+    getDiscountList(): Discount[];
+    scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
+    setDiscountSelected(params: {
+        discountId: number;
+        isSelected: boolean;
+    }): Promise<void>;
+    submitScanOrder<T = any>(params?: {
+        payments?: OrderPaymentSource[];
+        paymentStatus?: BaseSalesPaymentStatus;
+        smallTicketDataFlag?: number;
+        enhancePayload?: SubmitPayloadEnhancer;
+    }): Promise<T>;
+    /**
+     * 提交当前 Sales 订单。
+     *
+     * PaymentModal 场景通过 smallTicketDataFlag=1 请求 B 端小票数据；
+     * payments 会交给 OrderModule 统一映射为 Sales 协议支付项。
+     */
+    submitSalesOrder<T = any>(params?: {
+        payments?: OrderPaymentSource[];
+        paymentStatus?: BaseSalesPaymentStatus;
+        smallTicketDataFlag?: number;
+        enhancePayload?: SubmitPayloadEnhancer;
+    }): Promise<T>;
+    syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
+    /** 读取当前 BaseSales 订单上下文中的 Sales 协议支付项。 */
+    getOrderPayments(): OrderPaymentData[];
+    /** 覆盖当前订单支付项，内部由 OrderModule 清洗为 Sales 协议字段。 */
+    setOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
+    /** 追加单个支付项到当前订单。 */
+    addOrderPayment(payment: OrderPaymentSource): OrderPaymentData[];
+    /** 更新当前订单中的指定支付项。 */
+    updateOrderPayment(paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>): OrderPaymentData[];
+    /** 删除当前订单中的指定支付项。 */
+    deleteOrderPayment(paymentIdentity: string | number): OrderPaymentData[];
+    /** 覆盖 wallet pass 支付项，同时保留普通支付项。 */
+    updateVoucherOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
+    /**
+     * 更新当前订单客户字段。
+     *
+     * 这是 PaymentModal 客户切换的订单事实入口；外部客户模块同步应由
+     * 调用方通过 onCustomerChange 回调完成。
+     */
+    updateOrderCustomer(customer: UpdateTempOrderCustomerInput): {
+        customerId: number | null;
+        customerName: string;
+        phone: string;
+        email: string;
+    };
+    /** 获取可用支付方式列表，供 PaymentModal 渲染支付选项。 */
+    getPaymentMethodsAsync(): Promise<any[]>;
+    /** 轻量舍入能力，供现金支付 UI 计算 rounding_amount。 */
+    roundAmount(params: {
+        amount: string | number;
+        interval?: string | number;
+        rule?: 'standard_rounding' | 'standard_down' | 'always_up' | 'always_down' | string;
+    }): {
+        originalAmount: string;
+        roundedAmount: string;
+        roundingDifference: string;
+    };
+    /**
+     * 发送支付链接。
+     *
+     * 如果没有 orderIds 或显式 submitBeforeSend，会先提交当前本地订单到云端；
+     * 只有成功拿到远端 order_id 后才调用 OrderModule 发送邮件。
+     */
+    sendCustomerPayLink<T = any>(params: Omit<SendCustomerPayLinkParams, 'orderIds' | 'order_ids'> & {
+        orderIds?: Array<number | string>;
+        order_ids?: Array<number | string>;
+        submitBeforeSend?: boolean;
+    }): Promise<T>;
+    addProductToOrder(product: Partial<BaseSalesOrderProduct> & BaseSalesOrderProductIdentity, booking?: AddProductBookingInput): Promise<import("../../modules/Order/types").OrderProduct[]>;
+    updateProductInOrder(params: UpdateProductInOrderParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
+    /**
+     * 设置单行商品备注（与整单 `updateTempOrderNote` 区分）。
+     * 多行同 SKU 时必须传入与删除/更新一致的 unique_identification_number。
+     */
+    setOrderProductLineNote(identity: BaseSalesOrderProductIdentity, note: string): Promise<import("../../modules/Order/types").OrderProduct[]>;
+    removeProductFromOrder(identity: BaseSalesOrderProductIdentity): Promise<import("../../modules/Order/types").OrderProduct[]>;
+    getProductList(): Promise<any>;
+    getOtherParams(): Record<string, any>;
+    setOtherParams(params: Record<string, any>, { cover }?: {
+        cover?: boolean;
+    }): Promise<void>;
+}