@pisell/pisellos 2.2.77 → 2.2.79

package/dist/core/index.d.ts

@@ -1,4 +1,4 @@
-import { Plugin, PluginOptions, Module, ModuleOptions, PisellCore, PisellOSOptions, BusinessContext, ModuleContextConfig, InitializeServerOptions } from '../types';
+import { Plugin, PluginOptions, Module, ModuleOptions, PisellCore, PisellOSOptions, BusinessContext, ModuleContextConfig, ServerOptions, InitializeServerOptions } from '../types';
 import { EffectsManager } from '../effects';
 /**
  * pisell OS 核心实现
@@ -11,7 +11,7 @@ declare class PisellOSCore implements PisellCore {
     private debug;
     context: BusinessContext;
     server: any;
-    private serverOptions?;
+    serverOptions?: ServerOptions;
     constructor(options?: PisellOSOptions);
     private initialize;
     /**

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

@@ -19,7 +19,8 @@ var defaultStrategyMetadataCustom = {
   maxUsagePerOrder: 0,
   allowCrossProduct: true,
   applicableProductLimit: 0,
-  deductTaxAndFee: true
+  deductTaxAndFee: true,
+  maxPassesPerItem: 0
 };
 
 /**

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

@@ -3,6 +3,7 @@ export var locales = {
     'not_meet_the_required_conditions': '未达到使用条件',
     'exceeds_the_maximum_deduction_limit': '超出最大抵扣金额限制',
     'usage_limit_reached': '已达到使用次数上限',
+    'max_passes_per_item_reached': '该商品已达到卡券使用上限',
     'not_available_for_this_channel': '当前渠道不可使用',
     'not_valid_for_this_order_type': '当前订单类型不适用'
   },
@@ -10,6 +11,7 @@ export var locales = {
     'not_meet_the_required_conditions': 'Not meet the required conditions.',
     'exceeds_the_maximum_deduction_limit': 'Exceeds the maximum deduction limit.',
     'usage_limit_reached': 'Usage limit reached.',
+    'max_passes_per_item_reached': 'Max passes per item reached.',
     'not_available_for_this_channel': 'Not available for this channel.',
     'not_valid_for_this_order_type': 'Not valid for this order type.'
   },
@@ -17,6 +19,7 @@ export var locales = {
     'not_meet_the_required_conditions': '未達使用條件',
     'exceeds_the_maximum_deduction_limit': '超出最大抵扣金額限制',
     'usage_limit_reached': '已達使用次數上限',
+    'max_passes_per_item_reached': '該商品已達卡券使用上限',
     'not_available_for_this_channel': '當前渠道不可使用',
     'not_valid_for_this_order_type': '當前訂單類型不適用'
   }

package/dist/model/strategy/adapter/walletPass/type.d.ts

@@ -41,6 +41,8 @@ export interface Voucher {
         allowCrossProduct: boolean;
         /** 可用商品数量上限 （仅多商品） 默认为0，表示不限制商品数量。 */
         applicableProductLimit: number;
+        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品行最多抵扣次数）。默认为 0，表示不限制。 */
+        maxPassesPerItem: number;
     };
 }
 /**
@@ -127,6 +129,8 @@ export interface EvaluatorInput {
         allowCrossProduct: boolean;
         /** 可用商品数量上限 （仅多商品） 默认为0，表示不限制商品数量。 */
         applicableProductLimit: number;
