@pisell/pisellos 0.10.56 → 0.10.58

package/dist/modules/ProductList/index.js

@@ -102,18 +102,102 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
       this.otherParams = params || {};
     }
   }, {
-    key: "storeChange",
+    key: "enrichProducts",
     value: function () {
-      var _storeChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(path, value) {
+      var _enrichProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(products, context) {
+        var _context$signal, _context$signal2;
+        var enrich, result;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
+              enrich = this.otherParams.enrichProducts;
+              if (enrich) {
+                _context2.next = 3;
+                break;
+              }
+              return _context2.abrupt("return", products);
+            case 3:
+              if (!((_context$signal = context.signal) !== null && _context$signal !== void 0 && _context$signal.aborted)) {
+                _context2.next = 5;
+                break;
+              }
+              throw new Error('Product enrichment cancelled');
+            case 5:
+              _context2.next = 7;
+              return enrich(cloneDeep(products), _objectSpread({
+                businessCode: this.otherParams.businessCode,
+                channel: this.otherParams.channel
+              }, context));
+            case 7:
+              result = _context2.sent;
+              if (!((_context$signal2 = context.signal) !== null && _context$signal2 !== void 0 && _context$signal2.aborted)) {
+                _context2.next = 10;
+                break;
+              }
+              throw new Error('Product enrichment cancelled');
+            case 10:
+              if (Array.isArray(result)) {
+                _context2.next = 12;
+                break;
+              }
+              throw new Error('Product enrichment must return an array');
+            case 12:
+              return _context2.abrupt("return", result);
+            case 13:
             case "end":
               return _context2.stop();
           }
-        }, _callee2);
+        }, _callee2, this);
+      }));
+      function enrichProducts(_x3, _x4) {
+        return _enrichProducts.apply(this, arguments);
+      }
+      return enrichProducts;
+    }()
+  }, {
+    key: "enrichCatalog",
+    value: function () {
+      var _enrichCatalog = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(products, reason) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.prev = 0;
+              _context3.next = 3;
+              return this.enrichProducts(products, {
+                reason: reason
+              });
+            case 3:
+              return _context3.abrupt("return", _context3.sent);
+            case 6:
+              _context3.prev = 6;
+              _context3.t0 = _context3["catch"](0);
+              // An unavailable supplementary source is not zero stock or an empty catalog.
+              console.warn('[ProductList] Supplementary product data could not be refreshed');
+              return _context3.abrupt("return", products);
+            case 10:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this, [[0, 6]]);
       }));
-      function storeChange(_x3, _x4) {
+      function enrichCatalog(_x5, _x6) {
+        return _enrichCatalog.apply(this, arguments);
+      }
+      return enrichCatalog;
+    }()
+  }, {
+    key: "storeChange",
+    value: function () {
+      var _storeChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(path, value) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4);
+      }));
+      function storeChange(_x7, _x8) {
         return _storeChange.apply(this, arguments);
       }
       return storeChange;
