@pisell/pisellos 2.3.1 → 2.3.2

package/lib/solution/BaseSales/index.js

@@ -154,6 +154,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     this.currentSalesDetail = null;
     this.discountConfigCacheKey = null;
     this.hasManualDiscountSelection = false;
+    this.reusedSharedSubModuleNames = /* @__PURE__ */ new Set();
     this.paymentMethodsCache = [];
   }
   /**
@@ -163,6 +164,23 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   getRegisteredModuleNames() {
     return ["products", "order", "salesSummary", "schedule", "payment", "quotation"];
   }
+  getReusableSharedSubModule(moduleName) {
+    var _a;
+    if (moduleName !== "schedule" && moduleName !== "quotation")
+      return null;
+    return ((_a = this.core) == null ? void 0 : _a.getModule(moduleName)) || null;
+  }
+  isScheduleListLoaded(scheduleModule) {
+    if (!scheduleModule)
+      return false;
+    if (typeof scheduleModule.isScheduleListLoaded === "function") {
+      return scheduleModule.isScheduleListLoaded();
+    }
+    if (typeof scheduleModule.getScheduleList === "function") {
+      return Array.isArray(scheduleModule.getScheduleList());
+    }
+    return false;
+  }
   /**
    * 记录信息日志
    */
@@ -242,13 +260,32 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       return void 0;
     return customerId;
   }
+  normalizePriceContextCustomerId(customerId) {
+    if (customerId === void 0 || customerId === null || customerId === "")
+      return null;
+    return String(customerId);
+  }
   applyQuotationScheduleResolver(quotation) {
     const scheduleModule = this.store.schedule;
     if (!scheduleModule)
       return;
+    const scheduleById = /* @__PURE__ */ new Map();
+    const scheduleList = typeof scheduleModule.getScheduleList === "function" ? scheduleModule.getScheduleList() : [];
+    if (Array.isArray(scheduleList)) {
+      scheduleList.forEach((schedule) => {
+        if ((schedule == null ? void 0 : schedule.id) !== void 0 && (schedule == null ? void 0 : schedule.id) !== null) {
+          scheduleById.set(String(schedule.id), schedule);
+        }
+      });
+    }
     quotation.setScheduleResolver((id) => {
-      var _a;
-      const schedules = ((_a = scheduleModule.getScheduleListByIds) == null ? void 0 : _a.call(scheduleModule, [id])) || [];
+      var _a, _b;
+      const scheduleId = String(id);
+      if (scheduleById.has(scheduleId))
+        return scheduleById.get(scheduleId);
+      const schedules = ((_a = scheduleModule.getScheduleListByIds) == null ? void 0 : _a.call(scheduleModule, [id])) || ((_b = scheduleModule.getScheduleByIds) == null ? void 0 : _b.call(scheduleModule, [id])) || [];
+      if (schedules[0])
+        scheduleById.set(scheduleId, schedules[0]);
       return schedules[0];
     });
   }
@@ -294,24 +331,25 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       schedule_datetime: now.format("YYYY-MM-DD HH:mm:ss")
     };
   }
