@pisell/pisellos 3.0.60 → 3.0.62

package/dist/modules/Cart/utils/cartProduct.js

@@ -12,6 +12,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 Decimal from 'decimal.js';
 import { isNormalProduct } from "../../Product/utils";
+import { getDiscountAmount } from "../../../solution/ShopDiscount/utils";
 
 /**
  * @title 处理组合商品
@@ -192,8 +193,14 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
       // 不是商品券则代表折扣卡，计算打折后的价格
       // 一个商品折扣卡只能存在于一张
       if (currentValue.type !== 'good_pass') {
-        var discountPrice = new Decimal(100).minus(currentValue.discount.percent || 0).div(100).mul(new Decimal(price || 0)).toFixed(2);
-        price = Number(discountPrice);
+        var _currentValue$discoun;
+        price = getDiscountAmount({
+          tag: currentValue.type,
+          par_value: currentValue.discount.percent,
+          metadata: {
+            discount_card_type: currentValue === null || currentValue === void 0 || (_currentValue$discoun = currentValue.discount) === null || _currentValue$discoun === void 0 ? void 0 : _currentValue$discoun.discount_card_type
+          }
+        }, price, price);
       }
     });
   }

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

@@ -20,8 +20,9 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_discount_card: 0 | 1;
         customer_id: number;
     }): Promise<Discount[]>;
-    batchSearch(code: string): Promise<Discount[]>;
+    batchSearch(code: string, customerId?: number): Promise<Discount[]>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
+    private checkUsageCreditsLimit;
     uniqueByProductId(discountList: Discount[]): Discount[];
     filterDiscountListByProductIds(discountList: Discount[], productIds: number[]): Discount[];
     calcDiscountApplicableProductTotalPrice(discount: Discount): number | undefined;

package/dist/modules/Discount/index.js

@@ -145,7 +145,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "batchSearch",
     value: function () {
-      var _batchSearch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(code) {
+      var _batchSearch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(code, customerId) {
         var result, resultDiscountList;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
@@ -156,7 +156,10 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
                 translate_flag: 1,
                 tags: ['good_pass', 'product_discount_card'],
                 available: 1,
-                relation_product: 1
+                relation_product: 1,
+                with: ['extensionData'],
+                order_behavior_count: 1,
+                order_behavior_count_customer_id: customerId || 1
               });
             case 2:
               result = _context4.sent;
@@ -168,7 +171,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee4, this);
       }));
-      function batchSearch(_x5) {
+      function batchSearch(_x5, _x6) {
         return _batchSearch.apply(this, arguments);
       }
       return batchSearch;
@@ -176,11 +179,71 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "filterEnabledDiscountList",
     value: function filterEnabledDiscountList(discountList) {
+      var _this2 = this;
       return discountList.filter(function (discount) {
-        return discount.limit_status === 'enable' && new Decimal((discount === null || discount === void 0 ? void 0 : discount.par_value) || 0).minus(new Decimal((discount === null || discount === void 0 ? void 0 : discount.used_par_value) || 0)).greaterThan(0);
+        return discount.limit_status === 'enable' && new Decimal((discount === null || discount === void 0 ? void 0 : discount.par_value) || 0).minus(new Decimal((discount === null || discount === void 0 ? void 0 : discount.used_par_value) || 0)).greaterThan(0) && _this2.checkUsageCreditsLimit(discount);
       });
     }
 
+    // 检查使用次数限制
+  }, {
+    key: "checkUsageCreditsLimit",
+    value: function checkUsageCreditsLimit(discount) {
+      // 如果没有 extension_data，则不需要限制
+      if (!discount.extension_data || discount.extension_data.length === 0) {
+        return true;
+      }
+
+      // 查找 field_key 为 usage_credits 的数据
+      var usageCreditsData = discount.extension_data.find(function (data) {
+        return data.field_key === 'usage_credits';
+      });
+
+      // 如果没有找到 usage_credits 数据，则不需要限制
+      if (!usageCreditsData) {
+        return true;
+      }
+      var value = usageCreditsData.value;
+
+      // 检查总次数限制
+      if (value.total_credits && value.total_credits > 0) {
+        if ((discount.total_order_behavior_count || 0) >= value.total_credits) {
+          return false;
+        }
+      }
+
+      // 检查单用户限制
+      if (value.per_user_limit && value.per_user_limit > 0) {
+        if ((discount.customer_order_behavior_count || 0) >= value.per_user_limit) {
+          return false;
+        }
+      }
+
+      // 检查单日限制
+      if (value.max_per_day && value.max_per_day > 0) {
+        if ((discount.today_order_behavior_count || 0) >= value.max_per_day) {
+          return false;
+        }
+      }
+
+      // 检查单周限制
+      if (value.max_per_week && value.max_per_week > 0) {
+        if ((discount.week_order_behavior_count || 0) >= value.max_per_week) {
+          return false;
+        }
+      }
+
+      // 检查单月限制
+      if (value.max_per_month && value.max_per_month > 0) {
+        if ((discount.month_order_behavior_count || 0) >= value.max_per_month) {
+          return false;
+        }
+      }
+
+      // 所有检查都通过
+      return true;
+    }
+
     // 根据productIds去重
   }, {
     key: "uniqueByProductId",

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

@@ -36,6 +36,25 @@ interface ApplicableProductDetails {
         title?: string;
     };
 }
+interface UsageCreditsValue {
+    total_credits: number;
+    per_user_limit: number;
+    max_per_day: number;
+    max_per_week: number;
+    max_per_month: number;
+}
+interface ExtensionData {
+    id: number;
+    shop_id: number;
+    product_id: number;
+    field_id: number;
+    field_key: string;
+    type: string;
+    value: UsageCreditsValue | Record<string, any> | string | number | boolean | any[];
+    created_at: string | null;
+    updated_at: string | null;
+    deleted_at: string | null;
+}
 export interface Discount {
     id: number;
     product_name: string;
@@ -51,6 +70,9 @@ export interface Discount {
     limited_relation_product_data: Limitedrelationproductdata;
     balance: string;
     format_title: Formattitle;
+    metadata?: {
+        discount_card_type?: 'fixed_amount' | 'percent';
+    };
     product: Product;
     type: "product" | 'good_pass';
     resource_id?: number;
@@ -70,6 +92,12 @@ export interface Discount {
     appliedProductDetails: ApplicableProductDetails[];
     isDisabledForProductUsed?: boolean;
     amount?: number;
+    extension_data?: ExtensionData[];
+    total_order_behavior_count?: number;
+    today_order_behavior_count?: number;
+    week_order_behavior_count?: number;
+    month_order_behavior_count?: number;
+    customer_order_behavior_count?: number;
 }
 export interface DiscountState {
     discountList: Discount[];

package/dist/modules/Rules/index.js

@@ -25,7 +25,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 { BaseModule } from "../BaseModule";
 import { RulesHooks } from "./types";
-import { uniqueById } from "../../solution/ShopDiscount/utils";
+import { uniqueById, getDiscountAmount } from "../../solution/ShopDiscount/utils";
 import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils";
 import Decimal from 'decimal.js';
 export var RulesModule = /*#__PURE__*/function (_BaseModule) {
@@ -188,8 +188,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       });
 
       // 优惠力度排序，传进来的数据里可能有商品券，也可能有优惠券