@@ -127,14 +211,14 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getAddTimeProducts",
     value: (function () {
-      var _getAddTimeProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      var _getAddTimeProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
         var params,
-          _args3 = arguments;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+          _args5 = arguments;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              params = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {};
-              return _context3.abrupt("return", this.loadProducts(_objectSpread(_objectSpread({
+              params = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {};
+              return _context5.abrupt("return", this.loadProducts(_objectSpread(_objectSpread({
                 schedule_date: dayjs().format('YYYY-MM-DD'),
                 status: 'published'
               }, params), {}, {
@@ -142,9 +226,9 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               })));
             case 2:
             case "end":
-              return _context3.stop();
+              return _context5.stop();
           }
-        }, _callee3, this);
+        }, _callee5, this);
       }));
       function getAddTimeProducts() {
         return _getAddTimeProducts.apply(this, arguments);
@@ -154,9 +238,12 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadProducts",
     value: function () {
-      var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+      var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
         var _this$otherParams,
+          _this$otherParams$bus,
           _this$otherParams2,
+          _this$otherParams3,
+          _this$otherParams4,
           _this2 = this;
         var _ref,
           _ref$category_ids,
@@ -185,19 +272,22 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
           channelMap,
           rawApplicationCode,
           mappedApplicationCode,
+          configuredBusinessCode,
+          resolvedStrategyContext,
           queryPayload,
           handledByOsServer,
           originalCallback,
           subscriptionCallback,
           productsData,
           resolvedList,
+          enrichedList,
           sortedList,
-          _args5 = arguments;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+          _args7 = arguments;
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _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;
+              _ref = _args7.length > 0 && _args7[0] !== undefined ? _args7[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 = _args7.length > 1 ? _args7[1] : undefined;
               // // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
               // if (!schedule_ids?.length) {
               //   const schedule_ids_data = this.store.schedule
@@ -227,7 +317,15 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               };
               rawApplicationCode = (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel;
               mappedApplicationCode = typeof rawApplicationCode === 'string' ? channelMap[rawApplicationCode] || rawApplicationCode : rawApplicationCode;
-              queryPayload = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, isCustomerUserPlatform((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.platform) ? {} : {
+              configuredBusinessCode = (_this$otherParams$bus = (_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.businessCode) !== null && _this$otherParams$bus !== void 0 ? _this$otherParams$bus : (_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.business_code; // application_code 是后端商品筛选字段；智能定价评估器则只读取
+              // strategy_context 中的 channel / business_code。默认补齐两者，
+              // 但允许调用方显式传入的上下文覆盖默认值。
+              resolvedStrategyContext = _objectSpread(_objectSpread(_objectSpread({}, mappedApplicationCode ? {
+                channel: mappedApplicationCode
+              } : {}), configuredBusinessCode ? {
+                business_code: configuredBusinessCode
+              } : {}), strategy_context || {});
+              queryPayload = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, isCustomerUserPlatform((_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.platform) ? {} : {
                 open_quotation: 1
               }), {}, {
                 open_bundle: 0,
@@ -256,24 +354,24 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 with_schedule: with_schedule,
                 schedule_datetime: schedule_datetime,
                 extension_type: extension_type,
-                strategy_context: strategy_context
+                strategy_context: Object.keys(resolvedStrategyContext).length ? resolvedStrategyContext : undefined
               });
               handledByOsServer = isProductQueryHandledByOsServer(this.core, this.request);
               originalCallback = typeof (options === null || options === void 0 ? void 0 : options.callback) === 'function' ? options.callback : undefined;
               subscriptionCallback = originalCallback ? ( /*#__PURE__*/function () {
-                var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(result) {
+                var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(result) {
                   var _result$data;
-                  var callbackList, resolvedCallbackList;
-                  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-                    while (1) switch (_context4.prev = _context4.next) {
+                  var callbackList, resolvedCallbackList, enrichedCallbackList;
+                  return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+                    while (1) switch (_context6.prev = _context6.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;
+                          _context6.next = 4;
                           break;
                         }
                         originalCallback(result);
-                        return _context4.abrupt("return");
+                        return _context6.abrupt("return");
                       case 4:
                         if (!handledByOsServer) {
                           // Subscription payloads may contain only changed products, so keep
@@ -287,33 +385,37 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                           queryPayload: queryPayload,
                           handledByOsServer: handledByOsServer
                         });
-                        _context4.next = 8;
-                        return _this2.addProduct(resolvedCallbackList);
+                        _context6.next = 8;
+                        return _this2.enrichCatalog(resolvedCallbackList, 'catalog-update');
                       case 8:
-                        originalCallback(resolvedCallbackList === callbackList ? result : _objectSpread(_objectSpread({}, result), {}, {
+                        enrichedCallbackList = _context6.sent;
+                        _context6.next = 11;
+                        return _this2.addProduct(enrichedCallbackList);
+                      case 11:
+                        originalCallback(enrichedCallbackList === callbackList ? result : _objectSpread(_objectSpread({}, result), {}, {
                           data: _objectSpread(_objectSpread({}, result.data), {}, {
-                            list: resolvedCallbackList
+                            list: enrichedCallbackList
                           })
                         }));
-                      case 9:
+                      case 12:
                       case "end":
-                        return _context4.stop();
+                        return _context6.stop();
                     }
-                  }, _callee4);
+                  }, _callee6);
                 }));
-                return function (_x5) {
+                return function (_x9) {
                   return _ref2.apply(this, arguments);
                 };
               }()) : undefined;
-              _context5.next = 14;
+              _context7.next = 16;
               return this.request.post("/product/query", queryPayload, {
                 osServer: true,
                 callback: subscriptionCallback,
                 subscriberId: options === null || options === void 0 ? void 0 : options.subscriberId,
                 customToast: function customToast() {}
               });
-            case 14:
-              productsData = _context5.sent;
+            case 16:
+              productsData = _context7.sent;
               if (!handledByOsServer && Array.isArray(productsData.data.list)) {
                 this.replaceRawProductQueryResult(productsData.data.list, product_ids);
               }
@@ -324,7 +426,11 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 queryPayload: queryPayload,
                 handledByOsServer: handledByOsServer
               });
-              sortedList = resolvedList.slice().sort(function (a, b) {
+              _context7.next = 21;
+              return this.enrichCatalog(resolvedList, 'catalog');
+            case 21:
+              enrichedList = _context7.sent;
+              sortedList = enrichedList.slice().sort(function (a, b) {
                 return Number(b.sort) - Number(a.sort);
               }); // if (sortedList.length) {
               //   sortedList.forEach((n: any) => {
@@ -333,13 +439,15 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               //     }
               //   })
               // }
-              this.addProduct(sortedList);
-              return _context5.abrupt("return", sortedList);
-            case 20:
+              _context7.next = 25;
+              return this.addProduct(sortedList);
+            case 25:
+              return _context7.abrupt("return", sortedList);
+            case 26:
             case "end":
-              return _context5.stop();
+              return _context7.stop();
           }
-        }, _callee5, this);
+        }, _callee7, this);
       }));
       function loadProducts() {
         return _loadProducts.apply(this, arguments);
@@ -349,13 +457,13 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadProductsPrice",
     value: function () {
-      var _loadProductsPrice = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref3) {
+      var _loadProductsPrice = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(_ref3) {
         var _ref3$ids, ids, customer_id, schedule_date, channel, productsData;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               _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;
+              _context8.next = 3;
               return this.request.post("/product/query/price", {
                 ids: ids,
                 customer_id: customer_id,
@@ -365,15 +473,15 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 useCache: true
               });
             case 3:
-              productsData = _context6.sent;
-              return _context6.abrupt("return", productsData.data);
+              productsData = _context8.sent;
+              return _context8.abrupt("return", productsData.data);
             case 5:
             case "end":
-              return _context6.stop();
+              return _context8.stop();
           }
-        }, _callee6, this);
+        }, _callee8, this);
       }));
