@pisell/pisellos 2.1.85 → 2.1.87

package/dist/modules/Rules/index.js

@@ -31,6 +31,7 @@ import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils"
 import Decimal from 'decimal.js';
 import { isBoolean } from 'lodash-es';
 import dayjs from 'dayjs';
+
 // 临时变量
 var flatItem;
 export var RulesModule = /*#__PURE__*/function (_BaseModule) {
@@ -43,8 +44,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "defaultName", 'rules');
     _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
-    _defineProperty(_assertThisInitialized(_this), "window", void 0);
-    // WindowPlugin 实例
     _defineProperty(_assertThisInitialized(_this), "hooks", void 0);
     _this.hooks = {};
     return _this;
@@ -59,8 +58,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               this.core = core;
               this.hooks = options === null || options === void 0 ? void 0 : options.hooks;
               this.store = options === null || options === void 0 ? void 0 : options.store;
-              this.window = core.getPlugin('window');
-            case 4:
+            case 3:
             case "end":
               return _context.stop();
           }
@@ -97,12 +95,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
     value: function getRulesList() {
       return this.store.rulesList;
     }
-  }, {
-    key: "getWalletPassEvaluator",
-    value: function getWalletPassEvaluator() {
-      var _this$window$getWalle, _this$window;
-      return (_this$window$getWalle = (_this$window = this.window).getWalletPassEvaluator) === null || _this$window$getWalle === void 0 ? void 0 : _this$window$getWalle.call(_this$window);
-    }
 
     // 商品不需要holder,则不需要判断，直接返回true，商品需要holder但是还没填写，那么暂时不使用带有holder的券，直到填写才去匹配
   }, {
@@ -131,7 +123,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         newDiscountList = _ref.newDiscountList,
         productList = _ref.productList,
         holders = _ref.holders,
-        orderTotalAmount = _ref.orderTotalAmount,
         isFormSubject = _ref.isFormSubject;
       // 首先检查是否有新的优惠券可应用
       if (!newDiscountList || newDiscountList.length === 0) {
@@ -166,7 +157,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         discountList: mergedDiscountList,
         productList: _toConsumableArray(productList),
         holders: holders,
-        orderTotalAmount: orderTotalAmount,
         isFormSubject: isFormSubject
       }, {
         scan: true
@@ -292,7 +282,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var discountList = _ref2.discountList,
         productList = _ref2.productList,
         holders = _ref2.holders,
-        orderTotalAmount = _ref2.orderTotalAmount,
         isFormSubject = _ref2.isFormSubject;
       // 识别出来是不是在编辑的界面里又新增了商品
       // 这种情况下，如果有可用的优惠券，也会自动勾选上
@@ -540,57 +529,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         return priceB.minus(priceA).toNumber();
       });
 
