@pisell/pisellos 2.3.78 → 2.3.80

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

@@ -18,6 +18,19 @@ 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>;
     /**
      * 获取加时商品列表。
@@ -25,11 +38,11 @@ export declare class ProductList extends BaseModule implements Module {
      * @example
      * const products = await productList.getAddTimeProducts({ schedule_date: '2026-06-16' });
      */
-    getAddTimeProducts(params?: ProductListLoadProductsParams): Promise<any>;
+    getAddTimeProducts(params?: ProductListLoadProductsParams): Promise<ProductData[]>;
     loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, extension_type, status, strategy_context, }?: ProductListLoadProductsParams, options?: {
         callback?: (result: any) => void;
         subscriberId?: string;
-    }): Promise<any>;
+    }): Promise<ProductData[]>;
     loadProductsPrice({ ids, customer_id, schedule_date, channel, }: {
         ids?: number[];
         customer_id?: number;

package/dist/modules/ProductList/index.js

@@ -1,6 +1,6 @@
-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 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); }); }; }
@@ -78,6 +78,64 @@ 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 () {
@@ -131,8 +189,9 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadProducts",
     value: function () {
-      var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        var _this$otherParams;
+      var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+        var _this$otherParams3,
+          _this2 = this;
         var _ref,
           _ref$category_ids,
           category_ids,
@@ -161,14 +220,18 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
           rawApplicationCode,
           mappedApplicationCode,
           queryPayload,
+          handledByOsServer,
+          originalCallback,
+          subscriptionCallback,
           productsData,
+          resolvedList,
           sortedList,
-          _args4 = arguments;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+          _args5 = arguments;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _ref = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {}, _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, _ref$menu_list_ids = _ref.menu_list_ids, menu_list_ids = _ref$menu_list_ids === void 0 ? [] : _ref$menu_list_ids, paramsCustomerId = _ref.customer_id, _ref$with_count = _ref.with_count, with_count = _ref$with_count === void 0 ? [] : _ref$with_count, schedule_datetime = _ref.schedule_datetime, schedule_date = _ref.schedule_date, cacheId = _ref.cacheId, with_schedule = _ref.with_schedule, extension_type = _ref.extension_type, _ref$status = _ref.status, status = _ref$status === void 0 ? 'published' : _ref$status, strategy_context = _ref.strategy_context;
-              options = _args4.length > 1 ? _args4[1] : undefined;
+              _ref = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {}, _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, _ref$menu_list_ids = _ref.menu_list_ids, menu_list_ids = _ref$menu_list_ids === void 0 ? [] : _ref$menu_list_ids, paramsCustomerId = _ref.customer_id, _ref$with_count = _ref.with_count, with_count = _ref$with_count === void 0 ? [] : _ref$with_count, schedule_datetime = _ref.schedule_datetime, schedule_date = _ref.schedule_date, cacheId = _ref.cacheId, with_schedule = _ref.with_schedule, extension_type = _ref.extension_type, _ref$status = _ref.status, status = _ref$status === void 0 ? 'published' : _ref$status, strategy_context = _ref.strategy_context;
+              options = _args5.length > 1 ? _args5[1] : undefined;
               // // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
               // if (!schedule_ids?.length) {
               //   const schedule_ids_data = this.store.schedule
@@ -196,7 +259,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 scan_to_order_2: 'mobile_order',
                 scan_to_order_3: 'scantoorder3'
               };
-              rawApplicationCode = (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel;
+              rawApplicationCode = (_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.channel;
               mappedApplicationCode = typeof rawApplicationCode === 'string' ? channelMap[rawApplicationCode] || rawApplicationCode : rawApplicationCode;
               queryPayload = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
                 open_quotation: 1,
@@ -228,16 +291,53 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 extension_type: extension_type,
                 strategy_context: strategy_context
               });
-              _context4.next = 11;
+              handledByOsServer = this.isProductQueryHandledByOsServer();
+              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) {
+                  var _result$data;
+                  var callbackList, products;
+                  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+                    while (1) switch (_context4.prev = _context4.next) {
+                      case 0:
+                        callbackList = result === null || result === void 0 || (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.list;
+                        if (Array.isArray(callbackList)) {
+                          _context4.next = 4;
+                          break;
+                        }
+                        originalCallback(result);
+                        return _context4.abrupt("return");
+                      case 4:
+                        products = _this2.resolveClientDataVariants(callbackList, queryPayload, handledByOsServer);
+                        _context4.next = 7;
+                        return _this2.addProduct(products);
+                      case 7:
+                        originalCallback(handledByOsServer ? result : _objectSpread(_objectSpread({}, result), {}, {
+                          data: _objectSpread(_objectSpread({}, result.data), {}, {
+                            list: products
+                          })
+                        }));
+                      case 8:
+                      case "end":
+                        return _context4.stop();
+                    }
+                  }, _callee4);
+                }));
+                return function (_x5) {
+                  return _ref2.apply(this, arguments);
+                };
+              }()) : undefined;
+              _context5.next = 14;
               return this.request.post("/product/query", queryPayload, {
                 osServer: true,
-                callback: options === null || options === void 0 ? void 0 : options.callback,
+                callback: subscriptionCallback,
                 subscriberId: options === null || options === void 0 ? void 0 : options.subscriberId,
                 customToast: function customToast() {}
               });