-      function loadProductsPrice(_x6) {
+      function loadProductsPrice(_x10) {
         return _loadProductsPrice.apply(this, arguments);
       }
       return loadProductsPrice;
@@ -435,19 +543,19 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProducts",
     value: function () {
-      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              _context7.next = 2;
+              _context9.next = 2;
               return this.core.effects.emit("".concat(this.name, ":onGetProducts"), this.store.list);
             case 2:
-              return _context7.abrupt("return", cloneDeep(this.store.list));
+              return _context9.abrupt("return", cloneDeep(this.store.list));
             case 3:
             case "end":
-              return _context7.stop();
+              return _context9.stop();
           }
-        }, _callee7, this);
+        }, _callee9, this);
       }));
       function getProducts() {
         return _getProducts.apply(this, arguments);
@@ -457,25 +565,25 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProduct",
     value: function () {
-      var _getProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(id) {
+      var _getProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(id) {
         var product;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              _context8.next = 2;
+              _context10.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 _context8.abrupt("return", product ? cloneDeep(product) : undefined);
+              return _context10.abrupt("return", product ? cloneDeep(product) : undefined);
             case 4:
             case "end":
-              return _context8.stop();
+              return _context10.stop();
           }
-        }, _callee8, this);
+        }, _callee10, this);
       }));
-      function getProduct(_x7) {
+      function getProduct(_x11) {
         return _getProduct.apply(this, arguments);
       }
       return getProduct;
@@ -483,7 +591,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "queryProducts",
     value: function () {
-      var _queryProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+      var _queryProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
         var params,
           includeIds,
           excludeIds,
@@ -494,11 +602,11 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
           channelApplications,
           codeOrBarcode,
           products,
-          _args9 = arguments;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+          _args11 = arguments;
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              params = _args9.length > 0 && _args9[0] !== undefined ? _args9[0] : {};
+              params = _args11.length > 0 && _args11[0] !== undefined ? _args11[0] : {};
               includeIds = normalizeQuerySet(params.includeIds);
               excludeIds = normalizeQuerySet(params.excludeIds);
               categoryIds = normalizeQuerySet(params.categoryIds);
@@ -537,12 +645,12 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 }
                 return true;
               });
