@pisell/pisellos 1.0.63 → 1.0.65

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/types.d.ts

@@ -70,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;

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';
 import { isBoolean } from 'lodash-es';
@@ -189,8 +189,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;
@@ -201,13 +205,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);
         }
 
@@ -291,7 +316,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);
 
@@ -303,6 +328,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               type: discountType,
               tag: discountType,
               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,
@@ -323,7 +349,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       console.log(sortedProductList, 'sortedProductListsortedProductList');
 
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
-      sortedProductList.forEach(function (originProduct, i) {
+      sortedProductList.forEach(function (originProduct, index) {
         var _product$discount_lis4, _product$discount_lis5, _product$discount_lis7, _product$discount_lis8, _product$discount_lis9, _product$discount_lis10, _product$discount_lis11;
         var product = _this3.hooks.getProduct(originProduct);
         if (product !== null && product !== void 0 && product.booking_id && (_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.length && product !== null && product !== void 0 && (_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.every(function (discount) {
@@ -415,7 +441,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             }))]);
           } else {
             processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
-              _id: product._id.split('___')[0] + '___' + i,
+              _id: product._id.split('___')[0] + '___' + index,
               total: product.origin_total || product.total,
               price: product.price
             }), {}, {
@@ -443,10 +469,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             _id: product._id.split('___')[0]
           }));
         }
