@pisell/pisellos 2.3.81 → 2.3.82

package/dist/model/strategy/adapter/promotion/index.js

@@ -1,9 +0,0 @@
-// 导出评估器
-export { PromotionEvaluator } from "./evaluator";
-
-// 导出适配器
-export { PromotionAdapter } from "./adapter";
-export { default } from "./adapter";
-
-// 导出策略配置示例常量
-export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, ITEM_REWARD_STRATEGY } from "./examples";

package/dist/modules/ProductList/clientDataVariants.d.ts

@@ -17,7 +17,30 @@ export interface ResolveClientDataVariantsParams {
     handledByOsServer: boolean;
     scheduleList?: unknown;
     menuList?: unknown;
+    /** Quote fast paths require hydrated relations; legacy list resolution does not. */
+    requireCompleteDataVariantRelations?: boolean;
+    /** Quote fast paths require every referenced rule; legacy list resolution is best-effort. */
+    requireEvaluatorReady?: boolean;
 }
+export type ResolveClientDataVariantsResult = {
+    status: 'handled-by-os-server' | 'empty' | 'data-variants-unavailable' | 'evaluator-unavailable' | 'evaluator-not-ready';
+    products: ProductData[];
+} | {
+    status: 'resolved';
+    products: ProductData[];
+} | {
+    status: 'error';
+    products: ProductData[];
+    error: unknown;
+};
+/**
+ * Strict client-side Data Variant resolution for quote fast paths.
+ *
+ * Unlike resolveClientDataVariants, callers can distinguish a complete local
+ * result from a capability/readiness/error fallback and decide to query the
+ * remote product endpoint instead.
+ */
+export declare function tryResolveClientDataVariants({ core, otherParams, products, queryPayload, handledByOsServer, scheduleList: explicitScheduleList, menuList: explicitMenuList, requireCompleteDataVariantRelations, requireEvaluatorReady, }: ResolveClientDataVariantsParams): ResolveClientDataVariantsResult;
 /**
  * 未启用商品 OS 路由时，在客户端补做 Data Variant 解析。
  *

package/dist/modules/ProductList/clientDataVariants.js

@@ -13,13 +13,74 @@ export function isProductQueryHandledByOsServer(core, request) {
   var requestBaseUrl = String((request === null || request === void 0 ? void 0 : request.baseUrl) || '/shop').replace(/\/+$/, '');
   return server.hasRoute('post', "".concat(requestBaseUrl, "/product/query")) === true;
 }
+function getBundleItems(product) {
+  if (!Array.isArray(product.bundle_group)) return [];
+  return product.bundle_group.flatMap(function (group) {
+    return Array.isArray(group === null || group === void 0 ? void 0 : group.bundle_item) ? group.bundle_item : [];
+  });
+}
+function hasCompleteDataVariantRelations(products) {
+  return products.every(function (product) {
+    return Array.isArray(product === null || product === void 0 ? void 0 : product.data_variants);
+  });
+}
+function hasAnyDataVariants(products) {
+  return products.some(function (product) {
+    var _product$data_variant;
+    return (((_product$data_variant = product.data_variants) === null || _product$data_variant === void 0 ? void 0 : _product$data_variant.length) || 0) > 0 || getBundleItems(product).some(function (item) {
+      return Array.isArray(item === null || item === void 0 ? void 0 : item.data_variants) && item.data_variants.length > 0;
+    });
+  });
+}
+function collectReferencedRuleIds(products) {
+  var ids = new Set();
+  var remember = function remember(variants) {
+    if (!Array.isArray(variants)) return;
+    variants.forEach(function (variant) {
+      var _variant$data_variant;
+      var id = String((_variant$data_variant = variant === null || variant === void 0 ? void 0 : variant.data_variant_rule_id) !== null && _variant$data_variant !== void 0 ? _variant$data_variant : '').trim();
+      if (id) ids.add(id);
+    });
+  };
+  products.forEach(function (product) {
+    remember(product.data_variants);
+    getBundleItems(product).forEach(function (item) {
+      return remember(item === null || item === void 0 ? void 0 : item.data_variants);
+    });
+  });
+  return ids;
+}
+function isEvaluatorReady(evaluator, products) {
+  if (typeof evaluator.isReady === 'function') {
+    if (evaluator.isReady() === false) return false;
+  }
+  if (evaluator.isReady === false || evaluator.ready === false) return false;
+
+  // The built-in evaluator is installed before its strategy request completes.
+  // A referenced Data Variant cannot be evaluated authoritatively until those
+  // configs have arrived. Evaluators without this capability remain compatible.
+  if (typeof evaluator.getStrategyConfigs === 'function') {
+    var configs = evaluator.getStrategyConfigs();
+    if (!Array.isArray(configs) || configs.length === 0) return false;
+    var availableRuleIds = new Set(configs.map(function (config) {
+      var _config$metadata$id, _config$metadata;
+      return String((_config$metadata$id = config === null || config === void 0 || (_config$metadata = config.metadata) === null || _config$metadata === void 0 ? void 0 : _config$metadata.id) !== null && _config$metadata$id !== void 0 ? _config$metadata$id : '').trim();
+    }).filter(Boolean));
+    return Array.from(collectReferencedRuleIds(products)).every(function (id) {
+      return availableRuleIds.has(id);
+    });
+  }
+  return true;
+}
+
 /**
- * 未启用商品 OS 路由时，在客户端补做 Data Variant 解析。
+ * Strict client-side Data Variant resolution for quote fast paths.
  *
- * 商品列表和预约报价必须共用这个边界，避免 H5 的弹窗报价绕过客户端智能定价。
- * OS Server 已接管时直接信任服务端结果，确保同一批商品只评估一次。
+ * Unlike resolveClientDataVariants, callers can distinguish a complete local
+ * result from a capability/readiness/error fallback and decide to query the
+ * remote product endpoint instead.
  */
