@pisell/pisellos 0.10.21 → 0.10.22

package/lib/solution/BaseSales/index.js

@@ -30,6 +30,8 @@ var _paymentUtils = require("../../modules/Order/payment-utils");
 var _paymentNumber = require("../../utils/payment-number");
 var _orderCollectionIdentity = require("../../modules/Order/utils/orderCollectionIdentity");
 var _dayjs = _interopRequireDefault(require("dayjs"));
+var _clientDataVariants = require("../../modules/ProductList/clientDataVariants");
+var _platform = require("../../utils/platform");
 var _Quotation = require("../../modules/Quotation");
 var _transformBaseProductToOrderProduct = require("./utils/transformBaseProductToOrderProduct");
 var _quotationPrice = require("./utils/quotationPrice");
@@ -662,8 +664,10 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   async loadQuotationForPriceQuery(params) {
     if (!params.quotation) return;
     this.applyQuotationScheduleResolver(params.quotation);
-    await params.quotation.loadQuotations({
-      channel: params.channel || this.otherParams?.channel,
+    const quotation = params.quotation;
+    const load = typeof quotation.ensureQuotations === 'function' ? quotation.ensureQuotations.bind(quotation) : quotation.loadQuotations.bind(quotation);
+    await load({
+      channel: this.getPriceQueryChannel(params.channel),
       customer_id: params.customer_id
     });
   }
@@ -745,34 +749,175 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       schedule_datetime: now.format('YYYY-MM-DD HH:mm:ss')
     };
   }