-      // 🔥 为每个折扣卡/商品券执行策略检查并附加config
-      var evaluator = this.getWalletPassEvaluator();
-      if (evaluator) {
-        addModeDiscount.forEach(function (discount) {
-          var discountType = discount.tag || discount.type;
-          // 只对 good_pass 和 discount_card 类型执行策略检查
-          if (['good_pass', 'discount_card', 'product_discount_card'].includes(discountType)) {
-            var _discount$limited_rel, _discount$limited_rel2;
-            // 转换 discount 为 Voucher 格式
-            var voucher = {
-              id: discount.id,
-              amount: Number(discount.par_value || 0),
-              balance: Number(discount.balance || 0),
-              type: discountType,
-              product_id: discount.product_id,
-              unified_available_status: 1,
-              available_product_type: (_discount$limited_rel = discount.limited_relation_product_data) === null || _discount$limited_rel === void 0 ? void 0 : _discount$limited_rel.type,
-              available_product_ids: (_discount$limited_rel2 = discount.limited_relation_product_data) === null || _discount$limited_rel2 === void 0 ? void 0 : _discount$limited_rel2.product_ids
-            };
-
-            // 转换 sortedFlattenedList 为 Product 格式
-            var productsForEvaluate = sortedFlattenedList.map(function (item) {
-              return {
-                product_id: item.id,
-                price: item.price || 0,
-                quantity: item.quantity || item.num || 1,
-                selling_price: item.price || 0
-              };
-            });
-
-            // 调用策略检查
-            var result = evaluator.checkVoucherAvailability({
-              orderTotalAmount: orderTotalAmount,
-              products: productsForEvaluate,
-              vouchers: [voucher]
-            });
-
-            // 将 config 附加到 discount 对象
-            if (result.isAvailable) {
-              discount.config = _objectSpread(_objectSpread({}, result.config), {}, {
-                isAvailable: true
-              });
-            } else {
-              discount.config = {
-                isAvailable: false
-              };
-            }
-          }
-        });
-      }
-
       /**
       // 对productList按价格降序排序（用于应用优惠券时优先选择高价商品） 价格相同时使用quantity 排序
       const sortedProductList = [...productList].sort((a, b) => {
@@ -611,9 +549,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 标记已使用的优惠券
       var usedDiscounts = new Map();
 
-      // 🔥 统计每个 product_id（商品券商品id）已使用的数量，用于 maxUsagePerOrder 限制
-      var usedProductIdCounts = new Map();
-
       // 记录每个优惠券适用的商品ID
       var discountApplicability = new Map();
 
@@ -843,7 +778,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           originProduct = flatItem.originProduct;
         }
         addModeDiscount.forEach(function (discount) {
-          var _product6, _product7, _product8, _product9, _flatItem$bundleItem3, _flatItem$bundleItem4, _discount$config;
+          var _product6, _product7, _product8, _product9, _flatItem$bundleItem3, _flatItem$bundleItem4;
           var limitedData = discount === null || discount === void 0 ? void 0 : discount.limited_relation_product_data;
           // 拿到discount配置的holder信息 product信息 product.holder 加在 isLimitedProduct
           var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
@@ -854,7 +789,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var timeLimit = true;
           timeLimit = !!filterDiscountListByBookingTime([discount], (((_product6 = product) === null || _product6 === void 0 ? void 0 : _product6.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
           // 是符合折扣的商品
-          var isLimitedProduct = (limitedData.type === 'product_all' && limitedData.filter !== 1 || limitedData.type === 'product_all' && limitedData.filter === 1 && !limitedData.exclude_product_ids.includes(product.id) || limitedData.product_ids && limitedData.product_ids.includes(product.id)) && isHolderMatch;
+          var isLimitedProduct = (limitedData.type === 'product_all' || limitedData.product_ids && limitedData.product_ids.includes(product.id)) && isHolderMatch;
 
           // 编辑的商品 使用了优惠券不可用
           var isAvailableProduct = flatItem.type === 'main' ? !((_product7 = product) !== null && _product7 !== void 0 && _product7.booking_id && (_product8 = product) !== null && _product8 !== void 0 && (_product8 = _product8.discount_list) !== null && _product8 !== void 0 && _product8.length && (_product9 = product) !== null && _product9 !== void 0 && (_product9 = _product9.discount_list) !== null && _product9 !== void 0 && _product9.every(function (discount) {
@@ -867,7 +802,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
 
           // 判断优惠券是否适用于该商品
-          if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable && (_discount$config = discount.config) !== null && _discount$config !== void 0 && _discount$config.isAvailable) {
+          if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable) {
             var _discountApplicabilit, _discount$metadata4, _discount$metadata5;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
@@ -891,8 +826,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 title: discount.format_title,
                 original_amount: product.price || product.origin_total,
                 pre_value: discount.par_value,
-                product_id: originProduct.id,
-                discount_product_id: discount.product_id
+                product_id: originProduct.id
               },
               metadata: {
                 num: num
@@ -952,16 +886,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
           var _product$discount_lis3, _product$discount_lis4;
-          // 🔥 检查策略可用性（针对 good_pass 和折扣卡）
-          var discountType = discount.tag || discount.type;
-          if (['good_pass', 'discount_card', 'product_discount_card'].includes(discountType)) {
-            var _discount$config2;
-            // 如果策略检查后没有config，说明不可用
-            if (discount.config === undefined || !(discount !== null && discount !== void 0 && (_discount$config2 = discount.config) !== null && _discount$config2 !== void 0 && _discount$config2.isAvailable)) {
-              return false;
-            }
-          }
-
           // 如果商品价格为 0，其实不需要使用任何优惠券，直接 return true
           // 商品券时主商品价格为0不可用
           if ((Number(product.price) <= 0 || !product.price) && !((_product$discount_lis3 = product.discount_list) !== null && _product$discount_lis3 !== void 0 && _product$discount_lis3.length) && (discount.tag || discount.type) === 'good_pass') return false;
@@ -974,18 +898,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 如果优惠券已被使用，则跳过
           var targetUsedDiscounts = usedDiscounts.get(discount.id);
           if (targetUsedDiscounts && (discount.tag || discount.type) === 'good_pass') return false;
-
-          // 🔥 检查 maxUsagePerOrder 限制：同一 product_id 的商品券使用数量不能超过配置值
-          if ((discount.tag || discount.type) === 'good_pass') {
-            var _discount$config3;
-            var maxUsagePerOrder = (_discount$config3 = discount.config) === null || _discount$config3 === void 0 ? void 0 : _discount$config3.maxUsagePerOrder;
-            if (maxUsagePerOrder && maxUsagePerOrder > 0) {
-              var currentUsedCount = usedProductIdCounts.get(discount.product_id) || 0;
-              if (currentUsedCount >= maxUsagePerOrder) {
-                return false;
-              }
-            }
-          }
           var limitedData = discount.limited_relation_product_data;
 
           // 拿到discount配置的holder信息 product信息 product.holder 不可用return false
@@ -1004,9 +916,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 判断优惠券是否适用于该商品
           if (limitedData.type === 'product_all') {
-            if (limitedData.filter === 1 && limitedData.exclude_product_ids.includes(product.id)) {
-              return false;
-            }
             // 检查 package_sub_item_usage_rules
             if (!_this3.checkPackageSubItemUsageRules(discount, flatItem)) {
               return false;
@@ -1173,13 +1082,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var availableGoodPassCount = applicableDiscounts.filter(function (item) {
           return (item.tag || item.type) === 'good_pass';
         }).length;
-
-        // 🔥 如果selectedDiscount有config配置，则使用config.maxUsagePerOrder限制使用次数
-        var maxUsageLimit = availableGoodPassCount;
-        if (selectedDiscount.config && selectedDiscount.config.maxUsagePerOrder) {
-          maxUsageLimit = Math.min(availableGoodPassCount, selectedDiscount.config.maxUsagePerOrder);
-        }
-        var splitCount = isNeedSplit ? Math.min(product.quantity || product.num || 1, maxUsageLimit) : 1;
+        var splitCount = isNeedSplit ? Math.min(totalQuantity, availableGoodPassCount) : 1;
         var arr = [];
 
         // 🔥 主商品和bundle子商品分别处理
@@ -1189,8 +1092,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             arr.push(_this3.hooks.setProduct(originProduct, {
               discount_list: [],
               quantity: totalQuantity - splitCount,
-              _id: product._id.split('___')[0],
-              total: product.origin_total || product.total
+              _id: product._id.split('___')[0]
             }));
           }
           for (var i = 0; i < splitCount; i++) {
@@ -1199,11 +1101,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
             // 标记优惠券为已使用
             usedDiscounts.set(_selectedDiscount.id, true);
-            // 🔥 更新 product_id 使用计数
-            if ((_selectedDiscount.tag || _selectedDiscount.type) === 'good_pass') {
-              var currentCount = usedProductIdCounts.get(_selectedDiscount.product_id) || 0;
-              usedProductIdCounts.set(_selectedDiscount.product_id, currentCount + 1);
-            }
 
             // 记录实际应用了优惠券的商品信息
             var appliedProducts = appliedDiscountProducts.get(_selectedDiscount.id) || [];
@@ -1237,7 +1134,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               targetProductTotal = getDiscountAmount(_selectedDiscount, product.price, product.price);
               amount = new Decimal(product.price).minus(new Decimal(targetProductTotal)).toNumber();
             }
-            var discountType = _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount.tag;
+            var discountType = _selectedDiscount.tag || _selectedDiscount.type;
             var isGoodPass = discountType === 'good_pass';
             var discountDetail = {
               amount: amount,
@@ -1250,12 +1147,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 title: _selectedDiscount.format_title,
                 original_amount: product.price,
                 product_id: originProduct.id,
-                percent: _selectedDiscount.par_value,
-                discount_product_id: _selectedDiscount.product_id
+                percent: _selectedDiscount.par_value
               },
               // 前端使用的num数量，为了计算优惠金额
               _num: isGoodPass ? 1 : product.num,
-              config: _selectedDiscount === null || _selectedDiscount === void 0 ? void 0 : _selectedDiscount.config,
               metadata: _objectSpread({
                 num: 1
               }, productDiscountDifference !== undefined && {
@@ -1276,6 +1171,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 记录应用了优惠券的商品
             // 后续更新价格改为 getProductTotalPrice getProductOriginTotalPrice逻辑
             if (product.isClient) {
+              debugger;
               arr.push(_this3.hooks.setProduct(originProduct, {
                 discount_list: [discountDetail],
                 price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
@@ -1317,20 +1213,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               var _selectedDiscount2$me;
               var _selectedDiscount2 = applicableDiscounts[_i];
               usedDiscounts.set(_selectedDiscount2.id, true);
-              // 🔥 更新 product_id 使用计数
-              if ((_selectedDiscount2.tag || _selectedDiscount2.type) === 'good_pass') {
-                var _currentCount = usedProductIdCounts.get(_selectedDiscount2.product_id) || 0;
-                usedProductIdCounts.set(_selectedDiscount2.product_id, _currentCount + 1);
-              }
 
               // 🔥 生成唯一的 _id
               var uniqueId = "".concat(flatItem._id, "_split_").concat(_i);
-
-              // 计算折扣后的价格（使用 getDiscountAmount，内部已处理 maxDeductionAmount）
-              var discountedPrice = getDiscountAmount(_selectedDiscount2, product.origin_total, product.origin_total);
-              var bundleDiscountAmount = new Decimal(product.origin_total || 0).minus(discountedPrice).toNumber();
               var _discountDetail = {
-                amount: bundleDiscountAmount,
+                amount: product.origin_total,
                 type: 'good_pass',
                 discount: {
                   fixed_amount: product.origin_total,
@@ -1338,16 +1225,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   resource_id: _selectedDiscount2.id,
                   title: _selectedDiscount2.format_title,
                   original_amount: product.origin_total,
-                  product_id: product.id,
-                  discount_product_id: _selectedDiscount2.product_id
+                  product_id: product.id
                 },
                 metadata: {
                   // 🔥 使用拆分后的唯一 _id
                   custom_product_bundle_map_id: uniqueId,
                   num: 1
                 },
-                _num: 1,
-                config: _selectedDiscount2 === null || _selectedDiscount2 === void 0 ? void 0 : _selectedDiscount2.config
+                _num: 1
               };
 
               // 记录实际应用的折扣
@@ -1359,9 +1244,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 _id: uniqueId,
                 num: 1,
                 quantity: 1,
-                price: discountedPrice,
-                // 折扣后的价格
-                total: discountedPrice,
+                price: 0,
+                // 商品券价格为0
+                total: 0,
                 discount_list: [_discountDetail],
                 processed: true,
                 _discountId: _selectedDiscount2.id
@@ -1384,11 +1269,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 折扣卡：不拆分数量，直接应用
             var _selectedDiscount3 = selectedDiscountCard || applicableDiscounts[0];
             usedDiscounts.set(_selectedDiscount3.id, true);
-            // 🔥 更新 product_id 使用计数（虽然此处主要是折扣卡，但保持一致性）
-            if ((_selectedDiscount3.tag || _selectedDiscount3.type) === 'good_pass') {
-              var _currentCount2 = usedProductIdCounts.get(_selectedDiscount3.product_id) || 0;
-              usedProductIdCounts.set(_selectedDiscount3.product_id, _currentCount2 + 1);
-            }
             var _productOriginTotal = product.original_price || product.price || 0;
 
             // 🔥 检查是否是 order_level 固定金额折扣卡
@@ -1408,7 +1288,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               _targetProductTotal = getDiscountAmount(_selectedDiscount3, _productOriginTotal, _productOriginTotal);
               fixedAmountPerItem = new Decimal(_productOriginTotal).minus(_targetProductTotal).toNumber();
             }
-
+            debugger;
             // 🔥 使用当前的 _id 作为唯一标识
             var _uniqueId = flatItem._id;
             var _discountDetail2 = {
@@ -1422,8 +1302,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 title: _selectedDiscount3.format_title,
                 original_amount: product.original_price,
                 product_id: product.id,
-                percent: _selectedDiscount3.par_value,
-                discount_product_id: _selectedDiscount3.product_id
+                percent: _selectedDiscount3.par_value
               },
               metadata: _objectSpread({
                 // 🔥 使用唯一的 _id
@@ -1432,7 +1311,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               }, _productDiscountDifference !== undefined && {
                 product_discount_difference: _productDiscountDifference
               }),
-              config: _selectedDiscount3 === null || _selectedDiscount3 === void 0 ? void 0 : _selectedDiscount3.config,
               _num: (product.num || 1) * ((flatItem === null || flatItem === void 0 || (_flatItem$parentProdu9 = flatItem.parentProduct) === null || _flatItem$parentProdu9 === void 0 ? void 0 : _flatItem$parentProdu9.num) || 1)
             };
 

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

@@ -31,7 +31,6 @@ export interface RulesModuleAPI {
         holders: {
             form_record_id: number;
         }[];
-        orderTotalAmount: number;
         isFormSubject: boolean;
     }) => DiscountResult;
 }

package/dist/modules/Schedule/getDateIsInSchedule.d.ts

@@ -0,0 +1,32 @@
+import dayjs from "dayjs";
+import { ScheduleItem } from "./types";
+export declare const getDateIsInSchedule: (dateTime: string, scheduleList: ScheduleItem[]) => boolean;
+export type ScheduleTimeSlot = {
+    /** 开始时间 HH:mm */
+    start_time: string;
+    /** 结束时间 HH:mm */
+    end_time: string;
+    /** 开始日期时间 YYYY-MM-DD HH:mm:ss */
+    start_at: dayjs.Dayjs;
+    /** 结束日期时间 YYYY-MM-DD HH:mm:ss */
+    end_at: dayjs.Dayjs;
+};
+/**
+ * 获取当前日期日程时间点
+ * @param date 日期 YYYY-MM-DD
+ * @param scheduleList 日程列表
+ * @returns 当前日期日程时间点 结构，数组 [{
+ *
+ *  // HH:mm
+ *  end_time: string,
+ *  // HH:mm
+ *  start_time: string,
+ *  // 日期时间
+ *  // YYYY-MM-DD HH:mm:ss
+ *  end_at: Dayjs,
+ *  // YYYY-MM-DD HH:mm:ss
+ *  start_at: Dayjs,
+ *
+ * }]
+ */
+export declare const getScheduleStartEndTimePoints: (date: string, scheduleList: ScheduleItem[]) => ScheduleTimeSlot[];