@pisell/pisellos 2.2.71 → 2.2.73

package/dist/modules/Rules/index.js

@@ -201,6 +201,13 @@ 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) {
@@ -953,6 +960,9 @@ 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;
@@ -1048,25 +1058,36 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 }),
                 price: product.price
               }), {}, {
-                discount_list: []
+                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
+              var _ref7, _product$_promotion$f, _product12, _product$origin_total;
+              var 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.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
+              var main_product_selling_price = product.price;
+              if ((product.discount_list || []).some(function (item) {
+                return item.type === 'promotion';
+              })) {
+                var _product$total, _product$main_product;
+                total = (_product$total = product.total) !== null && _product$total !== void 0 ? _product$total : product.origin_total;
+                main_product_selling_price = (_product$main_product = product.main_product_selling_price) !== null && _product$main_product !== void 0 ? _product$main_product : main_product_selling_price;
+              }
               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.origin_total || product.total,
+                total: total,
                 price: product.price,
-                main_product_selling_price: product.price
+                main_product_selling_price: main_product_selling_price
               }), {}, {
-                discount_list: []
+                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             }
           } else {
+            var _flatItem$bundleItem8;
             // bundle子商品：保存到扁平化Map
             processedFlatItemsMap.set(flatItem._id, [_objectSpread(_objectSpread({}, flatItem), {}, {
-              discount_list: [],
+              discount_list: _this3.filterDiscountListByType(((_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.discount_list) || [], 'promotion'),
               price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
               processed: true
             })]);
@@ -1098,15 +1119,23 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         if (flatItem.type === 'main') {
           // 主商品：保持原有逻辑
           if (splitCount < totalQuantity && isNeedSplit) {
+            var _product$origin_total2;
+            var _total = (_product$origin_total2 = product.origin_total) !== null && _product$origin_total2 !== void 0 ? _product$origin_total2 : product.total;
+            if ((product.discount_list || []).some(function (item) {
+              return item.type === 'promotion';
+            })) {
+              var _product$total2;
+              _total = (_product$total2 = product.total) !== null && _product$total2 !== void 0 ? _product$total2 : product.origin_total;
+            }
             arr.push(_this3.hooks.setProduct(originProduct, {
-              discount_list: [],
+              discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion'),
               quantity: totalQuantity - splitCount,
               _id: product._id.split('___')[0],
-              total: product.origin_total || product.total
+              total: _total
             }));
           }
           for (var i = 0; i < splitCount; i++) {
-            var _product$discount_lis10, _originProduct, _selectedDiscount$met, _selectedDiscount$met2;
+            var _originProduct, _selectedDiscount$met, _selectedDiscount$met2;
             // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
             var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
             // 标记优惠券为已使用
@@ -1123,7 +1152,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 ((_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.length && product.origin_total) {
+            if (_this3.filterDiscountListByType(product.discount_list, 'promotion').length && product.origin_total) {
               productOriginTotal = product.origin_total;
             }
             // 如果originProduct?._productInit?.original_price为 0，product.origin_total可能为空，此时取 product.total
@@ -1176,13 +1205,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             };
             appliedProducts.push(discountDetail);
             appliedDiscountProducts.set(_selectedDiscount.id, appliedProducts);
-            var total = targetProductTotal;
+            var _total2 = targetProductTotal;
             if (product.options) {
-              total = product.options.reduce(function (accumulator, currentValue) {
+              _total2 = product.options.reduce(function (accumulator, currentValue) {
                 var currentPrice = new Decimal(currentValue.price || 0);
                 var currentNum = new Decimal(currentValue.num || 0);
                 return accumulator.add(currentPrice.mul(currentNum));
-              }, new Decimal(total)).toNumber();
+              }, new Decimal(_total2)).toNumber();
             }
 
             // 记录应用了优惠券的商品
@@ -1201,15 +1230,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 }),
                 variant: originProduct._productInit.variant,
                 original_price: new Decimal(product.price || 0).toNumber(),
-                total: total
+                total: _total2
               }));
             } else {
               arr.push(_this3.hooks.setProduct(originProduct, {
-                discount_list: [discountDetail],
+                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion').concat([discountDetail]),
                 _id: product._id.split('___')[0] + '___' + _selectedDiscount.id + index,
                 price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
                 quantity: isNeedSplit ? 1 : product.quantity,
-                total: total,
+                total: _total2,
                 origin_total: productOriginTotal,
                 main_product_selling_price: targetProductTotal
               }));
@@ -1376,7 +1405,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             var getDefaultProduct = function getDefaultProduct() {
               if (product.isClient) {
                 return _this3.hooks.setProduct(originProduct, {
-                  discount_list: [],
+                  discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion'),
                   price: product.price,
                   origin_total: getProductOriginTotalPrice({
                     product: {
@@ -1397,7 +1426,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 });
               } else {
                 return _this3.hooks.setProduct(originProduct, {
-                  discount_list: [],
+                  discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion'),
                   total: product.total,
                   origin_total: product.origin_total,
                   price: product.price
@@ -1858,10 +1887,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return true; // 单独购买时可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem8, _flatItem$bundleItem9;
+          var _flatItem$bundleItem9, _flatItem$bundleItem10;
           // 套餐中购买时，判断是否为原价
-          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;
+          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;
           // original_price 对应：
           // 1. price_type: "markup" && price_type_ext: "product_price"
           // markup_price 对应：
@@ -1899,10 +1928,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return false; // 单独购买时不可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem10, _flatItem$bundleItem11;
+          var _flatItem$bundleItem11, _flatItem$bundleItem12;
           // 套餐中购买时，判断是否为原价
-          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;
+          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;
 
           // original_price 对应：
           // 1. price_type: "markup" && price_type_ext: "product_price"

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, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -1,3 +1,5 @@
 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,6 +30,8 @@ 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
 });
@@ -37,8 +39,12 @@ 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/promotion/adapter.d.ts

@@ -0,0 +1,66 @@
+import type { EvaluationResult, RuntimeContext } from '../../type';
+import type { BusinessAdapter } from '../type';
+import type { PromotionBusinessData, PromotionTransformResult } from './type';
+/**
+ * Promotion 适配器
+ *
+ * 用于将促销活动业务数据转换为策略引擎可识别的格式
+ * 策略引擎只负责匹配，具体的优惠计算由业务层完成
+ */
+export declare class PromotionAdapter implements BusinessAdapter {
+    name: string;
+    version: string;
+    /**
+     * 准备运行时上下文
+     *
+     * 将业务数据转换为策略引擎可识别的 RuntimeContext
+     */
+    prepareContext(businessData: PromotionBusinessData): RuntimeContext;
+    /**
+     * 转换执行结果
+     *
+     * 将策略引擎的通用结果转换为业务层需要的格式
+     * 主要是整理 matchedActions，让业务层更容易使用
+     */
+    transformResult(result: EvaluationResult, businessData?: PromotionBusinessData): PromotionTransformResult;
+    /**
+     * 格式化配置
+     */
+    formatConfig(result: EvaluationResult, businessData?: PromotionBusinessData): {
+        result: EvaluationResult;
+        businessData?: PromotionBusinessData;
+    };
+    /**
+     * 格式化日期时间
+     */
+    private formatDateTime;
+    /**
+     * 解析 Action 详情
+     *
+     * 将 matchedAction 转换为更易用的结构
+     */
+    private parseActionDetail;
+    /**
+     * 解析 X件Y元 Action
+     */
+    private parseXItemsForYPriceAction;
+    /**
+     * 解析 买X送Y Action
+     */
+    private parseBuyXGetYFreeAction;
+    /**
+     * 获取适用的商品列表
+     *
+     * 从购物车商品中筛选出符合策略条件的商品
+     */
+    private getApplicableProducts;
+    /**
+     * 查找商品匹配规则
+     */
+    private findProductMatchRule;
+    /**
+     * 检查商品是否匹配
+     */
+    private isProductMatch;
+}
+export default PromotionAdapter;

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

@@ -0,0 +1,217 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/adapter.ts
+var adapter_exports = {};
+__export(adapter_exports, {
+  PromotionAdapter: () => PromotionAdapter,
+  default: () => adapter_default
+});
+module.exports = __toCommonJS(adapter_exports);
+var import_type = require("./type");
+var PromotionAdapter = class {
+  constructor() {
+    this.name = "PromotionAdapter";
+    this.version = "1.0.0";
+  }
+  /**
+   * 准备运行时上下文
+   *
+   * 将业务数据转换为策略引擎可识别的 RuntimeContext
+   */
+  prepareContext(businessData) {
+    const { products, currentProduct, channel, custom } = businessData;
+    const now = /* @__PURE__ */ new Date();
+    const currentDateTime = this.formatDateTime(now);
+    const evaluatingProduct = currentProduct || (products.length > 0 ? products[0] : null);
+    return {
+      entities: {
+        products,
+        currentProduct: evaluatingProduct
+      },
+      attributes: {
+        // 当前时间（格式化字符串，用于时间条件判断）
+        currentDateTime,
+        // 当前评估的商品信息（用于 product_match 运算符）
+        productIdAndVariantId: evaluatingProduct ? {
+          product_id: evaluatingProduct.product_id,
+          product_variant_id: evaluatingProduct.product_variant_id
+        } : null,
+        // 渠道
+        channel: channel || "",
+        // 商品总数量
+        totalQuantity: products.reduce((sum, p) => sum + p.quantity, 0),
+        // 商品总金额
+        totalAmount: products.reduce((sum, p) => sum + p.price * p.quantity, 0),
+        // 自定义属性
+        ...custom
+      },
+      metadata: {
+        timestamp: Date.now()
+      }
+    };
+  }
+  /**
+   * 转换执行结果
+   *
+   * 将策略引擎的通用结果转换为业务层需要的格式
+   * 主要是整理 matchedActions，让业务层更容易使用
+   */
+  transformResult(result, businessData) {
+    const applicableProducts = businessData ? this.getApplicableProducts(result, businessData) : [];
+    if (!result.applicable) {
+      return {
+        isApplicable: false,
+        applicableProducts: [],
+        reason: result.message,
+        reasonCode: result.code,
+        strategyResult: result
+      };
+    }
+    const matchedAction = result.matchedActions[0];
+    if (!matchedAction) {
+      return {
+        isApplicable: false,
+        applicableProducts: [],
+        reason: "No matched action",
+        reasonCode: "NO_ACTION",
+        strategyResult: result
+      };
+    }
+    const actionDetail = this.parseActionDetail(matchedAction);
+    return {
+      isApplicable: true,
+      actionType: matchedAction.type,
+      actionDetail,
+      applicableProducts,
+      strategyResult: result
+    };
+  }
+  /**
+   * 格式化配置
+   */
+  formatConfig(result, businessData) {
+    return { result, businessData };
+  }
+  // ============================================
+  // 私有辅助方法
+  // ============================================
+  /**
+   * 格式化日期时间
+   */
+  formatDateTime(date) {
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, "0");
+    const day = String(date.getDate()).padStart(2, "0");
+    const hours = String(date.getHours()).padStart(2, "0");
+    const minutes = String(date.getMinutes()).padStart(2, "0");
+    const seconds = String(date.getSeconds()).padStart(2, "0");
+    return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+  }
+  /**
+   * 解析 Action 详情
+   *
+   * 将 matchedAction 转换为更易用的结构
+   */
+  parseActionDetail(action) {
+    switch (action.type) {
+      case import_type.PROMOTION_ACTION_TYPES.X_ITEMS_FOR_Y_PRICE:
+        return this.parseXItemsForYPriceAction(action);
+      case import_type.PROMOTION_ACTION_TYPES.BUY_X_GET_Y_FREE:
+        return this.parseBuyXGetYFreeAction(action);
+      default:
+        return void 0;
+    }
+  }
+  /**
+   * 解析 X件Y元 Action
+   */
+  parseXItemsForYPriceAction(action) {
+    const value = action.value || {};
+    const config = action.config || {};
+    return {
+      type: import_type.PROMOTION_ACTION_TYPES.X_ITEMS_FOR_Y_PRICE,
+      x: value.x || 2,
+      price: value.price || 0,
+      allowCrossProduct: config.allowCrossProduct ?? true,
+      cumulative: config.cumulative ?? true
+    };
+  }
+  /**
+   * 解析 买X送Y Action
+   */
+  parseBuyXGetYFreeAction(action) {
+    const value = action.value || {};
+    const config = action.config || {};
+    return {
+      type: import_type.PROMOTION_ACTION_TYPES.BUY_X_GET_Y_FREE,
+      buyQuantity: value.buyQuantity || 1,
+      freeQuantity: value.freeQuantity || 1,
+      giftSelectionMode: config.giftSelectionMode || "user_select",
+      cumulative: config.cumulative ?? true,
+      giftProducts: config.giftProducts || []
+    };
+  }
+  /**
+   * 获取适用的商品列表
+   *
+   * 从购物车商品中筛选出符合策略条件的商品
+   */
+  getApplicableProducts(result, businessData) {
+    const { products } = businessData;
+    const productMatchRule = this.findProductMatchRule(result.config);
+    if (!productMatchRule) {
+      return products;
+    }
+    const configProducts = productMatchRule.value;
+    return products.filter(
+      (product) => this.isProductMatch(product, configProducts)
+    );
+  }
+  /**
+   * 查找商品匹配规则
+   */
+  findProductMatchRule(config) {
+    var _a;
+    if (!((_a = config == null ? void 0 : config.conditions) == null ? void 0 : _a.rules)) {
+      return null;
+    }
+    return config.conditions.rules.find(
+      (rule) => rule.field === "productIdAndVariantId" && (rule.operator === "product_match" || rule.operator === "object_in")
+    );
+  }
+  /**
+   * 检查商品是否匹配
+   */
+  isProductMatch(product, configProducts) {
+    return configProducts.some((config) => {
+      if (config.product_id !== product.product_id) {
+        return false;
+      }
+      if (config.product_variant_id === 0) {
+        return true;
+      }
+      return config.product_variant_id === product.product_variant_id;
+    });
+  }
+};
+var adapter_default = PromotionAdapter;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  PromotionAdapter
+});