-              return _context9.abrupt("return", cloneDeep(products));
+              return _context11.abrupt("return", cloneDeep(products));
             case 11:
             case "end":
-              return _context9.stop();
+              return _context11.stop();
           }
-        }, _callee9, this);
+        }, _callee11, this);
       }));
       function queryProducts() {
         return _queryProducts.apply(this, arguments);
@@ -552,23 +660,23 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProductByIds",
     value: function () {
-      var _getProductByIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(ids) {
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+      var _getProductByIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(ids) {
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              _context10.next = 2;
+              _context12.next = 2;
               return this.core.effects.emit("".concat(this.name, ":onGetProductByIds"), this.store.list);
             case 2:
-              return _context10.abrupt("return", this.queryProducts({
+              return _context12.abrupt("return", this.queryProducts({
                 includeIds: ids
               }));
             case 3:
             case "end":
-              return _context10.stop();
+              return _context12.stop();
           }
-        }, _callee10, this);
+        }, _callee12, this);
       }));
-      function getProductByIds(_x8) {
+      function getProductByIds(_x12) {
         return _getProductByIds.apply(this, arguments);
       }
       return getProductByIds;
@@ -576,10 +684,10 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProduct",
     value: function () {
-      var _addProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(products) {
+      var _addProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(products) {
         var _this6 = this;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               // list 需要根据 id 去重
               if (!this.store.list) {
@@ -602,11 +710,11 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               this.core.effects.emit("".concat(this.name, ":changed"), this.store.list);
             case 4:
             case "end":
-              return _context11.stop();
+              return _context13.stop();
           }
-        }, _callee11, this);
+        }, _callee13, this);
       }));
-      function addProduct(_x9) {
+      function addProduct(_x13) {
         return _addProduct.apply(this, arguments);
       }
       return addProduct;
@@ -614,18 +722,18 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "selectProducts",
     value: function () {
-      var _selectProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(products) {
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+      var _selectProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(products) {
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               this.store.selectProducts = products;
             case 1:
             case "end":
-              return _context12.stop();
+              return _context14.stop();
           }
-        }, _callee12, this);
+        }, _callee14, this);
       }));
