@pisell/pisellos 0.0.460 → 0.0.461

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

@@ -1,447 +0,0 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { PROMOTION_ACTION_TYPES } from "./type";
-// 导出类型定义
-// export * from './type';
-
-// 导出评估器
-import { PromotionEvaluator } from "./evaluator";
-export { PromotionEvaluator };
-
-// ============================================
-// Promotion 适配器实现
-// ============================================
-
-/**
- * Promotion 适配器
- *
- * 用于将促销活动业务数据转换为策略引擎可识别的格式
- * 策略引擎只负责匹配，具体的优惠计算由业务层完成
- */
-export var PromotionAdapter = /*#__PURE__*/function () {
-  function PromotionAdapter() {
-    _classCallCheck(this, PromotionAdapter);
-    _defineProperty(this, "name", 'PromotionAdapter');
-    _defineProperty(this, "version", '1.0.0');
-  }
-  _createClass(PromotionAdapter, [{
-    key: "prepareContext",
-    value:
-    /**
-     * 准备运行时上下文
-     *
-     * 将业务数据转换为策略引擎可识别的 RuntimeContext
-     */
-    function prepareContext(businessData) {
-      var products = businessData.products,
-        currentProduct = businessData.currentProduct,
-        channel = businessData.channel,
-        custom = businessData.custom;
-
-      // 当前时间（用于时间条件判断）
-      var now = new Date();
-      var currentDateTime = this.formatDateTime(now);
-
-      // 如果有 currentProduct，用于单商品场景（商品卡片展示）
-      var evaluatingProduct = currentProduct || (products.length > 0 ? products[0] : null);
-      return {
-        entities: {
-          products: products,
-          currentProduct: evaluatingProduct
-        },
-        attributes: _objectSpread({
-          // 当前时间（格式化字符串，用于时间条件判断）
-          currentDateTime: currentDateTime,
-          // 当前评估的商品信息（用于 product_match 运算符）
-          productIdAndVariantId: evaluatingProduct ? {
-            product_id: evaluatingProduct.product_id,
-            product_variant_id: evaluatingProduct.product_variant_id
-          } : null,
-          // 渠道
-          channel: channel || '',
-          // 商品总数量
-          totalQuantity: products.reduce(function (sum, p) {
-            return sum + p.quantity;
-          }, 0),
-          // 商品总金额
-          totalAmount: products.reduce(function (sum, p) {
-            return sum + p.price * p.quantity;
-          }, 0)
-        }, custom),
-        metadata: {
-          timestamp: Date.now()
-        }
-      };
-    }
-
-    /**
-     * 转换执行结果
-     *
-     * 将策略引擎的通用结果转换为业务层需要的格式
-     * 主要是整理 matchedActions，让业务层更容易使用
-     */
-  }, {
-    key: "transformResult",
-    value: function transformResult(result, businessData) {
-      // 获取适用的商品列表
-      var applicableProducts = businessData ? this.getApplicableProducts(result, businessData) : [];
-      if (!result.applicable) {
-        return {
-          isApplicable: false,
-          applicableProducts: [],
-          reason: result.message,
-          reasonCode: result.code,
-          strategyResult: result
-        };
-      }
-
-      // 获取第一个匹配的 action（按 priority 排序后的）
-      var matchedAction = result.matchedActions[0];
-      if (!matchedAction) {
-        return {
-          isApplicable: false,
-          applicableProducts: [],
-          reason: 'No matched action',
-          reasonCode: 'NO_ACTION',
-          strategyResult: result
-        };
-      }
-
-      // 解析 action 详情
-      var actionDetail = this.parseActionDetail(matchedAction);
-      return {
-        isApplicable: true,
-        actionType: matchedAction.type,
-        actionDetail: actionDetail,
-        applicableProducts: applicableProducts,
-        strategyResult: result
-      };
-    }
-
-    /**
-     * 格式化配置
-     */
-  }, {
-    key: "formatConfig",
-    value: function formatConfig(result, businessData) {
-      return {
-        result: result,
-        businessData: businessData
-      };
-    }
-
-    // ============================================
-    // 私有辅助方法
-    // ============================================
-
-    /**
-     * 格式化日期时间
-     */
-  }, {
-    key: "formatDateTime",
-    value: function formatDateTime(date) {
-      var year = date.getFullYear();
-      var month = String(date.getMonth() + 1).padStart(2, '0');
-      var day = String(date.getDate()).padStart(2, '0');
-      var hours = String(date.getHours()).padStart(2, '0');
-      var minutes = String(date.getMinutes()).padStart(2, '0');
-      var seconds = String(date.getSeconds()).padStart(2, '0');
-      return "".concat(year, "-").concat(month, "-").concat(day, " ").concat(hours, ":").concat(minutes, ":").concat(seconds);
-    }
-
-    /**
-     * 解析 Action 详情
-     *
-     * 将 matchedAction 转换为更易用的结构
-     */
-  }, {
-    key: "parseActionDetail",
-    value: function parseActionDetail(action) {
-      switch (action.type) {
-        case PROMOTION_ACTION_TYPES.X_ITEMS_FOR_Y_PRICE:
-          return this.parseXItemsForYPriceAction(action);
-        case PROMOTION_ACTION_TYPES.BUY_X_GET_Y_FREE:
-          return this.parseBuyXGetYFreeAction(action);
-        default:
-          return undefined;
-      }
-    }
-
-    /**
-     * 解析 X件Y元 Action
-     */
-  }, {
-    key: "parseXItemsForYPriceAction",
-    value: function parseXItemsForYPriceAction(action) {
-      var _config$allowCrossPro, _config$cumulative;
-      var value = action.value || {};
-      var config = action.config || {};
-      return {
-        type: PROMOTION_ACTION_TYPES.X_ITEMS_FOR_Y_PRICE,
-        x: value.x || 2,
-        price: value.price || 0,
-        allowCrossProduct: (_config$allowCrossPro = config.allowCrossProduct) !== null && _config$allowCrossPro !== void 0 ? _config$allowCrossPro : true,
-        cumulative: (_config$cumulative = config.cumulative) !== null && _config$cumulative !== void 0 ? _config$cumulative : true
-      };
-    }
-
-    /**
-     * 解析 买X送Y Action
-     */
-  }, {
-    key: "parseBuyXGetYFreeAction",
-    value: function parseBuyXGetYFreeAction(action) {
-      var _config$cumulative2;
-      var value = action.value || {};
-      var config = action.config || {};
-      return {
-        type: PROMOTION_ACTION_TYPES.BUY_X_GET_Y_FREE,
-        buyQuantity: value.buyQuantity || 1,
-        freeQuantity: value.freeQuantity || 1,
-        giftSelectionMode: config.giftSelectionMode || 'user_select',
-        cumulative: (_config$cumulative2 = config.cumulative) !== null && _config$cumulative2 !== void 0 ? _config$cumulative2 : true,
-        giftProducts: config.giftProducts || []
-      };
-    }
-
-    /**
-     * 获取适用的商品列表
-     *
-     * 从购物车商品中筛选出符合策略条件的商品
-     */
-  }, {
-    key: "getApplicableProducts",
-    value: function getApplicableProducts(result, businessData) {
-      var _this = this;
-      var products = businessData.products;
-
-      // 从策略配置中获取商品范围条件
-      var productMatchRule = this.findProductMatchRule(result.config);
-      if (!productMatchRule) {
-        // 如果没有商品范围条件，所有商品都适用
-        return products;
-      }
-      var configProducts = productMatchRule.value;
-
-      // 筛选适用的商品
-      return products.filter(function (product) {
-        return _this.isProductMatch(product, configProducts);
-      });
-    }
-
-    /**
-     * 查找商品匹配规则
-     */
-  }, {
-    key: "findProductMatchRule",
-    value: function findProductMatchRule(config) {
-      var _config$conditions;
-      if (!(config !== null && config !== void 0 && (_config$conditions = config.conditions) !== null && _config$conditions !== void 0 && _config$conditions.rules)) {
-        return null;
-      }
-      return config.conditions.rules.find(function (rule) {
-        return rule.field === 'productIdAndVariantId' && (rule.operator === 'product_match' || rule.operator === 'object_in');
-      });
-    }
-
-    /**
-     * 检查商品是否匹配
-     */
-  }, {
-    key: "isProductMatch",
-    value: function isProductMatch(product, configProducts) {
-      return configProducts.some(function (config) {
-        // 首先检查 product_id
-        if (config.product_id !== product.product_id) {
-          return false;
-        }
-
-        // 如果配置的 product_variant_id = 0，只需要 product_id 匹配
-        if (config.product_variant_id === 0) {
-          return true;
-        }
-
-        // 否则需要 product_variant_id 精确匹配
-        return config.product_variant_id === product.product_variant_id;
-      });
-    }
-  }]);
-  return PromotionAdapter;
-}();
-
-// 导出默认实例
-export default PromotionAdapter;
-
-/**
- * X件Y元策略配置示例
- *
- * 业务规则：
- * - 每X件商品固定价格Y元（可累计）
- * - 支持跨商品组合（A+B可以凑成一组）
- * - 买5件 = 2组优惠 + 1件原价
- *
- * 商品匹配规则：
- * - product_variant_id = 0 表示匹配任意变体
- * - product_variant_id != 0 表示精确匹配该变体
- */
-export var X_ITEMS_FOR_Y_PRICE_STRATEGY = {
-  metadata: {
-    id: 'STRATEGY_001',
-    name: {
-      en: '2 items for $10',
-      'zh-CN': '2杯10元',
-      'zh-HK': '2杯10元'
-    },
-    type: 'promotion',
-    custom: {
-      display: {
-        product_card: {
-          text: {
-            en: '2 for $10',
-            'zh-CN': '2杯10元',
-            'zh-HK': '2杯10元'
-          },
-          type: 'tag'
-        }
-      }
-    }
-  },
-  conditions: {
-    operator: 'and',
-    rules: [{
-      type: 'operator',
-      field: 'currentDateTime',
-      value: '2023-01-01 00:00:00',
-      operator: '>='
-    }, {
-      type: 'operator',
-      field: 'currentDateTime',
-      value: '2027-01-01 00:00:00',
-      operator: '<='
-    }, {
-      type: 'operator',
-      field: 'productIdAndVariantId',
-      value: [{
-        product_id: 60736,
-        product_variant_id: 0 // 0 = 匹配任意变体
-      }, {
-        product_id: 60737,
-        product_variant_id: 0 // 0 = 匹配任意变体
-      }],
-      operator: 'product_match'
-    }],
-    actionIds: ['1']
-  },
-  actions: [{
-    id: '1',
-    type: 'X_ITEMS_FOR_Y_PRICE',
-    value: {
-      x: 2,
-      // 每X件
-      price: 10 // 固定价格Y元
-    },
-    valueType: 'object',
-    target: 'product',
-    priority: 1,
-    config: {
-      allowCrossProduct: true,
-      // 允许跨商品组合（A+B可以凑成一组）
-      cumulative: true // 可累计（买5件 = 2组优惠 + 1件原价）
-    }
-  }]
-};
-
-/**
- * 买X送Y策略配置示例
- *
- * 业务规则：
- * - 买X件送Y件（可累计：买2送2、买3送3...）
- * - 赠品由用户从列表中选择
- *
- * 商品匹配规则：
- * - product_variant_id = 0 表示匹配任意变体
- * - product_variant_id != 0 表示精确匹配该变体
- */
-export var BUY_X_GET_Y_FREE_STRATEGY = {
-  metadata: {
-    id: 'STRATEGY_002',
-    name: {
-      en: 'Buy 1 Get 1 Free',
-      'zh-CN': '买1送1',
-      'zh-HK': '買1送1'
-    },
-    type: 'promotion',
-    custom: {
-      display: {
-        product_card: {
-          text: {
-            en: 'Buy 1 Get 1',
-            'zh-CN': '买1送1',
-            'zh-HK': '買1送1'
-          },
-          type: 'tag'
-        }
-      }
-    }
-  },
-  conditions: {
-    operator: 'and',
-    rules: [{
-      type: 'operator',
-      field: 'currentDateTime',
-      value: '2023-01-01 00:00:00',
-      operator: '>='
-    }, {
-      type: 'operator',
-      field: 'currentDateTime',
-      value: '2027-01-01 00:00:00',
-      operator: '<='
-    }, {
-      type: 'operator',
-      field: 'productIdAndVariantId',
-      value: [{
-        product_id: 60736,
-        product_variant_id: 0 // 0 = 匹配任意变体
-      }, {
-        product_id: 60737,
-        product_variant_id: 0 // 0 = 匹配任意变体
-      }],
-      operator: 'product_match'
-    }],
-    actionIds: ['1']
-  },
-  actions: [{
-    id: '1',
-    type: 'BUY_X_GET_Y_FREE',
-    value: {
-      buyQuantity: 1,
-      // 买X件
-      freeQuantity: 1 // 送Y件
-    },
-    valueType: 'object',
-    target: 'product',
-    priority: 1,
-    config: {
-      // 可累计（买2送2、买3送3...）
-      cumulative: true,
-      // 可选的赠品列表
-      giftProducts: [{
-        product_id: 60757,
-        product_variant_id: 0
-      }, {
-        product_id: 38782,
-        product_variant_id: 0
-      }, {
-        product_id: 60749,
-        product_variant_id: 27267
-      }]
-    }
-  }]
-};

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