-            case 11:
-              productsData = _context4.sent;
-              sortedList = (productsData.data.list || []).slice().sort(function (a, b) {
+            case 14:
+              productsData = _context5.sent;
+              resolvedList = this.resolveClientDataVariants(productsData.data.list || [], queryPayload, handledByOsServer);
+              sortedList = resolvedList.slice().sort(function (a, b) {
                 return Number(b.sort) - Number(a.sort);
               }); // if (sortedList.length) {
               //   sortedList.forEach((n: any) => {
@@ -247,12 +347,12 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               //   })
               // }
               this.addProduct(sortedList);
-              return _context4.abrupt("return", sortedList);
-            case 15:
+              return _context5.abrupt("return", sortedList);
+            case 19:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
       function loadProducts() {
         return _loadProducts.apply(this, arguments);
@@ -262,13 +362,13 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadProductsPrice",
     value: function () {
-      var _loadProductsPrice = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref2) {
-        var _ref2$ids, ids, customer_id, schedule_date, channel, productsData;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _loadProductsPrice = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref3) {
+        var _ref3$ids, ids, customer_id, schedule_date, channel, productsData;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              _ref2$ids = _ref2.ids, ids = _ref2$ids === void 0 ? [] : _ref2$ids, customer_id = _ref2.customer_id, schedule_date = _ref2.schedule_date, channel = _ref2.channel;
-              _context5.next = 3;
+              _ref3$ids = _ref3.ids, ids = _ref3$ids === void 0 ? [] : _ref3$ids, customer_id = _ref3.customer_id, schedule_date = _ref3.schedule_date, channel = _ref3.channel;
+              _context6.next = 3;
               return this.request.post("/product/query/price", {
                 ids: ids,
                 customer_id: customer_id,
@@ -278,15 +378,15 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 useCache: true
               });
             case 3:
-              productsData = _context5.sent;
-              return _context5.abrupt("return", productsData.data);
+              productsData = _context6.sent;
+              return _context6.abrupt("return", productsData.data);
             case 5:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, this);
+        }, _callee6, this);
       }));
-      function loadProductsPrice(_x5) {
+      function loadProductsPrice(_x6) {
         return _loadProductsPrice.apply(this, arguments);
       }
       return loadProductsPrice;
@@ -294,19 +394,19 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProducts",
     value: function () {
-      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _context6.next = 2;
+              _context7.next = 2;
               return this.core.effects.emit("".concat(this.name, ":onGetProducts"), this.store.list);
             case 2:
-              return _context6.abrupt("return", cloneDeep(this.store.list));
+              return _context7.abrupt("return", cloneDeep(this.store.list));
             case 3:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }));
       function getProducts() {
         return _getProducts.apply(this, arguments);
@@ -316,25 +416,25 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProduct",
     value: function () {
-      var _getProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(id) {
+      var _getProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(id) {
         var product;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              _context7.next = 2;
+              _context8.next = 2;
               return this.core.effects.emit("".concat(this.name, ":onGetProduct"), this.store.list);
             case 2:
               product = this.store.list.find(function (product) {
                 return product.id === id;
               });
-              return _context7.abrupt("return", product ? cloneDeep(product) : undefined);
+              return _context8.abrupt("return", product ? cloneDeep(product) : undefined);
             case 4:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7, this);
+        }, _callee8, this);
       }));