-        for (var _i = 0; _i < splitCount; _i++) {
-          var _product$discount_lis12, _originProduct$_produ;
+        for (var i = 0; i < splitCount; i++) {
+          var _product$discount_lis12, _originProduct$_produ, _selectedDiscount$met;
           // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
-          var _selectedDiscount = selectedDiscountCard || applicableDiscounts[_i];
+          var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
           // 标记优惠券为已使用
           usedDiscounts.set(_selectedDiscount.id, true);
 
@@ -465,12 +491,13 @@ 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 discountType = _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount.tag;
           var discountDetail = {
             amount: new Decimal(productOriginTotal).minus(new Decimal(targetProductTotal)).toNumber(),
             type: discountType,
             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,
@@ -507,7 +534,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           } else {
             arr.push(_this3.hooks.setProduct(originProduct, {
               discount_list: [discountDetail],
-              _id: product._id.split('___')[0] + "___" + _selectedDiscount.id,
+              _id: product._id.split('___')[0] + "___" + _selectedDiscount.id + index,
               price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
               quantity: isNeedSplit ? 1 : product.quantity,
               total: targetProductTotal,

package/dist/solution/BookingByStep/utils/timeslots.js

@@ -107,29 +107,29 @@ export function findFastestAvailableResource(_ref2) {
     _step2;
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var resource = _step2.value;
+      var _resource = _step2.value;
       // 获取资源当天且还在工作时间内的时间段
-      var todayTimes = resource.times.filter(function (time) {
+      var todayTimes = _resource.times.filter(function (time) {
         var isToday = dayjs(time.start_at).isSame(currentTime, 'day');
         var isStillWorking = dayjs(time.end_at).isAfter(currentTime);
         return isToday && isStillWorking;
       });
       if (todayTimes.length === 0) {
-        console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(resource.id, "(").concat(resource.main_field, ") \u4ECA\u65E5\u65E0\u53EF\u7528\u65F6\u95F4\u6BB5"));
+        console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(_resource.id, "(").concat(_resource.main_field, ") \u4ECA\u65E5\u65E0\u53EF\u7528\u65F6\u95F4\u6BB5"));
         continue;
       }
-      var _iterator3 = _createForOfIteratorHelper(todayTimes),
-        _step3;
+      var _iterator4 = _createForOfIteratorHelper(todayTimes),
+        _step4;
       try {
         var _loop = function _loop() {
             var _time$event_list, _time$event_list2;
-            var time = _step3.value;
+            var time = _step4.value;
             var workStartTime = dayjs(time.start_at);
             var workEndTime = dayjs(time.end_at);
 
             // 确定检查的起始时间（当前时间 vs 工作开始时间）
             var nextAvailableTime = currentTime.isBefore(workStartTime) ? workStartTime : currentTime;
-            console.log("[TimeslotUtils] \u68C0\u67E5\u8D44\u6E90 ".concat(resource.id, "(").concat(resource.main_field, "):"), {
+            console.log("[TimeslotUtils] \u68C0\u67E5\u8D44\u6E90 ".concat(_resource.id, "(").concat(_resource.main_field, "):"), {
               workTime: "".concat(workStartTime.format('HH:mm'), "-").concat(workEndTime.format('HH:mm')),
               checkStartTime: nextAvailableTime.format('HH:mm:ss'),
               eventCount: ((_time$event_list = time.event_list) === null || _time$event_list === void 0 ? void 0 : _time$event_list.length) || 0
@@ -148,40 +148,40 @@ export function findFastestAvailableResource(_ref2) {
 
             // 检查从 nextAvailableTime 开始的可用性
             var finalAvailableTime = nextAvailableTime;
-            var _iterator4 = _createForOfIteratorHelper(relevantEvents),
-              _step4;
+            var _iterator5 = _createForOfIteratorHelper(relevantEvents),
+              _step5;
             try {
-              for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-                var event = _step4.value;
-                var eventStart = dayjs(event.start_at);
-                var eventEnd = dayjs(event.end_at);
+              for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                var _event = _step5.value;
+                var _eventStart = dayjs(_event.start_at);
+                var _eventEnd = dayjs(_event.end_at);
                 console.log("[TimeslotUtils] \u68C0\u67E5\u4E8B\u4EF6\u51B2\u7A81:", {
-                  resourceId: resource.id,
-                  eventTime: "".concat(eventStart.format('HH:mm'), "-").concat(eventEnd.format('HH:mm')),
+                  resourceId: _resource.id,
+                  eventTime: "".concat(_eventStart.format('HH:mm'), "-").concat(_eventEnd.format('HH:mm')),
                   checkTime: finalAvailableTime.format('HH:mm:ss'),
-                  pax: event.pax || 1
+                  pax: _event.pax || 1
                 });
 
                 // 检查资源类型和容量
-                if (resource.resourceType === 'single' || (resource.capacity || 1) === 1) {
+                if (_resource.resourceType === 'single' || (_resource.capacity || 1) === 1) {
                   // 单人预约资源：检查时间冲突
-                  if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(30, 'minute'))) {
+                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(30, 'minute'))) {
                     // 有冲突，使用事件结束时间
-                    finalAvailableTime = eventEnd;
+                    finalAvailableTime = _eventEnd;
                     console.log("[TimeslotUtils] \u53D1\u73B0\u65F6\u95F4\u51B2\u7A81\uFF0C\u8C03\u6574\u5230: ".concat(finalAvailableTime.format('HH:mm:ss')));
                   }
                 } else {
                   // 多人预约资源：检查容量
-                  var totalCapacity = resource.capacity || 0;
-                  var currentUsedCapacity = countMap[resource.id] || 0;
-                  var eventUsedCapacity = event.pax || 1;
+                  var totalCapacity = _resource.capacity || 0;
+                  var currentUsedCapacity = countMap[_resource.id] || 0;
+                  var eventUsedCapacity = _event.pax || 1;
 
                   // 如果在事件时间范围内，检查容量是否足够
-                  if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(30, 'minute'))) {
+                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(30, 'minute'))) {
                     var totalRequiredCapacity = currentUsedCapacity + currentCapacity + eventUsedCapacity;
                     if (totalRequiredCapacity > totalCapacity) {
                       // 容量不足，使用事件结束时间
-                      finalAvailableTime = eventEnd;
+                      finalAvailableTime = _eventEnd;
                       console.log("[TimeslotUtils] \u5BB9\u91CF\u4E0D\u8DB3\uFF0C\u8C03\u6574\u5230: ".concat(finalAvailableTime.format('HH:mm:ss')));
                     }
                   }
@@ -190,38 +190,38 @@ export function findFastestAvailableResource(_ref2) {
 
               // 确保可用时间在工作时间内
             } catch (err) {
-              _iterator4.e(err);
+              _iterator5.e(err);
             } finally {
-              _iterator4.f();
+              _iterator5.f();
             }
             if (finalAvailableTime.isAfter(workEndTime)) {
-              console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(resource.id, " \u53EF\u7528\u65F6\u95F4\u8D85\u51FA\u5DE5\u4F5C\u65F6\u95F4\uFF0C\u8DF3\u8FC7"));
+              console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(_resource.id, " \u53EF\u7528\u65F6\u95F4\u8D85\u51FA\u5DE5\u4F5C\u65F6\u95F4\uFF0C\u8DF3\u8FC7"));
               return 0; // continue
             }
-            console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(resource.id, "(").concat(resource.main_field, ") \u6700\u5FEB\u53EF\u7528\u65F6\u95F4: ").concat(finalAvailableTime.format('HH:mm:ss')));
+            console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(_resource.id, "(").concat(_resource.main_field, ") \u6700\u5FEB\u53EF\u7528\u65F6\u95F4: ").concat(finalAvailableTime.format('HH:mm:ss')));
 
             // 更新最快可用时间和资源
             if (!fastestTime || finalAvailableTime.isBefore(fastestTime)) {
               fastestTime = finalAvailableTime;
-              fastestResources = [resource];
-              console.log("[TimeslotUtils] \u66F4\u65B0\u6700\u5FEB\u65F6\u95F4: ".concat(fastestTime.format('HH:mm:ss'), ", \u8D44\u6E90: ").concat(resource.main_field));
+              fastestResources = [_resource];
+              console.log("[TimeslotUtils] \u66F4\u65B0\u6700\u5FEB\u65F6\u95F4: ".concat(fastestTime.format('HH:mm:ss'), ", \u8D44\u6E90: ").concat(_resource.main_field));
             } else if (finalAvailableTime.isSame(fastestTime)) {
-              fastestResources.push(resource);
-              console.log("[TimeslotUtils] \u6DFB\u52A0\u76F8\u540C\u65F6\u95F4\u8D44\u6E90: ".concat(resource.main_field));
+              fastestResources.push(_resource);
+              console.log("[TimeslotUtils] \u6DFB\u52A0\u76F8\u540C\u65F6\u95F4\u8D44\u6E90: ".concat(_resource.main_field));
             }
             return 1; // break
             // 每个资源只需要计算一次
           },
           _ret;
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
           _ret = _loop();
           if (_ret === 0) continue;
           if (_ret === 1) break;
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator3.f();
+        _iterator4.f();
       }
     }
 
@@ -243,10 +243,60 @@ export function findFastestAvailableResource(_ref2) {
     return fastestResources[0];
   }
 
-  // 如果有多个最快可用的资源，选择第一个或根据其他逻辑选择
-  // 这里简化处理，直接返回第一个
+  // 如果有多个最快可用的资源，选择空闲时间最长的资源
   var selectedResource = fastestResources[0];
-  console.log("[TimeslotUtils] \u8FD4\u56DE\u591A\u4E2A\u8D44\u6E90\u4E2D\u7684\u7B2C\u4E00\u4E2A: ".concat(selectedResource.main_field));
+  var maxIdleTime = 0;
+  console.log("[TimeslotUtils] \u6BD4\u8F83 ".concat(fastestResources.length, " \u4E2A\u8D44\u6E90\u7684\u7A7A\u95F2\u65F6\u95F4:"));
+  for (var _i2 = 0, _fastestResources = fastestResources; _i2 < _fastestResources.length; _i2++) {
+    var _workingTime$event_li;
+    var resource = _fastestResources[_i2];
+    // 找到该资源当天且还在工作的时间段
+    var workingTime = resource.times.find(function (time) {
+      var isToday = dayjs(time.start_at).isSame(fastestTime, 'day');
+      var isStillWorking = dayjs(time.end_at).isAfter(fastestTime);
+      return isToday && isStillWorking;
+    });
+    if (!workingTime) continue;
+    var workEndTime = dayjs(workingTime.end_at);
+
+    // 计算从最快可用时间到工作结束时间的空闲时长（分钟）
+    var totalIdleTime = workEndTime.diff(fastestTime, 'minute');
+
+    // 减去已有预约占用的时间
+    var relevantEvents = ((_workingTime$event_li = workingTime.event_list) === null || _workingTime$event_li === void 0 ? void 0 : _workingTime$event_li.filter(function (event) {
+      var eventStart = dayjs(event.start_at);
+      var eventEnd = dayjs(event.end_at);
+      // 只计算在最快可用时间之后的预约
+      return eventEnd.isAfter(fastestTime) && eventStart.isAfter(fastestTime);
+    })) || [];
+    var _iterator3 = _createForOfIteratorHelper(relevantEvents),
+      _step3;
+    try {
+      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+        var event = _step3.value;
+        var eventStart = dayjs(event.start_at);
+        var eventEnd = dayjs(event.end_at);
+        var eventDuration = eventEnd.diff(eventStart, 'minute');
+        totalIdleTime -= eventDuration;
+      }
+    } catch (err) {
+      _iterator3.e(err);
+    } finally {
+      _iterator3.f();
+    }
+    console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(resource.id, "(").concat(resource.main_field, "):"), {
+      工作结束时间: workEndTime.format('HH:mm'),
+      总工作时长: workEndTime.diff(fastestTime, 'minute') + '分钟',
+      预约占用时长: workEndTime.diff(fastestTime, 'minute') - totalIdleTime + '分钟',
+      实际空闲时长: totalIdleTime + '分钟'
+    });
+    if (totalIdleTime > maxIdleTime) {
+      maxIdleTime = totalIdleTime;
+      selectedResource = resource;
+      console.log("[TimeslotUtils] \u66F4\u65B0\u6700\u4F73\u9009\u62E9: ".concat(resource.main_field, " (\u7A7A\u95F2").concat(totalIdleTime, "\u5206\u949F)"));
+    }
+  }
+  console.log("[TimeslotUtils] \u6700\u7EC8\u9009\u62E9\u8D44\u6E90: ".concat(selectedResource.main_field, " (\u6700\u957F\u7A7A\u95F2").concat(maxIdleTime, "\u5206\u949F)"));
   return selectedResource;
 }
 

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

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

package/dist/solution/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/types.d.ts

@@ -70,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;

package/lib/modules/Rules/index.js

@@ -132,6 +132,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")
@@ -139,10 +140,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);
       }