+  isCustomerUserPriceQuery() {
+    return (0, _platform.isCustomerUserPlatform)(this.otherParams?.platform);
+  }
+  getPriceQueryScheduleList() {
+    const storeScheduleList = this.store.schedule?.getScheduleList?.();
+    if (Array.isArray(storeScheduleList) && storeScheduleList.length > 0) {
+      return storeScheduleList;
+    }
+    const contextScheduleList = this.core?.context?.scheduleList;
+    return Array.isArray(contextScheduleList) && contextScheduleList.length > 0 ? contextScheduleList : undefined;
+  }
+  buildPriceQueryPayload(params) {
+    const channel = this.getPriceQueryChannel(params.channel);
+    const strategyContext = this.getPriceQueryStrategyContext(channel);
+    return {
+      ids: params.ids,
+      ...(this.isCustomerUserPriceQuery() ? {} : {
+        open_quotation: 1
+      }),
+      open_bundle: 1,
+      with: [..._clientDataVariants.PRODUCT_QUERY_DATA_VARIANT_RELATIONS],
+      status: 'published',
+      num: Math.max(params.ids.length, 1),
+      skip: 1,
+      customer_id: params.customerId,
+      schedule_date: params.schedule.schedule_date,
+      schedule_datetime: params.schedule.schedule_datetime,
+      application_code: channel,
+      ...(Object.keys(strategyContext).length ? {
+        strategy_context: strategyContext
+      } : {})
+    };
+  }
+  getRawProductPriceSources(ids) {
+    const products = this.store.products;
+    if (typeof products?.getRawProductPriceSources !== 'function') {
+      return new Map();
+    }
+    try {
+      const result = products.getRawProductPriceSources(ids);
+      return result instanceof Map ? result : new Map();
+    } catch (error) {
+      this.logWarning('getRawProductPriceSources: 读取商品原始报价源失败', {
+        ids,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      return new Map();
+    }
+  }
+  rememberRawProductPriceSources(products) {
+    const productList = this.store.products;
+    if (typeof productList?.rememberRawProductQueryResult !== 'function') return;
+    try {
+      productList.rememberRawProductQueryResult(products);
+    } catch (error) {
+      this.logWarning('rememberRawProductPriceSources: 保存商品原始报价源失败', {
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
+  }
+  getSelectedProductVariantId(product) {
+    const variantId = Number(product?.product_variant_id ?? product?.variant_id ?? 0);
+    return Number.isFinite(variantId) && variantId > 0 ? variantId : 0;
+  }
+
+  /**
+   * 将目录原始商品还原为本次选择的 SKU 基线。
+   *
+   * 这里绝不能复用已评估后的目录商品，否则从命中智能价切回不命中的
+   * 日期时会残留旧价格。套餐仅验证所选关系存在，最终仍由 merge 方法把
+   * 评估后的套餐价格映射回用户的选择数据。
+   */
+  prepareRawProductForPriceQuery(rawProduct, selectedProduct) {
+    const product = (0, _lodashEs.cloneDeep)(rawProduct);
+    const rawProductId = this.getPriceQueryProductId(product);
+    const selectedProductId = this.getPriceQueryProductId(selectedProduct);
+    if (rawProductId === null || selectedProductId === null || rawProductId !== selectedProductId) {
+      return null;
+    }
+    const selectedVariantId = this.getSelectedProductVariantId(selectedProduct);
+    product.product_id = product.product_id ?? product.id;
+    product.product_variant_id = selectedVariantId;
+    product.variant_id = selectedVariantId;
+    if (selectedVariantId > 0) {
+      const variants = Array.isArray(product.variant) ? product.variant : [];
+      const selectedVariant = variants.find(variant => Number(variant?.id) === selectedVariantId);
+      if (!selectedVariant) return null;
+      const variantPrice = selectedVariant.price ?? selectedVariant.selling_price ?? selectedVariant.base_price;
+      if (variantPrice === undefined || variantPrice === null || variantPrice === '') {
+        return null;
+      }
+      product.price = variantPrice;
+      product.selling_price = selectedVariant.selling_price ?? variantPrice;
+      product.base_price = selectedVariant.base_price ?? variantPrice;
+    }
+    const selectedBundles = Array.isArray(selectedProduct.product_bundle) ? selectedProduct.product_bundle : [];
+    if (selectedBundles.length > 0) {
+      const rawBundleItems = this.getAuthoritativeBundleItems(product);
+      const allSelectedBundlesExist = selectedBundles.every(bundle => {
+        const authoritativeBundle = this.findAuthoritativeBundleItem(bundle, rawBundleItems);
+        if (!authoritativeBundle) return false;
+        const selectedBundleVariantId = Number(bundle?.bundle_variant_id ?? bundle?.variant_id ?? 0);
+        const authoritativeBundleVariantId = Number(authoritativeBundle?.bundle_variant_id ?? authoritativeBundle?.variant_id ?? 0);
+        if ((Number.isFinite(selectedBundleVariantId) ? selectedBundleVariantId : 0) !== (Number.isFinite(authoritativeBundleVariantId) ? authoritativeBundleVariantId : 0)) {
+          return false;
+        }
+
+        // 省略字段表示该套餐子商品关系没有被价格查询完整水合，不能把它
+        // 当作“没有规则”而静默使用基础价。
+        return Array.isArray(authoritativeBundle.data_variants);
+      });
+      if (!allSelectedBundlesExist) return null;
+    }
+    return product;
+  }
+  resolveLocalProductForPriceQuery(params) {
+    if (!params.rawProduct) return null;
+    const preparedProduct = this.prepareRawProductForPriceQuery(params.rawProduct, params.selectedProduct);
+    if (!preparedProduct) return null;
+    const scheduleList = this.getPriceQueryScheduleList();
+    const result = (0, _clientDataVariants.tryResolveClientDataVariants)({
+      core: this.core,
+      otherParams: this.otherParams,
+      products: [preparedProduct],
+      queryPayload: params.queryPayload,
+      handledByOsServer: false,
+      ...(scheduleList ? {
+        scheduleList
+      } : {})
+    });
+    if (result.status !== 'resolved') return null;
+    return result.products[0] || null;
+  }
   async loadProductsForPriceQuery(params) {
     const ids = Array.from(new Set(params.ids.filter(id => Number.isFinite(id))));
     const productsById = new Map();
     if (!ids.length || !this.request) return productsById;
-    const channel = this.getPriceQueryChannel(params.channel);
-    const strategyContext = this.getPriceQueryStrategyContext(channel);
+    const handledByOsServer = (0, _clientDataVariants.isProductQueryHandledByOsServer)(this.core, this.request);
     try {
-      const response = await this.request.post('/product/query', {
-        ids,
-        open_quotation: 1,
-        open_bundle: 1,
-        status: 'published',
-        num: 1,
-        skip: 1,
-        customer_id: params.customerId,
-        schedule_date: params.schedule.schedule_date,
-        schedule_datetime: params.schedule.schedule_datetime,
-        application_code: channel,
-        ...(Object.keys(strategyContext).length ? {
-          strategy_context: strategyContext
-        } : {})
-      }, {
+      const queryPayload = this.buildPriceQueryPayload({
+        ...params,
+        ids
+      });
+      const response = await this.request.post('/product/query', queryPayload, {
         osServer: true,
         customToast: () => {}
       });
       const list = response?.data?.list || response?.list || [];
       if (!Array.isArray(list)) return productsById;
-      list.forEach(item => {
+      if (this.isCustomerUserPriceQuery() && !handledByOsServer) {
+        this.rememberRawProductPriceSources(list);
+        list.forEach(item => {
+          const productId = Number(item?.id ?? item?.product_id);
+          if (Number.isFinite(productId)) productsById.set(productId, item);
+        });
+        return productsById;
+      }
+      const scheduleList = this.getPriceQueryScheduleList();
+      const resolvedList = (0, _clientDataVariants.resolveClientDataVariants)({
+        core: this.core,
+        otherParams: this.otherParams,
+        products: list,
+        queryPayload,
+        handledByOsServer,
+        ...(scheduleList ? {
+          scheduleList
+        } : {})
+      });
+      resolvedList.forEach(item => {
         const productId = Number(item?.id ?? item?.product_id);
         if (Number.isFinite(productId)) productsById.set(productId, item);
       });
@@ -785,18 +930,69 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       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,
+  async resolveProductsForPriceQuery(params) {
+    const selectedProducts = params.priceQueries.map(item => item.product || {});
+    const productIds = selectedProducts.map(product => this.getPriceQueryProductId(product));
+    const ids = Array.from(new Set(productIds.filter(id => id !== null)));
+    if (!ids.length) {
+      return selectedProducts.map(() => null);
+    }
+    const handledByOsServer = this.request ? (0, _clientDataVariants.isProductQueryHandledByOsServer)(this.core, this.request) : false;
+    const canUseLocalFastPath = this.isCustomerUserPriceQuery() && !handledByOsServer;
+    if (!canUseLocalFastPath) {
+      if (!this.request) return selectedProducts.map(() => null);
+      const productsById = await this.loadProductsForPriceQuery({
+        ids,
+        schedule: params.schedule,
+        customerId: params.customerId,
+        channel: params.channel
+      });
+      return productIds.map(productId => productId === null ? null : productsById.get(productId) || null);
+    }
+    const queryPayload = this.buildPriceQueryPayload({
+      ids,
+      schedule: params.schedule,
+      customerId: params.customerId,
+      channel: params.channel
+    });
+    const cachedRawProducts = this.getRawProductPriceSources(ids);
+    const authoritativeProducts = selectedProducts.map((selectedProduct, index) => {
+      const productId = productIds[index];
+      return productId === null ? null : this.resolveLocalProductForPriceQuery({
+        selectedProduct,
+        rawProduct: cachedRawProducts.get(productId),
+        queryPayload
+      });
+    });
+    const missingIds = Array.from(new Set(productIds.filter((productId, index) => productId !== null && !authoritativeProducts[index])));
+    if (!missingIds.length) return authoritativeProducts;
+    if (!this.request) return authoritativeProducts;
+    const remoteRawProducts = await this.loadProductsForPriceQuery({
+      ids: missingIds,
+      schedule: params.schedule,
+      customerId: params.customerId,
       channel: params.channel
     });
-    return productsById.get(productId) || null;
+    authoritativeProducts.forEach((authoritativeProduct, index) => {
+      if (authoritativeProduct) return;
+      const productId = productIds[index];
+      if (productId === null) return;
+      const rawProduct = remoteRawProducts.get(productId);
+      const locallyResolved = this.resolveLocalProductForPriceQuery({
+        selectedProduct: selectedProducts[index],
+        rawProduct,
+        queryPayload
+      });
+      if (locallyResolved) {
+        authoritativeProducts[index] = locallyResolved;
+        return;
+      }
+
+      // 严格客户端能力仍不可用时，真实请求已经是最后的权威降级。
+      // 尽量应用所选 SKU 基线；关系不完整时保持旧的远端商品语义。
+      authoritativeProducts[index] = rawProduct ? this.prepareRawProductForPriceQuery(rawProduct, selectedProducts[index]) || rawProduct : null;
+    });
+    return authoritativeProducts;
   }
   getAuthoritativeBundleItems(product) {
     if (Array.isArray(product?.product_bundle)) return product.product_bundle;
@@ -3264,18 +3460,28 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     return (0, _transformBaseProductToOrderProduct.transformBaseProductToOrderProduct)(params);
   }
   async calculateProductBookingPrice(params) {
-    const quotation = this.store.quotation;
+    const useCustomerUserPricing = this.isCustomerUserPriceQuery();
+    const quotation = useCustomerUserPricing ? undefined : this.store.quotation;
     const customerId = params.customer_id ?? this.getCurrentOrderCustomerId();
     await this.prepareProductPriceQueryContext(customerId);
-    const authoritativeProduct = await this.loadProductForPriceQuery(params, customerId);
-    const product = this.mergeProductForPriceQuery(params.product, authoritativeProduct);
-    await this.loadQuotationForPriceQuery({
-      quotation,
-      customer_id: customerId,
-      channel: params.channel
+    const channel = this.getPriceQueryChannel(params.channel);
+    const [authoritativeProduct] = await this.resolveProductsForPriceQuery({
+      priceQueries: [params],
+      schedule: this.getPriceQuerySchedule(params),
+      customerId,
+      channel
     });
+    const product = this.mergeProductForPriceQuery(params.product, authoritativeProduct);
+    if (!useCustomerUserPricing) {
+      await this.loadQuotationForPriceQuery({
+        quotation,
+        customer_id: customerId,
+        channel
+      });
+    }
     return (0, _quotationPrice.calculateBaseSalesProductBookingPrice)({
       ...params,
+      channel,
       product,
       fallback_price: authoritativeProduct ? undefined : params.fallback_price,
       customer_id: customerId,
@@ -3327,7 +3533,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     const scopedCustomerIds = new Set(scopeInfo.customerIds.map(id => String(id)));
     const previousCustomerId = this.normalizePriceContextCustomerId(params.previousCustomerId);
     const nextCustomerId = this.normalizePriceContextCustomerId(params.nextCustomerId);
-    if (this.hasSmartPricingStrategies()) {
+    if (this.isCustomerUserPriceQuery() || this.hasSmartPricingStrategies()) {
       return previousCustomerId !== nextCustomerId;
     }
     const previousInScope = previousCustomerId ? scopedCustomerIds.has(previousCustomerId) : false;
@@ -3346,50 +3552,71 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   }
   async calculateProductBookingPrices(paramsList) {
     if (!paramsList.length) return [];
-    const quotation = this.store.quotation;
-    const customerId = paramsList[0]?.customer_id ?? this.getCurrentOrderCustomerId();
-    await this.prepareProductPriceQueryContext(customerId);
-    const productMapsByGroup = new Map();
+    const useCustomerUserPricing = this.isCustomerUserPriceQuery();
+    const quotation = useCustomerUserPricing ? undefined : this.store.quotation;
+    const currentOrderCustomerId = this.getCurrentOrderCustomerId();
+    const resolvedChannels = paramsList.map(params => this.getPriceQueryChannel(params.channel));
+    const authoritativeProducts = paramsList.map(() => null);
+    const preparedCustomerKeys = new Set();
+    await Promise.all(paramsList.map(async params => {
+      const customerId = params.customer_id ?? currentOrderCustomerId;
+      const customerKey = this.normalizePriceContextCustomerId(customerId) || '';
+      if (preparedCustomerKeys.has(customerKey)) return;
+      preparedCustomerKeys.add(customerKey);
+      await this.prepareProductPriceQueryContext(customerId);
+    }));
     const groups = new Map();
-    paramsList.forEach(params => {
-      const product = params.product || {};
-      const productId = this.getPriceQueryProductId(product);
-      if (productId === null) return;
+    paramsList.forEach((params, index) => {
       const schedule = this.getPriceQuerySchedule(params);
-      const channel = params.channel || this.otherParams?.channel;
-      const groupKey = [schedule.schedule_date, schedule.schedule_datetime, channel || ''].join('|');
+      const channel = resolvedChannels[index];
+      const customerId = params.customer_id ?? currentOrderCustomerId;
+      const groupKey = [schedule.schedule_date, schedule.schedule_datetime, channel || '', this.normalizePriceContextCustomerId(customerId) || ''].join('|');
       const group = groups.get(groupKey) || {
-        ids: new Set(),
+        indices: [],
         schedule,
+        customerId,
         channel
       };
-      group.ids.add(productId);
+      group.indices.push(index);
       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),
+    await Promise.all(Array.from(groups.values()).map(async group => {
+      const priceQueries = group.indices.map(index => paramsList[index]);
+      const resolvedProducts = await this.resolveProductsForPriceQuery({
+        priceQueries,
         schedule: group.schedule,
-        customerId,
+        customerId: group.customerId,
         channel: group.channel
       });
-      productMapsByGroup.set(groupKey, productsById);
+      group.indices.forEach((originalIndex, groupIndex) => {
+        authoritativeProducts[originalIndex] = resolvedProducts[groupIndex] || null;
+      });
     }));
-    await this.loadQuotationForPriceQuery({
-      quotation,
-      customer_id: customerId,
-      channel: paramsList[0]?.channel
-    });
-    return paramsList.map(params => {
+    if (!useCustomerUserPricing) {
+      const quotationContexts = new Map();
+      paramsList.forEach((params, index) => {
+        const channel = resolvedChannels[index];
+        const key = channel || '';
+        if (quotationContexts.has(key)) return;
+        quotationContexts.set(key, {
+          channel,
+          customer_id: params.customer_id ?? currentOrderCustomerId
+        });
+      });
+      await Promise.all(Array.from(quotationContexts.values()).map(context => this.loadQuotationForPriceQuery({
+        quotation,
+        ...context
+      })));
+    }
+    return paramsList.map((params, index) => {
       const productInput = params.product || {};
-      const productId = this.getPriceQueryProductId(productInput);
-      const schedule = this.getPriceQuerySchedule(params);
-      const channel = params.channel || this.otherParams?.channel;
-      const groupKey = [schedule.schedule_date, schedule.schedule_datetime, channel || ''].join('|');
-      const authoritativeProduct = productId === null ? null : productMapsByGroup.get(groupKey)?.get(productId) || null;
+      const authoritativeProduct = authoritativeProducts[index];
       const product = this.mergeProductForPriceQuery(productInput, authoritativeProduct);
+      const customerId = params.customer_id ?? currentOrderCustomerId;
+      const channel = resolvedChannels[index];
       return (0, _quotationPrice.calculateBaseSalesProductBookingPrice)({
         ...params,
+        channel,
         product,
         fallback_price: authoritativeProduct ? undefined : params.fallback_price,
         customer_id: customerId,

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 | 2 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -232,7 +232,7 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     private releaseAvailabilityCommitLock;
     /** IO boundary: loads catalog, schedules, resources, occupancies, and registers one context. */
     prepareAvailabilityProjection(params: UnifiedBookingSalesPrepareAvailabilityProjectionParams): Promise<AvailabilityContextRef>;
-    /** Pure configuration calculation over the current context projection. */
+    /** Candidate calculation over the current context projection and runtime minute. */
     getProductTimeRanges(contextId: string, request?: GetProductTimeRangesRequest): Promise<ContextualProductTimeRangeGroup[]>;
     /** Thin facade: auto-refresh on cart drift, then delegate to the pure projection query. */
     queryBookingAvailability(contextId: string, request: ContextualAvailabilityQuery): Promise<ContextualAvailabilityQueryResult>;