-  async loadProductForPriceQuery(params, customerId) {
+  async loadProductsForPriceQuery(params) {
     var _a, _b;
-    const product = params.product || {};
-    const productId = this.getPriceQueryProductId(product);
-    if (productId === null || !this.request)
-      return null;
-    const schedule = this.getPriceQuerySchedule(params);
+    const ids = Array.from(new Set(
+      params.ids.filter((id) => Number.isFinite(id))
+    ));
+    const productsById = /* @__PURE__ */ new Map();
+    if (!ids.length || !this.request)
+      return productsById;
     try {
       const response = await this.request.post("/product/query", {
-        ids: [productId],
+        ids,
         open_quotation: 1,
         open_bundle: 1,
         status: "published",
         num: 1,
         skip: 1,
-        customer_id: customerId,
-        schedule_date: schedule.schedule_date,
-        schedule_datetime: schedule.schedule_datetime,
+        customer_id: params.customerId,
+        schedule_date: params.schedule.schedule_date,
+        schedule_datetime: params.schedule.schedule_datetime,
         application_code: params.channel || ((_a = this.otherParams) == null ? void 0 : _a.channel)
       }, {
         osServer: true,
@@ -320,16 +358,35 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       });
       const list = ((_b = response == null ? void 0 : response.data) == null ? void 0 : _b.list) || (response == null ? void 0 : response.list) || [];
       if (!Array.isArray(list))
-        return null;
-      return list.find((item) => Number((item == null ? void 0 : item.id) ?? (item == null ? void 0 : item.product_id)) === productId) || null;
+        return productsById;
+      list.forEach((item) => {
+        const productId = Number((item == null ? void 0 : item.id) ?? (item == null ? void 0 : item.product_id));
+        if (Number.isFinite(productId))
+          productsById.set(productId, item);
+      });
+      return productsById;
     } catch (error) {
-      this.logWarning("loadProductForPriceQuery: 商品重查失败，使用入参 fallback", {
-        productId,
+      this.logWarning("loadProductsForPriceQuery: 商品批量重查失败，使用入参 fallback", {
+        ids,
         error: error instanceof Error ? error.message : String(error)
       });
-      return null;
+      return productsById;
     }
   }
+  async loadProductForPriceQuery(params, customerId) {
+    const product = params.product || {};
+    const productId = this.getPriceQueryProductId(product);
+    if (productId === null || !this.request)
+      return null;
+    const schedule = this.getPriceQuerySchedule(params);
+    const productsById = await this.loadProductsForPriceQuery({
+      ids: [productId],
+      schedule,
+      customerId,
+      channel: params.channel
+    });
+    return productsById.get(productId) || null;
+  }
   getAuthoritativeBundleItems(product) {
     if (Array.isArray(product == null ? void 0 : product.product_bundle))
       return product.product_bundle;
@@ -455,7 +512,10 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   async syncOtherParamsToSubModules(changedParams, { cover = false } = {}) {
     const nextSubModuleOtherParams = this.buildSubModuleOtherParams();
     await Promise.all(
-      Object.values(this.store).map(async (subModule) => {
+      Object.entries(this.store).map(async ([moduleName, subModule]) => {
+        if (this.reusedSharedSubModuleNames.has(moduleName)) {
+          return;
+        }
         const targetModule = subModule;
         if (!targetModule || typeof targetModule.updateOtherParams !== "function") {
           return;
@@ -535,6 +595,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     this.initializeOptions = options || {};
     this.otherParams = options.otherParams || {};
     this.cacheId = (_a = this.otherParams) == null ? void 0 : _a.cacheId;
+    this.reusedSharedSubModuleNames.clear();
     this.window = core.getPlugin("window");
     this.request = core.getPlugin("request");
     this.appPlugin = core.getPlugin("app");
@@ -546,6 +607,12 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     const targetCacheData = this.readSessionCacheData();
     const moduleNames = this.getRegisteredModuleNames();
     moduleNames.forEach((step) => {
+      const reusedModule = this.getReusableSharedSubModule(step);
+      if (reusedModule) {
+        this.store[step] = reusedModule;
+        this.reusedSharedSubModuleNames.add(step);
+        return;
+      }
       const targetModule = this.createSubModule(step);
       if (!targetModule) {
         throw new Error(`模块 ${step} 不存在`);
@@ -558,7 +625,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         otherParams: this.buildSubModuleOtherParams()
       });
     });
-    if (this.store.schedule) {
+    if (this.store.schedule && !this.isScheduleListLoaded(this.store.schedule)) {
       await this.store.schedule.loadAllSchedule();
     }
     if (this.store.order && typeof ((_b = this.otherParams) == null ? void 0 : _b.enableTempOrderPersist) === "boolean") {
@@ -571,6 +638,8 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   }
   async destroy() {
     Object.keys(this.store).forEach((key) => {
+      if (this.reusedSharedSubModuleNames.has(key))
+        return;
       const sub = this.store[key];
       if (sub && typeof sub.destroy === "function") {
         try {
@@ -1719,6 +1788,126 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       quotation
     });
   }
+  getQuotationCustomerScopeInfo() {
+    const quotation = this.store.quotation;
+    if (quotation && typeof quotation.getQuotationCustomerScopeInfo === "function") {
+      return quotation.getQuotationCustomerScopeInfo();
+    }
+    const list = typeof (quotation == null ? void 0 : quotation.getQuotationList) === "function" ? quotation.getQuotationList() : [];
+    const customerById = /* @__PURE__ */ new Map();
+    const quotationScopes = (Array.isArray(list) ? list : []).filter((item) => Array.isArray(item == null ? void 0 : item.customer) && item.customer.length > 0).map((item) => {
+      const localSeen = /* @__PURE__ */ new Set();
+      const customers = item.customer.filter((customer) => {
+        const customerId = this.normalizePriceContextCustomerId(customer == null ? void 0 : customer.id);
+        if (!customerId || localSeen.has(customerId))
+          return false;
+        localSeen.add(customerId);
+        if (!customerById.has(customerId))
+          customerById.set(customerId, customer);
+        return true;
+      });
+      return {
+        quotationId: item.id,
+        quotationName: item.name,
+        customerIds: customers.map((customer) => String(customer.id)),
+        customers
+      };
+    });
+    return {
+      quotationCount: Array.isArray(list) ? list.length : 0,
+      hasCustomerScopedQuotations: quotationScopes.length > 0,
+      allQuotationsCustomerScoped: Array.isArray(list) && list.length > 0 && quotationScopes.length === list.length,
+      customerIds: Array.from(customerById.keys()),
+      customers: Array.from(customerById.values()),
+      quotationScopes
+    };
+  }
+  shouldRecalculateProductBookingPricesForContextChange(params) {
+    const scopeInfo = this.getQuotationCustomerScopeInfo();
+    const scopedCustomerIds = new Set(scopeInfo.customerIds.map((id) => String(id)));
+    const previousCustomerId = this.normalizePriceContextCustomerId(params.previousCustomerId);
+    const nextCustomerId = this.normalizePriceContextCustomerId(params.nextCustomerId);
+    const previousInScope = previousCustomerId ? scopedCustomerIds.has(previousCustomerId) : false;
+    const nextInScope = nextCustomerId ? scopedCustomerIds.has(nextCustomerId) : false;
+    let shouldRecalculate = false;
+    if (scopeInfo.hasCustomerScopedQuotations) {
+      if (previousInScope) {
+        shouldRecalculate = true;
+      } else if (!previousCustomerId && !nextInScope) {
+        shouldRecalculate = false;
+      } else {
+        shouldRecalculate = nextInScope;
+      }
+    }
+    return shouldRecalculate;
+  }
+  async calculateProductBookingPrices(paramsList) {
+    var _a, _b;
+    if (!paramsList.length)
+      return [];
+    const quotation = this.store.quotation;
+    const customerId = ((_a = paramsList[0]) == null ? void 0 : _a.customer_id) ?? this.getCurrentOrderCustomerId();
+    const productMapsByGroup = /* @__PURE__ */ new Map();
+    const groups = /* @__PURE__ */ new Map();
+    paramsList.forEach((params) => {
+      var _a2;
+      const product = params.product || {};
+      const productId = this.getPriceQueryProductId(product);
+      if (productId === null)
+        return;
+      const schedule = this.getPriceQuerySchedule(params);
+      const channel = params.channel || ((_a2 = this.otherParams) == null ? void 0 : _a2.channel);
+      const groupKey = [
+        schedule.schedule_date,
+        schedule.schedule_datetime,
+        channel || ""
+      ].join("|");
+      const group = groups.get(groupKey) || {
+        ids: /* @__PURE__ */ new Set(),
+        schedule,
+        channel
+      };
+      group.ids.add(productId);
+      groups.set(groupKey, group);
+    });
+    await Promise.all(
+      Array.from(groups.entries()).map(async ([groupKey, group]) => {
+        const productsById = await this.loadProductsForPriceQuery({
+          ids: Array.from(group.ids),
+          schedule: group.schedule,
+          customerId,
+          channel: group.channel
+        });
+        productMapsByGroup.set(groupKey, productsById);
+      })
+    );
+    await this.loadQuotationForPriceQuery({
+      quotation,
+      customer_id: customerId,
+      channel: (_b = paramsList[0]) == null ? void 0 : _b.channel
+    });
+    return paramsList.map((params) => {
+      var _a2, _b2;
+      const productInput = params.product || {};
+      const productId = this.getPriceQueryProductId(productInput);
+      const schedule = this.getPriceQuerySchedule(params);
+      const channel = params.channel || ((_a2 = this.otherParams) == null ? void 0 : _a2.channel);
+      const groupKey = [
+        schedule.schedule_date,
+        schedule.schedule_datetime,
+        channel || ""
+      ].join("|");
+      const authoritativeProduct = productId === null ? null : ((_b2 = productMapsByGroup.get(groupKey)) == null ? void 0 : _b2.get(productId)) || null;
+      const product = this.mergeProductForPriceQuery(productInput, authoritativeProduct);
+      return (0, import_quotationPrice.calculateBaseSalesProductBookingPrice)({
+        ...params,
+        product,
+        fallback_price: authoritativeProduct ? void 0 : params.fallback_price,
+        customer_id: customerId,
+        quotation
+      });
+    });
+  }
   async addProductToOrder(product, booking) {
     try {
       if (!this.store.order)
@@ -1739,6 +1928,16 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  async updateOrderProducts(paramsList) {
+    try {
+      if (!this.store.order)
+        throw new Error("order 模块未初始化");
+      const products = await this.store.order.updateOrderProducts(paramsList);
+      return products;
+    } catch (error) {
+      throw error;
+    }
+  }
   async updateOrderProductQuantity(params) {
     try {
       if (!this.store.order)

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

@@ -1,6 +1,7 @@
 import { OrderModule, ProductList, QuotationModule, SalesSummaryModule, ScanOrderLoggerModule as BaseSalesLoggerModule, ScheduleModule } from '../../modules';
 import type { ScanOrderLogInput as BaseSalesLogInput, ScanOrderLoggerProviderConfig as BaseSalesLoggerProviderConfig, ScanOrderLoggerProviderType as BaseSalesLoggerProviderType } from '../../modules/ScanOrderLogger/types';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
+import type { QuotationCustomerScopeInfo } from '../../modules/Quotation/types';
 /**
  * BaseSales 流程 hook 后缀。
  * 完整事件名应由当前模块名动态拼接，避免多个实例共享固定事件 key。
@@ -278,6 +279,12 @@ export interface BaseSalesProductBookingPriceResult {
     segments: BaseSalesProductBookingPriceSegment[];
     product_bundle?: BaseSalesBundleProductBookingPriceResult[];
 }
+export type BaseSalesQuotationCustomerScopeInfo = QuotationCustomerScopeInfo;
+export interface BaseSalesPriceRecalculationContextChange {
+    previousCustomerId?: number | string | null;
+    nextCustomerId?: number | string | null;
+    [key: string]: any;
+}
 export type BaseSalesAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'additional_order_with_code' | 'additional_order';
 export interface BaseSalesTableFormRecord {
     policy?: string | null;

package/lib/solution/BaseSales/utils/quotationPrice.d.ts

@@ -1,7 +1,18 @@
 import type { QuotationModule } from '../../../modules/Quotation';
 import type { BaseSalesCalculateProductBookingPriceParams, BaseSalesProductBookingPriceResult } from '../types';
 interface BuildBaseSalesQuotationPriceParams extends BaseSalesCalculateProductBookingPriceParams {
-    quotation?: Pick<QuotationModule, 'getPriceForProduct' | 'getQuotationShelfId'> | null;
+    quotation?: (Pick<QuotationModule, 'getPriceForProduct' | 'getQuotationShelfId'> & {
+        getQuotationMatchForProduct?: (params: {
+            productId: number;
+            variantId?: number;
+            datetime: string;
+            channel?: string;
+            customer_id?: number | string;
+        }) => {
+            price: string | null;
+            quotationShelfId: number;
+        } | null;
+    }) | null;
 }
 export declare function calculateBaseSalesProductBookingPrice(params: BuildBaseSalesQuotationPriceParams): BaseSalesProductBookingPriceResult;
 export {};

package/lib/solution/BaseSales/utils/quotationPrice.js

@@ -161,19 +161,28 @@ function formatTimePoint(datetime) {
 }
 function buildPriceSegment(params) {
   const timePoint = formatTimePoint(params.segment.start);
-  const quotedPrice = params.quotation && params.productId !== null ? params.quotation.getPriceForProduct({
+  const match = params.quotation && params.productId !== null && params.quotation.getQuotationMatchForProduct ? params.quotation.getQuotationMatchForProduct({
     productId: params.productId,
     variantId: params.variantId,
     datetime: timePoint,
+    channel: params.channel,
+    customer_id: params.customerId
+  }) : null;
+  const quotedPrice = match ? match.price : params.quotation && params.productId !== null ? params.quotation.getPriceForProduct({
+    productId: params.productId,
+    variantId: params.variantId,
+    datetime: timePoint,
+    channel: params.channel,
     customer_id: params.customerId
   }) : null;
   const unitPrice = toPriceString(quotedPrice ?? params.fallbackPrice);
-  const quotationShelfId = quotedPrice !== null && params.quotation && params.productId !== null ? params.quotation.getQuotationShelfId({
+  const quotationShelfId = quotedPrice !== null ? (match == null ? void 0 : match.quotationShelfId) ?? (params.quotation && params.productId !== null ? params.quotation.getQuotationShelfId({
     productId: params.productId,
     variantId: params.variantId,
     datetime: timePoint,
+    channel: params.channel,
     customer_id: params.customerId
-  }) : 0;
+  }) : 0) : 0;
   return {
     start_datetime: timePoint,
     end_datetime: params.segment.end ? formatTimePoint(params.segment.end) : void 0,
@@ -192,6 +201,7 @@ function calculatePriceForProduct(params) {
     productId: params.productId,
     variantId: params.variantId,
     customerId: params.customerId,
+    channel: params.channel,
     fallbackPrice: params.fallbackPrice,
     segment
   }));
@@ -222,6 +232,7 @@ function calculateBundlePrices(params, segments) {
       productId,
       variantId,
       customerId: params.customer_id,
+      channel: params.channel,
       quantity,
       fallbackPrice: getBundleFallbackPrice(bundle),
       segments
@@ -253,6 +264,7 @@ function calculateBaseSalesProductBookingPrice(params) {
     productId,
     variantId,
     customerId: params.customer_id,
+    channel: params.channel,
     quantity: productQuantity,
     fallbackPrice,
     segments: timeSegments

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 6 | 3 | 4 | 5;
+        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",