@pisell/pisellos 2.2.62 → 2.2.63

package/dist/modules/BaseModule.js

@@ -79,11 +79,6 @@ export var BaseModule = /*#__PURE__*/function () {
     value: function effectsOnce(eventType, callback) {
       return this.core.effects.once("".concat(this.name, ":").concat(eventType), callback);
     }
-  }, {
-    key: "effectsEmit",
-    value: function effectsEmit(eventType, payload) {
-      return this.core.effects.emit("".concat(this.name, ":").concat(eventType), payload);
-    }
   }]);
   return BaseModule;
 }();

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

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

@@ -30,7 +30,6 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         discountList: Discount[];
         productList: any[];
     };
-    filterDiscountListByType(discountList: Discount[], type: string): Discount[];
     calcDiscount({ discountList, productList, holders, isFormSubject, orderTotalAmount }: {
         discountList: Discount[];
         productList: any[];

package/dist/modules/Rules/index.js

@@ -201,13 +201,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         productList: hasApplicableDiscount ? result.productList : productList
       };
     }
-  }, {
-    key: "filterDiscountListByType",
-    value: function filterDiscountListByType(discountList, type) {
-      return (discountList || []).filter(function (item) {
-        return item.type === type || item.tag === type;
-      });
-    }
   }, {
     key: "calcDiscount",
     value: function calcDiscount(_ref2, options) {
@@ -960,9 +953,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }) && (!((_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.length) || ((_product11 = product) === null || _product11 === void 0 || (_product11 = _product11.discount_list) === null || _product11 === void 0 || (_product11$every = _product11.every) === null || _product11$every === void 0 ? void 0 : _product11$every.call(_product11, function (item) {
             return item.type === 'product';
           })));
-          if (product.inPromotion) {
-            isManualDiscount = false;
-          }
         } else {
           // bundle子商品：判断父主商品是否手动折扣
           var parentProduct = flatItem.parentProduct;
@@ -1058,27 +1048,25 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 }),
                 price: product.price
               }), {}, {
-                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
+                discount_list: []
               }))]);
             } else {
-              var _ref7, _product$_promotion$f, _product12;
               processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {
                 price: product.price,
                 main_product_selling_price: product.price
               } : {
                 _id: product._id.split('___')[0] + '___' + index,
-                total: product.inPromotion ? (_ref7 = (_product$_promotion$f = (_product12 = product) === null || _product12 === void 0 || (_product12 = _product12._promotion) === null || _product12 === void 0 ? void 0 : _product12.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref7 !== void 0 ? _ref7 : product.total : product.origin_total || product.total,
+                total: product.origin_total || product.total,
                 price: product.price,
                 main_product_selling_price: product.price
               }), {}, {
-                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
+                discount_list: []
               }))]);
             }
           } else {
-            var _flatItem$bundleItem8;
             // bundle子商品：保存到扁平化Map
             processedFlatItemsMap.set(flatItem._id, [_objectSpread(_objectSpread({}, flatItem), {}, {
-              discount_list: _this3.filterDiscountListByType(((_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.discount_list) || [], 'promotion'),
+              discount_list: [],
               price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
               processed: true
             })]);
@@ -1111,14 +1099,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 主商品：保持原有逻辑
           if (splitCount < totalQuantity && isNeedSplit) {
             arr.push(_this3.hooks.setProduct(originProduct, {
-              discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion'),
+              discount_list: [],
               quantity: totalQuantity - splitCount,
               _id: product._id.split('___')[0],
               total: product.origin_total || product.total
             }));
           }
           for (var i = 0; i < splitCount; i++) {
-            var _originProduct, _selectedDiscount$met, _selectedDiscount$met2;
+            var _product$discount_lis10, _originProduct, _selectedDiscount$met, _selectedDiscount$met2;
             // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
             var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
             // 标记优惠券为已使用
@@ -1135,7 +1123,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 优先从 origin_total拿，可能会拿不到（比如用户端预约在没有配置 original_price 的情况下）
             var productOriginTotal = product.origin_total || product.total || 0;
             // 如果当前 product 有 discount_list，则先从 origin_total 拿
-            if (_this3.filterDiscountListByType(product.discount_list, 'promotion').length && product.origin_total) {
+            if ((_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.length && product.origin_total) {
               productOriginTotal = product.origin_total;
             }
             // 如果originProduct?._productInit?.original_price为 0，product.origin_total可能为空，此时取 product.total
@@ -1217,7 +1205,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               }));
             } else {
               arr.push(_this3.hooks.setProduct(originProduct, {
-                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion').concat([discountDetail]),
+                discount_list: [discountDetail],
                 _id: product._id.split('___')[0] + '___' + _selectedDiscount.id + index,
                 price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
                 quantity: isNeedSplit ? 1 : product.quantity,
@@ -1388,7 +1376,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             var getDefaultProduct = function getDefaultProduct() {
               if (product.isClient) {
                 return _this3.hooks.setProduct(originProduct, {
-                  discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion'),
+                  discount_list: [],
                   price: product.price,
                   origin_total: getProductOriginTotalPrice({
                     product: {
@@ -1409,7 +1397,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 });
               } else {
                 return _this3.hooks.setProduct(originProduct, {
-                  discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion'),
+                  discount_list: [],
                   total: product.total,
                   origin_total: product.origin_total,
                   price: product.price
@@ -1869,10 +1857,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return true; // 单独购买时可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem9, _flatItem$bundleItem10;
+          var _flatItem$bundleItem8, _flatItem$bundleItem9;
           // 套餐中购买时，判断是否为原价
-          var priceType = (_flatItem$bundleItem9 = flatItem.bundleItem) === null || _flatItem$bundleItem9 === void 0 ? void 0 : _flatItem$bundleItem9.price_type;
-          var priceTypeExt = (_flatItem$bundleItem10 = flatItem.bundleItem) === null || _flatItem$bundleItem10 === void 0 ? void 0 : _flatItem$bundleItem10.price_type_ext;
+          var priceType = (_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.price_type;
+          var priceTypeExt = (_flatItem$bundleItem9 = flatItem.bundleItem) === null || _flatItem$bundleItem9 === void 0 ? void 0 : _flatItem$bundleItem9.price_type_ext;
           // original_price 对应：
           // 1. price_type: "markup" && price_type_ext: "product_price"
           // markup_price 对应：
@@ -1910,10 +1898,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return false; // 单独购买时不可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem11, _flatItem$bundleItem12;
+          var _flatItem$bundleItem10, _flatItem$bundleItem11;
           // 套餐中购买时，判断是否为原价
-          var _priceType = (_flatItem$bundleItem11 = flatItem.bundleItem) === null || _flatItem$bundleItem11 === void 0 ? void 0 : _flatItem$bundleItem11.price_type;
-          var _priceTypeExt = (_flatItem$bundleItem12 = flatItem.bundleItem) === null || _flatItem$bundleItem12 === void 0 ? void 0 : _flatItem$bundleItem12.price_type_ext;
+          var _priceType = (_flatItem$bundleItem10 = flatItem.bundleItem) === null || _flatItem$bundleItem10 === void 0 ? void 0 : _flatItem$bundleItem10.price_type;
+          var _priceTypeExt = (_flatItem$bundleItem11 = flatItem.bundleItem) === null || _flatItem$bundleItem11 === void 0 ? void 0 : _flatItem$bundleItem11.price_type_ext;
 
           // original_price 对应：
           // 1. price_type: "markup" && price_type_ext: "product_price"

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

@@ -344,7 +344,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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

@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/Checkout/index.js

@@ -428,7 +428,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               // 可选，附加费均摊舍入金额
               "surcharge_rounding_remainder": item.metadata.surcharge_rounding_remainder
             },
-            product_bundle: item.product_bundle.map(function (bundle) {
+            product_bundle: (item.product_bundle || []).map(function (bundle) {
               return {
                 is_price_include_tax: item.is_price_include_tax,
                 bundle_id: bundle.bundle_id,

package/dist/solution/ShopDiscount/index.js

@@ -370,6 +370,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
 
       // 找到需要修改状态的优惠券
       var newDiscountList = discountList.map(function (discount) {
+        if (discount.isEditMode) return discount;
         if (selectionMap.has(discount.id)) {
           var targetIsSelected = selectionMap.get(discount.id);
           return _objectSpread(_objectSpread({}, discount), {}, {

package/lib/model/strategy/adapter/index.d.ts

@@ -1,5 +1,3 @@
 export * from './type';
 export { default as WalletPassAdapter } from './walletPass';
 export { WalletPassEvaluator } from './walletPass/evaluator';
-export { PromotionEvaluator } from './promotion/evaluator';
-export { PromotionAdapter } from './promotion/adapter';

package/lib/model/strategy/adapter/index.js

@@ -30,8 +30,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/model/strategy/adapter/index.ts
 var adapter_exports = {};
 __export(adapter_exports, {
-  PromotionAdapter: () => import_adapter.PromotionAdapter,
-  PromotionEvaluator: () => import_evaluator2.PromotionEvaluator,
   WalletPassAdapter: () => import_walletPass.default,
   WalletPassEvaluator: () => import_evaluator.WalletPassEvaluator
 });
@@ -39,12 +37,8 @@ module.exports = __toCommonJS(adapter_exports);
 __reExport(adapter_exports, require("./type"), module.exports);
 var import_walletPass = __toESM(require("./walletPass"));
 var import_evaluator = require("./walletPass/evaluator");
-var import_evaluator2 = require("./promotion/evaluator");
-var import_adapter = require("./promotion/adapter");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  PromotionAdapter,
-  PromotionEvaluator,
   WalletPassAdapter,
   WalletPassEvaluator,
   ...require("./type")

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

@@ -53,8 +53,7 @@ var WalletPassEvaluator = class {
     });
   }
   setStrategyConfigs(strategyConfigs) {
-    const newStrategyConfigs = strategyConfigs.filter((item) => item.metadata.type === "wallet_pass");
-    this.strategyConfigs = newStrategyConfigs;
+    this.strategyConfigs = strategyConfigs;
   }
   getStrategyConfigs() {
     return this.strategyConfigs;

package/lib/model/strategy/index.d.ts

@@ -1,3 +1,94 @@
-export { StrategyEngine, createStrategyEngine, evaluate } from './engine';
-export * from './type';
+import { StrategyConfig, RuntimeContext, EvaluationResult, EngineOptions, OperatorHandler } from './type';
+/**
+ * 策略模型 - 核心实现
+ *
+ * 完全业务无关的通用策略引擎
+ * 支持条件评估、动作匹配、结果返回
+ */
+/**
+ * 策略引擎
+ *
+ * 核心职责：
+ * 1. 递归评估条件组
+ * 2. 收集满足条件的 actionIds
+ * 3. 根据 actionIds 获取 ActionEffect 对象
+ * 4. 按 priority 排序返回
+ */
+export declare class StrategyEngine {
+    private options;
+    private operatorHandlers;
+    constructor(options?: EngineOptions);
+    /**
+     * 评估策略
+     */
+    evaluate(config: StrategyConfig, context: RuntimeContext): EvaluationResult;
+    /**
+     * 递归评估条件组
+     *
+     * @param group 条件组
+     * @param context 运行时上下文
+     * @returns 评估结果对象，包含条件是否满足和收集到的 actionIds
+     */
+    private evaluateConditionGroup;
+    /**
+     * 评估条件组的逻辑运算
+     */
+    private evaluateGroupLogic;
+    /**
+     * 评估单个规则
+     */
+    private evaluateRule;
+    /**
+     * 评估代码模式条件
+     */
+    private evaluateCodeCondition;
+    /**
+     * 评估运算符模式条件
+     */
+    private evaluateOperatorCondition;
+    /**
+     * 获取字段值
+     */
+    private getFieldValue;
+    /**
+     * 评估内置运算符
+     */
+    private evaluateBuiltInOperator;
+    /**
+     * 根据 actionIds 获取 ActionEffect 对象
+     */
+    private getActionsByIds;
+    /**
+     * 按 priority 排序（降序）
+     */
+    private sortActionsByPriority;
+    /**
+     * 判断是否为条件组
+     */
+    private isConditionGroup;
+    /**
+     * 验证配置
+     */
+    private validateConfig;
+    /**
+     * 初始化内置运算符处理器
+     */
+    private initializeBuiltInOperators;
+    /**
+     * 注册自定义运算符
+     */
+    registerOperator(operator: string, handler: OperatorHandler): void;
+    /**
+     * 获取调试信息
+     */
+    getDebugInfo(): Record<string, any>;
+}
 export * from './adapter';
+/**
+ * 创建策略引擎实例
+ */
+export declare function createStrategyEngine(options?: EngineOptions): StrategyEngine;
+/**
+ * 快速评估（使用默认引擎配置）
+ */
+export declare function evaluate(config: StrategyConfig, context: RuntimeContext): EvaluationResult;