@pisell/pisellos 2.3.80 → 2.3.82

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

@@ -0,0 +1,50 @@
+import type { PisellCore } from '../../types';
+import type { RequestPlugin } from '../../plugins';
+import type { ProductData } from '../Product/types';
+export declare const PRODUCT_QUERY_DATA_VARIANT_RELATIONS: readonly ["category", "collection", "resourceRelation", "bundleGroup.bundleItem", "optionGroup.optionItem", "variantGroup.variantItem", "dataVariants"];
+/**
+ * 判断当前商品查询是否会被本地 OS Server 接管。
+ *
+ * H5 RequestPlugin 即使收到 osServer=true 仍会直接请求远端接口，因此必须按
+ * RequestPlugin 实际 baseUrl 对应的已注册路由判断，不能只看请求选项。
+ */
+export declare function isProductQueryHandledByOsServer(core: PisellCore | undefined, request: RequestPlugin | undefined): boolean;
+export interface ResolveClientDataVariantsParams {
+    core: PisellCore | undefined;
+    otherParams?: Record<string, any>;
+    products: ProductData[];
+    queryPayload: Record<string, any>;
+    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 解析。
+ *
+ * 商品列表和预约报价必须共用这个边界，避免 H5 的弹窗报价绕过客户端智能定价。
+ * OS Server 已接管时直接信任服务端结果，确保同一批商品只评估一次。
+ */
+export declare function resolveClientDataVariants({ core, otherParams, products, queryPayload, handledByOsServer, scheduleList: explicitScheduleList, menuList: explicitMenuList, }: ResolveClientDataVariantsParams): ProductData[];

package/dist/modules/ProductList/clientDataVariants.js

@@ -0,0 +1,216 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+export var PRODUCT_QUERY_DATA_VARIANT_RELATIONS = ['category', 'collection', 'resourceRelation', 'bundleGroup.bundleItem', 'optionGroup.optionItem', 'variantGroup.variantItem', 'dataVariants'];
+
+/**
+ * 判断当前商品查询是否会被本地 OS Server 接管。
+ *
+ * H5 RequestPlugin 即使收到 osServer=true 仍会直接请求远端接口，因此必须按
+ * RequestPlugin 实际 baseUrl 对应的已注册路由判断，不能只看请求选项。
+ */
+export function isProductQueryHandledByOsServer(core, request) {
+  var server = core === null || core === void 0 ? void 0 : core.server;
+  if (!server || typeof server.hasRoute !== 'function') return false;
+  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;
+}
+
+/**
+ * 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 function tryResolveClientDataVariants(_ref) {
+  var _core$context, _scheduleModule$getSc, _core$context2, _core$context3, _strategyContext$busi;
+  var core = _ref.core,
+    _ref$otherParams = _ref.otherParams,
+    otherParams = _ref$otherParams === void 0 ? {} : _ref$otherParams,
+    products = _ref.products,
+    queryPayload = _ref.queryPayload,
+    handledByOsServer = _ref.handledByOsServer,
+    explicitScheduleList = _ref.scheduleList,
+    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 {
+      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();
+  var scheduleModule = (fatherModule ? core === null || core === void 0 ? void 0 : core.getModule("".concat(fatherModule, "_schedule")) : null) || (core === null || core === void 0 ? void 0 : core.getModule('schedule'));
+  var moduleScheduleList = scheduleModule === null || scheduleModule === void 0 || (_scheduleModule$getSc = scheduleModule.getScheduleList) === null || _scheduleModule$getSc === void 0 ? void 0 : _scheduleModule$getSc.call(scheduleModule);
+  var contextScheduleList = core === null || core === void 0 || (_core$context2 = core.context) === null || _core$context2 === void 0 ? void 0 : _core$context2.scheduleList;
+  var contextMenuList = core === null || core === void 0 || (_core$context3 = core.context) === null || _core$context3 === void 0 ? void 0 : _core$context3.menuList;
+  var businessData = {
+    products: products,
+    scheduleDateTime: queryPayload.schedule_datetime || queryPayload.schedule_date,
+    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,
+    orderType: strategyContext.orderType || strategyContext.order_type,
+    businessCode: (_strategyContext$busi = strategyContext.business_code) !== null && _strategyContext$busi !== void 0 ? _strategyContext$busi : strategyContext.businessCode,
+    availableWalletIds: strategyContext.available_wallet_ids,
+    custom: strategyContext
+  };
+  try {
+    var result = evaluator.resolveProducts(businessData);
+    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) {
+    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>;
     /**
@@ -18,19 +19,6 @@ export declare class ProductList extends BaseModule implements Module {
      * productList.updateOtherParams({ channel: 'pos' });
      */
     updateOtherParams(params: Record<string, any>): void;
-    /**
-     * 判断当前商品查询是否会被本地 OS Server 接管。
-     *
-     * 不能只看请求参数中的 osServer=true：H5 RequestPlugin 会透传该参数，但仍然直接请求远端接口。
-     * 这里按 RequestPlugin 实际使用的 baseUrl 检查已注册路由，避免 OS Server 与客户端重复执行
-     * Data Variant 评估。
-     */
-    private isProductQueryHandledByOsServer;
-    /**
-     * 未启用商品 OS 路由时，在客户端补做 Data Variant 解析。
-     * OS Server 已接管时直接信任服务端结果，确保同一批商品只评估一次。
-     */
-    private resolveClientDataVariants;
     storeChange(path?: string, value?: any): Promise<void>;
     /**
      * 获取加时商品列表。
@@ -49,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

@@ -1,6 +1,12 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -20,6 +26,8 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 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);
@@ -33,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, [{
@@ -46,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);
@@ -56,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();
           }
@@ -78,64 +88,6 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     value: function updateOtherParams(params) {
       this.otherParams = params || {};
     }
-
-    /**
-     * 判断当前商品查询是否会被本地 OS Server 接管。
-     *
-     * 不能只看请求参数中的 osServer=true：H5 RequestPlugin 会透传该参数，但仍然直接请求远端接口。
-     * 这里按 RequestPlugin 实际使用的 baseUrl 检查已注册路由，避免 OS Server 与客户端重复执行
-     * Data Variant 评估。
-     */
-  }, {
-    key: "isProductQueryHandledByOsServer",
-    value: function isProductQueryHandledByOsServer() {
-      var _this$core, _this$request;
-      var server = (_this$core = this.core) === null || _this$core === void 0 ? void 0 : _this$core.server;
-      if (!server || typeof server.hasRoute !== 'function') return false;
-      var requestBaseUrl = String(((_this$request = this.request) === null || _this$request === void 0 ? void 0 : _this$request.baseUrl) || '/shop').replace(/\/+$/, '');
-      var routePath = "".concat(requestBaseUrl, "/product/query");
-      return server.hasRoute('post', routePath) === true;
-    }
-
-    /**
-     * 未启用商品 OS 路由时，在客户端补做 Data Variant 解析。
-     * OS Server 已接管时直接信任服务端结果，确保同一批商品只评估一次。
-     */
-  }, {
-    key: "resolveClientDataVariants",
-    value: function resolveClientDataVariants(products, queryPayload, handledByOsServer) {
-      var _this$core2, _this$otherParams, _scheduleModule$getSc, _this$core3, _this$core4, _this$otherParams2, _strategyContext$busi;
-      if (handledByOsServer || products.length === 0) return products;
-      var evaluator = (_this$core2 = this.core) === null || _this$core2 === void 0 || (_this$core2 = _this$core2.context) === null || _this$core2 === void 0 ? void 0 : _this$core2.dataVariantEvaluator;
-      if (!evaluator || typeof evaluator.resolveProducts !== 'function') {
-        return products;
-      }
-      var strategyContext = queryPayload.strategy_context && _typeof(queryPayload.strategy_context) === 'object' ? queryPayload.strategy_context : {};
-      var fatherModule = String(((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.fatherModule) || '').trim();
-      var scheduleModule = (fatherModule ? this.core.getModule("".concat(fatherModule, "_schedule")) : null) || this.core.getModule('schedule');
-      var scheduleList = scheduleModule === null || scheduleModule === void 0 || (_scheduleModule$getSc = scheduleModule.getScheduleList) === null || _scheduleModule$getSc === void 0 ? void 0 : _scheduleModule$getSc.call(scheduleModule);
-      var contextScheduleList = (_this$core3 = this.core) === null || _this$core3 === void 0 || (_this$core3 = _this$core3.context) === null || _this$core3 === void 0 ? void 0 : _this$core3.scheduleList;
-      var contextMenuList = (_this$core4 = this.core) === null || _this$core4 === void 0 || (_this$core4 = _this$core4.context) === null || _this$core4 === void 0 ? void 0 : _this$core4.menuList;
-      var businessData = {
-        products: products,
-        scheduleDateTime: queryPayload.schedule_datetime || queryPayload.schedule_date,
-        scheduleList: Array.isArray(scheduleList) ? scheduleList : Array.isArray(contextScheduleList) ? contextScheduleList : [],
-        menuList: Array.isArray((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.menuList) ? this.otherParams.menuList : Array.isArray(contextMenuList) ? contextMenuList : [],
-        customerId: queryPayload.customer_id,
-        channel: strategyContext.channel,
-        orderType: strategyContext.orderType || strategyContext.order_type,
-        businessCode: (_strategyContext$busi = strategyContext.business_code) !== null && _strategyContext$busi !== void 0 ? _strategyContext$busi : strategyContext.businessCode,
-        availableWalletIds: strategyContext.available_wallet_ids,
-        custom: strategyContext
-      };
-      try {
-        var _result = evaluator.resolveProducts(businessData);
-        return Array.isArray(_result === null || _result === void 0 ? void 0 : _result.products) ? _result.products : products;
-      } catch (error) {
-        console.error('[ProductList] Data Variant 客户端解析失败', error);
-        return products;
-      }
-    }
   }, {
     key: "storeChange",
     value: function () {
@@ -190,7 +142,8 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     key: "loadProducts",
     value: function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        var _this$otherParams3,
+        var _this$otherParams,
+          _this$otherParams2,
           _this2 = this;
         var _ref,
           _ref$category_ids,
@@ -259,13 +212,14 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 scan_to_order_2: 'mobile_order',
                 scan_to_order_3: 'scantoorder3'
               };
-              rawApplicationCode = (_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.channel;
+              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: ['category', 'collection', 'resourceRelation', 'bundleGroup.bundleItem', 'optionGroup.optionItem', 'variantGroup.variantItem', 'dataVariants'],
+                with: _toConsumableArray(PRODUCT_QUERY_DATA_VARIANT_RELATIONS),
                 status: status,
                 num: 500,
                 skip: 1,
@@ -291,7 +245,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 extension_type: extension_type,
                 strategy_context: strategy_context
               });
-              handledByOsServer = this.isProductQueryHandledByOsServer();
+              handledByOsServer = isProductQueryHandledByOsServer(this.core, this.request);
               originalCallback = options === null || options === void 0 ? void 0 : options.callback;
               subscriptionCallback = typeof originalCallback === 'function' ? ( /*#__PURE__*/function () {
                 var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(result) {
@@ -308,16 +262,27 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                         originalCallback(result);
                         return _context4.abrupt("return");
                       case 4:
-                        products = _this2.resolveClientDataVariants(callbackList, queryPayload, handledByOsServer);
-                        _context4.next = 7;
+                        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,
+                          products: callbackList,
+                          queryPayload: queryPayload,
+                          handledByOsServer: handledByOsServer
+                        });
+                        _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();
                     }
@@ -336,7 +301,16 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               });
             case 14:
               productsData = _context5.sent;
-              resolvedList = this.resolveClientDataVariants(productsData.data.list || [], queryPayload, handledByOsServer);
+              if (!handledByOsServer && Array.isArray(productsData.data.list)) {
+                this.replaceRawProductQueryResult(productsData.data.list, product_ids);
+              }
+              resolvedList = resolveClientDataVariants({
+                core: this.core,
+                otherParams: this.otherParams,
+                products: productsData.data.list || [],
+                queryPayload: queryPayload,
+                handledByOsServer: handledByOsServer
+              });
               sortedList = resolvedList.slice().sort(function (a, b) {
                 return Number(b.sort) - Number(a.sort);
               }); // if (sortedList.length) {
@@ -348,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();
           }
@@ -391,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 () {
@@ -469,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:
@@ -478,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;