-      function selectProducts(_x10) {
+      function selectProducts(_x14) {
         return _selectProducts.apply(this, arguments);
       }
       return selectProducts;

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

@@ -1,4 +1,12 @@
 import { ProductData } from '../Product/types';
+/** Runtime-only enrichment; never serialized into a product query. */
+export interface ProductEnrichmentContext {
+    reason: 'catalog' | 'catalog-update' | 'detail-open';
+    businessCode?: string;
+    channel?: string;
+    signal?: AbortSignal;
+}
+export type ProductEnricher = (products: ProductData[], context: ProductEnrichmentContext) => Promise<ProductData[]>;
 export interface ProductListLoadProductsParams {
     category_ids?: number[];
     product_ids?: number[];

package/dist/modules/ProductList/types.js

@@ -1,3 +1,5 @@
+/** Runtime-only enrichment; never serialized into a product query. */
+
 export var ProductListHooks = /*#__PURE__*/function (ProductListHooks) {
   ProductListHooks["onGetProducts"] = "productList:onGetProducts";
   ProductListHooks["onGetProduct"] = "productList:onGetProduct";

package/dist/modules/ResourcePlanner/planner.js

@@ -436,7 +436,7 @@ function normalizeOccupancy(occupancy, coverage, timezoneName, fixedOffsetMinute
 }
 function normalizeRequirementGroup(product, requirementGroup) {
   var _requirementGroup$for;
-  var resourceType = 'single';
+  var resourceType = requirementGroup.resourceType === 'multiple' || requirementGroup.resourceType === 'capacity' ? requirementGroup.resourceType : 'single';
   var required = requirementGroup.required !== false;
   var min = required ? 1 : 0;
   return _objectSpread(_objectSpread({}, requirementGroup), {}, {
@@ -482,7 +482,7 @@ function normalizeProducts(products) {
 function normalizeResources(resources) {
   return resources.map(function (resource) {
     return _objectSpread(_objectSpread({}, resource), {}, {
-      resourceType: 'single',
+      resourceType: resource.resourceType === 'multiple' || resource.resourceType === 'capacity' ? resource.resourceType : 'single',
       capacity: Math.max(1, Number(resource.capacity || 1) || 1),
       windows: (resource.windows || []).map(function (window) {
         return _objectSpread({}, window);
@@ -637,7 +637,8 @@ function buildCells(projection) {
           var usedCapacity = segmentOccupancies.reduce(function (sum, occupancy) {
             return sum + Math.max(1, Number(occupancy.pax || 1) || 1);
           }, 0);
-          var remainingCapacity = Math.max(0, resource.capacity - usedCapacity);
+          // 预约模式来自商品资源组；v2 资源记录可能不包含 type。
+          var remainingCapacity = requirementGroup.resourceType === 'single' && segmentOccupancies.length > 0 ? 0 : Math.max(0, resource.capacity - usedCapacity);
           var requiredCapacity = resolveRequiredCapacity(requirementGroup, product);
           var reasonCodes = Array.from(new Set(segmentOccupancies.flatMap(function (occupancy) {
             var source = occupancy.source || 'remote';
@@ -671,7 +672,7 @@ function buildCells(projection) {
             requirementFormId: requirementGroup.formId,
             resourceId: resource.id,
             resourceName: resource.name,
-            resourceType: resource.resourceType,
+            resourceType: requirementGroup.resourceType,
             startAt: formatDateTime(start, timezoneName, fixedOffsetMinutes),
             endAt: formatDateTime(end, timezoneName, fixedOffsetMinutes),
             date: formatDate(start, timezoneName),
@@ -679,7 +680,7 @@ function buildCells(projection) {
             endTime: formatTime(end, timezoneName),
             timezone: projection.meta.timezone,
             status: status,
-            // 资源组当前统一单选；具体资源仍用 capacity 表达可承载的预约数量。
+            // capacity 表示人数；single 被占用时不再贡献可用容量。
             remainingCapacity: remainingCapacity,
             maxCapacity: resource.capacity,
             reasonCodes: Array.from(new Set(reasonCodes)),
@@ -1739,7 +1740,7 @@ function evaluateCandidate(projection, candidate, request) {
           resourceName: resource.name,
           resourceFormId: resource.formId,
           policyId: (_resource$raw = resource.raw) === null || _resource$raw === void 0 ? void 0 : _resource$raw.policy_id,
-          resourceType: resource.resourceType,
+          resourceType: requirementGroup.resourceType,
           status: _isPast ? 'past' : 'unavailable',
           maxPartySize: 0,
           reasonCodes: _isPast ? ['past'] : [].concat(_toConsumableArray(isExcludedScheduleDate ? ['schedule_excluded_date'] : []), ['outside_resource_window'])
@@ -1763,7 +1764,7 @@ function evaluateCandidate(projection, candidate, request) {
         resourceName: resource.name,
         resourceFormId: resource.formId,
         policyId: (_resource$raw2 = resource.raw) === null || _resource$raw2 === void 0 ? void 0 : _resource$raw2.policy_id,
-        resourceType: resource.resourceType,
+        resourceType: requirementGroup.resourceType,
         status: status,
         remainingCapacity: remainingCapacity,
         maxCapacity: maxCapacity,
@@ -2330,7 +2331,8 @@ export function validateAvailabilitySelection(projection, params) {
       var remainingCapacity = matchedCell === null || matchedCell === void 0 ? void 0 : matchedCell.remainingCapacity;
       if (option && (option.status === 'available' || option.status === 'limited') && remainingCapacity !== undefined) {
         var capacityPerBooking = normalizedPartySize !== null && normalizedPartySize !== void 0 ? normalizedPartySize : 1;
-        var availableQuantity = Math.max(0, Math.floor(remainingCapacity / capacityPerBooking));
+        var capacityQuantity = Math.max(0, Math.floor(remainingCapacity / capacityPerBooking));
+        var availableQuantity = matchedGroup.resourceType === 'single' ? Math.min(1, capacityQuantity) : capacityQuantity;
         if (normalizedBookingCount > availableQuantity) {
           conflicts.push({
             code: 'resource_capacity_exceeded',