@pisell/pisellos 2.3.80 → 2.3.81

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

@@ -0,0 +1,9 @@
+// 导出评估器
+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

@@ -0,0 +1,27 @@
+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;
+}
+/**
+ * 未启用商品 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,62 @@
+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;
+}
+/**
+ * 未启用商品 OS 路由时，在客户端补做 Data Variant 解析。
+ *
+ * 商品列表和预约报价必须共用这个边界，避免 H5 的弹窗报价绕过客户端智能定价。
+ * OS Server 已接管时直接信任服务端结果，确保同一批商品只评估一次。
+ */
+export function resolveClientDataVariants(_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;
+  if (handledByOsServer || products.length === 0) return 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;
+  }
+  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 : Array.isArray(moduleScheduleList) ? 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);
+    return Array.isArray(result === null || result === void 0 ? void 0 : result.products) ? result.products : products;
+  } catch (error) {
+    console.error('[ClientDataVariants] Data Variant 客户端解析失败', error);
+    return products;
+  }
+}

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

@@ -18,19 +18,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>;
     /**
      * 获取加时商品列表。

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,7 @@ 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";
 export * from "./types";
 export var ProductList = /*#__PURE__*/function (_BaseModule) {
   _inherits(ProductList, _BaseModule);
@@ -78,64 +85,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 +139,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     key: "loadProducts",
     value: function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        var _this$otherParams3,
+        var _this$otherParams,
           _this2 = this;
         var _ref,
           _ref$category_ids,
@@ -259,13 +208,13 @@ 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,
                 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 +240,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,7 +257,13 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                         originalCallback(result);
                         return _context4.abrupt("return");
                       case 4:
-                        products = _this2.resolveClientDataVariants(callbackList, queryPayload, handledByOsServer);
+                        products = resolveClientDataVariants({
+                          core: _this2.core,
+                          otherParams: _this2.otherParams,
+                          products: callbackList,
+                          queryPayload: queryPayload,
+                          handledByOsServer: handledByOsServer
+                        });
                         _context4.next = 7;
                         return _this2.addProduct(products);
                       case 7:
@@ -336,7 +291,13 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               });
             case 14:
               productsData = _context5.sent;
