@pisell/pisellos 0.0.567 → 0.0.569

package/dist/core/index.js

@@ -106,21 +106,20 @@ var PisellOSCore = /*#__PURE__*/function () {
               _context.next = 16;
               return this.server.initialize(this.serverOptions.modules, this.serverOptions.autoInitData !== false, options);
             case 16:
-              console.log('[PisellOS] ✅ Server 初始化完成，所有数据已预加载');
               this.log('[PisellOS] Server 初始化完成');
-              _context.next = 25;
+              _context.next = 24;
               break;
-            case 20:
-              _context.prev = 20;
+            case 19:
+              _context.prev = 19;
               _context.t0 = _context["catch"](6);
               console.error('[PisellOS] ❌ Server 初始化失败:', _context.t0);
               this.log("Server \u521D\u59CB\u5316\u5931\u8D25: ".concat(_context.t0), 'error');
               throw _context.t0;
-            case 25:
+            case 24:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[6, 20]]);
+        }, _callee, this, [[6, 19]]);
       }));
       function initializeServer(_x) {
         return _initializeServer.apply(this, arguments);
@@ -138,11 +137,10 @@ var PisellOSCore = /*#__PURE__*/function () {
       var prefix = '[PisellOS]';
       switch (level) {
         case 'info':
-          console.log("".concat(prefix, " ").concat(message));
           break;
         case 'warn':
           // 使用 console.log 避免显示堆栈跟踪，提升性能
-          console.log("%c".concat(prefix, "%c ").concat(message), 'color: #f59e0b; font-weight: bold;', 'color: #f59e0b;');
+
           break;
         case 'error':
           console.error("".concat(prefix, " ").concat(message));
@@ -249,7 +247,6 @@ var PisellOSCore = /*#__PURE__*/function () {
       }
       // 预先给模块初始化值系统
       var _createStore = createStore((options === null || options === void 0 ? void 0 : options.initialState) || {}, module.name, function (path, value) {
-          console.log('core 检测到模块值更新', module.name, path, value);
           _this3.effects.emit("".concat(module.name, ":changed"), {
             path: path,
             value: value

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

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

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

@@ -257,7 +257,6 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
             var rawText = this.getText(reasonCode);
             // 金额类型字段：从 otherParams.getData 取货币符号；非金额或取不到则留空
             var currency = failedField && AMOUNT_FIELDS.has(failedField) ? ((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 || (_this$otherParams$get = (_this$otherParams2 = _this$otherParams).getData) === null || _this$otherParams$get === void 0 ? void 0 : _this$otherParams$get.call(_this$otherParams2, 'shop_symbol')) || '' : '';
-            console.log(currency, 'currency12345');
             var reason = thresholdValue !== undefined ? formatReason(rawText, thresholdValue, currency) : rawText;
             results.push({
               voucher: voucher,
@@ -506,7 +505,6 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
   }, {
     key: "calculateApplicableProducts",
     value: function calculateApplicableProducts(products, applicableProductIds, deductTaxAndFee) {
-      console.log(products, 'products1234');
       var total = 0;
       var count = 0;
 

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

@@ -164,8 +164,6 @@ var strategyConfigs = [
 // ============================================
 
 function runExample() {
-  console.log('========== WalletPass 评估器示例 ==========\n');
-
   // 创建评估器实例
   var evaluator = new WalletPassEvaluator();
 
@@ -178,38 +176,17 @@ function runExample() {
   });
 
   // 输出结果
-  console.log('订单信息：');
-  console.log("- \u603B\u91D1\u989D: ".concat(180, " \u5143"));
-  console.log("- \u5546\u54C1: ".concat(products.map(function (p) {
-    return "".concat(p.name, "(").concat(p.quantity, "\u4EF6)");
-  }).join(', '), "\n"));
-  console.log('评估结果：\n');
+
   results.forEach(function (result, index) {
-    console.log("Voucher ".concat(index + 1, ": ").concat(result.voucher.id));
-    console.log("  \u9762\u989D: ".concat(result.voucher.amount, " \u5143"));
-    console.log("  \u53EF\u7528: ".concat(result.isApplicable ? '✅ 是' : '❌ 否'));
-    if (result.isApplicable) {
-      console.log("  \u6700\u5927\u62B5\u6263: ".concat(result.maxDeduction, " \u5143"));
-      console.log("  \u6BCF\u5355\u53EF\u7528: ".concat(result.canUseCount, " \u5F20"));
-      console.log("  \u62B5\u6263\u7A0E\u8D39: ".concat(result.deductTaxAndFee ? '是' : '否'));
-      console.log("  \u9002\u7528\u5546\u54C1: ".concat(result.applicableProductIds.join(', ')));
-    } else {
-      console.log("  \u539F\u56E0: ".concat(result.reason));
-      console.log("  \u539F\u56E0\u7801: ".concat(result.reasonCode));
-    }
-    console.log('');
+    if (result.isApplicable) {} else {}
   });
 
   // 筛选可用的 vouchers
   var availableVouchers = results.filter(function (r) {
     return r.isApplicable;
   });
-  console.log("\n\u5171 ".concat(availableVouchers.length, " \u5F20\u53EF\u7528"));
   if (availableVouchers.length > 0) {
-    console.log('可用 voucher ID:');
-    availableVouchers.forEach(function (v) {
-      console.log("  - ".concat(v.voucher.id, ": \u6700\u591A\u62B5\u6263 ").concat(v.maxDeduction, " \u5143"));
-    });
+    availableVouchers.forEach(function (v) {});
   }
 }
 

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

@@ -72,7 +72,6 @@ function applyMaxPassUsageIncrements(usageMap, walletPassProductId, maxPassesPer
 // 辅助函数：根据 deductTaxAndFee 配置获取推荐使用金额
 var getRecommendedAmount = function getRecommendedAmount(voucher) {
   var _config$deductTaxAndF;
-  console.log('voucher312', voucher);
   var config = voucher.config,
     recommended_usage_amount = voucher.recommended_usage_amount,
     recommended_pure_product_usage_amount = voucher.recommended_pure_product_usage_amount;
@@ -166,8 +165,6 @@ var getApplicableProducts = function getApplicableProducts(voucher, productsData
  * @returns 返回推荐券列表和全部列表，每个券包含 _available_max_amount 和 _unified_available_status
  */
 export function processVouchers(applicableVouchers, orderTotalAmount, products) {
-  console.log(products, 'products123');
-
   // 拆分商品数据，同时维护含税和不含税两个金额池
   // remainingAmountWithTax: 含税费的剩余可抵扣金额
   // remainingAmountPure: 纯商品金额（不含税费）的剩余可抵扣金额
@@ -494,7 +491,7 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
     // ======================================================================================
 
     // 计算本次抵扣金额（使用同样的 usageAmount）
-    var maxDeduction = Decimal.min(new Decimal(usageAmount), new Decimal(maxDeductionAmount));
+    var maxDeduction = Decimal.min(new Decimal(usageAmount), new Decimal(maxDeductionAmount), remainingOrderAmount);
     var deductionLeft = maxDeduction;
     var deductionDetails = [];
     if (allowCrossProduct) {
@@ -677,6 +674,7 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
 
   // 第一步：按顺序应用已选中的券，计算实际抵扣
   selectedVouchers.forEach(function (selectedVoucher) {
+    var _selectedVoucher$_ava;
     var config = selectedVoucher.config,
       id = selectedVoucher.id;
     var maxDeductionAmount = config.maxDeductionAmount,
@@ -710,9 +708,11 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
       return;
     }
 
-    // 计算本次抵扣金额
-    // 优先使用用户手动编辑的金额，否则根据 deductTaxAndFee 配置获取推荐金额
-    var usageAmount = typeof selectedVoucher.edit_current_amount === 'number' ? selectedVoucher.edit_current_amount : getRecommendedAmount(selectedVoucher);
+    // 计算本次抵扣金额：
+    // - 用户手动编辑时以编辑金额为准；
+    // - 自动推荐/重算时沿用上一轮基于剩余待付金额算出的 _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);
     var maxDeduction = Decimal.min(new Decimal(usageAmount), new Decimal(maxDeductionAmount), remainingOrderAmount);
     var deductionLeft = maxDeduction;
     var deductionDetails = [];

package/dist/model/strategy/strategy-example.js

@@ -246,8 +246,6 @@ var codeContext = {
 // ============================================
 
 function runExamples() {
-  console.log('====== 策略模型使用示例 ======\n');
-
   // 创建引擎实例（开启调试和追踪）
   var engine = createStrategyEngine({
     debug: true,
@@ -255,32 +253,23 @@ function runExamples() {
   });
 
   // 示例1: 代金券
-  console.log('示例1: 10元代金券');
+
   var result1 = engine.evaluate(voucherConfig, voucherContext);
-  console.log('结果:', JSON.stringify(result1, null, 2));
-  console.log('\n');
 
   // 示例2: 阶梯满减
-  console.log('示例2: 阶梯满减（订单金额250）');
+
   var result2 = engine.evaluate(tieredDiscountConfig, tieredContext);
-  console.log('结果:', JSON.stringify(result2, null, 2));
-  console.log('\n');
 
   // 示例3: Code 模式
-  console.log('示例3: Code 模式条件');
+
   var result3 = engine.evaluate(codeConditionConfig, codeContext);
-  console.log('结果:', JSON.stringify(result3, null, 2));
-  console.log('\n');
 
   // 快速评估（不需要创建引擎实例）
-  console.log('示例4: 快速评估');
+
   var result4 = evaluate(voucherConfig, voucherContext);
-  console.log('适用:', result4.applicable);
-  console.log('匹配动作数:', result4.matchedActions.length);
-  console.log('\n');
 
   // 注册自定义运算符
-  console.log('示例5: 自定义运算符');
+
   engine.registerOperator('divisible_by', function (fieldValue, compareValue) {
     return Number(fieldValue) % Number(compareValue) === 0;
   });
@@ -317,11 +306,8 @@ function runExamples() {
     }
   };
   var result5 = engine.evaluate(customOperatorConfig, customContext);
-  console.log('结果:', result5.applicable ? '适用' : '不适用');
-  console.log('匹配动作:', result5.matchedActions);
 
   // 调试信息
-  console.log('\n引擎调试信息:', engine.getDebugInfo());
 }
 
 // 运行示例（如果直接执行此文件）

package/dist/modules/BaseModule.d.ts

@@ -14,9 +14,9 @@ export declare class BaseModule {
         store: any;
         cacheKey: string[];
     }): void;
-    effectsOn(eventType: string, callback: (payload: any) => void, force?: boolean): void;
+    effectsOn(eventType: string, callback: (payload: any) => void): () => void;
     effectsOff(eventType: string, callback: (payload: any) => void): void;
-    effectsOnce(eventType: string, callback: (payload: any) => void, force?: boolean): void;
+    effectsOnce(eventType: string, callback: (payload: any) => void): void;
     effectsEmit(eventType: string, payload: any): Promise<{
         status: boolean;
         data: any;

package/dist/modules/BaseModule.js

@@ -68,8 +68,8 @@ export var BaseModule = /*#__PURE__*/function () {
     }
   }, {
     key: "effectsOn",
-    value: function effectsOn(eventType, callback, force) {
-      return this.core.effects.on("".concat(this.name, ":").concat(eventType), callback, force);
+    value: function effectsOn(eventType, callback) {
+      return this.core.effects.on("".concat(this.name, ":").concat(eventType), callback);
     }
   }, {
     key: "effectsOff",
@@ -78,8 +78,8 @@ export var BaseModule = /*#__PURE__*/function () {
     }
   }, {
     key: "effectsOnce",
-    value: function effectsOnce(eventType, callback, force) {
-      return this.core.effects.once("".concat(this.name, ":").concat(eventType), callback, force);
+    value: function effectsOnce(eventType, callback) {
+      return this.core.effects.once("".concat(this.name, ":").concat(eventType), callback);
     }
   }, {
     key: "effectsEmit",

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

@@ -0,0 +1,48 @@
+import { Module, ModuleOptions, PisellCore } from '../../types';
+import { BaseModule } from '../BaseModule';
+import { BookingContextConfig, BookingContextDateInput, BookingContextModuleAPI, BookingContextResource, BookingContextResourceMap, BookingContextState, InitBookingContextParams, LoadBookingConfigParams, LoadBookingResourcesParams } from './types';
+export * from './types';
+export * from './utils';
+/**
+ * 清理跨实例共享缓存，仅供单元测试隔离使用。
+ *
+ * @example
+ * __clearBookingContextSharedCacheForTest();
+ */
+export declare function __clearBookingContextSharedCacheForTest(): void;
+/** 稳定序列化 config 查询参数，用于判断是否与上次 loadBookingConfig 一致。 */
+export declare function buildBookingConfigQueryKey(params?: LoadBookingConfigParams): string;
+/** 稳定序列化资源列表查询（date + bookingIds），用于跳过重复 loadResources。 */
+export declare function buildBookingResourcesQueryKey(params?: LoadBookingResourcesParams): string;
+export declare class BookingContextModule extends BaseModule implements Module, BookingContextModuleAPI {
+    protected defaultName: string;
+    protected defaultVersion: string;
+    private request;
+    private store;
+    /** 上次成功 loadBookingConfig 的 query key；命中则不再请求。 */
+    private lastConfigQueryKey;
+    /** 上次成功 loadResources 的 query key（date|bookingIds）；命中则不再请求。 */
+    private lastResourcesQueryKey;
+    constructor(name?: string, version?: string);
+    initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
+    loadBookingConfig(params?: LoadBookingConfigParams, options?: {
+        forceRefresh?: boolean;
+    }): Promise<BookingContextConfig | null>;
+    loadResources(params?: LoadBookingResourcesParams, options?: {
+        forceRefresh?: boolean;
+    }): Promise<BookingContextResource[]>;
+    /**
+     * store 内是否已具备与本次 init 入参等价的 config / resources（不再打接口）。
+     */
+    isBookingContextReady(params?: InitBookingContextParams): boolean;
+    initBookingContext(params?: InitBookingContextParams): Promise<BookingContextState>;
+    setBookingConfig(config: BookingContextConfig | null): void;
+    getBookingConfig(): BookingContextConfig | null;
+    setResources(resources: BookingContextResource[] | null | undefined): void;
+    getResourcesOrigin(): BookingContextResource[];
+    getResourcesOriginMap(): BookingContextResourceMap;
+    setDate(date: BookingContextDateInput): void;
+    getDate(): string | null;
+    getState(): BookingContextState;
+    clear(): void;
+}