-      // 商品券（n.tag=good_pass）视为最优惠（免费），折扣券（n.tag=product_discount_card）按照n.par_value排序
-      // 如果最后拍出来商品券有多个，或者说没有商品券，但是有多个相同折扣的折扣券（比如 6 折券有 3张），则按照过期时间(n.expire_time)排序
+      // 1. 商品券（n.tag=good_pass）视为最优惠（免费）
+      // 2. 折扣券（n.tag=product_discount_card）按照新的优先级排序：
+      //    - 固定金额优先于百分比（固定金额 > 百分比）
+      //    - 固定金额内部：金额越大越优先
+      //    - 百分比内部：折扣越大越优先（par_value越小越优先）
+      // 3. 相同类型和金额的情况下，按照过期时间(n.expire_time)排序
       var sortedDiscountList = _toConsumableArray(filteredDiscountList).sort(function (a, b) {
         // 1. 商品券优先级最高
         if (a.tag === 'good_pass' && b.tag !== 'good_pass') return -1;
@@ -200,13 +204,34 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 都是商品券，按照过期时间排序
           return compareByExpireTime(a, b);
         } else if (a.tag === 'product_discount_card' && b.tag === 'product_discount_card') {
-          // 都是折扣券，按照par_value排序（折扣越大越优先，即par_value越小越优先）
-          if (a.par_value !== b.par_value) {
-            var valueA = new Decimal(100).minus(a.par_value || 0);
-            var valueB = new Decimal(100).minus(b.par_value || 0);
-            return valueA.minus(valueB).toNumber();
+          var _a$metadata, _b$metadata;
+          // 都是折扣券，按照新的优先级排序：固定金额优先于百分比
+          var typeA = ((_a$metadata = a.metadata) === null || _a$metadata === void 0 ? void 0 : _a$metadata.discount_card_type) || 'percent'; // 默认为百分比
+          var typeB = ((_b$metadata = b.metadata) === null || _b$metadata === void 0 ? void 0 : _b$metadata.discount_card_type) || 'percent'; // 默认为百分比
+
+          // 1. 固定金额优先于百分比
+          if (typeA === 'fixed_amount' && typeB === 'percent') return -1;
+          if (typeA === 'percent' && typeB === 'fixed_amount') return 1;
+
+          // 2. 都是固定金额时，金额越大越优先
+          if (typeA === 'fixed_amount' && typeB === 'fixed_amount') {
+            if (a.par_value !== b.par_value) {
+              var valueA = new Decimal(a.par_value || 0);
+              var valueB = new Decimal(b.par_value || 0);
+              return valueB.minus(valueA).toNumber(); // 金额大的在前
+            }
           }
-          // 相同折扣的情况下，按照过期时间排序
+
+          // 3. 都是百分比时，折扣越大越优先（par_value越小越优先）
+          if (typeA === 'percent' && typeB === 'percent') {
+            if (a.par_value !== b.par_value) {
+              var _valueA = new Decimal(100).minus(a.par_value || 0);
+              var _valueB = new Decimal(100).minus(b.par_value || 0);
+              return _valueB.minus(_valueA).toNumber(); // 折扣大的在前
+            }
+          }
+
+          // 相同类型和金额的情况下，按照过期时间排序
           return compareByExpireTime(a, b);
         }
 
@@ -290,7 +315,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 判断优惠券是否适用于该商品
           if (isAvailableProduct && isLimitedProduct) {
-            var _discountApplicabilit;
+            var _discountApplicabilit, _discount$metadata;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
 
@@ -301,6 +326,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               type: discount.tag || discount.type,
               tag: discount.tag || discount.type,
               discount: {
+                discount_card_type: discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.discount_card_type,
                 resource_id: discount.id,
                 title: discount.format_title,
                 original_amount: product.origin_total,
@@ -427,7 +453,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }));
         }
         for (var _i = 0; _i < splitCount; _i++) {
-          var _product$discount_lis11, _originProduct$_produ;
+          var _product$discount_lis11, _originProduct$_produ, _selectedDiscount$met;
           // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
           var _selectedDiscount = selectedDiscountCard || applicableDiscounts[_i];
           // 标记优惠券为已使用
@@ -448,11 +474,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
 
           // 计算使用折扣卡/商品券以后，单个商品的总 total
-          var targetProductTotal = _selectedDiscount.tag === 'good_pass' ? new Decimal(productOriginTotal).minus(new Decimal(product.price || 0)).toNumber() : new Decimal(100).minus(_selectedDiscount.par_value || 0).div(100).mul(new Decimal(productOriginTotal)).toNumber();
+          var targetProductTotal = getDiscountAmount(_selectedDiscount, productOriginTotal, product.price);
           var discountDetail = {
             amount: new Decimal(productOriginTotal).minus(new Decimal(targetProductTotal)).toNumber(),
             type: _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount.tag,
             discount: {
+              discount_card_type: _selectedDiscount === null || _selectedDiscount === void 0 || (_selectedDiscount$met = _selectedDiscount.metadata) === null || _selectedDiscount$met === void 0 ? void 0 : _selectedDiscount$met.discount_card_type,
               resource_id: _selectedDiscount.id,
               title: _selectedDiscount.format_title,
               original_amount: productOriginTotal,

package/dist/solution/BookingByStep/index.js

@@ -1273,7 +1273,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       // 如果此时 resources 为空，视作购物车里已经有了 dateRange 数据，此时 dateList 里明确就是那一天的数据
       if (!allOriginResources.length) {
         var dateList = this.store.date.getDateList();
-        dateList.forEach(function (n) {
+        dateList === null || dateList === void 0 || dateList.forEach(function (n) {
           if (n.resource) allOriginResources.push.apply(allOriginResources, _toConsumableArray(n.resource));
         });
       }

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

@@ -34,7 +34,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         discountList: Discount[];
     };
     setProductList(productList: Record<string, any>[]): void;
-    scanCode(code: string): Promise<{
+    scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
         productList: Record<string, any>[];
         discountList: Discount[];

package/dist/solution/ShopDiscount/index.js

@@ -304,14 +304,14 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "scanCode",
     value: function () {
-      var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code) {
+      var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, customerId) {
         var _this$store$discount3, resultDiscountList, rulesModule, withScanList, _ref3, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               _context5.prev = 0;
               _context5.next = 3;
-              return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.batchSearch(code);
+              return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.batchSearch(code, customerId);
             case 3:
               _context5.t0 = _context5.sent;
               if (_context5.t0) {
@@ -393,7 +393,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee5, this, [[0, 23]]);
       }));
-      function scanCode(_x4) {
+      function scanCode(_x4, _x5) {
         return _scanCode.apply(this, arguments);
       }
       return scanCode;
@@ -438,7 +438,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee6, this);
       }));
