@pisell/pisellos 2.2.242 → 2.2.244

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

@@ -747,10 +747,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
         return b.price - a.price;
       });
 
-      // 3. 计算可以凑成多少组（cumulative 缺省视为 true，与 adapter 一致）
+      // 3. 计算可以凑成多少组
       var totalUnits = unitProducts.length;
-      var isCumulative = cumulative !== false;
-      var groupCount = isCumulative ? Math.floor(totalUnits / x) : totalUnits >= x ? 1 : 0;
+      var groupCount = cumulative ? Math.floor(totalUnits / x) : totalUnits >= x ? 1 : 0;
       var promotionUnits = groupCount * x;
 
       // 4. 分离参与促销的和不参与的商品

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

@@ -0,0 +1,9 @@
+// 导出评估器
+export { PromotionEvaluator } from "./evaluator";
+
+// 导出适配器
+export { PromotionAdapter } from "./adapter";
+export { default } from "./adapter";
+
+// 导出策略配置示例常量
+export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY } from "./examples";

package/dist/model/strategy/adapter/walletPass/utils.js

@@ -494,7 +494,7 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
     // ======================================================================================
 
     // 计算本次抵扣金额（使用同样的 usageAmount）
-    var maxDeduction = Decimal.min(new Decimal(usageAmount), new Decimal(maxDeductionAmount), remainingOrderAmount);
+    var maxDeduction = Decimal.min(new Decimal(usageAmount), new Decimal(maxDeductionAmount));
     var deductionLeft = maxDeduction;
     var deductionDetails = [];
     if (allowCrossProduct) {
@@ -677,7 +677,6 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
 
   // 第一步：按顺序应用已选中的券，计算实际抵扣
   selectedVouchers.forEach(function (selectedVoucher) {
-    var _selectedVoucher$_ava;
     var config = selectedVoucher.config,
       id = selectedVoucher.id;
     var maxDeductionAmount = config.maxDeductionAmount,
@@ -711,11 +710,9 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
       return;
     }
 
-    // 计算本次抵扣金额：
-    // - 用户手动编辑时以编辑金额为准；
-    // - 自动推荐/重算时沿用上一轮基于剩余待付金额算出的 _available_max_amount，
-    //   避免 recalculateVouchers 又回退到后端单券 recommended_usage_amount 造成超付。
-    var usageAmount = typeof selectedVoucher.edit_current_amount === 'number' ? selectedVoucher.edit_current_amount : (_selectedVoucher$_ava = selectedVoucher._available_max_amount) !== null && _selectedVoucher$_ava !== void 0 ? _selectedVoucher$_ava : getRecommendedAmount(selectedVoucher);
+    // 计算本次抵扣金额
+    // 优先使用用户手动编辑的金额，否则根据 deductTaxAndFee 配置获取推荐金额
+    var usageAmount = typeof selectedVoucher.edit_current_amount === 'number' ? selectedVoucher.edit_current_amount : getRecommendedAmount(selectedVoucher);
     var maxDeduction = Decimal.min(new Decimal(usageAmount), new Decimal(maxDeductionAmount), remainingOrderAmount);
     var deductionLeft = maxDeduction;
     var deductionDetails = [];

package/dist/modules/Cart/utils/cartProduct.js

@@ -14,7 +14,6 @@ import Decimal from 'decimal.js';
 import { isNormalProduct } from "../../Product/utils";
 import { getDiscountAmount } from "../../../solution/ShopDiscount/utils";
 import { calcDiscountListDifference } from "../../Summary/utils";
-import { getBundleSellingMagnitude } from "../../Order/utils";
 
 /** 与 Rules / ShopDiscount 一致的折扣入参，用于主价与 option 单价 */
 var toDiscountPayload = function toDiscountPayload(discountItem) {
@@ -184,9 +183,7 @@ export var formatProductToCartItemOrigin = function formatProductToCartItemOrigi
       product_id: product.id,
       product_variant_id: product_variant_id || 0,
       product_bundle: ((_origin$product2 = origin.product) === null || _origin$product2 === void 0 ? void 0 : _origin$product2.product_bundle) || [],
-      product_sku: ((_origin$product3 = origin.product) === null || _origin$product3 === void 0 ? void 0 : _origin$product3.product_sku) || {
-        option: []
-      },
+      product_option_item: ((_origin$product3 = origin.product) === null || _origin$product3 === void 0 ? void 0 : _origin$product3.product_option_item) || [],
       metadata: {
         product_discount_difference: product_discount_difference
       }
@@ -199,16 +196,7 @@ export var formatProductToCartItemOrigin = function formatProductToCartItemOrigi
       origin.product.product_bundle = formatBundleToOrigin(bundle);
     }
     if (options !== null && options !== void 0 && options.length) {
-      origin.product.product_sku = _objectSpread(_objectSpread({}, origin.product.product_sku || {}), {}, {
-        option: formatOptionsToOrigin(options).map(function (option) {
-          var _option$add_price;
-          var next = _objectSpread(_objectSpread({}, option), {}, {
-            add_price: (_option$add_price = option.add_price) !== null && _option$add_price !== void 0 ? _option$add_price : option.price
-          });
-          delete next.price;
-          return next;
-        })
-      });
+      origin.product.product_option_item = formatOptionsToOrigin(options);
     }
   }
   return origin;
@@ -375,7 +363,6 @@ export var formatBundle = function formatBundle(bundle) {
 export var formatBundleToOrigin = function formatBundleToOrigin(bundle) {
   if (!(bundle !== null && bundle !== void 0 && bundle.length)) return [];
   return bundle.map(function (d) {
-    var _d$price, _d$price_type, _d$price_type_ext;
     var getBundleValueByKey = function getBundleValueByKey(key) {
       var _d$originBundleItem;
       return (d === null || d === void 0 ? void 0 : d[key]) || (d === null || d === void 0 || (_d$originBundleItem = d.originBundleItem) === null || _d$originBundleItem === void 0 ? void 0 : _d$originBundleItem[key]);
@@ -384,14 +371,6 @@ export var formatBundleToOrigin = function formatBundleToOrigin(bundle) {
       var _cur$metadata2;
       return pre + ((cur === null || cur === void 0 || (_cur$metadata2 = cur.metadata) === null || _cur$metadata2 === void 0 ? void 0 : _cur$metadata2.product_discount_difference) || 0);
     }, 0);
-    var normalizedBundle = _objectSpread(_objectSpread({}, d), {}, {
-      // 计算 markdown 净额时只传真实毛价；若仅有 bundle_selling_price，则由 helper 当历史净额兜底。
-      price: (_d$price = d === null || d === void 0 ? void 0 : d.price) !== null && _d$price !== void 0 ? _d$price : d === null || d === void 0 ? void 0 : d.custom_price,
-      bundle_selling_price: d === null || d === void 0 ? void 0 : d.bundle_selling_price,
-      price_type: (_d$price_type = d === null || d === void 0 ? void 0 : d.price_type) !== null && _d$price_type !== void 0 ? _d$price_type : d === null || d === void 0 ? void 0 : d.custom_price_type,
-      price_type_ext: (_d$price_type_ext = d === null || d === void 0 ? void 0 : d.price_type_ext) !== null && _d$price_type_ext !== void 0 ? _d$price_type_ext : d === null || d === void 0 ? void 0 : d.custom_price_type_ext,
-      option: getBundleValueByKey('option')
-    });
     return {
       bundle_group_id: getBundleValueByKey('group_id'),
       bundle_id: d.id,
@@ -402,7 +381,7 @@ export var formatBundleToOrigin = function formatBundleToOrigin(bundle) {
       extension_type: getBundleValueByKey('extension_type'),
       option: formatOptionsToOrigin(getBundleValueByKey('option')),
       discount_list: d.discount_list,
-      "bundle_selling_price": getBundleSellingMagnitude(normalizedBundle).toFixed(2),
+      "bundle_selling_price": d === null || d === void 0 ? void 0 : d.price,
       "custom_price": d === null || d === void 0 ? void 0 : d.price,
       metadata: {
         custom_product_bundle_map_id: d._id,

package/dist/modules/Cart/utils/changePrice.js

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function 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); }); }; }
-import { getBundleSellingMagnitude } from "../../Order/utils";
+import Decimal from "decimal.js";
 export function updateAllCartItemPrice(_x, _x2, _x3, _x4, _x5) {
   return _updateAllCartItemPrice.apply(this, arguments);
 }
@@ -54,18 +54,18 @@ function _updateAllCartItemPrice() {
                       var targetBundleItem = targetBundle.bundle_item.find(function (m) {
                         return m.id === n.id;
                       });
+                      if (targetBundleItem.price_type === 'markdown') {
+                        targetBundleItem.price = new Decimal(targetBundleItem.price || 0).mul(-1).toNumber();
+                      }
+                      // 如果有选择 option，还需要加上 option 的价格
+                      if (n.option) {
+                        targetBundleItem.price = new Decimal(targetBundleItem.price || 0).add(n.option.reduce(function (pre, cur) {
+                          return pre + new Decimal(cur.price || 0).mul(cur.num || 1).toNumber();
+                        }, 0)).toNumber();
+                      }
                       if (targetBundleItem) {
-                        var normalizedBundle = _objectSpread(_objectSpread({}, n), {}, {
-                          price: targetBundleItem.price,
-                          custom_price: targetBundleItem.price,
-                          price_type: targetBundleItem.price_type,
-                          price_type_ext: targetBundleItem.price_type_ext
-                        });
-                        var bundleSellingPrice = getBundleSellingMagnitude(normalizedBundle).toFixed(2);
                         return _objectSpread(_objectSpread({}, n), {}, {
-                          custom_price: targetBundleItem.price,
-                          price: targetBundleItem.price_type === 'markdown' ? bundleSellingPrice : targetBundleItem.price,
-                          bundle_selling_price: bundleSellingPrice,
+                          price: targetBundleItem.price,
                           base_price: targetBundleItem.base_price
                         });
                       }

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

@@ -7,25 +7,11 @@ export declare class CustomerModule extends BaseModule implements Module, Custom
     private store;
     private request;
     private cacheId;
-    /**
-     * 判断两份选中客户的核心展示字段是否一致，用于避免重复 clone / emit。
-     *
-     * @example
-     * this.isSameSelectedCustomer(currentCustomer, nextCustomer);
-     */
-    private isSameSelectedCustomer;
     private openCache;
     private fatherModule;
     private otherParams;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
-    /**
-     * 更新父级解决方案透传的运行态参数，并刷新客户模块缓存配置。
-     *
-     * @example
-     * customerModule.updateOtherParams({ isFranchisee: true, cacheId: 'cache-2' });
-     */
-    updateOtherParams(params: Record<string, any>): void;
     /**
      * 获取客户列表数据（内部方法）
      * @param params 查询参数
@@ -38,12 +24,6 @@ export declare class CustomerModule extends BaseModule implements Module, Custom
      * @param operation 操作名称
      */
     private handleCustomerListError;
-    /**
-     * 查询客户列表但不写入 customerList / pagination 状态。
-     *
-     * 用于按 ID 补齐客户等内部查询，避免把临时的 num/searchParams 污染到滚动列表。
-     */
-    queryCustomerList(params?: ShopGetCustomerListParams): Promise<ICustomerListResponse>;
     /**
      * 获取客户列表
      * @param params 查询参数

package/dist/modules/Customer/index.js

@@ -60,30 +60,6 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
     return _this;
   }
   _createClass(CustomerModule, [{
-    key: "isSameSelectedCustomer",
-    value:
-    /**
-     * 判断两份选中客户的核心展示字段是否一致，用于避免重复 clone / emit。
-     *
-     * @example
-     * this.isSameSelectedCustomer(currentCustomer, nextCustomer);
-     */
-    function isSameSelectedCustomer(current, next) {
-      var _id, _id2;
-      var normalizedNext = !next ? DEFAULT_CUSTOMER : next;
-      var normalizedCurrent = current || null;
-      if (!normalizedCurrent) return false;
-      // Walk-In 是默认客户，展示文案 / 默认区号可能来自不同入口；同为 id=1 时视为同一客户。
-      if (String((_id = normalizedCurrent === null || normalizedCurrent === void 0 ? void 0 : normalizedCurrent.id) !== null && _id !== void 0 ? _id : '') === '1' && String((_id2 = normalizedNext === null || normalizedNext === void 0 ? void 0 : normalizedNext.id) !== null && _id2 !== void 0 ? _id2 : '') === '1') {
-        return true;
-      }
-      var keys = ['id', 'name', 'phone', 'email', 'country_calling_code'];
-      return keys.every(function (key) {
-        var _key, _key2;
-        return String((_key = normalizedCurrent === null || normalizedCurrent === void 0 ? void 0 : normalizedCurrent[key]) !== null && _key !== void 0 ? _key : '') === String((_key2 = normalizedNext === null || normalizedNext === void 0 ? void 0 : normalizedNext[key]) !== null && _key2 !== void 0 ? _key2 : '');
-      });
-    }
-  }, {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
@@ -119,7 +95,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
               } else {
                 this.store.currentPage = 1;
               }
-              if (typeof (options === null || options === void 0 || (_options$initialState5 = options.initialState) === null || _options$initialState5 === void 0 ? void 0 : _options$initialState5.pageSize) === 'number' && options.initialState.pageSize > 1) {
+              if (typeof (options === null || options === void 0 || (_options$initialState5 = options.initialState) === null || _options$initialState5 === void 0 ? void 0 : _options$initialState5.pageSize) === 'number') {
                 this.store.pageSize = options.initialState.pageSize;
               } else {
                 this.store.pageSize = DEFAULT_PAGE_SIZE;
@@ -149,22 +125,6 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
       }
       return initialize;
     }()
-    /**
-     * 更新父级解决方案透传的运行态参数，并刷新客户模块缓存配置。
-     *
-     * @example
-     * customerModule.updateOtherParams({ isFranchisee: true, cacheId: 'cache-2' });
-     */
-  }, {
-    key: "updateOtherParams",
-    value: function updateOtherParams(params) {
-      var _this$otherParams$ope;
-      this.otherParams = params || {};
-      this.openCache = (_this$otherParams$ope = this.otherParams.openCache) !== null && _this$otherParams$ope !== void 0 ? _this$otherParams$ope : false;
-      this.cacheId = this.otherParams.cacheId;
-      this.fatherModule = this.otherParams.fatherModule;
-    }
-
     /**
      * 获取客户列表数据（内部方法）
      * @param params 查询参数
@@ -276,52 +236,6 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
       }
       return handleCustomerListError;
     }()
-    /**
-     * 查询客户列表但不写入 customerList / pagination 状态。
-     *
-     * 用于按 ID 补齐客户等内部查询，避免把临时的 num/searchParams 污染到滚动列表。
-     */
-    )
-  }, {
-    key: "queryCustomerList",
-    value: (function () {
-      var _queryCustomerList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        var params,
-          _yield$this$fetchCust,
-          customerList,
-          total,
-          page,
-          pageSize,
-          _args4 = arguments;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
-            case 0:
-              params = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {};
-              _context4.next = 3;
-              return this.fetchCustomerListData(params);
-            case 3:
-              _yield$this$fetchCust = _context4.sent;
-              customerList = _yield$this$fetchCust.customerList;
-              total = _yield$this$fetchCust.total;
-              page = _yield$this$fetchCust.page;
-              pageSize = _yield$this$fetchCust.pageSize;
-              return _context4.abrupt("return", {
-                list: customerList,
-                total: total,
-                page: page,
-                pageSize: pageSize
-              });
-            case 9:
-            case "end":
-              return _context4.stop();
-          }
-        }, _callee4, this);
-      }));
-      function queryCustomerList() {
-        return _queryCustomerList.apply(this, arguments);
-      }
-      return queryCustomerList;
-    }()
     /**
      * 获取客户列表
      * @param params 查询参数
@@ -331,9 +245,9 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getCustomerList",
     value: (function () {
-      var _getCustomerList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+      var _getCustomerList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
         var params,
-          _yield$this$fetchCust2,
+          _yield$this$fetchCust,
           customerList,
           total,
           page,
@@ -342,22 +256,22 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
           num,
           searchParams,
           response,
-          _args5 = arguments;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+          _args4 = arguments;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              params = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {};
-              _context5.prev = 1;
+              params = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {};
+              _context4.prev = 1;
               this.store.loading = true;
               this.store.error = null;
-              _context5.next = 6;
+              _context4.next = 6;
               return this.fetchCustomerListData(params);
             case 6:
-              _yield$this$fetchCust2 = _context5.sent;
-              customerList = _yield$this$fetchCust2.customerList;
-              total = _yield$this$fetchCust2.total;
-              page = _yield$this$fetchCust2.page;
-              pageSize = _yield$this$fetchCust2.pageSize;
+              _yield$this$fetchCust = _context4.sent;
+              customerList = _yield$this$fetchCust.customerList;
+              total = _yield$this$fetchCust.total;
+              page = _yield$this$fetchCust.page;
+              pageSize = _yield$this$fetchCust.pageSize;
               // 保存搜索条件（排除skip和num）
               skip = params.skip, num = params.num, searchParams = _objectWithoutProperties(params, _excluded2);
               this.store.searchParams = cloneDeep(searchParams);
@@ -372,7 +286,9 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
 
               // 设置客户列表（替换模式）
               this.store.customerList = cloneDeep(customerList);
-
+              _context4.next = 20;
+              return this.core.effects.emit("".concat(this.name, ":onCustomerListUpdate"), this.store);
+            case 20:
               // 触发分页变化事件
               this.triggerPaginationChange({
                 page: page,
@@ -386,27 +302,24 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
                 page: page,
                 pageSize: pageSize
               };
-              return _context5.abrupt("return", response);
-            case 23:
-              _context5.prev = 23;
-              _context5.t0 = _context5["catch"](1);
-              _context5.next = 27;
-              return this.handleCustomerListError(_context5.t0, 'fetch customer list');
-            case 27:
-              throw _context5.t0;
-            case 28:
-              _context5.prev = 28;
+              return _context4.abrupt("return", response);
+            case 25:
+              _context4.prev = 25;
+              _context4.t0 = _context4["catch"](1);
+              _context4.next = 29;
+              return this.handleCustomerListError(_context4.t0, 'fetch customer list');
+            case 29:
+              throw _context4.t0;
+            case 30:
+              _context4.prev = 30;
               this.store.loading = false;
               this.storeChange();
-              _context5.next = 33;
-              return this.core.effects.emit("".concat(this.name, ":onCustomerListUpdate"), this.store);
-            case 33:
-              return _context5.finish(28);
+              return _context4.finish(30);
             case 34:
             case "end":
-              return _context5.stop();
+              return _context4.stop();
           }
-        }, _callee5, this, [[1, 23, 28, 34]]);
+        }, _callee4, this, [[1, 25, 30, 34]]);
       }));
       function getCustomerList() {
         return _getCustomerList.apply(this, arguments);
@@ -436,9 +349,6 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setSelectedCustomer",
     value: function setSelectedCustomer(customer) {
-      if (this.isSameSelectedCustomer(this.store.selectedCustomer, customer)) {
-        return;
-      }
       this.store.selectedCustomer = !customer ? DEFAULT_CUSTOMER : cloneDeep(customer);
       this.core.effects.emit("".concat(this.name, ":onCustomerSelected"), this.store.selectedCustomer);
       this.storeChange();
@@ -583,10 +493,10 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "changeCustomerPage",
     value: (function () {
-      var _changeCustomerPage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(page, pageSize) {
+      var _changeCustomerPage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(page, pageSize) {
         var targetPageSize, skip, num;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               targetPageSize = pageSize || this.store.pageSize; // 先更新分页状态
               this.setPaginationInfo(page, targetPageSize);
@@ -594,18 +504,18 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
               // skip直接使用page，num使用pageSize
               skip = page;
               num = targetPageSize; // 自动调用获取客户列表，使用存储的搜索条件
-              _context6.next = 6;
+              _context5.next = 6;
               return this.getCustomerList(_objectSpread({
                 skip: skip,
                 num: num
               }, this.store.searchParams));
             case 6:
-              return _context6.abrupt("return", _context6.sent);
+              return _context5.abrupt("return", _context5.sent);
             case 7:
             case "end":
-              return _context6.stop();
+              return _context5.stop();
           }
-        }, _callee6, this);
+        }, _callee5, this);
       }));
       function changeCustomerPage(_x5, _x6) {
         return _changeCustomerPage.apply(this, arguments);
@@ -620,16 +530,16 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadMoreCustomers",
     value: (function () {
-      var _loadMoreCustomers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-        var nextPage, loadMoreParams, _yield$this$fetchCust3, newCustomers, total, page, pageSize, updatedCustomerList, response;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _loadMoreCustomers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+        var nextPage, _yield$this$fetchCust2, newCustomers, total, page, pageSize, updatedCustomerList, response;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               if (!(!this.store.hasMore || this.store.loadingMore)) {
-                _context7.next = 2;
+                _context6.next = 2;
                 break;
               }
-              return _context7.abrupt("return", {
+              return _context6.abrupt("return", {
                 list: [],
                 total: this.store.total,
                 page: this.store.currentPage,
@@ -638,21 +548,22 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
             case 2:
               // 计算下一页
               nextPage = this.store.currentPage + 1;
-              _context7.prev = 3;
+              _context6.prev = 3;
               this.store.loadingMore = true;
               this.store.error = null;
-              loadMoreParams = _objectSpread({
+
+              // 使用公共方法获取数据，传入存储的搜索条件
+              _context6.next = 8;
+              return this.fetchCustomerListData(_objectSpread({
                 skip: nextPage,
                 num: this.store.pageSize
-              }, this.store.searchParams); // 使用公共方法获取数据，传入存储的搜索条件
-              _context7.next = 9;
-              return this.fetchCustomerListData(loadMoreParams);
-            case 9:
-              _yield$this$fetchCust3 = _context7.sent;
-              newCustomers = _yield$this$fetchCust3.customerList;
-              total = _yield$this$fetchCust3.total;
-              page = _yield$this$fetchCust3.page;
-              pageSize = _yield$this$fetchCust3.pageSize;
+              }, this.store.searchParams));
+            case 8:
+              _yield$this$fetchCust2 = _context6.sent;
+              newCustomers = _yield$this$fetchCust2.customerList;
+              total = _yield$this$fetchCust2.total;
+              page = _yield$this$fetchCust2.page;
+              pageSize = _yield$this$fetchCust2.pageSize;
               // 将新数据追加到现有列表（追加模式）
               updatedCustomerList = [].concat(_toConsumableArray(this.store.customerList), _toConsumableArray(cloneDeep(newCustomers))); // 更新状态
               this.store.customerList = updatedCustomerList;
@@ -661,14 +572,17 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
               this.store.hasMore = page * pageSize < total;
 
               // 触发滚动加载特定事件
-              _context7.next = 21;
+              _context6.next = 20;
               return this.core.effects.emit("".concat(this.name, ":onScrollLoadMore"), {
                 newCustomers: newCustomers,
                 allCustomers: this.store.customerList,
                 currentPage: page,
                 hasMore: this.store.hasMore
               });
-            case 21:
+            case 20:
+              _context6.next = 22;
+              return this.core.effects.emit("".concat(this.name, ":onCustomerListUpdate"), this.store);
+            case 22:
               // 触发分页变化事件
               this.triggerPaginationChange({
                 page: page,
@@ -683,27 +597,24 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
                 page: page,
                 pageSize: pageSize
               };
-              return _context7.abrupt("return", response);
-            case 26:
-              _context7.prev = 26;
-              _context7.t0 = _context7["catch"](3);
-              _context7.next = 30;
-              return this.handleCustomerListError(_context7.t0, 'load more customers');
-            case 30:
-              throw _context7.t0;
+              return _context6.abrupt("return", response);
+            case 27:
+              _context6.prev = 27;
+              _context6.t0 = _context6["catch"](3);
+              _context6.next = 31;
+              return this.handleCustomerListError(_context6.t0, 'load more customers');
             case 31:
-              _context7.prev = 31;
+              throw _context6.t0;
+            case 32:
+              _context6.prev = 32;
               this.store.loadingMore = false;
               this.storeChange();
-              _context7.next = 36;
-              return this.core.effects.emit("".concat(this.name, ":onCustomerListUpdate"), this.store);
+              return _context6.finish(32);
             case 36:
-              return _context7.finish(31);
-            case 37:
             case "end":
-              return _context7.stop();
+              return _context6.stop();
           }
-        }, _callee7, this, [[3, 26, 31, 37]]);
+        }, _callee6, this, [[3, 27, 32, 36]]);
       }));
       function loadMoreCustomers() {
         return _loadMoreCustomers.apply(this, arguments);
@@ -719,15 +630,15 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "resetAndLoadCustomers",
     value: (function () {
-      var _resetAndLoadCustomers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+      var _resetAndLoadCustomers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
         var params,
           resetParams,
           response,
-          _args8 = arguments;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+          _args7 = arguments;
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              params = _args8.length > 0 && _args8[0] !== undefined ? _args8[0] : {};
+              params = _args7.length > 0 && _args7[0] !== undefined ? _args7[0] : {};
               // 重置状态
               this.store.customerList = [];
               this.store.currentPage = 1;
@@ -739,23 +650,23 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
                 skip: 1,
                 num: params.num || this.store.pageSize
               }); // 调用普通的获取列表方法
-              _context8.next = 8;
+              _context7.next = 8;
               return this.getCustomerList(resetParams);
             case 8:
-              response = _context8.sent;
-              _context8.next = 11;
+              response = _context7.sent;
+              _context7.next = 11;
               return this.core.effects.emit("".concat(this.name, ":onScrollLoadComplete"), {
                 customers: this.store.customerList,
                 total: this.store.total,
                 hasMore: this.store.hasMore
               });
             case 11:
-              return _context8.abrupt("return", response);
+              return _context7.abrupt("return", response);
             case 12:
             case "end":
-              return _context8.stop();
+              return _context7.stop();
           }
-        }, _callee8, this);
+        }, _callee7, this);
       }));
       function resetAndLoadCustomers() {
         return _resetAndLoadCustomers.apply(this, arguments);

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

@@ -110,8 +110,6 @@ export interface CustomerState {
 export interface CustomerModuleAPI {
     /** 获取客户列表 */
     getCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
-    /** 查询客户列表但不更新列表分页状态 */
-    queryCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
     /** 设置客户列表 */
     setCustomerList: (customers: ShopCustomer[], total?: number) => void;
     /** 设置当前选择的客户 */