-export function resolveClientDataVariants(_ref) {
+export function tryResolveClientDataVariants(_ref) {
   var _core$context, _scheduleModule$getSc, _core$context2, _core$context3, _strategyContext$busi;
   var core = _ref.core,
     _ref$otherParams = _ref.otherParams,
@@ -28,11 +89,59 @@ export function resolveClientDataVariants(_ref) {
     queryPayload = _ref.queryPayload,
     handledByOsServer = _ref.handledByOsServer,
     explicitScheduleList = _ref.scheduleList,
-    explicitMenuList = _ref.menuList;
-  if (handledByOsServer || products.length === 0) return products;
+    explicitMenuList = _ref.menuList,
+    _ref$requireCompleteD = _ref.requireCompleteDataVariantRelations,
+    requireCompleteDataVariantRelations = _ref$requireCompleteD === void 0 ? true : _ref$requireCompleteD,
+    _ref$requireEvaluator = _ref.requireEvaluatorReady,
+    requireEvaluatorReady = _ref$requireEvaluator === void 0 ? true : _ref$requireEvaluator;
+  if (handledByOsServer) {
+    return {
+      status: 'handled-by-os-server',
+      products: products
+    };
+  }
+  if (products.length === 0) {
+    return {
+      status: 'empty',
+      products: products
+    };
+  }
+  if (requireCompleteDataVariantRelations && !hasCompleteDataVariantRelations(products)) {
+    return {
+      status: 'data-variants-unavailable',
+      products: products
+    };
+  }
+
+  // Explicit empty arrays mean the query hydrated the relation and there is no
+  // rule to apply. This is an authoritative local base-price result even when
+  // no evaluator has been installed.
+  if (!hasAnyDataVariants(products)) {
+    return {
+      status: 'resolved',
+      products: products
+    };
+  }
   var evaluator = core === null || core === void 0 || (_core$context = core.context) === null || _core$context === void 0 ? void 0 : _core$context.dataVariantEvaluator;
   if (!evaluator || typeof evaluator.resolveProducts !== 'function') {
-    return products;
+    return {
+      status: 'evaluator-unavailable',
+      products: products
+    };
+  }
+  try {
+    if (requireEvaluatorReady && !isEvaluatorReady(evaluator, products)) {
+      return {
+        status: 'evaluator-not-ready',
+        products: products
+      };
+    }
+  } catch (error) {
+    return {
+      status: 'error',
+      products: products,
+      error: error
+    };
   }
   var strategyContext = queryPayload.strategy_context && _typeof(queryPayload.strategy_context) === 'object' ? queryPayload.strategy_context : {};
   var fatherModule = String(otherParams.fatherModule || '').trim();
@@ -43,7 +152,7 @@ export function resolveClientDataVariants(_ref) {
   var businessData = {
     products: products,
     scheduleDateTime: queryPayload.schedule_datetime || queryPayload.schedule_date,
-    scheduleList: Array.isArray(explicitScheduleList) ? explicitScheduleList : Array.isArray(moduleScheduleList) ? moduleScheduleList : Array.isArray(contextScheduleList) ? contextScheduleList : [],
+    scheduleList: Array.isArray(explicitScheduleList) && explicitScheduleList.length > 0 ? explicitScheduleList : Array.isArray(moduleScheduleList) && moduleScheduleList.length > 0 ? moduleScheduleList : Array.isArray(contextScheduleList) ? contextScheduleList : [],
     menuList: Array.isArray(explicitMenuList) ? explicitMenuList : Array.isArray(otherParams.menuList) ? otherParams.menuList : Array.isArray(contextMenuList) ? contextMenuList : [],
     customerId: queryPayload.customer_id,
     channel: strategyContext.channel,
@@ -54,9 +163,54 @@ export function resolveClientDataVariants(_ref) {
   };
   try {
     var result = evaluator.resolveProducts(businessData);
-    return Array.isArray(result === null || result === void 0 ? void 0 : result.products) ? result.products : products;
+    if (!Array.isArray(result === null || result === void 0 ? void 0 : result.products)) {
+      return {
+        status: 'error',
+        products: products,
+        error: new Error('Data Variant evaluator returned an invalid product list')
+      };
+    }
+    return {
+      status: 'resolved',
+      products: result.products
+    };
   } catch (error) {
-    console.error('[ClientDataVariants] Data Variant 客户端解析失败', error);
-    return products;
+    return {
+      status: 'error',
+      products: products,
+      error: error
+    };
+  }
+}
+
+/**
+ * 未启用商品 OS 路由时，在客户端补做 Data Variant 解析。
+ *
+ * 商品列表和预约报价必须共用这个边界，避免 H5 的弹窗报价绕过客户端智能定价。
+ * OS Server 已接管时直接信任服务端结果，确保同一批商品只评估一次。
+ */
+export function resolveClientDataVariants(_ref2) {
+  var core = _ref2.core,
+    _ref2$otherParams = _ref2.otherParams,
+    otherParams = _ref2$otherParams === void 0 ? {} : _ref2$otherParams,
+    products = _ref2.products,
+    queryPayload = _ref2.queryPayload,
+    handledByOsServer = _ref2.handledByOsServer,
+    explicitScheduleList = _ref2.scheduleList,
+    explicitMenuList = _ref2.menuList;
+  var result = tryResolveClientDataVariants({
+    core: core,
+    otherParams: otherParams,
+    products: products,
+    queryPayload: queryPayload,
+    handledByOsServer: handledByOsServer,
+    scheduleList: explicitScheduleList,
+    menuList: explicitMenuList,
+    requireCompleteDataVariantRelations: false,
+    requireEvaluatorReady: false
+  });
+  if (result.status === 'error') {
+    console.error('[ClientDataVariants] Data Variant 客户端解析失败', result.error);
   }
+  return result.products;
 }

package/dist/modules/ProductList/index.d.ts

@@ -9,6 +9,7 @@ export declare class ProductList extends BaseModule implements Module {
     private store;
     private request;
     private otherParams;
+    private rawProductPriceSources;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     /**
@@ -36,6 +37,19 @@ export declare class ProductList extends BaseModule implements Module {
         schedule_date?: string;
         channel?: string;
     }): Promise<any>;
+    /**
+     * Remember raw remote product records before client-side Data Variant
+     * evaluation. Quote-only reads can then always start from a clean baseline.
+     */
+    rememberRawProductQueryResult(products: Array<ProductData | Record<string, any>>): void;
+    private replaceRawProductQueryResult;
+    /**
+     * Return isolated raw price sources for the requested products.
+     *
+     * Missing IDs are intentionally omitted so callers can remotely fetch only
+     * the incomplete part of a batch quote.
+     */
+    getRawProductPriceSources(ids: number[]): Map<number, ProductData>;
     getProducts(): Promise<ProductData[]>;
     getProduct(id: number): Promise<ProductData | undefined>;
     getProductByIds(ids: number[]): Promise<ProductData[] | undefined>;

package/dist/modules/ProductList/index.js

@@ -27,6 +27,7 @@ import { BaseModule } from "../BaseModule";
 import { cloneDeep } from 'lodash-es';
 import dayjs from 'dayjs';
 import { isProductQueryHandledByOsServer, PRODUCT_QUERY_DATA_VARIANT_RELATIONS, resolveClientDataVariants } from "./clientDataVariants";
+import { isCustomerUserPlatform } from "../../utils/platform";
 export * from "./types";
 export var ProductList = /*#__PURE__*/function (_BaseModule) {
   _inherits(ProductList, _BaseModule);
@@ -40,6 +41,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
     _defineProperty(_assertThisInitialized(_this), "otherParams", {});
+    _defineProperty(_assertThisInitialized(_this), "rawProductPriceSources", new Map());
     return _this;
   }
   _createClass(ProductList, [{
@@ -53,6 +55,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               this.core = core;
               this.store = options.store;
               this.otherParams = options.otherParams || {};
+              this.rawProductPriceSources.clear();
               if (Array.isArray((_options$initialState = options.initialState) === null || _options$initialState === void 0 ? void 0 : _options$initialState.list)) {
                 this.store.list = options.initialState.list.slice().sort(function (a, b) {
                   return Number(b.sort) - Number(a.sort);
@@ -63,7 +66,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 this.store.selectProducts = [];
               }
               this.request = core.getPlugin('request');
-            case 5:
+            case 6:
             case "end":
               return _context.stop();
           }
@@ -140,6 +143,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
         var _this$otherParams,
+          _this$otherParams2,
           _this2 = this;
         var _ref,
           _ref$category_ids,
@@ -210,8 +214,9 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               };
               rawApplicationCode = (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel;
               mappedApplicationCode = typeof rawApplicationCode === 'string' ? channelMap[rawApplicationCode] || rawApplicationCode : rawApplicationCode;
-              queryPayload = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
-                open_quotation: 1,
+              queryPayload = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, isCustomerUserPlatform((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.platform) ? {} : {
+                open_quotation: 1
+              }), {}, {
                 open_bundle: 0,
                 exclude_extension_type: ['product_party', 'product_event', 'product_series_event', 'product_package_ticket', 'ticket', 'event_item'],
                 with: _toConsumableArray(PRODUCT_QUERY_DATA_VARIANT_RELATIONS),
@@ -257,6 +262,11 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                         originalCallback(result);
                         return _context4.abrupt("return");
                       case 4:
+                        if (!handledByOsServer) {
+                          // Subscription callbacks may contain only changed products. Upsert
+                          // their raw records without evicting other IDs from the scope.
+                          _this2.rememberRawProductQueryResult(callbackList);
+                        }
                         products = resolveClientDataVariants({
                           core: _this2.core,
                           otherParams: _this2.otherParams,
@@ -264,15 +274,15 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                           queryPayload: queryPayload,
                           handledByOsServer: handledByOsServer
                         });
-                        _context4.next = 7;
+                        _context4.next = 8;
                         return _this2.addProduct(products);
-                      case 7:
+                      case 8:
                         originalCallback(handledByOsServer ? result : _objectSpread(_objectSpread({}, result), {}, {
                           data: _objectSpread(_objectSpread({}, result.data), {}, {
                             list: products
                           })
                         }));
-                      case 8:
+                      case 9:
                       case "end":
                         return _context4.stop();
                     }
@@ -291,6 +301,9 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               });
             case 14:
               productsData = _context5.sent;
+              if (!handledByOsServer && Array.isArray(productsData.data.list)) {
+                this.replaceRawProductQueryResult(productsData.data.list, product_ids);
+              }
               resolvedList = resolveClientDataVariants({
                 core: this.core,
                 otherParams: this.otherParams,
@@ -309,7 +322,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               // }
               this.addProduct(sortedList);
               return _context5.abrupt("return", sortedList);
-            case 19:
+            case 20:
             case "end":
               return _context5.stop();
           }
@@ -352,6 +365,60 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
       }
       return loadProductsPrice;
     }()
+    /**
+     * Remember raw remote product records before client-side Data Variant
+     * evaluation. Quote-only reads can then always start from a clean baseline.
+     */
+  }, {
+    key: "rememberRawProductQueryResult",
+    value: function rememberRawProductQueryResult(products) {
+      var _this3 = this;
+      if (!Array.isArray(products)) return;
+      products.forEach(function (product) {
+        var _source$id;
+        var source = product;
+        var id = Number((_source$id = source === null || source === void 0 ? void 0 : source.id) !== null && _source$id !== void 0 ? _source$id : source === null || source === void 0 ? void 0 : source.product_id);
+        if (!Number.isFinite(id)) return;
+        _this3.rawProductPriceSources.set(id, cloneDeep(product));
+      });
+    }
+  }, {
+    key: "replaceRawProductQueryResult",
+    value: function replaceRawProductQueryResult(products, requestedIds) {
+      var _this4 = this;
+      if (Array.isArray(requestedIds) && requestedIds.length > 0) {
+        requestedIds.forEach(function (rawId) {
+          var id = Number(rawId);
+          if (Number.isFinite(id)) _this4.rawProductPriceSources.delete(id);
+        });
+      } else {
+        // A non-ID query represents the latest catalog scope. Clearing before
+        // replacing prevents removed products from surviving indefinitely.
+        this.rawProductPriceSources.clear();
+      }
+      this.rememberRawProductQueryResult(products);
+    }
+
+    /**
+     * Return isolated raw price sources for the requested products.
+     *
+     * Missing IDs are intentionally omitted so callers can remotely fetch only
+     * the incomplete part of a batch quote.
+     */
+  }, {
+    key: "getRawProductPriceSources",
+    value: function getRawProductPriceSources(ids) {
+      var _this5 = this;
+      var products = new Map();
+      if (!Array.isArray(ids)) return products;
+      ids.forEach(function (rawId) {
+        var id = Number(rawId);
+        if (!Number.isFinite(id) || products.has(id)) return;
+        var product = _this5.rawProductPriceSources.get(id);
+        if (product) products.set(id, cloneDeep(product));
+      });
+      return products;
+    }
   }, {
     key: "getProducts",
     value: function () {
@@ -430,7 +497,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     key: "addProduct",
     value: function () {
       var _addProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(products) {
-        var _this3 = this;
+        var _this6 = this;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
@@ -439,13 +506,13 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 this.store.list = [];
               }
               products.forEach(function (n) {
-                var index = _this3.store.list.findIndex(function (m) {
+                var index = _this6.store.list.findIndex(function (m) {
                   return m.id === n.id;
                 });
                 if (index === -1) {
-                  _this3.store.list.push(n);
+                  _this6.store.list.push(n);
                 } else {
-                  _this3.store.list[index] = n;
+                  _this6.store.list[index] = n;
                 }
               });
               // 根据 sort 值做降序排序（数字越大越靠前）

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

@@ -129,8 +129,23 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      */
     protected preferAuthoritativeProductQueryPrice(): boolean;
     private getPriceQuerySchedule;
+    private isCustomerUserPriceQuery;
+    private getPriceQueryScheduleList;
+    private buildPriceQueryPayload;
+    private getRawProductPriceSources;
+    private rememberRawProductPriceSources;
+    private getSelectedProductVariantId;
+    /**
+     * 将目录原始商品还原为本次选择的 SKU 基线。
+     *
+     * 这里绝不能复用已评估后的目录商品，否则从命中智能价切回不命中的
+     * 日期时会残留旧价格。套餐仅验证所选关系存在，最终仍由 merge 方法把
+     * 评估后的套餐价格映射回用户的选择数据。
+     */
+    private prepareRawProductForPriceQuery;
+    private resolveLocalProductForPriceQuery;
     private loadProductsForPriceQuery;
-    private loadProductForPriceQuery;
+    private resolveProductsForPriceQuery;
     private getAuthoritativeBundleItems;
     private findAuthoritativeBundleItem;
     private getAuthoritativeBundleUnitPrice;