-      function getProduct(_x6) {
+      function getProduct(_x7) {
         return _getProduct.apply(this, arguments);
       }
       return getProduct;
@@ -342,25 +442,25 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProductByIds",
     value: function () {
-      var _getProductByIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(ids) {
+      var _getProductByIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(ids) {
         var products;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              _context8.next = 2;
+              _context9.next = 2;
               return this.core.effects.emit("".concat(this.name, ":onGetProductByIds"), this.store.list);
             case 2:
               products = this.store.list.filter(function (product) {
                 return ids.includes(product.id);
               });
-              return _context8.abrupt("return", products);
+              return _context9.abrupt("return", products);
             case 4:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
-        }, _callee8, this);
+        }, _callee9, this);
       }));
-      function getProductByIds(_x7) {
+      function getProductByIds(_x8) {
         return _getProductByIds.apply(this, arguments);
       }
       return getProductByIds;
@@ -368,23 +468,23 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProduct",
     value: function () {
-      var _addProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(products) {
-        var _this2 = this;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+      var _addProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(products) {
+        var _this3 = this;
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
               // list 需要根据 id 去重
               if (!this.store.list) {
                 this.store.list = [];
               }
               products.forEach(function (n) {
-                var index = _this2.store.list.findIndex(function (m) {
+                var index = _this3.store.list.findIndex(function (m) {
                   return m.id === n.id;
                 });
                 if (index === -1) {
-                  _this2.store.list.push(n);
+                  _this3.store.list.push(n);
                 } else {
-                  _this2.store.list[index] = n;
+                  _this3.store.list[index] = n;
                 }
               });
               // 根据 sort 值做降序排序（数字越大越靠前）
@@ -394,11 +494,11 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               this.core.effects.emit("".concat(this.name, ":changed"), this.store.list);
             case 4:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
-        }, _callee9, this);
+        }, _callee10, this);
       }));
-      function addProduct(_x8) {
+      function addProduct(_x9) {
         return _addProduct.apply(this, arguments);
       }
       return addProduct;
@@ -406,18 +506,18 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "selectProducts",
     value: function () {
-      var _selectProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(products) {
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+      var _selectProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(products) {
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               this.store.selectProducts = products;
             case 1:
             case "end":
-              return _context10.stop();
+              return _context11.stop();
           }
-        }, _callee10, this);
+        }, _callee11, this);
       }));
-      function selectProducts(_x9) {
+      function selectProducts(_x10) {
         return _selectProducts.apply(this, arguments);
       }
       return selectProducts;

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

@@ -495,7 +495,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     getUnfulfilledPromotions(): OrderUnfulfilledPromotion[];
     /** 最近一次促销计算输出的赠品操作 diff。 */
     getLastGiftActions(): OrderLastGiftActions | null;
-    getProductList(): Promise<any>;
+    getProductList(): Promise<import("../..").ProductData[] | undefined>;
     getOtherParams(): Record<string, any>;
     setOtherParams(params: Record<string, any>, { cover }?: {
         cover?: boolean;

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

@@ -67,7 +67,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         product_ids?: number[];
         collection?: number | string[];
         schedule_date?: string;
-    }): Promise<any>;
+    }): Promise<ProductData[]>;
     /**
      * 通过 schedule 来读取商品，适用于 session 类商品
      *
@@ -87,7 +87,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         product_ids?: number[];
         category_ids?: number[];
-    }): Promise<any>;
+    }): Promise<ProductData[]>;
     /**
      * 更新完商品数据、切换日期、或者在较后的流程里登录了，检测当前购物车里是否有商品，如果有，则需要更新购物车里的商品价格
      *
@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 1 | 5 | 2 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -128,7 +128,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     loadProducts(params?: ILoadProductsParams, options?: {
         callback?: (result: any) => void;
         subscriberId?: string;
-    }): Promise<any>;
+    }): Promise<ProductData[]>;
     /**
      * 获取加时商品列表。
      *
@@ -334,7 +334,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态
@@ -453,7 +453,19 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
+        action: "reloadCatalog";
+    } | {
+        action: "add";
+        cacheItem: any;
+    } | {
+        action: "requiresDetail";
+        payload: AddProductRequiresDetailPayload;
+    } | {
+        action: "requiresBookingEdit";
+        cacheItem: any;
+        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
+    };
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**