-              resolvedList = this.resolveClientDataVariants(productsData.data.list || [], queryPayload, handledByOsServer);
+              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) {

package/dist/solution/BaseSales/index.js

@@ -42,6 +42,7 @@ import { resolvePaymentNumberDevicePrefix, resolvePaymentNumberDevicePrefixFromD
 import { applyOrderCollectionUidRemaps, getOrderCollectionPersistentId, getOrderCollectionReferenceUid, getOrderCollectionUid, isSameOrderCollectionItem, mergeOrderCollectionItems, normalizeOrderCollection, normalizeOrderCollections, setOrderCollectionUid } from "../../modules/Order/utils/orderCollectionIdentity";
 import dayjs from 'dayjs';
 export * from "./types";
+import { isProductQueryHandledByOsServer, PRODUCT_QUERY_DATA_VARIANT_RELATIONS, resolveClientDataVariants } from "../../modules/ProductList/clientDataVariants";
 import { QuotationModule } from "../../modules/Quotation";
 import { transformBaseProductToOrderProduct as _transformBaseProductToOrderProduct } from "./utils/transformBaseProductToOrderProduct";
 import { calculateBaseSalesProductBookingPrice } from "./utils/quotationPrice";
@@ -995,7 +996,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadProductsForPriceQuery",
     value: function () {
       var _loadProductsForPriceQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params) {
-        var ids, productsById, channel, strategyContext, _response$data, response, list;
+        var ids, productsById, channel, strategyContext, handledByOsServer, _response$data, _this$store$schedule, _this$store$schedule$, queryPayload, response, list, resolvedList;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
@@ -1011,14 +1012,15 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 4:
               channel = this.getPriceQueryChannel(params.channel);
               strategyContext = this.getPriceQueryStrategyContext(channel);
-              _context8.prev = 6;
-              _context8.next = 9;
-              return this.request.post('/product/query', _objectSpread({
+              handledByOsServer = isProductQueryHandledByOsServer(this.core, this.request);
+              _context8.prev = 7;
+              queryPayload = _objectSpread({
                 ids: ids,
                 open_quotation: 1,
                 open_bundle: 1,
+                with: _toConsumableArray(PRODUCT_QUERY_DATA_VARIANT_RELATIONS),
                 status: 'published',
-                num: 1,
+                num: Math.max(ids.length, 1),
                 skip: 1,
                 customer_id: params.customerId,
                 schedule_date: params.schedule.schedule_date,
@@ -1026,38 +1028,48 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 application_code: channel
               }, Object.keys(strategyContext).length ? {
                 strategy_context: strategyContext
-              } : {}), {
+              } : {});
+              _context8.next = 11;
+              return this.request.post('/product/query', queryPayload, {
                 osServer: true,
                 customToast: function customToast() {}
               });
-            case 9:
+            case 11:
               response = _context8.sent;
               list = (response === null || response === void 0 || (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.list) || (response === null || response === void 0 ? void 0 : response.list) || [];
               if (Array.isArray(list)) {
-                _context8.next = 13;
+                _context8.next = 15;
                 break;
               }
               return _context8.abrupt("return", productsById);
-            case 13:
-              list.forEach(function (item) {
+            case 15:
+              resolvedList = resolveClientDataVariants({
+                core: this.core,
+                otherParams: this.otherParams,
+                products: list,
+                queryPayload: queryPayload,
+                handledByOsServer: handledByOsServer,
+                scheduleList: (_this$store$schedule = this.store.schedule) === null || _this$store$schedule === void 0 || (_this$store$schedule$ = _this$store$schedule.getScheduleList) === null || _this$store$schedule$ === void 0 ? void 0 : _this$store$schedule$.call(_this$store$schedule)
+              });
+              resolvedList.forEach(function (item) {
                 var _item$id;
                 var productId = Number((_item$id = item === null || item === void 0 ? void 0 : item.id) !== null && _item$id !== void 0 ? _item$id : item === null || item === void 0 ? void 0 : item.product_id);
                 if (Number.isFinite(productId)) productsById.set(productId, item);
               });
               return _context8.abrupt("return", productsById);
-            case 17:
-              _context8.prev = 17;
-              _context8.t0 = _context8["catch"](6);
+            case 20:
+              _context8.prev = 20;
+              _context8.t0 = _context8["catch"](7);
               this.logWarning('loadProductsForPriceQuery: 商品批量重查失败，使用入参 fallback', {
                 ids: ids,
                 error: _context8.t0 instanceof Error ? _context8.t0.message : String(_context8.t0)
               });
               return _context8.abrupt("return", productsById);
-            case 21:
+            case 24:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, this, [[6, 17]]);
+        }, _callee8, this, [[7, 20]]);
       }));
       function loadProductsForPriceQuery(_x7) {
         return _loadProductsForPriceQuery.apply(this, arguments);

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

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

@@ -0,0 +1,27 @@
+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;
+}
+/**
+ * 未启用商品 OS 路由时，在客户端补做 Data Variant 解析。
+ *
+ * 商品列表和预约报价必须共用这个边界，避免 H5 的弹窗报价绕过客户端智能定价。
+ * OS Server 已接管时直接信任服务端结果，确保同一批商品只评估一次。
+ */
+export declare function resolveClientDataVariants({ core, otherParams, products, queryPayload, handledByOsServer, scheduleList: explicitScheduleList, menuList: explicitMenuList, }: ResolveClientDataVariantsParams): ProductData[];

package/lib/modules/ProductList/clientDataVariants.js

@@ -0,0 +1,68 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PRODUCT_QUERY_DATA_VARIANT_RELATIONS = void 0;
+exports.isProductQueryHandledByOsServer = isProductQueryHandledByOsServer;
+exports.resolveClientDataVariants = resolveClientDataVariants;
+const PRODUCT_QUERY_DATA_VARIANT_RELATIONS = exports.PRODUCT_QUERY_DATA_VARIANT_RELATIONS = ['category', 'collection', 'resourceRelation', 'bundleGroup.bundleItem', 'optionGroup.optionItem', 'variantGroup.variantItem', 'dataVariants'];
+
+/**
+ * 判断当前商品查询是否会被本地 OS Server 接管。
+ *
+ * H5 RequestPlugin 即使收到 osServer=true 仍会直接请求远端接口，因此必须按
+ * RequestPlugin 实际 baseUrl 对应的已注册路由判断，不能只看请求选项。
+ */
+function isProductQueryHandledByOsServer(core, request) {
+  const server = core?.server;
+  if (!server || typeof server.hasRoute !== 'function') return false;
+  const requestBaseUrl = String(request?.baseUrl || '/shop').replace(/\/+$/, '');
+  return server.hasRoute('post', `${requestBaseUrl}/product/query`) === true;
+}
+/**
+ * 未启用商品 OS 路由时，在客户端补做 Data Variant 解析。
+ *
+ * 商品列表和预约报价必须共用这个边界，避免 H5 的弹窗报价绕过客户端智能定价。
+ * OS Server 已接管时直接信任服务端结果，确保同一批商品只评估一次。
+ */
+function resolveClientDataVariants({
+  core,
+  otherParams = {},
+  products,
+  queryPayload,
+  handledByOsServer,
+  scheduleList: explicitScheduleList,
+  menuList: explicitMenuList
+}) {
+  if (handledByOsServer || products.length === 0) return products;
+  const evaluator = core?.context?.dataVariantEvaluator;
+  if (!evaluator || typeof evaluator.resolveProducts !== 'function') {
+    return products;
+  }
+  const strategyContext = queryPayload.strategy_context && typeof queryPayload.strategy_context === 'object' ? queryPayload.strategy_context : {};
+  const fatherModule = String(otherParams.fatherModule || '').trim();
+  const scheduleModule = (fatherModule ? core?.getModule(`${fatherModule}_schedule`) : null) || core?.getModule('schedule');
+  const moduleScheduleList = scheduleModule?.getScheduleList?.();
+  const contextScheduleList = core?.context?.scheduleList;
+  const contextMenuList = core?.context?.menuList;
+  const businessData = {
+    products,
+    scheduleDateTime: queryPayload.schedule_datetime || queryPayload.schedule_date,
+    scheduleList: Array.isArray(explicitScheduleList) ? explicitScheduleList : Array.isArray(moduleScheduleList) ? 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.business_code ?? strategyContext.businessCode,
+    availableWalletIds: strategyContext.available_wallet_ids,
+    custom: strategyContext
+  };
+  try {
+    const result = evaluator.resolveProducts(businessData);
+    return Array.isArray(result?.products) ? result.products : products;
+  } catch (error) {
+    console.error('[ClientDataVariants] Data Variant 客户端解析失败', error);
+    return products;
+  }
+}

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

@@ -18,19 +18,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>;
     /**
      * 获取加时商品列表。

package/lib/modules/ProductList/index.js

@@ -10,6 +10,7 @@ exports.ProductList = void 0;
 var _BaseModule = require("../BaseModule");
 var _lodashEs = require("lodash-es");
 var _dayjs = _interopRequireDefault(require("dayjs"));
+var _clientDataVariants = require("./clientDataVariants");
 var _types = require("./types");
 Object.keys(_types).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -55,58 +56,6 @@ class ProductList extends _BaseModule.BaseModule {
   updateOtherParams(params) {
     this.otherParams = params || {};
   }
-
-  /**
-   * 判断当前商品查询是否会被本地 OS Server 接管。
-   *
-   * 不能只看请求参数中的 osServer=true：H5 RequestPlugin 会透传该参数，但仍然直接请求远端接口。
-   * 这里按 RequestPlugin 实际使用的 baseUrl 检查已注册路由，避免 OS Server 与客户端重复执行
-   * Data Variant 评估。
-   */
-  isProductQueryHandledByOsServer() {
-    const server = this.core?.server;
-    if (!server || typeof server.hasRoute !== 'function') return false;
-    const requestBaseUrl = String(this.request?.baseUrl || '/shop').replace(/\/+$/, '');
-    const routePath = `${requestBaseUrl}/product/query`;
-    return server.hasRoute('post', routePath) === true;
-  }
-
-  /**
-   * 未启用商品 OS 路由时，在客户端补做 Data Variant 解析。
-   * OS Server 已接管时直接信任服务端结果，确保同一批商品只评估一次。
-   */
-  resolveClientDataVariants(products, queryPayload, handledByOsServer) {
-    if (handledByOsServer || products.length === 0) return products;
-    const evaluator = this.core?.context?.dataVariantEvaluator;
-    if (!evaluator || typeof evaluator.resolveProducts !== 'function') {
-      return products;
-    }
-    const strategyContext = queryPayload.strategy_context && typeof queryPayload.strategy_context === 'object' ? queryPayload.strategy_context : {};
-    const fatherModule = String(this.otherParams?.fatherModule || '').trim();
-    const scheduleModule = (fatherModule ? this.core.getModule(`${fatherModule}_schedule`) : null) || this.core.getModule('schedule');
-    const scheduleList = scheduleModule?.getScheduleList?.();
-    const contextScheduleList = this.core?.context?.scheduleList;
-    const contextMenuList = this.core?.context?.menuList;
-    const businessData = {
-      products,
-      scheduleDateTime: queryPayload.schedule_datetime || queryPayload.schedule_date,
-      scheduleList: Array.isArray(scheduleList) ? scheduleList : Array.isArray(contextScheduleList) ? contextScheduleList : [],
-      menuList: Array.isArray(this.otherParams?.menuList) ? this.otherParams.menuList : Array.isArray(contextMenuList) ? contextMenuList : [],
-      customerId: queryPayload.customer_id,
-      channel: strategyContext.channel,
-      orderType: strategyContext.orderType || strategyContext.order_type,
-      businessCode: strategyContext.business_code ?? strategyContext.businessCode,
-      availableWalletIds: strategyContext.available_wallet_ids,
-      custom: strategyContext
-    };
-    try {
-      const result = evaluator.resolveProducts(businessData);
-      return Array.isArray(result?.products) ? result.products : products;
-    } catch (error) {
-      console.error('[ProductList] Data Variant 客户端解析失败', error);
-      return products;
-    }
-  }
   async storeChange(path, value) {
     // No longer needed - products are stored as plain objects instead of Product instances
   }
@@ -173,7 +122,7 @@ class ProductList extends _BaseModule.BaseModule {
       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: [..._clientDataVariants.PRODUCT_QUERY_DATA_VARIANT_RELATIONS],
       status,
       num: 500,
       skip: 1,
@@ -201,7 +150,7 @@ class ProductList extends _BaseModule.BaseModule {
       extension_type,
       strategy_context
     };
-    const handledByOsServer = this.isProductQueryHandledByOsServer();
+    const handledByOsServer = (0, _clientDataVariants.isProductQueryHandledByOsServer)(this.core, this.request);
     const originalCallback = options?.callback;
     const subscriptionCallback = typeof originalCallback === 'function' ? async result => {
       const callbackList = result?.data?.list;
@@ -209,7 +158,13 @@ class ProductList extends _BaseModule.BaseModule {
         originalCallback(result);
         return;
       }
-      const products = this.resolveClientDataVariants(callbackList, queryPayload, handledByOsServer);
+      const products = (0, _clientDataVariants.resolveClientDataVariants)({
+        core: this.core,
+        otherParams: this.otherParams,
+        products: callbackList,
+        queryPayload,
+        handledByOsServer
+      });
       await this.addProduct(products);
       originalCallback(handledByOsServer ? result : {
         ...result,
@@ -225,7 +180,13 @@ class ProductList extends _BaseModule.BaseModule {
       subscriberId: options?.subscriberId,
       customToast: () => {}
     });
-    const resolvedList = this.resolveClientDataVariants(productsData.data.list || [], queryPayload, handledByOsServer);
+    const resolvedList = (0, _clientDataVariants.resolveClientDataVariants)({
+      core: this.core,
+      otherParams: this.otherParams,
+      products: productsData.data.list || [],
+      queryPayload,
+      handledByOsServer
+    });
     const sortedList = resolvedList.slice().sort((a, b) => Number(b.sort) - Number(a.sort));
     // if (sortedList.length) {
     //   sortedList.forEach((n: any) => {

package/lib/solution/BaseSales/index.js

@@ -29,6 +29,7 @@ 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 _Quotation = require("../../modules/Quotation");
 var _transformBaseProductToOrderProduct = require("./utils/transformBaseProductToOrderProduct");
 var _quotationPrice = require("./utils/quotationPrice");
@@ -726,13 +727,15 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     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', {
+      const queryPayload = {
         ids,
         open_quotation: 1,
         open_bundle: 1,
+        with: [..._clientDataVariants.PRODUCT_QUERY_DATA_VARIANT_RELATIONS],
         status: 'published',
-        num: 1,
+        num: Math.max(ids.length, 1),
         skip: 1,
         customer_id: params.customerId,
         schedule_date: params.schedule.schedule_date,
@@ -741,13 +744,22 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
         ...(Object.keys(strategyContext).length ? {
           strategy_context: strategyContext
         } : {})
-      }, {
+      };
+      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 => {
+      const resolvedList = (0, _clientDataVariants.resolveClientDataVariants)({
+        core: this.core,
+        otherParams: this.otherParams,
+        products: list,
+        queryPayload,
+        handledByOsServer,
+        scheduleList: this.store.schedule?.getScheduleList?.()
+      });
+      resolvedList.forEach(item => {
         const productId = Number(item?.id ?? item?.product_id);
         if (Number.isFinite(productId)) productsById.set(productId, item);
       });

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

package/package.json

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