@@ -83,6 +83,7 @@ export interface Discount {
     balance: string;
     format_title: Formattitle;
     metadata?: {
+        num?: number;
         discount_card_type?: 'fixed_amount' | 'percent';
         custom_product_bundle_map_id?: string;
         validity_type?: "custom_schedule_validity" | "fixed_validity";

package/dist/modules/Rules/index.js

@@ -627,6 +627,16 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 🔥 统计每张折扣卡的 applicableProductLimit 已使用次数（跨商品全局计数）
       var usedDiscountCardLimitCounts = new Map();
 
+      // 🔥 预先将 editModeDiscount 中的折扣卡计入 applicableProductLimit 已使用次数
+      editModeDiscount.forEach(function (discount) {
+        var discountType = discount.tag || discount.type;
+        if (['discount_card', 'product_discount_card'].includes(discountType)) {
+          var _discount$metadata4;
+          var currentCount = usedDiscountCardLimitCounts.get(discount.id) || 0;
+          usedDiscountCardLimitCounts.set(discount.id, currentCount + (((_discount$metadata4 = discount.metadata) === null || _discount$metadata4 === void 0 ? void 0 : _discount$metadata4.num) || 1));
+        }
+      });
+
       // 记录每个优惠券适用的商品ID
       var discountApplicability = new Map();
 
@@ -881,7 +891,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 判断优惠券是否适用于该商品
           if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable && (_discount$config = discount.config) !== null && _discount$config !== void 0 && _discount$config.isAvailable) {
-            var _discountApplicabilit, _discount$metadata4, _discount$metadata5;
+            var _discountApplicabilit, _discount$metadata5, _discount$metadata6;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
 
@@ -897,9 +907,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               type: discountType,
               tag: discountType,
               discount: {
-                discount_card_type: discount === null || discount === void 0 || (_discount$metadata4 = discount.metadata) === null || _discount$metadata4 === void 0 ? void 0 : _discount$metadata4.discount_card_type,
+                discount_card_type: discount === null || discount === void 0 || (_discount$metadata5 = discount.metadata) === null || _discount$metadata5 === void 0 ? void 0 : _discount$metadata5.discount_card_type,
                 fixed_amount: product.price,
-                discount_calculation_mode: discount === null || discount === void 0 || (_discount$metadata5 = discount.metadata) === null || _discount$metadata5 === void 0 ? void 0 : _discount$metadata5.discount_calculation_mode,
+                discount_calculation_mode: discount === null || discount === void 0 || (_discount$metadata6 = discount.metadata) === null || _discount$metadata6 === void 0 ? void 0 : _discount$metadata6.discount_calculation_mode,
                 resource_id: discount.id,
                 title: discount.format_title,
                 original_amount: product.price || product.origin_total,
@@ -1687,8 +1697,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
               // 🔥 更新主商品自己的 discount_list 中的 num（quantity=1）
               var updatedMainDiscountList = mainProductData.discount_list.map(function (discount) {
-                var _discount$metadata6, _discount$metadata7;
-                if (discount !== null && discount !== void 0 && (_discount$metadata6 = discount.metadata) !== null && _discount$metadata6 !== void 0 && _discount$metadata6.custom_product_bundle_map_id) {
+                var _discount$metadata7, _discount$metadata8;
+                if (discount !== null && discount !== void 0 && (_discount$metadata7 = discount.metadata) !== null && _discount$metadata7 !== void 0 && _discount$metadata7.custom_product_bundle_map_id) {
                   // bundle的discount_list保持不变
                   return discount;
                 }
@@ -1696,7 +1706,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 return _objectSpread(_objectSpread({}, discount), {}, {
                   // num: 1,
                   metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
-                    custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata7 = discount.metadata) === null || _discount$metadata7 === void 0 ? void 0 : _discount$metadata7.custom_product_bundle_map_id,
+                    custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata8 = discount.metadata) === null || _discount$metadata8 === void 0 ? void 0 : _discount$metadata8.custom_product_bundle_map_id,
                     num: 1
                   })
                 });
@@ -1761,8 +1771,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
                 // 🔥 更新主商品自己的 discount_list 中的 num（quantity=原quantity-1）
                 var updatedMainDiscountListOriginal = mainProductData.discount_list.map(function (discount) {
-                  var _discount$metadata8, _discount$metadata9;
-                  if (discount !== null && discount !== void 0 && (_discount$metadata8 = discount.metadata) !== null && _discount$metadata8 !== void 0 && _discount$metadata8.custom_product_bundle_map_id) {
+                  var _discount$metadata9, _discount$metadata10;
+                  if (discount !== null && discount !== void 0 && (_discount$metadata9 = discount.metadata) !== null && _discount$metadata9 !== void 0 && _discount$metadata9.custom_product_bundle_map_id) {
                     // bundle的discount_list保持不变
                     return discount;
                   }
@@ -1770,7 +1780,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   return _objectSpread(_objectSpread({}, discount), {}, {
                     metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                       num: mainProductQuantity - 1,
-                      custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata9 = discount.metadata) === null || _discount$metadata9 === void 0 ? void 0 : _discount$metadata9.custom_product_bundle_map_id
+                      custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata10 = discount.metadata) === null || _discount$metadata10 === void 0 ? void 0 : _discount$metadata10.custom_product_bundle_map_id
                     })
                     // num: mainProductQuantity - 1,
                   });
@@ -1835,11 +1845,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                       processedBundleItems.forEach(function (item) {
                         // 🔥 更新 discount_list 中的 num，使其与拆分后的 item.num 一致
                         var updatedDiscountList = (item.discount_list || []).map(function (discount) {
-                          var _discount$metadata10;
+                          var _discount$metadata11;
                           return _objectSpread(_objectSpread({}, discount), {}, {
                             metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                               num: item.num,
-                              custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata10 = discount.metadata) === null || _discount$metadata10 === void 0 ? void 0 : _discount$metadata10.custom_product_bundle_map_id
+                              custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata11 = discount.metadata) === null || _discount$metadata11 === void 0 ? void 0 : _discount$metadata11.custom_product_bundle_map_id
                             })
                             // num: item.num, // 使用拆分后的 num
                           });

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -358,7 +358,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/dist/solution/ShopDiscount/index.js

@@ -618,21 +618,27 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 return n.id === (((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) || discount.id);
               });
               if (index !== -1) {
-                var _discount$metadata;
+                var _editModeDiscountList, _discount$metadata, _discount$metadata2;
                 editModeDiscountList[index] = _objectSpread(_objectSpread({}, editModeDiscountList[index]), {}, {
+                  metadata: _objectSpread(_objectSpread({}, discount.metadata || {}), {}, {
+                    num: ((editModeDiscountList === null || editModeDiscountList === void 0 || (_editModeDiscountList = editModeDiscountList[index]) === null || _editModeDiscountList === void 0 || (_editModeDiscountList = _editModeDiscountList.metadata) === null || _editModeDiscountList === void 0 ? void 0 : _editModeDiscountList.num) || 1) + (((_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.num) || 1)
+                  }),
                   amount: new Decimal(discount.amount || 0).plus(new Decimal(editModeDiscountList[index].amount || 0)).toNumber(),
-                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.product_discount_difference) || 0).plus(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
+                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.product_discount_difference) || 0).plus(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
                 });
               } else {
-                var _discount$metadata2, _discount$discount2, _discount$discount3, _discount$discount4;
+                var _discount$metadata3, _discount$metadata4, _discount$discount2, _discount$discount3, _discount$discount4;
                 if (discount.type && !discount.tag) {
                   discount.tag = discount.type;
                 }
                 editModeDiscountList.push(_objectSpread(_objectSpread({}, discount), {}, {
+                  metadata: _objectSpread(_objectSpread({}, discount.metadata || {}), {}, {
+                    num: ((_discount$metadata3 = discount.metadata) === null || _discount$metadata3 === void 0 ? void 0 : _discount$metadata3.num) || 1
+                  }),
                   name: discount.name || discount.discount.title.auto,
                   isEditMode: true,
                   limited_relation_product_data: {},
-                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.product_discount_difference) || 0).toNumber(),
+                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata4 = discount.metadata) === null || _discount$metadata4 === void 0 ? void 0 : _discount$metadata4.product_discount_difference) || 0).toNumber(),
                   isAvailable: true,
                   id: ((_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) || discount.id,
                   format_title: ((_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.title) || discount.format_title,

package/lib/modules/Discount/types.d.ts

@@ -83,6 +83,7 @@ export interface Discount {
     balance: string;
     format_title: Formattitle;
     metadata?: {
+        num?: number;
         discount_card_type?: 'fixed_amount' | 'percent';
         custom_product_bundle_map_id?: string;
         validity_type?: "custom_schedule_validity" | "fixed_validity";

package/lib/modules/Rules/index.js

@@ -418,6 +418,14 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     const usedDiscounts = /* @__PURE__ */ new Map();
     const usedProductIdCounts = /* @__PURE__ */ new Map();
     const usedDiscountCardLimitCounts = /* @__PURE__ */ new Map();
+    editModeDiscount.forEach((discount) => {
+      var _a;
+      const discountType = discount.tag || discount.type;
+      if (["discount_card", "product_discount_card"].includes(discountType)) {
+        const currentCount = usedDiscountCardLimitCounts.get(discount.id) || 0;
+        usedDiscountCardLimitCounts.set(discount.id, currentCount + (((_a = discount.metadata) == null ? void 0 : _a.num) || 1));
+      }
+    });
     const discountApplicability = /* @__PURE__ */ new Map();
     const discountApplicableProducts = /* @__PURE__ */ new Map();
     addModeDiscount.forEach((discount) => {

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -358,7 +358,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/lib/solution/ShopDiscount/index.js

@@ -394,7 +394,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       if (item.booking_id) {
         const product = (_a2 = this.hooks) == null ? void 0 : _a2.getProduct(item);
         (item.discount_list || []).forEach((discount) => {
-          var _a3, _b, _c, _d, _e;
+          var _a3, _b, _c, _d, _e, _f, _g, _h, _i;
           if (discount.id && ["good_pass", "discount_card"].includes(discount.type)) {
             const index = editModeDiscountList.findIndex((n) => {
               var _a4;
@@ -403,8 +403,12 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
             if (index !== -1) {
               editModeDiscountList[index] = {
                 ...editModeDiscountList[index],
+                metadata: {
+                  ...discount.metadata || {},
+                  num: (((_b = (_a3 = editModeDiscountList == null ? void 0 : editModeDiscountList[index]) == null ? void 0 : _a3.metadata) == null ? void 0 : _b.num) || 1) + (((_c = discount.metadata) == null ? void 0 : _c.num) || 1)
+                },
                 amount: new import_decimal.default(discount.amount || 0).plus(new import_decimal.default(editModeDiscountList[index].amount || 0)).toNumber(),
-                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1).plus(((_a3 = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a3.product_discount_difference) || 0).plus(new import_decimal.default(editModeDiscountList[index].savedAmount || 0)).toNumber()
+                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1).plus(((_d = discount == null ? void 0 : discount.metadata) == null ? void 0 : _d.product_discount_difference) || 0).plus(new import_decimal.default(editModeDiscountList[index].savedAmount || 0)).toNumber()
               };
             } else {
               if (discount.type && !discount.tag) {
@@ -412,16 +416,20 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
               }
               editModeDiscountList.push({
                 ...discount,
+                metadata: {
+                  ...discount.metadata || {},
+                  num: ((_e = discount.metadata) == null ? void 0 : _e.num) || 1
+                },
                 name: discount.name || discount.discount.title.auto,
                 isEditMode: true,
                 limited_relation_product_data: {},
-                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1).plus(((_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.product_discount_difference) || 0).toNumber(),
+                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1).plus(((_f = discount == null ? void 0 : discount.metadata) == null ? void 0 : _f.product_discount_difference) || 0).toNumber(),
                 isAvailable: true,
-                id: ((_c = discount.discount) == null ? void 0 : _c.resource_id) || discount.id,
-                format_title: ((_d = discount.discount) == null ? void 0 : _d.title) || discount.format_title,
+                id: ((_g = discount.discount) == null ? void 0 : _g.resource_id) || discount.id,
+                format_title: ((_h = discount.discount) == null ? void 0 : _h.title) || discount.format_title,
                 isDisabled: true,
                 isSelected: true,
-                product_id: ((_e = discount.discount) == null ? void 0 : _e.product_id) || discount.product_id
+                product_id: ((_i = discount.discount) == null ? void 0 : _i.product_id) || discount.product_id
               });
             }
           }

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.460",
+  "version": "0.0.461",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",