+        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品行最多抵扣次数）。默认为 0，表示不限制。 */
+        maxPassesPerItem: number;
     }>[];
 }
 /**

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

@@ -118,8 +118,33 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
   var productsCopy = expandProductsWithBundleItems(products, true);
   var remainingOrderAmount = new Decimal(orderTotalAmount); // 订单剩余应付金额
 
+  // ========== 辅助工具：maxPassesPerItem（单商品可用卡券上限）追踪 ==========
+  // 获取指定 Wallet Pass 商品对指定订单商品行的已用卡券次数
+  var getItemPassUsage = function getItemPassUsage(usageMap, walletPassProductId, orderItemProductId) {
+    var _usageMap$get;
+    return ((_usageMap$get = usageMap.get(walletPassProductId)) === null || _usageMap$get === void 0 ? void 0 : _usageMap$get.get(orderItemProductId)) || 0;
+  };
+
+  // 更新指定 Wallet Pass 商品对指定订单商品行的已用卡券次数 +1
+  var incrementItemPassUsage = function incrementItemPassUsage(usageMap, walletPassProductId, orderItemProductId) {
+    if (!usageMap.has(walletPassProductId)) {
+      usageMap.set(walletPassProductId, new Map());
+    }
+    var innerMap = usageMap.get(walletPassProductId);
+    innerMap.set(orderItemProductId, (innerMap.get(orderItemProductId) || 0) + 1);
+  };
+
+  // 按 maxPassesPerItem 过滤商品：排除已达到单商品可用卡券上限的商品
+  var filterByMaxPassesPerItem = function filterByMaxPassesPerItem(products, usageMap, walletPassProductId, maxPassesPerItem) {
+    if (maxPassesPerItem <= 0) return products; // 0 = 不限制
+    return products.filter(function (p) {
+      return getItemPassUsage(usageMap, walletPassProductId, p.product_id) < maxPassesPerItem;
+    });
+  };
+  // ================================================================
+
   // 辅助函数：计算单张券的 _available_max_amount
-  var calculateAvailableMaxAmount = function calculateAvailableMaxAmount(voucher, productsData) {
+  var calculateAvailableMaxAmount = function calculateAvailableMaxAmount(voucher, productsData, itemPassUsage) {
     var config = voucher.config;
     var _ref2 = config !== null && config !== void 0 ? config : {},
       _ref2$maxDeductionAmo = _ref2.maxDeductionAmount,
@@ -129,7 +154,9 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
       _ref2$applicableProdu = _ref2.applicableProductLimit,
       applicableProductLimit = _ref2$applicableProdu === void 0 ? 0 : _ref2$applicableProdu,
       _ref2$deductTaxAndFee = _ref2.deductTaxAndFee,
-      deductTaxAndFee = _ref2$deductTaxAndFee === void 0 ? true : _ref2$deductTaxAndFee;
+      deductTaxAndFee = _ref2$deductTaxAndFee === void 0 ? true : _ref2$deductTaxAndFee,
+      _ref2$maxPassesPerIte = _ref2.maxPassesPerItem,
+      maxPassesPerItem = _ref2$maxPassesPerIte === void 0 ? 0 : _ref2$maxPassesPerIte;
 
     // 根据 deductTaxAndFee 配置获取推荐金额
     var recommendedAmount = getRecommendedAmount(voucher);
@@ -145,6 +172,11 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
     var applicableProducts = getApplicableProducts(voucher, productsData).filter(function (p) {
       return p[amountField].greaterThan(0);
     });
+
+    // 按 maxPassesPerItem 过滤：排除已达到单商品可用卡券上限的商品
+    if (itemPassUsage) {
+      applicableProducts = filterByMaxPassesPerItem(applicableProducts, itemPassUsage, voucher.product_id, maxPassesPerItem);
+    }
     if (applicableProducts.length === 0) {
       return new Decimal(0);
     }
@@ -202,7 +234,7 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
   };
 
   // 辅助函数：判断券是否可用，返回可用性和原因代码
-  var isVoucherAvailable = function isVoucherAvailable(voucher, productsData, usedVoucherCounts) {
+  var isVoucherAvailable = function isVoucherAvailable(voucher, productsData, usedVoucherCounts, itemPassUsage) {
     var config = voucher.config,
       id = voucher.id,
       product_id = voucher.product_id;
@@ -245,6 +277,25 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
         };
       }
     }
+
+    // 检查 maxPassesPerItem：如果所有适用商品都已达到单商品可用卡券上限，则不可用
+    var maxPassesPerItem = (config === null || config === void 0 ? void 0 : config.maxPassesPerItem) || 0;
+    if (maxPassesPerItem > 0 && itemPassUsage) {
+      var _config$deductTaxAndF3;
+      var deductTaxAndFee = (_config$deductTaxAndF3 = config === null || config === void 0 ? void 0 : config.deductTaxAndFee) !== null && _config$deductTaxAndF3 !== void 0 ? _config$deductTaxAndF3 : true;
+      var amountField = deductTaxAndFee ? 'remainingAmountWithTax' : 'remainingAmountPure';
+      var availableAfterPassLimit = getApplicableProducts(voucher, productsData).filter(function (p) {
+        return p[amountField].greaterThan(0);
+      }).filter(function (p) {
+        return getItemPassUsage(itemPassUsage, product_id, p.product_id) < maxPassesPerItem;
+      });
+      if (availableAfterPassLimit.length === 0) {
+        return {
+          isAvailable: false,
+          reasonCode: 'max_passes_per_item_reached'
+        };
+      }
+    }
     return {
       isAvailable: true
     };
@@ -272,6 +323,8 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
   // 重置商品余额追踪（同时维护含税和不含税两个金额池）
   var productsForRecommendation = expandProductsWithBundleItems(products, true);
   remainingOrderAmount = new Decimal(orderTotalAmount);
+  // 追踪推荐阶段每个 Wallet Pass 商品对每个订单商品行的已使用卡券次数
+  var itemPassUsageMap = new Map();
 
   /**
   // 分类券：未跨商品券 vs 跨商品券
@@ -302,7 +355,7 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
   // 处理单张券的抵扣
   var applyVoucher = function applyVoucher(voucher) {
     // 检查是否可用
-    var availabilityCheck = isVoucherAvailable(voucher, productsForRecommendation, usedVoucherCounts);
+    var availabilityCheck = isVoucherAvailable(voucher, productsForRecommendation, usedVoucherCounts, itemPassUsageMap);
     if (!availabilityCheck.isAvailable) {
       return false;
     }
@@ -317,7 +370,9 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
       _ref3$applicableProdu = _ref3.applicableProductLimit,
       applicableProductLimit = _ref3$applicableProdu === void 0 ? 0 : _ref3$applicableProdu,
       _ref3$deductTaxAndFee = _ref3.deductTaxAndFee,
-      deductTaxAndFee = _ref3$deductTaxAndFee === void 0 ? true : _ref3$deductTaxAndFee;
+      deductTaxAndFee = _ref3$deductTaxAndFee === void 0 ? true : _ref3$deductTaxAndFee,
+      _ref3$maxPassesPerIte = _ref3.maxPassesPerItem,
+      maxPassesPerItem = _ref3$maxPassesPerIte === void 0 ? 0 : _ref3$maxPassesPerIte;
 
     // 根据券的配置选择使用哪个单价字段和金额字段
     var unitPriceField = deductTaxAndFee ? 'unitPriceWithTax' : 'unitPricePure';
@@ -327,6 +382,9 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
     var applicableProducts = getApplicableProducts(voucher, productsForRecommendation).filter(function (p) {
       return p[amountField].greaterThan(0);
     });
+
+    // 按 maxPassesPerItem 过滤：排除已达到单商品可用卡券上限的商品
+    applicableProducts = filterByMaxPassesPerItem(applicableProducts, itemPassUsageMap, product_id, maxPassesPerItem);
     if (applicableProducts.length === 0) return false;
 
     // ========== 关键修改：在应用券之前，基于当前剩余金额计算 _available_max_amount ==========
@@ -466,6 +524,11 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
       // 更新券使用次数（按 product_id 统计）
       usedVoucherCounts.set(product_id, (usedVoucherCounts.get(product_id) || 0) + 1);
 
+      // 更新 maxPassesPerItem 追踪：记录每个被抵扣的商品行
+      deductionDetails.forEach(function (detail) {
+        incrementItemPassUsage(itemPassUsageMap, product_id, detail.product_id);
+      });
+
       // 添加到推荐列表（包含基于当前剩余金额计算的 available_max_amount）
       recommendedVouchers.push(_objectSpread(_objectSpread({}, voucher), {}, {
         actualDeduction: totalDeducted.toNumber(),
@@ -547,6 +610,27 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
   var remainingOrderAmount = new Decimal(orderTotalAmount);
   var selectedWithDetails = [];
 
+  // 追踪每个 Wallet Pass 商品对每个订单商品行的已使用卡券次数
+  // Map<walletPassProductId, Map<orderItemProductId, usedCount>>
+  var itemPassUsageMap = new Map();
+  var getItemPassUsage = function getItemPassUsage(walletPassProductId, orderItemProductId) {
+    var _itemPassUsageMap$get;
+    return ((_itemPassUsageMap$get = itemPassUsageMap.get(walletPassProductId)) === null || _itemPassUsageMap$get === void 0 ? void 0 : _itemPassUsageMap$get.get(orderItemProductId)) || 0;
+  };
+  var incrementItemPassUsage = function incrementItemPassUsage(walletPassProductId, orderItemProductId) {
+    if (!itemPassUsageMap.has(walletPassProductId)) {
+      itemPassUsageMap.set(walletPassProductId, new Map());
+    }
+    var innerMap = itemPassUsageMap.get(walletPassProductId);
+    innerMap.set(orderItemProductId, (innerMap.get(orderItemProductId) || 0) + 1);
+  };
+  var filterByMaxPassesPerItem = function filterByMaxPassesPerItem(products, walletPassProductId, maxPassesPerItem) {
+    if (maxPassesPerItem <= 0) return products; // 0 = 不限制
+    return products.filter(function (p) {
+      return getItemPassUsage(walletPassProductId, p.product_id) < maxPassesPerItem;
+    });
+  };
+
   // 第一步：按顺序应用已选中的券，计算实际抵扣
   selectedVouchers.forEach(function (selectedVoucher) {
     var config = selectedVoucher.config,
@@ -554,8 +638,10 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
     var maxDeductionAmount = config.maxDeductionAmount,
       allowCrossProduct = config.allowCrossProduct,
       applicableProductLimit = config.applicableProductLimit,
-      _config$deductTaxAndF3 = config.deductTaxAndFee,
-      deductTaxAndFee = _config$deductTaxAndF3 === void 0 ? true : _config$deductTaxAndF3;
+      _config$deductTaxAndF4 = config.deductTaxAndFee,
+      deductTaxAndFee = _config$deductTaxAndF4 === void 0 ? true : _config$deductTaxAndF4,
+      _config$maxPassesPerI = config.maxPassesPerItem,
+      maxPassesPerItem = _config$maxPassesPerI === void 0 ? 0 : _config$maxPassesPerI;
 
     // 根据券的配置选择使用哪个单价字段和金额字段
     var unitPriceField = deductTaxAndFee ? 'unitPriceWithTax' : 'unitPricePure';
@@ -565,6 +651,9 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
     var applicableProducts = getApplicableProducts(selectedVoucher, productsForCalc).filter(function (p) {
       return p[amountField].greaterThan(0);
     });
+
+    // 按 maxPassesPerItem 过滤：排除已达到单商品可用卡券上限的商品
+    applicableProducts = filterByMaxPassesPerItem(applicableProducts, selectedVoucher.product_id, maxPassesPerItem);
     if (applicableProducts.length === 0) {
       // 无适用商品，跳过
       selectedWithDetails.push(_objectSpread(_objectSpread({}, selectedVoucher), {}, {
@@ -658,6 +747,11 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
 
     // 更新订单剩余金额
     remainingOrderAmount = remainingOrderAmount.minus(totalDeducted);
+
+    // 更新 maxPassesPerItem 追踪：记录每个被抵扣的商品行
+    deductionDetails.forEach(function (detail) {
+      incrementItemPassUsage(selectedVoucher.product_id, detail.product_id);
+    });
     selectedWithDetails.push(_objectSpread(_objectSpread({}, selectedVoucher), {}, {
       actualDeduction: totalDeducted.toNumber(),
       // 转换为数字
@@ -692,8 +786,10 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
     var maxDeductionAmount = config.maxDeductionAmount,
       allowCrossProduct = config.allowCrossProduct,
       applicableProductLimit = config.applicableProductLimit,
-      _config$deductTaxAndF4 = config.deductTaxAndFee,
-      deductTaxAndFee = _config$deductTaxAndF4 === void 0 ? true : _config$deductTaxAndF4;
+      _config$deductTaxAndF5 = config.deductTaxAndFee,
+      deductTaxAndFee = _config$deductTaxAndF5 === void 0 ? true : _config$deductTaxAndF5,
+      _config$maxPassesPerI2 = config.maxPassesPerItem,
+      maxPassesPerItem = _config$maxPassesPerI2 === void 0 ? 0 : _config$maxPassesPerI2;
 
     // 根据券的配置选择使用哪个单价字段和金额字段
     var unitPriceField = deductTaxAndFee ? 'unitPriceWithTax' : 'unitPricePure';
@@ -726,6 +822,9 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
         var applicableProducts = getApplicableProducts(voucher, productsForCalc).filter(function (p) {
           return p[amountField].greaterThan(0);
         });
+
+        // 按 maxPassesPerItem 过滤：排除已达到单商品可用卡券上限的商品
+        applicableProducts = filterByMaxPassesPerItem(applicableProducts, product_id, maxPassesPerItem);
         if (applicableProducts.length === 0) {
           isAvailable = false;
           reasonCode = 'not_meet_the_required_conditions';

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

@@ -22,6 +22,9 @@ export declare class ProductList extends BaseModule implements Module {
         schedule_datetime?: string;
         with_count?: string[];
         with_schedule?: number;
+    }, options?: {
+        callback?: (result: any) => void;
+        subscriberId?: string;
     }): Promise<any>;
     loadProductsPrice({ ids, customer_id, schedule_date, channel, }: {
         ids?: number[];

package/dist/modules/ProductList/index.js

@@ -84,7 +84,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadProducts",
     value: function () {
-      var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref) {
+      var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref, options) {
         var _this$otherParams;
         var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, _ref$menu_list_ids, menu_list_ids, paramsCustomerId, _ref$with_count, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, userPlugin, customer_id, _userPlugin$get, productsData, sortedList;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
@@ -134,7 +134,9 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 with_schedule: with_schedule,
                 schedule_datetime: schedule_datetime
               }, {
-                osServer: true
+                osServer: true,
+                callback: options === null || options === void 0 ? void 0 : options.callback,
+                subscriberId: options === null || options === void 0 ? void 0 : options.subscriberId
               });
             case 6:
               productsData = _context3.sent;
@@ -155,7 +157,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee3, this);
       }));
-      function loadProducts(_x5) {
+      function loadProducts(_x5, _x6) {
         return _loadProducts.apply(this, arguments);
       }
       return loadProducts;
@@ -187,7 +189,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee4, this);
       }));
-      function loadProductsPrice(_x6) {
+      function loadProductsPrice(_x7) {
         return _loadProductsPrice.apply(this, arguments);
       }
       return loadProductsPrice;
@@ -235,7 +237,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee6, this);
       }));
-      function getProduct(_x7) {
+      function getProduct(_x8) {
         return _getProduct.apply(this, arguments);
       }
       return getProduct;
@@ -273,7 +275,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee7, this);
       }));
-      function addProduct(_x8) {
+      function addProduct(_x9) {
         return _addProduct.apply(this, arguments);
       }
       return addProduct;
@@ -292,7 +294,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee8, this);
       }));
-      function selectProducts(_x9) {
+      function selectProducts(_x10) {
         return _selectProducts.apply(this, arguments);
       }
       return selectProducts;

package/dist/plugins/request.d.ts

@@ -69,6 +69,8 @@ export interface RequestOptions {
     customToast?: () => void;
     cache?: CacheProps;
     osServer?: boolean;
+    callback?: (res: any) => void;
+    subscriberId?: string;
 }
 /**
  * 响应接口

package/dist/server/index.d.ts

@@ -18,6 +18,7 @@ declare class Server {
     quotation?: QuotationModule;
     schedule?: ScheduleModuleEx;
     router: Router;
+    private productQuerySubscribers;
     private moduleRegistry;
     constructor(core: PisellCore);
     /**
@@ -85,6 +86,12 @@ declare class Server {
      * 获取所有已注册的模块列表
      */
     getRegisteredModules(): string[];
