@pisell/pisellos 2.2.153 → 2.2.154

package/dist/server/modules/products/index.js

@@ -523,26 +523,32 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
      * @param extraContext 额外的上下文数据（可选，由 Server 层传入）
      * @param options 可选参数
      * @param options.changedIds 变更的商品 IDs，非空时仅对这些商品增量执行 prepare 并更新缓存
+     * @param options.productIds 指定商品 IDs，仅对这些商品执行价格计算；不传则处理全量
      * @returns 应用了价格的商品列表
      */
   }, {
     key: "getProductsWithPrice",
     value: (function () {
       var _getProductsWithPrice = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(schedule_date, extraContext, options) {
-        var t0, cacheKey, changedIds, cachedProducts, updatedProducts, updatedMap, mergedCache, _iterator, _step, p, _iterator2, _step2, _p, errorMessage, result;
+        var _options$changedIds;
+        var t0, scopedProductIds, cacheKey, scopedProductIdSet, changedIds, cachedProducts, updatedProducts, updatedMap, mergedCache, _iterator, _step, p, _iterator2, _step2, _p, errorMessage, result;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               t0 = performance.now();
-              cacheKey = this.getProductsPriceCacheKey(schedule_date, extraContext);
-              changedIds = options === null || options === void 0 ? void 0 : options.changedIds;
+              scopedProductIds = this.normalizeProductIds(options === null || options === void 0 ? void 0 : options.productIds);
+              cacheKey = this.getProductsPriceCacheKey(schedule_date, extraContext, scopedProductIds);
+              scopedProductIdSet = scopedProductIds ? new Set(scopedProductIds) : undefined;
+              changedIds = scopedProductIdSet ? options === null || options === void 0 || (_options$changedIds = options.changedIds) === null || _options$changedIds === void 0 ? void 0 : _options$changedIds.filter(function (id) {
+                return scopedProductIdSet.has(id);
+              }) : options === null || options === void 0 ? void 0 : options.changedIds;
               if (!this.productsPriceCache.has(cacheKey)) {
-                _context6.next = 33;
+                _context6.next = 35;
                 break;
               }
               cachedProducts = this.productsPriceCache.get(cacheKey); // 有变更的商品 → 增量 prepare 后 merge 回缓存
               if (!(changedIds && changedIds.length > 0)) {
-                _context6.next = 30;
+                _context6.next = 32;
                 break;
               }
               this.logInfo('商品价格缓存命中，增量更新变更商品', {
@@ -550,15 +556,15 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
                 changedIds: changedIds,
                 cachedProductCount: cachedProducts.length
               });
-              _context6.prev = 7;
-              _context6.next = 10;
+              _context6.prev = 9;
+              _context6.next = 12;
               return this.prepareProductsWithPrice(schedule_date, extraContext, {
                 productIds: changedIds
               });
-            case 10:
+            case 12:
               updatedProducts = _context6.sent;
               if (!(updatedProducts.length > 0)) {
-                _context6.next = 22;
+                _context6.next = 24;
                 break;
               }
               // merge：用更新结果替换缓存中对应的商品，新增的追加
@@ -606,26 +612,26 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
                 count: mergedCache.length
               });
               return _context6.abrupt("return", mergedCache);
-            case 22:
-              _context6.next = 28;
-              break;
             case 24:
-              _context6.prev = 24;
-              _context6.t0 = _context6["catch"](7);
+              _context6.next = 30;
+              break;
+            case 26:
+              _context6.prev = 26;
+              _context6.t0 = _context6["catch"](9);
               errorMessage = _context6.t0 instanceof Error ? _context6.t0.message : String(_context6.t0);
               this.logError('增量更新失败，返回现有缓存', {
                 cacheKey: cacheKey,
                 changedIds: changedIds,
                 error: errorMessage
               });
-            case 28:
+            case 30:
               perfMark('getProductsWithPrice(incrementalUpdate)', performance.now() - t0, {
                 cacheKey: cacheKey,
                 changedCount: changedIds.length,
                 count: cachedProducts.length
               });
               return _context6.abrupt("return", cachedProducts);
-            case 30:
+            case 32:
               perfMark('getProductsWithPrice(cacheHit)', performance.now() - t0, {
                 cacheKey: cacheKey,
                 count: cachedProducts.length
@@ -635,13 +641,16 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
                 productCount: cachedProducts.length
               });
               return _context6.abrupt("return", cachedProducts);
-            case 33:
+            case 35:
               this.logInfo('商品价格缓存未命中，准备获取', {
-                cacheKey: cacheKey
+                cacheKey: cacheKey,
+                scopedProductCount: scopedProductIds === null || scopedProductIds === void 0 ? void 0 : scopedProductIds.length
               });
-              _context6.next = 36;
-              return this.prepareProductsWithPrice(schedule_date, extraContext);
-            case 36:
+              _context6.next = 38;
+              return this.prepareProductsWithPrice(schedule_date, extraContext, scopedProductIds ? {
+                productIds: scopedProductIds
+              } : undefined);
+            case 38:
               result = _context6.sent;
               this.productsPriceCache.set(cacheKey, result);
               this.logInfo('商品价格已缓存', {
@@ -654,11 +663,11 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
                 count: result.length
               });
               return _context6.abrupt("return", result);
-            case 42:
+            case 44:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[7, 24]]);
+        }, _callee6, this, [[9, 26]]);
       }));
       function getProductsWithPrice(_x7, _x8, _x9) {
         return _getProductsWithPrice.apply(this, arguments);
@@ -679,13 +688,13 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     key: "prepareProductsWithPrice",
     value: (function () {
       var _prepareProductsWithPrice = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(schedule_date, extraContext, options) {
-        var tTotal, targetIds, isIncremental, _priceData$length, _this$core, products, ids, idSet, tIds, i, tPrice, priceData, context, tFormat, processedProducts, errorMessage;
+        var tTotal, targetIds, isIncremental, _priceData$length, _this$core, products, ids, tIds, i, tPrice, priceData, context, tFormat, processedProducts, errorMessage;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
               tTotal = performance.now();
               targetIds = options === null || options === void 0 ? void 0 : options.productIds;
-              isIncremental = targetIds && targetIds.length > 0;
+              isIncremental = Array.isArray(targetIds);
               this.logInfo('prepareProductsWithPrice 开始处理', {
                 schedule_date: schedule_date,
                 mode: isIncremental ? 'incremental' : 'full',
@@ -695,10 +704,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
               // 1. 获取商品列表：指定 IDs 时从 store 取子集，否则取全量
 
               if (isIncremental) {
-                idSet = new Set(targetIds);
-                products = this.getProductsRef().filter(function (p) {
-                  return idSet.has(p.id);
-                });
+                products = this.getProductsRefByIds(targetIds);
                 ids = products.map(function (p) {
                   return p.id;
                 });
@@ -793,10 +799,72 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     }())
   }, {
     key: "getProductsPriceCacheKey",
-    value: function getProductsPriceCacheKey(schedule_date, extraContext) {
+    value: function getProductsPriceCacheKey(schedule_date, extraContext, productIds) {
       var _extraContext$custome;
       var datetime = (extraContext === null || extraContext === void 0 ? void 0 : extraContext.schedule_datetime) || schedule_date;
-      return "".concat(datetime, ":customer:").concat((_extraContext$custome = extraContext === null || extraContext === void 0 ? void 0 : extraContext.customer_id) !== null && _extraContext$custome !== void 0 ? _extraContext$custome : '');
+      var productScope = productIds ? ":products:".concat(productIds.join(',')) : '';
+      return "".concat(datetime, ":customer:").concat((_extraContext$custome = extraContext === null || extraContext === void 0 ? void 0 : extraContext.customer_id) !== null && _extraContext$custome !== void 0 ? _extraContext$custome : '').concat(productScope);
+    }
+  }, {
+    key: "normalizeProductIds",
+    value: function normalizeProductIds(productIds) {
+      if (!Array.isArray(productIds)) return undefined;
+      return Array.from(new Set(productIds.map(function (id) {
+        return Number(id);
+      }).filter(function (id) {
+        return Number.isFinite(id);
+      }))).sort(function (a, b) {
+        return a - b;
+      });
+    }
+
+    /**
+     * 按轻量范围返回商品 ID，不做 structuredClone。
+     */
+  }, {
+    key: "getProductIdsByScope",
+    value: function getProductIdsByScope(scope) {
+      var productIds = this.normalizeProductIds(scope.productIds) || [];
+      var collectionIds = this.normalizeProductIds(scope.collectionIds) || [];
+      if (scope.isAllProducts) {
+        return this.getProductsRef().map(function (product) {
+          return product.id;
+        });
+      }
+      if (productIds.length === 0 && collectionIds.length === 0) return [];
+      var result = new Set();
+      var _iterator3 = _createForOfIteratorHelper(productIds),
+        _step3;
+      try {
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var id = _step3.value;
+          if (this.store.map.has(id)) result.add(id);
+        }
+      } catch (err) {
+        _iterator3.e(err);
+      } finally {
+        _iterator3.f();
+      }
+      if (collectionIds.length === 0) return Array.from(result);
+      var collectionIdSet = new Set(collectionIds);
+      var _iterator4 = _createForOfIteratorHelper(this.getProductsRef()),
+        _step4;
+      try {
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var product = _step4.value;
+          if (result.has(product.id)) continue;
+          if (!Array.isArray(product.collection)) continue;
+          var isInCollection = product.collection.some(function (collection) {
+            return collectionIdSet.has(collection.id);
+          });
+          if (isInCollection) result.add(product.id);
+        }
+      } catch (err) {
+        _iterator4.e(err);
+      } finally {
+        _iterator4.f();
+      }
+      return Array.from(result);
     }
 
     /**
@@ -1218,6 +1286,29 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
       return this.store.list;
     }
 
+    /**
+     * 按 ID 从 Map 取商品引用，供内部 formatter 流程使用。
+     */
+  }, {
+    key: "getProductsRefByIds",
+    value: function getProductsRefByIds(ids) {
+      var products = [];
+      var _iterator5 = _createForOfIteratorHelper(ids),
+        _step5;
+      try {
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var id = _step5.value;
+          var product = this.store.map.get(id);
+          if (product) products.push(product);
+        }
+      } catch (err) {
+        _iterator5.e(err);
+      } finally {
+        _iterator5.f();
+      }
+      return products;
+    }
+
     /**
      * 根据ID获取单个商品（从内存缓存）
      * 使用 Map 快速查询，时间复杂度 O(1)
@@ -1252,7 +1343,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     key: "removeProductsByIds",
     value: (function () {
       var _removeProductsByIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(ids) {
-        var idSet, _iterator3, _step3, _id, _iterator4, _step4, id, errorMessage, _iterator5, _step5, _step5$value, dateKey, cachedProducts;
+        var idSet, _iterator6, _step6, _id, _iterator7, _step7, id, errorMessage, _iterator8, _step8, _step8$value, dateKey, cachedProducts;
         return _regeneratorRuntime().wrap(function _callee14$(_context14) {
           while (1) switch (_context14.prev = _context14.next) {
             case 0:
@@ -1264,31 +1355,31 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
               this.store.list = this.store.list.filter(function (p) {
                 return !idSet.has(p.id);
               });
-              _iterator3 = _createForOfIteratorHelper(ids);
+              _iterator6 = _createForOfIteratorHelper(ids);
               try {
-                for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-                  _id = _step3.value;
+                for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+                  _id = _step6.value;
                   this.store.map.delete(_id);
                 }
               } catch (err) {
-                _iterator3.e(err);
+                _iterator6.e(err);
               } finally {
-                _iterator3.f();
+                _iterator6.f();
               }
               if (!this.dbManager) {
                 _context14.next = 30;
                 break;
               }
               _context14.prev = 6;
-              _iterator4 = _createForOfIteratorHelper(ids);
+              _iterator7 = _createForOfIteratorHelper(ids);
               _context14.prev = 8;
-              _iterator4.s();
+              _iterator7.s();
             case 10:
-              if ((_step4 = _iterator4.n()).done) {
+              if ((_step7 = _iterator7.n()).done) {
                 _context14.next = 16;
                 break;
               }
-              id = _step4.value;
+              id = _step7.value;
               _context14.next = 14;
               return this.dbManager.delete(INDEXDB_STORE_NAME, id);
             case 14:
@@ -1300,10 +1391,10 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
             case 18:
               _context14.prev = 18;
               _context14.t0 = _context14["catch"](8);
-              _iterator4.e(_context14.t0);
+              _iterator7.e(_context14.t0);
             case 21:
               _context14.prev = 21;
-              _iterator4.f();
+              _iterator7.f();
               return _context14.finish(21);
             case 24:
               _context14.next = 30;
@@ -1317,18 +1408,18 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
                 error: errorMessage
               });
             case 30:
-              _iterator5 = _createForOfIteratorHelper(this.productsPriceCache.entries());
+              _iterator8 = _createForOfIteratorHelper(this.productsPriceCache.entries());
               try {
-                for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-                  _step5$value = _slicedToArray(_step5.value, 2), dateKey = _step5$value[0], cachedProducts = _step5$value[1];
+                for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+                  _step8$value = _slicedToArray(_step8.value, 2), dateKey = _step8$value[0], cachedProducts = _step8$value[1];
                   this.productsPriceCache.set(dateKey, cachedProducts.filter(function (p) {
                     return !idSet.has(p.id);
                   }));
                 }
               } catch (err) {
-                _iterator5.e(err);
+                _iterator8.e(err);
               } finally {
-                _iterator5.f();
+                _iterator8.f();
               }
               this.core.effects.emit(ProductsHooks.onProductsChanged, this.store.list);
               this.logInfo('removeProductsByIds 完成', {
@@ -1568,17 +1659,17 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     value: function syncProductsMap() {
       var t0 = performance.now();
       this.store.map.clear();
-      var _iterator6 = _createForOfIteratorHelper(this.store.list),
-        _step6;
+      var _iterator9 = _createForOfIteratorHelper(this.store.list),
+        _step9;
       try {
-        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-          var product = _step6.value;
+        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+          var product = _step9.value;
           this.store.map.set(product.id, product);
         }
       } catch (err) {
-        _iterator6.e(err);
+        _iterator9.e(err);
       } finally {
-        _iterator6.f();
+        _iterator9.f();
       }
       perfMark('syncProductsMap', performance.now() - t0, {
         count: this.store.map.size
@@ -1790,7 +1881,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     key: "processProductSyncMessages",
     value: (function () {
       var _processProductSyncMessages = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
-        var messages, deleteIds, bodyUpdates, sseRefreshIds, priceRefreshIds, shouldClearPriceCache, _iterator7, _step7, msg, channelKey, _msg$relation_product, _msg$change_types, _msg$ids2, _msg$ids, ids, bodyId, _bodyId, _msg$relation_product2, _msg$relation_product3, uniqueDeleteIds, uniqueSSEIds, uniquePriceIds, freshProducts, allChangedIds, hasChanges, errorMessage;
+        var messages, deleteIds, bodyUpdates, sseRefreshIds, priceRefreshIds, shouldClearPriceCache, _iterator10, _step10, msg, channelKey, _msg$relation_product, _msg$change_types, _msg$ids2, _msg$ids, ids, bodyId, _bodyId, _msg$relation_product2, _msg$relation_product3, uniqueDeleteIds, uniqueSSEIds, uniquePriceIds, freshProducts, allChangedIds, hasChanges, errorMessage;
         return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
             case 0:
@@ -1810,15 +1901,15 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
               sseRefreshIds = [];
               priceRefreshIds = [];
               shouldClearPriceCache = false;
-              _iterator7 = _createForOfIteratorHelper(messages);
+              _iterator10 = _createForOfIteratorHelper(messages);
               _context20.prev = 11;
-              _iterator7.s();
+              _iterator10.s();
             case 13:
-              if ((_step7 = _iterator7.n()).done) {
+              if ((_step10 = _iterator10.n()).done) {
                 _context20.next = 36;
                 break;
               }
-              msg = _step7.value;
+              msg = _step10.value;
               channelKey = msg._channelKey || msg.module || 'product';
               if (!(channelKey === 'product')) {
                 _context20.next = 33;
@@ -1884,10 +1975,10 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
             case 38:
               _context20.prev = 38;
               _context20.t0 = _context20["catch"](11);
-              _iterator7.e(_context20.t0);
+              _iterator10.e(_context20.t0);
             case 41:
               _context20.prev = 41;
-              _iterator7.f();
+              _iterator10.f();
               return _context20.finish(41);
             case 44:
               uniqueDeleteIds = _toConsumableArray(new Set(deleteIds));
@@ -2058,7 +2149,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     key: "applyBodyUpdatesToStore",
     value: (function () {
       var _applyBodyUpdatesToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(bodyUpdates) {
-        var updatedCount, newCount, appliedIds, _iterator8, _step8, _step8$value, id, body;
+        var updatedCount, newCount, appliedIds, _iterator11, _step11, _step11$value, id, body;
         return _regeneratorRuntime().wrap(function _callee22$(_context22) {
           while (1) switch (_context22.prev = _context22.next) {
             case 0:
@@ -2076,19 +2167,19 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
                 }
                 return p;
               });
-              _iterator8 = _createForOfIteratorHelper(bodyUpdates);
+              _iterator11 = _createForOfIteratorHelper(bodyUpdates);
               try {
-                for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-                  _step8$value = _slicedToArray(_step8.value, 2), id = _step8$value[0], body = _step8$value[1];
+                for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+                  _step11$value = _slicedToArray(_step11.value, 2), id = _step11$value[0], body = _step11$value[1];
                   if (!appliedIds.has(id)) {
                     this.store.list.push(body);
                     newCount++;
                   }
                 }
               } catch (err) {
-                _iterator8.e(err);
+                _iterator11.e(err);
               } finally {
-                _iterator8.f();
+                _iterator11.f();
               }
               this.syncProductsMap();
               _context22.next = 10;
@@ -2121,21 +2212,21 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     key: "mergeProductsToStore",
     value: (function () {
       var _mergeProductsToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(freshProducts) {
-        var freshMap, _iterator9, _step9, p, updatedList, newCount, _iterator10, _step10, _p2, updatedCount;
+        var freshMap, _iterator12, _step12, p, updatedList, newCount, _iterator13, _step13, _p2, updatedCount;
         return _regeneratorRuntime().wrap(function _callee23$(_context23) {
           while (1) switch (_context23.prev = _context23.next) {
             case 0:
               freshMap = new Map();
-              _iterator9 = _createForOfIteratorHelper(freshProducts);
+              _iterator12 = _createForOfIteratorHelper(freshProducts);
               try {
-                for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-                  p = _step9.value;
+                for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+                  p = _step12.value;
                   freshMap.set(p.id, p);
                 }
               } catch (err) {
-                _iterator9.e(err);
+                _iterator12.e(err);
               } finally {
-                _iterator9.f();
+                _iterator12.f();
               }
               updatedList = this.store.list.map(function (p) {
                 if (freshMap.has(p.id)) {
@@ -2146,16 +2237,16 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
                 return p;
               }); // freshMap 中剩余的是新商品（create 场景）
               newCount = freshMap.size;
-              _iterator10 = _createForOfIteratorHelper(freshMap.values());
+              _iterator13 = _createForOfIteratorHelper(freshMap.values());
               try {
-                for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-                  _p2 = _step10.value;
+                for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+                  _p2 = _step13.value;
                   updatedList.push(_p2);
                 }
               } catch (err) {
-                _iterator10.e(err);
+                _iterator13.e(err);
               } finally {
-                _iterator10.f();
+                _iterator13.f();
               }
               updatedCount = freshProducts.length - newCount;
               this.store.list = updatedList;

package/dist/server/modules/products/types.d.ts

@@ -17,6 +17,17 @@ export interface FormattedProductData extends ProductData {
     /** 购物车详情值 */
     cartDetailValue?: any;
 }
+/**
+ * 商品轻量查询范围
+ */
+export interface ProductIdScope {
+    /** 是否返回全部商品 ID */
+    isAllProducts?: boolean;
+    /** 指定商品 ID */
+    productIds?: number[];
+    /** 指定商品集合 ID */
+    collectionIds?: number[];
+}
 /**
  * 加载报价单商品价格参数
  */

package/dist/server/modules/products/types.js

@@ -6,6 +6,10 @@
  * 商品格式化后数据
  */
 
+/**
+ * 商品轻量查询范围
+ */
+
 /**
  * 加载报价单商品价格参数
  */

package/dist/server/utils/product.js

@@ -240,7 +240,7 @@ var formatDataKey = function formatDataKey(data) {
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var item = _step.value;
-        var _str = "_".concat(item.option_group_id, "_").concat(item.product_option_item_id);
+        var _str = "_".concat(item.option_group_id, "_").concat(item.option_group_item_id);
         key += _str;
         rowKey += "".concat(_str, "_").concat(item.quantity || item.num);
       }
@@ -268,7 +268,7 @@ var formatDataKey = function formatDataKey(data) {
           try {
             for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
               var opt = _step3.value;
-              var _str3 = "_".concat(opt.option_group_id, "_").concat(opt.product_option_item_id);
+              var _str3 = "_".concat(opt.option_group_id, "_").concat(opt.option_group_item_id);
               key += _str3;
               rowKey += "".concat(_str3, "_").concat(opt.quantity || opt.num);
             }

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

@@ -8,12 +8,15 @@ import type { Discount } from '../../modules/Discount/types';
 import { RequestPlugin, WindowPlugin } from '../../plugins';
 export * from './types';
 import { ProductList } from '../../modules/ProductList';
+import { PaymentModule } from '../../modules/Payment';
 import type { SalesSummaryModule } from '../../modules/SalesSummary';
 import type { ScheduleModule } from '../../modules/Schedule';
 import type { ISalesDetail, ISalesDetailHeader, ISalesBooking, ISalesPayment, ISalesSurcharge } from './utils/parseSalesResponse';
+import { type TransformBaseProductToOrderProductParams } from './utils/transformBaseProductToOrderProduct';
 export interface BaseSalesState {
     order?: OrderModule;
     products?: ProductList;
+    payment?: PaymentModule;
     salesSummary?: SalesSummaryModule;
     schedule?: ScheduleModule;
 }
@@ -22,6 +25,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     protected defaultVersion: string;
     isSolution: boolean;
     protected initializeOptions: ModuleOptions;
+    private logger;
     protected store: BaseSalesState;
     protected otherParams: Record<string, any>;
     protected cacheId: string | undefined;
@@ -35,15 +39,29 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     constructor(name?: string, version?: string);
     /**
      * 子类可覆盖此方法以追加/收敛要注册的子模块。
-     * 默认包含通用销售模块：products / order / salesSummary / schedule。
+     * 默认包含通用销售模块：products / order / salesSummary / schedule / payment。
      */
     protected getRegisteredModuleNames(): readonly string[];
+    /**
+     * 记录信息日志
+     */
+    private logInfo;
+    /**
+     * 记录警告日志
+     */
+    private logWarning;
+    /**
+     * 记录错误日志
+     */
+    private logError;
+    get payment(): PaymentModule | undefined;
     /**
      * 工厂入口：根据子模块名实例化对应模块。
      * 默认使用 BookingByStep 公共 `createModule`。子类若需引入额外类型（如 customer），
      * 可覆盖此方法并把未识别的 name 委托给 `super.createSubModule(name)`。
      */
     protected createSubModule(moduleName: string): Module | null;
+    protected getSubModuleHooks(moduleName: string): any;
     /**
      * 读取 sessionStorage[this.name][cacheId]，作为子模块 initialState 的来源。
      * sessionStorage 损坏时静默忽略，按空状态注册。
@@ -80,7 +98,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     getOrderAmountSnapshot(): import("../../modules/Order/types").OrderAmountSnapshot | null;
     getTempOrderNote(): string;
     updateTempOrderNote(note: string): string;
-    updateOrderShopDiscount(amount: string | number): string;
+    updateTempOrderShopDiscount(amount: string | number): string;
+    updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
     private ensureTempOrder;
     addNewOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
     saveDraft(): Promise<void>;
@@ -124,6 +143,10 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     deleteOrderPayment(paymentIdentity: string | number): OrderPaymentData[];
     /** 覆盖 wallet pass 支付项，同时保留普通支付项。 */
     updateVoucherOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
+    private getWalletProductList;
+    initWalletData(params?: {
+        order_wait_pay_amount?: number;
+    }): Promise<import("../../modules/Payment").WalletInitializationResult>;
     /**
      * 更新当前订单客户字段。
      *
@@ -159,6 +182,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         order_ids?: Array<number | string>;
         submitBeforeSend?: boolean;
     }): Promise<T>;
+    transformBaseProductToOrderProduct(params: TransformBaseProductToOrderProductParams): import("./utils/transformBaseProductToOrderProduct").BaseProductOrderProductInput | null;
     addProductToOrder(product: Partial<BaseSalesOrderProduct> & BaseSalesOrderProductIdentity, booking?: AddProductBookingInput): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateProductInOrder(params: UpdateProductInOrderParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
     /**