-      function emitDiscountListChange(_x5) {
+      function emitDiscountListChange(_x6) {
         return _emitDiscountListChange.apply(this, arguments);
       }
       return emitDiscountListChange;
@@ -574,7 +574,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee7, this, [[0, 11]]);
       }));
-      function getCustomerWallet(_x6) {
+      function getCustomerWallet(_x7) {
         return _getCustomerWallet.apply(this, arguments);
       }
       return getCustomerWallet;
@@ -634,7 +634,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee8, this, [[0, 18]]);
       }));
-      function loadPrepareConfig(_x7) {
+      function loadPrepareConfig(_x8) {
         return _loadPrepareConfig.apply(this, arguments);
       }
       return loadPrepareConfig;

package/dist/solution/ShopDiscount/utils.d.ts

@@ -1 +1,12 @@
+import { Discount } from "../../modules/Discount/types";
 export declare const uniqueById: <T>(arr: T[], key?: string) => T[];
+/**
+ * 获取折扣金额 基于折扣卡类型计算
+ * 商品券：直接返回商品价格
+ * 折扣卡：根据折扣卡类型计算 固定金额：直接返回折扣卡金额 百分比：根据折扣卡金额计算
+ * @param discount
+ * @param total
+ * @param price
+ * @returns
+ */
+export declare const getDiscountAmount: (discount: Discount, total: number, price: number) => number;

package/dist/solution/ShopDiscount/utils.js

@@ -1,7 +1,36 @@
+import Decimal from "decimal.js";
 export var uniqueById = function uniqueById(arr) {
   var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'id';
   var seen = new Set();
   return arr.filter(function (item) {
     return !seen.has(item[key]) && seen.add(item[key]);
   });
+};
+
+/**
+ * 获取折扣金额 基于折扣卡类型计算 
+ * 商品券：直接返回商品价格
+ * 折扣卡：根据折扣卡类型计算 固定金额：直接返回折扣卡金额 百分比：根据折扣卡金额计算
+ * @param discount 
+ * @param total 
+ * @param price 
+ * @returns 
+ */
+export var getDiscountAmount = function getDiscountAmount(discount, total, price) {
+  var _discount$metadata;
+  // 商品券
+  if (discount.tag === 'good_pass') {
+    return new Decimal(total).minus(new Decimal(price || 0)).toNumber();
+  }
+
+  // 判断是否是固定金额
+  var isFixedAmount = (discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.discount_card_type) === 'fixed_amount';
+
+  // 固定金额 小于0时返回0
+  if (isFixedAmount) {
+    return Math.max(new Decimal(total).minus(new Decimal(discount.par_value || 0)).toNumber(), 0);
+  }
+
+  // 百分比：根据折扣卡金额计算
+  return new Decimal(100).minus(discount.par_value || 0).div(100).mul(new Decimal(total)).toNumber();
 };

package/lib/modules/Cart/utils/cartProduct.js

@@ -44,6 +44,7 @@ __export(cartProduct_exports, {
 module.exports = __toCommonJS(cartProduct_exports);
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../../Product/utils");
+var import_utils2 = require("../../../solution/ShopDiscount/utils");
 var handleVariantProduct = (product) => {
   var _a;
   if (product == null ? void 0 : product.product_variant_id) {
@@ -183,9 +184,15 @@ var getProductTotalPrice = (params) => {
   }
   if (discounts == null ? void 0 : discounts.length) {
     discounts.forEach((currentValue) => {
+      var _a;
       if (currentValue.type !== "good_pass") {
-        const discountPrice = new import_decimal.default(100).minus(currentValue.discount.percent || 0).div(100).mul(new import_decimal.default(price || 0)).toFixed(2);
-        price = Number(discountPrice);
+        price = (0, import_utils2.getDiscountAmount)({
+          tag: currentValue.type,
+          par_value: currentValue.discount.percent,
+          metadata: {
+            discount_card_type: (_a = currentValue == null ? void 0 : currentValue.discount) == null ? void 0 : _a.discount_card_type
+          }
+        }, price, price);
       }
     });
   }

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

@@ -20,8 +20,9 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_discount_card: 0 | 1;
         customer_id: number;
     }): Promise<Discount[]>;
-    batchSearch(code: string): Promise<Discount[]>;
+    batchSearch(code: string, customerId?: number): Promise<Discount[]>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
+    private checkUsageCreditsLimit;
     uniqueByProductId(discountList: Discount[]): Discount[];
     filterDiscountListByProductIds(discountList: Discount[], productIds: number[]): Discount[];
     calcDiscountApplicableProductTotalPrice(discount: Discount): number | undefined;

package/lib/modules/Discount/index.js

@@ -89,22 +89,64 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     ) || [];
     return goodPassList;
   }
-  async batchSearch(code) {
+  async batchSearch(code, customerId) {
     const result = await this.request.get(`/machinecode/batch-search`, {
       code,
       translate_flag: 1,
       tags: ["good_pass", "product_discount_card"],
       available: 1,
-      relation_product: 1
+      relation_product: 1,
+      with: ["extensionData"],
+      order_behavior_count: 1,
+      order_behavior_count_customer_id: customerId || 1
     });
     const resultDiscountList = this.filterEnabledDiscountList((result == null ? void 0 : result.data) || []) || [];
     return resultDiscountList;
   }
   filterEnabledDiscountList(discountList) {
     return discountList.filter(
-      (discount) => discount.limit_status === "enable" && new import_decimal.default((discount == null ? void 0 : discount.par_value) || 0).minus(new import_decimal.default((discount == null ? void 0 : discount.used_par_value) || 0)).greaterThan(0)
+      (discount) => discount.limit_status === "enable" && new import_decimal.default((discount == null ? void 0 : discount.par_value) || 0).minus(new import_decimal.default((discount == null ? void 0 : discount.used_par_value) || 0)).greaterThan(0) && this.checkUsageCreditsLimit(discount)
     );
   }
+  // 检查使用次数限制
+  checkUsageCreditsLimit(discount) {
+    if (!discount.extension_data || discount.extension_data.length === 0) {
+      return true;
+    }
+    const usageCreditsData = discount.extension_data.find(
+      (data) => data.field_key === "usage_credits"
+    );
+    if (!usageCreditsData) {
+      return true;
+    }
+    const value = usageCreditsData.value;
+    if (value.total_credits && value.total_credits > 0) {
+      if ((discount.total_order_behavior_count || 0) >= value.total_credits) {
+        return false;
+      }
+    }
+    if (value.per_user_limit && value.per_user_limit > 0) {
+      if ((discount.customer_order_behavior_count || 0) >= value.per_user_limit) {
+        return false;
+      }
+    }
+    if (value.max_per_day && value.max_per_day > 0) {
+      if ((discount.today_order_behavior_count || 0) >= value.max_per_day) {
+        return false;
+      }
+    }
+    if (value.max_per_week && value.max_per_week > 0) {
+      if ((discount.week_order_behavior_count || 0) >= value.max_per_week) {
+        return false;
+      }
+    }
+    if (value.max_per_month && value.max_per_month > 0) {
+      if ((discount.month_order_behavior_count || 0) >= value.max_per_month) {
+        return false;
+      }
+    }
+    return true;
+  }
   // 根据productIds去重
   uniqueByProductId(discountList) {
     return (0, import_utils.uniqueById)(discountList, "product_id");

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

@@ -36,6 +36,25 @@ interface ApplicableProductDetails {
         title?: string;
     };
 }
+interface UsageCreditsValue {
+    total_credits: number;
+    per_user_limit: number;
+    max_per_day: number;
+    max_per_week: number;
+    max_per_month: number;
+}
+interface ExtensionData {
+    id: number;
+    shop_id: number;
+    product_id: number;
+    field_id: number;
+    field_key: string;
+    type: string;
+    value: UsageCreditsValue | Record<string, any> | string | number | boolean | any[];
+    created_at: string | null;
+    updated_at: string | null;
+    deleted_at: string | null;
+}
 export interface Discount {
     id: number;
     product_name: string;
@@ -51,6 +70,9 @@ export interface Discount {
     limited_relation_product_data: Limitedrelationproductdata;
     balance: string;
     format_title: Formattitle;
+    metadata?: {
+        discount_card_type?: 'fixed_amount' | 'percent';
+    };
     product: Product;
     type: "product" | 'good_pass';
     resource_id?: number;
@@ -70,6 +92,12 @@ export interface Discount {
     appliedProductDetails: ApplicableProductDetails[];
     isDisabledForProductUsed?: boolean;
     amount?: number;
+    extension_data?: ExtensionData[];
+    total_order_behavior_count?: number;
+    today_order_behavior_count?: number;
+    week_order_behavior_count?: number;
+    month_order_behavior_count?: number;
+    customer_order_behavior_count?: number;
 }
 export interface DiscountState {
     discountList: Discount[];

package/lib/modules/Rules/index.js

@@ -131,6 +131,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       return !discount.isManualSelect;
     });
     const sortedDiscountList = [...filteredDiscountList].sort((a, b) => {
+      var _a, _b;
       if (a.tag === "good_pass" && b.tag !== "good_pass")
         return -1;
       if (b.tag === "good_pass" && a.tag !== "good_pass")
@@ -138,10 +139,25 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       if (a.tag === "good_pass" && b.tag === "good_pass") {
         return compareByExpireTime(a, b);
       } else if (a.tag === "product_discount_card" && b.tag === "product_discount_card") {
-        if (a.par_value !== b.par_value) {
-          const valueA = new import_decimal.default(100).minus(a.par_value || 0);
-          const valueB = new import_decimal.default(100).minus(b.par_value || 0);
-          return valueA.minus(valueB).toNumber();
+        const typeA = ((_a = a.metadata) == null ? void 0 : _a.discount_card_type) || "percent";
+        const typeB = ((_b = b.metadata) == null ? void 0 : _b.discount_card_type) || "percent";
+        if (typeA === "fixed_amount" && typeB === "percent")
+          return -1;
+        if (typeA === "percent" && typeB === "fixed_amount")
+          return 1;
+        if (typeA === "fixed_amount" && typeB === "fixed_amount") {
+          if (a.par_value !== b.par_value) {
+            const valueA = new import_decimal.default(a.par_value || 0);
+            const valueB = new import_decimal.default(b.par_value || 0);
+            return valueB.minus(valueA).toNumber();
+          }
+        }
+        if (typeA === "percent" && typeB === "percent") {
+          if (a.par_value !== b.par_value) {
+            const valueA = new import_decimal.default(100).minus(a.par_value || 0);
+            const valueB = new import_decimal.default(100).minus(b.par_value || 0);
+            return valueB.minus(valueA).toNumber();
+          }
         }
         return compareByExpireTime(a, b);
       }
@@ -181,7 +197,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     sortedProductList.forEach((originProduct) => {
       const product = this.hooks.getProduct(originProduct);
       addModeDiscount.forEach((discount) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const limitedData = discount == null ? void 0 : discount.limited_relation_product_data;
         const isLimitedProduct = limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id);
         const isAvailableProduct = !((product == null ? void 0 : product.booking_id) && ((_a = product == null ? void 0 : product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount2) => discount2.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount2.tag || discount2.type))));
@@ -193,6 +209,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             type: discount.tag || discount.type,
             tag: discount.tag || discount.type,
             discount: {
+              discount_card_type: (_d = discount == null ? void 0 : discount.metadata) == null ? void 0 : _d.discount_card_type,
               resource_id: discount.id,
               title: discount.format_title,
               original_amount: product.origin_total,
@@ -207,7 +224,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     });
     console.log(sortedProductList, "sortedProductListsortedProductList");
     sortedProductList.forEach((originProduct, i) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i;
       const product = this.hooks.getProduct(originProduct);
       if ((product == null ? void 0 : product.booking_id) && ((_a = product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount) => discount.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount.tag || discount.type)))) {
         processedProductsMap.set(product._id, [originProduct]);
@@ -308,11 +325,12 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         if (Number(((_h = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _h.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
           productOriginTotal = product.total;
         }
-        const targetProductTotal = selectedDiscount2.tag === "good_pass" ? new import_decimal.default(productOriginTotal).minus(new import_decimal.default(product.price || 0)).toNumber() : new import_decimal.default(100).minus(selectedDiscount2.par_value || 0).div(100).mul(new import_decimal.default(productOriginTotal)).toNumber();
+        const targetProductTotal = (0, import_utils.getDiscountAmount)(selectedDiscount2, productOriginTotal, product.price);
         const discountDetail = {
           amount: new import_decimal.default(productOriginTotal).minus(new import_decimal.default(targetProductTotal)).toNumber(),
           type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
           discount: {
+            discount_card_type: (_i = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _i.discount_card_type,
             resource_id: selectedDiscount2.id,
             title: selectedDiscount2.format_title,
             original_amount: productOriginTotal,

package/lib/solution/BookingByStep/index.js

@@ -694,7 +694,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     if (!allOriginResources.length) {
       const dateList = this.store.date.getDateList();
-      dateList.forEach((n) => {
+      dateList == null ? void 0 : dateList.forEach((n) => {
         if (n.resource)
           allOriginResources.push(...n.resource);
       });

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

@@ -34,7 +34,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         discountList: Discount[];
     };
     setProductList(productList: Record<string, any>[]): void;
-    scanCode(code: string): Promise<{
+    scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
         productList: Record<string, any>[];
         discountList: Discount[];

package/lib/solution/ShopDiscount/index.js

@@ -198,10 +198,10 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     this.store.productList = productList;
   }
   // 扫码输入code
-  async scanCode(code) {
+  async scanCode(code, customerId) {
     var _a, _b;
     try {
-      const resultDiscountList = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code)) || [];
+      const resultDiscountList = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, customerId)) || [];
       const rulesModule = this.store.rules;
       if (!rulesModule) {
         return {

package/lib/solution/ShopDiscount/utils.d.ts

@@ -1 +1,12 @@
+import { Discount } from "../../modules/Discount/types";
 export declare const uniqueById: <T>(arr: T[], key?: string) => T[];
+/**
+ * 获取折扣金额 基于折扣卡类型计算
+ * 商品券：直接返回商品价格
+ * 折扣卡：根据折扣卡类型计算 固定金额：直接返回折扣卡金额 百分比：根据折扣卡金额计算
+ * @param discount
+ * @param total
+ * @param price
+ * @returns
+ */
+export declare const getDiscountAmount: (discount: Discount, total: number, price: number) => number;

package/lib/solution/ShopDiscount/utils.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,19 +16,41 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/solution/ShopDiscount/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
+  getDiscountAmount: () => getDiscountAmount,
   uniqueById: () => uniqueById
 });
 module.exports = __toCommonJS(utils_exports);
+var import_decimal = __toESM(require("decimal.js"));
 var uniqueById = (arr, key = "id") => {
   const seen = /* @__PURE__ */ new Set();
   return arr.filter((item) => !seen.has(item[key]) && seen.add(item[key]));
 };
+var getDiscountAmount = (discount, total, price) => {
+  var _a;
+  if (discount.tag === "good_pass") {
+    return new import_decimal.default(total).minus(new import_decimal.default(price || 0)).toNumber();
+  }
+  const isFixedAmount = ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.discount_card_type) === "fixed_amount";
+  if (isFixedAmount) {
+    return Math.max(new import_decimal.default(total).minus(new import_decimal.default(discount.par_value || 0)).toNumber(), 0);
+  }
+  return new import_decimal.default(100).minus(discount.par_value || 0).div(100).mul(new import_decimal.default(total)).toNumber();
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getDiscountAmount,
   uniqueById
 });

package/package.json

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