+    /**
+     * 后台静默刷新商品数据
+     * 重新拉取全量 SSE 接口，更新本地数据后触发 onProductsSyncCompleted
+     * 不影响当前界面展示，适用于切回前台、定时刷新等场景
+     */
+    refreshProductsInBackground(): Promise<void>;
     /**
      * 清空所有server模块的IndexedDB缓存
      * @returns Promise<void>
@@ -132,10 +139,28 @@ declare class Server {
      */
     private registerServerRoutes;
     /**
-     * 处理商品查询请求（编排 Products、Menu、Schedule 模块）
-     * 这是一个业务编排方法，协调多个模块完成复杂的业务需求
+     * 根据 subscriberId 移除商品查询订阅者
+     */
+    removeProductQuerySubscriber(subscriberId?: string): void;
+    /**
+     * 处理商品查询请求
+     * 存储订阅者信息，便于数据变更时推送最新结果
      */
     private handleProductQuery;
+    /**
+     * 取消商品查询订阅（HTTP 路由入口）
+     */
+    private handleUnsubscribeProductQuery;
+    /**
+     * 商品查询的核心计算逻辑（编排 Products、Menu、Schedule 模块）
+     * 供 handleProductQuery 首次返回及 pubsub 变更推送复用
+     */
+    private computeProductQueryResult;
+    /**
+     * 数据变更后，遍历所有订阅者重新计算查询结果并通过 callback 推送
+     * 由 ProductsModule 的 onProductsSyncCompleted 事件触发
+     */
+    private recomputeAndNotifyProductQuery;
     /**
      * 根据餐牌配置过滤商品
      * @param products 所有商品列表