@@ -182,7 +198,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))));
@@ -195,6 +211,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             type: discountType,
             tag: discountType,
             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,
@@ -211,8 +228,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       });
     });
     console.log(sortedProductList, "sortedProductListsortedProductList");
-    sortedProductList.forEach((originProduct, i) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    sortedProductList.forEach((originProduct, index) => {
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
       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]);
@@ -288,7 +305,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             product._id,
             [this.hooks.setProduct(originProduct, {
               ...isManualDiscount ? {} : {
-                _id: product._id.split("___")[0] + "___" + i,
+                _id: product._id.split("___")[0] + "___" + index,
                 total: product.origin_total || product.total,
                 price: product.price
               },
@@ -311,8 +328,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           _id: product._id.split("___")[0]
         }));
       }
-      for (let i2 = 0; i2 < splitCount; i2++) {
-        const selectedDiscount2 = selectedDiscountCard || applicableDiscounts[i2];
+      for (let i = 0; i < splitCount; i++) {
+        const selectedDiscount2 = selectedDiscountCard || applicableDiscounts[i];
         usedDiscounts.set(selectedDiscount2.id, true);
         const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
         let productOriginTotal = product.origin_total || product.total || 0;
@@ -322,12 +339,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         if (Number(((_i = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _i.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 discountType = selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag;
         const discountDetail = {
           amount: new import_decimal.default(productOriginTotal).minus(new import_decimal.default(targetProductTotal)).toNumber(),
           type: discountType,
           discount: {
+            discount_card_type: (_j = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _j.discount_card_type,
             resource_id: selectedDiscount2.id,
             title: selectedDiscount2.format_title,
             original_amount: productOriginTotal,
@@ -359,7 +377,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         } else {
           arr.push(this.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
-            _id: product._id.split("___")[0] + "___" + selectedDiscount2.id,
+            _id: product._id.split("___")[0] + "___" + selectedDiscount2.id + index,
             price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
             quantity: isNeedSplit ? 1 : product.quantity,
             total: targetProductTotal,

package/lib/solution/BookingByStep/utils/timeslots.js

@@ -79,7 +79,7 @@ function findFastestAvailableResource({
   currentCapacity = 1,
   countMap = {}
 }) {
-  var _a, _b;
+  var _a, _b, _c;
   const currentTime = (0, import_dayjs.default)();
   let fastestTime = null;
   let fastestResources = [];
@@ -168,8 +168,43 @@ function findFastestAvailableResource({
     console.log(`[TimeslotUtils] 返回唯一最快资源: ${fastestResources[0].main_field}`);
     return fastestResources[0];
   }
-  const selectedResource = fastestResources[0];
-  console.log(`[TimeslotUtils] 返回多个资源中的第一个: ${selectedResource.main_field}`);
+  let selectedResource = fastestResources[0];
+  let maxIdleTime = 0;
+  console.log(`[TimeslotUtils] 比较 ${fastestResources.length} 个资源的空闲时间:`);
+  for (const resource of fastestResources) {
+    const workingTime = resource.times.find((time) => {
+      const isToday = (0, import_dayjs.default)(time.start_at).isSame(fastestTime, "day");
+      const isStillWorking = (0, import_dayjs.default)(time.end_at).isAfter(fastestTime);
+      return isToday && isStillWorking;
+    });
+    if (!workingTime)
+      continue;
+    const workEndTime = (0, import_dayjs.default)(workingTime.end_at);
+    let totalIdleTime = workEndTime.diff(fastestTime, "minute");
+    const relevantEvents = ((_c = workingTime.event_list) == null ? void 0 : _c.filter((event) => {
+      const eventStart = (0, import_dayjs.default)(event.start_at);
+      const eventEnd = (0, import_dayjs.default)(event.end_at);
+      return eventEnd.isAfter(fastestTime) && eventStart.isAfter(fastestTime);
+    })) || [];
+    for (const event of relevantEvents) {
+      const eventStart = (0, import_dayjs.default)(event.start_at);
+      const eventEnd = (0, import_dayjs.default)(event.end_at);
+      const eventDuration = eventEnd.diff(eventStart, "minute");
+      totalIdleTime -= eventDuration;
+    }
+    console.log(`[TimeslotUtils] 资源 ${resource.id}(${resource.main_field}):`, {
+      工作结束时间: workEndTime.format("HH:mm"),
+      总工作时长: workEndTime.diff(fastestTime, "minute") + "分钟",
+      预约占用时长: workEndTime.diff(fastestTime, "minute") - totalIdleTime + "分钟",
+      实际空闲时长: totalIdleTime + "分钟"
+    });
+    if (totalIdleTime > maxIdleTime) {
+      maxIdleTime = totalIdleTime;
+      selectedResource = resource;
+      console.log(`[TimeslotUtils] 更新最佳选择: ${resource.main_field} (空闲${totalIdleTime}分钟)`);
+    }
+  }
+  console.log(`[TimeslotUtils] 最终选择资源: ${selectedResource.main_field} (最长空闲${maxIdleTime}分钟)`);
   return selectedResource;
 }
 function filterConditionTimeSlots(times, startTime, endTime) {

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

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

package/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": "1.0.63",
+  "version": "1.0.65",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",