@pisell/pisellos 2.1.67 → 2.1.71

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

@@ -20,7 +20,9 @@ export interface ITime {
     date: string;
     week: string;
     weekNum: number;
-    status: 'unavailable' | 'available';
+    status: 'unavailable' | 'available' | 'lots_of_space' | 'filling_up_fast' | 'sold_out';
+    summaryCount?: number;
+    availableCount?: number;
     resource?: any[];
     color?: string[];
 }

package/dist/modules/Rules/index.js

@@ -108,7 +108,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       if (!product.isNeedHolder) return true;
       // 商品需要holder，但父预约及商品都无holder，返回false
       if (!orderHolderId && !productHolderId) return false;
-
       // 最终直接匹配 holder 是否相同
       return (productHolderId || orderHolderId) === discount.holder.holder_id;
     }
@@ -146,10 +145,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       }
 
       // 合并新旧折扣列表，并计算折扣结果,注意，如果旧折扣里有 isEditMode 为 true 的优惠券，则不合并
+      // 保留之前扫码得到的商品券（isScan: true）
       var filteredOldDiscountList = oldDiscountList.filter(function (discount) {
-        return !discount.isEditMode && discount.tag !== 'good_pass';
+        return !discount.isEditMode && (discount.tag !== 'good_pass' || discount.isScan);
       });
-      var mergedDiscountList = uniqueById(uniqueById([].concat(_toConsumableArray(filteredOldDiscountList), _toConsumableArray(newDiscountList))), 'product_id');
+      var mergedDiscountList = uniqueById([].concat(_toConsumableArray(filteredOldDiscountList), _toConsumableArray(newDiscountList)));
       var result = this.calcDiscount({
         discountList: mergedDiscountList,
         productList: _toConsumableArray(productList),
@@ -610,7 +610,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 收集该折扣卡适用的商品（排除被其他专属折扣卡占用的商品）
         var applicableProducts = [];
         sortedFlattenedList.forEach(function (flatItem) {
-          var _flatItem$parentProdu2;
+          var _flatItem$parentProdu2, _product$price, _ref5, _flatItem$original_pr;
           // 🔥 检查该商品是否被其他专属折扣卡占用
           var occupyingDiscountId = occupiedItems.get(flatItem._id);
           if (occupyingDiscountId !== undefined && occupyingDiscountId !== discount.id) {
@@ -636,10 +636,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 对于 bundle 子商品，quantity 需要乘以主商品的购买数量
           var quantity = flatItem.type === 'main' ? product.quantity || 1 : (product.num || 1) * (((_flatItem$parentProdu2 = flatItem.parentProduct) === null || _flatItem$parentProdu2 === void 0 ? void 0 : _flatItem$parentProdu2.quantity) || 1);
 
+          // 对于主商品：使用 price
+          // 对于子商品：优先使用 flatItem.original_price，否则使用 flatItem.price
+          var originalAmount = flatItem.type === 'main' ? Number((_product$price = product.price) !== null && _product$price !== void 0 ? _product$price : 0) : Number((_ref5 = (_flatItem$original_pr = flatItem.original_price) !== null && _flatItem$original_pr !== void 0 ? _flatItem$original_pr : flatItem.price) !== null && _ref5 !== void 0 ? _ref5 : 0);
+
           // 传递 parentQuantity 用于差值处理时判断是否是真正的"数量为1"
           var productData = {
             productId: flatItem._id,
-            amount: Number(product.price || 0),
+            amount: originalAmount,
             quantity: quantity
           };
 
@@ -857,8 +861,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var _product$discount_lis5, _product11, _product11$every;
           // 主商品：判断自身是否手动折扣
           isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : product.total != product.origin_total && (product.bundle || []).every(function (item) {
-            var _ref5;
-            return !((_ref5 = item.discount_list || []) !== null && _ref5 !== void 0 && _ref5.length);
+            var _ref6;
+            return !((_ref6 = item.discount_list || []) !== null && _ref6 !== void 0 && _ref6.length);
           }) && (!((_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.length) || ((_product11 = product) === null || _product11 === void 0 || (_product11 = _product11.discount_list) === null || _product11 === void 0 || (_product11$every = _product11.every) === null || _product11$every === void 0 ? void 0 : _product11$every.call(_product11, function (item) {
             return item.type === 'product';
           })));
@@ -868,8 +872,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           if (parentProduct) {
             var _parentProduct$discou, _parentProduct$discou2, _parentProduct$discou3;
             isManualDiscount = typeof parentProduct.isManualDiscount === 'boolean' ? parentProduct.isManualDiscount : parentProduct.total != parentProduct.origin_total && (parentProduct.bundle || []).every(function (item) {
-              var _ref6;
-              return !((_ref6 = item.discount_list || []) !== null && _ref6 !== void 0 && _ref6.length);
+              var _ref7;
+              return !((_ref7 = item.discount_list || []) !== null && _ref7 !== void 0 && _ref7.length);
             }) && (!((_parentProduct$discou = parentProduct.discount_list) !== null && _parentProduct$discou !== void 0 && _parentProduct$discou.length) || (parentProduct === null || parentProduct === void 0 || (_parentProduct$discou2 = parentProduct.discount_list) === null || _parentProduct$discou2 === void 0 || (_parentProduct$discou3 = _parentProduct$discou2.every) === null || _parentProduct$discou3 === void 0 ? void 0 : _parentProduct$discou3.call(_parentProduct$discou2, function (item) {
               return item.type === 'product';
             })));

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

@@ -316,6 +316,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
+        status: keyof TimeStatusMap;
     }[];
     /**
      * 找到多个资源的公共可用时间段
@@ -343,7 +344,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *
@@ -380,3 +381,9 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     */
     getContactInfo(params: any): Promise<any>;
 }
+interface TimeStatusMap {
+    lots_of_space: true;
+    filling_up_fast: true;
+    sold_out: true;
+}
+export {};

package/dist/solution/BookingByStep/index.js

@@ -2420,6 +2420,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: function getTimeslotBySchedule(_ref10) {
       var _this$store$currentPr2,
         _targetProductData$pr,
+        _targetProductData$pr2,
         _this14 = this;
       var date = _ref10.date,
         scheduleIds = _ref10.scheduleIds,
@@ -2463,7 +2464,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var firstEnabledResourceId = targetProductData === null || targetProductData === void 0 || (_targetProductData$pr = targetProductData.product_resource) === null || _targetProductData$pr === void 0 || (_targetProductData$pr = _targetProductData$pr.resources) === null || _targetProductData$pr === void 0 || (_targetProductData$pr = _targetProductData$pr.find(function (n) {
         return n.status === 1;
       })) === null || _targetProductData$pr === void 0 ? void 0 : _targetProductData$pr.id;
-
+      var firstEnabledResourceConfig = targetProductData === null || targetProductData === void 0 || (_targetProductData$pr2 = targetProductData.product_resource) === null || _targetProductData$pr2 === void 0 || (_targetProductData$pr2 = _targetProductData$pr2.resources) === null || _targetProductData$pr2 === void 0 ? void 0 : _targetProductData$pr2.find(function (n) {
+        return n.status === 1 && n.id === firstEnabledResourceId;
+      });
+      var isMultipleBooking = (firstEnabledResourceConfig === null || firstEnabledResourceConfig === void 0 ? void 0 : firstEnabledResourceConfig.type) === 'multiple';
       // 计算每个日程切片下日程可用的资源的容量总和
       var formatScheduleTimeSlots = scheduleTimeSlots.map(function (item) {
         // 用来计算资源的可使用情况，针对单个schedule 时间片
@@ -2471,6 +2475,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         var count = 0;
         var bookingLeft = 0;
         var summaryCount = 0;
+        var summaryConfigCount = 0;
         // 遍历所有资源
         allProductResources === null || allProductResources === void 0 || allProductResources.forEach(function (m) {
           // 遍历所有资源的上工时间片
@@ -2484,9 +2489,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           // n.start_at 是 2025-06-30 15:00 end_at 2025-06-30 17:00
           // item.start 是 2025-06-30 16:00 item.end 是 2025-06-30 19:00
           // 需要判断 n.start_at 和 n.end_at 是否在 item.start 和 item.end 之间
-          // 如果 n.start_at 和 n.end_at 在 item.start 和 item.end 有交集，则此时间需要计算
+          // 如果是仅用于计算的资源， n.start_at 和 n.end_at 在 item.start 和 item.end 有交集，则此时间需要计算
+          // https://project.feishu.cn/v2qint/bug/detail/6657165010
           var mTimes = m.times.filter(function (n) {
-            return !dayjs(n.start_at).isAfter(dayjs(item.start), 'minute') && !dayjs(n.end_at).isBefore(dayjs(item.end), 'minute') || dayjs(n.start_at).isBefore(dayjs(item.end), 'minute') && dayjs(n.end_at).isAfter(dayjs(item.start), 'minute');
+            return !dayjs(n.start_at).isAfter(dayjs(item.start), 'minute') && !dayjs(n.end_at).isBefore(dayjs(item.end), 'minute') || m.onlyComputed && dayjs(n.start_at).isBefore(dayjs(item.end), 'minute') && dayjs(n.end_at).isAfter(dayjs(item.start), 'minute');
           });
           // 如果在这个区间的时间一个都没有，可以直接认为这个资源不可用
           if (mTimes.length === 0) {
@@ -2518,6 +2524,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             }
             currentResourcesTimeSlotCanUsedArr.push(res.usable);
           });
+          if (m.form_id === firstEnabledResourceId) {
+            // 确认当前资源是单个预约还是多个预约，单个预约则只需要计数，多个预约才添加容量
+            if (isMultipleBooking) {
+              summaryConfigCount += m.capacity;
+            } else {
+              summaryConfigCount += 1;
+            }
+          }
           // 在已经选定时间的情况下，只要canUseTime如果有一个 false 那就不可用
           if (!currentResourcesTimeSlotCanUsedArr.some(function (n) {
             return n === false;
@@ -2672,6 +2686,28 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         });
         var startDayJs = dayjs(item.start);
         var endDayJs = dayjs(item.end);
+
+        // 状态
+        // 如果是isMultipleBooking
+        // lots_of_space: summaryCount / summaryConfigCount > 0.5
+        // filling_up_fast: summaryCount / summaryConfigCount <= 0.5 && summaryCount > 0
+        // sold_out: bookingLeft = 0
+        // 如果不是isMultipleBooking
+        // lots_of_space: bookingLeft / summaryConfigCount > 0.5
+        // filling_up_fast: bookingLeft / summaryConfigCount <= 0.5 && count > 0
+        // sold_out: bookingLeft = 0
+        var timeStatus = 'sold_out';
+        if (bookingLeft === 0) timeStatus = 'sold_out';else if (isMultipleBooking) {
+          if (summaryConfigCount === 0) timeStatus = 'sold_out';else {
+            var usageRatio = summaryCount / summaryConfigCount;
+            if (usageRatio > 0.5) timeStatus = 'lots_of_space';else if (summaryCount > 0) timeStatus = 'filling_up_fast';else timeStatus = 'sold_out';
+          }
+        } else {
+          if (summaryConfigCount === 0) timeStatus = 'sold_out';else {
+            var _usageRatio = bookingLeft / summaryConfigCount;
+            if (_usageRatio > 0.5) timeStatus = 'lots_of_space';else if (count > 0) timeStatus = 'filling_up_fast';else timeStatus = 'sold_out';
+          }
+        }
         return {
           start_time: startDayJs.format('HH:mm'),
           end_time: endDayJs.format('HH:mm'),
@@ -2679,7 +2715,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           end_at: endDayJs,
           count: count,
           left: bookingLeft,
-          summaryCount: summaryCount
+          summaryCount: summaryCount,
+          status: timeStatus
         };
       });
       return formatScheduleTimeSlots;
@@ -3864,12 +3901,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               });
               targetSchedules = this.store.schedule.getScheduleListByIds(tempProducts['schedule.ids']);
               _loop7 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop7() {
-                var currentDateStr, status, _checkSessionProductL, latestStartDate, earliestEndDate, scheduleByDate, minTimeMaxTime, scheduleTimeSlots, timesSlotCanUse;
+                var currentDateStr, status, summaryCount, availableCount, _checkSessionProductL, latestStartDate, earliestEndDate, scheduleByDate, minTimeMaxTime, scheduleTimeSlots, timesSlotCanUse, dateStatus, usageRatio;
                 return _regeneratorRuntime().wrap(function _loop7$(_context27) {
                   while (1) switch (_context27.prev = _context27.next) {
                     case 0:
                       currentDateStr = currentDate.format('YYYY-MM-DD');
-                      status = 'available'; // 1. 检查商品的提前量等情况是否满足
+                      status = 'available';
+                      summaryCount = 0;
+                      availableCount = 0; // 1. 检查商品的提前量等情况是否满足
                       _checkSessionProductL = checkSessionProductLeadTime(tempProducts), latestStartDate = _checkSessionProductL.latestStartDate, earliestEndDate = _checkSessionProductL.earliestEndDate;
                       if (latestStartDate || earliestEndDate) {
                         // 如果时间在最早开始时间之前，则设置为不可用
@@ -3895,17 +3934,25 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                       if (status === 'available') {
                         minTimeMaxTime = calcMinTimeMaxTimeBySchedules(targetSchedules, {}, currentDateStr);
                         scheduleTimeSlots = getAllSortedDateRanges(minTimeMaxTime); // 同一天内多个时间片下 只要有一个可用则视为可用
-                        timesSlotCanUse = scheduleTimeSlots.some(function (item) {
+                        timesSlotCanUse = false;
+                        scheduleTimeSlots.forEach(function (item) {
                           // 用来计算资源的可使用情况，针对单个schedule 时间片
                           var resourcesUseableMap = {};
                           // 遍历产品下启用的资源
                           // 必须要保证每种类型的资源都至少有一个能够在对应时间点被选择
-                          return openResources.every(function (resource) {
+                          // 求出第一个资源的剩余量和总量
+                          // 剩余量=每个资源在每个时间片内剩余之和
+                          // 总量=每个资源在每个时间片内资源总量之和
+                          var isAllResourceTypesUseable = true;
+                          openResources.forEach(function (resource) {
+                            // if (!isAllResourceTypesUseable) return;
+
                             // 获取当前资源类型的资源列表
                             var currentResourcesList = allProductResources.filter(function (n) {
                               return n.form_id === resource.resource_type_id;
                             });
-                            return currentResourcesList === null || currentResourcesList === void 0 ? void 0 : currentResourcesList.some(function (m) {
+                            var isAnyResourceUseableInType = false;
+                            currentResourcesList === null || currentResourcesList === void 0 || currentResourcesList.forEach(function (m) {
                               // 遍历所有资源的上工时间片
                               // m.times 需要做个过滤，假设 timeSlice.start_at 是 09:30 timeSlice.end_at 是 11:30
                               // time 是 time.start_at = 2025-05-26 10:30, time.end_at = 2025-05-26 12:30
@@ -3913,12 +3960,20 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                               var mTimes = m.times.filter(function (n) {
                                 return !dayjs(n.start_at).isAfter(dayjs(item.start), 'minute') && !dayjs(n.end_at).isBefore(dayjs(item.end), 'minute');
                               });
+
                               // 如果在这个区间的时间一个都没有，可以直接认为这个资源不可用
-                              if (mTimes.length === 0) {
-                                return;
+                              if (mTimes.length === 0) return;
+                              // 如果资源可用则把他的容量纳入总计
+                              if (resource.type === 'multiple') {
+                                summaryCount += m.capacity;
+                              } else {
+                                summaryCount += 1;
                               }
-                              var targetCanUseTimes = mTimes.some(function (childTiem) {
+                              var isAnyTimeSliceUseable = false;
+                              mTimes.forEach(function (childTiem) {
                                 var _tempProducts3;
+                                if (isAnyTimeSliceUseable) return;
+
                                 // 挨个去匹配某个工作时间段结合当前日程时间，资源能不能用，有多少容量能用
                                 var res = getIsUsableByTimeItem({
                                   timeSlice: {
@@ -3936,11 +3991,21 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                                 if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
                                   resourcesUseableMap[m.id] = res.usable;
                                 }
-                                return res.usable && !m.onlyComputed;
+                                if (res.usable && !m.onlyComputed) {
+                                  isAnyTimeSliceUseable = true;
+                                  if (resource.type === 'multiple') {
+                                    availableCount += res.remainingCapacity;
+                                  } else {
+                                    availableCount += 1;
+                                  }
+                                }
+                                ;
                               });
-                              return targetCanUseTimes;
+                              if (isAnyTimeSliceUseable) isAnyResourceUseableInType = true;
                             });
+                            if (!isAnyResourceUseableInType) isAllResourceTypesUseable = false;
                           });
+                          if (isAllResourceTypesUseable) timesSlotCanUse = true;
                         });
                         if (!timesSlotCanUse) {
                           status = 'unavailable';
@@ -3949,22 +4014,36 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                           firstAvailableDate = currentDateStr;
                         }
                       }
+                      // 状态： lots_of_space: availableCount / summaryCount > 0.5
+                      // filling_up_fast: availableCount / summaryCount <= 0.5 && availableCount > 0
+                      // sold_out: summaryCount = 0
+                      // unavailable: summaryCount > 0 && availableCount = 0
+
+                      if (status === 'unavailable') {
+                        // dateStatus = 'unavailable'
+                        if (availableCount === 0 && summaryCount > 0) dateStatus = 'sold_out';else dateStatus = 'unavailable';
+                      } else {
+                        usageRatio = availableCount / summaryCount;
+                        if (usageRatio > 0.5) dateStatus = 'lots_of_space';else dateStatus = 'filling_up_fast';
+                      }
                       dates.push({
                         date: dayjs(currentDate).format('YYYY-MM-DD'),
                         week: dayjs(currentDate).format('ddd'),
                         weekNum: dayjs(currentDate).day(),
-                        status: status
+                        summaryCount: summaryCount,
+                        availableCount: availableCount,
+                        status: dateStatus
                       });
 
                       // 如果 firstAvailableDate 距离 startDate 大于 14 天了，则后面就不需要再找了，也是一种性能保护
                       if (!(firstAvailableDate && dayjs(currentDate).diff(dayjs(startDate), 'day') > 31)) {
-                        _context27.next = 9;
+                        _context27.next = 12;
                         break;
                       }
                       return _context27.abrupt("return", 1);
-                    case 9:
+                    case 12:
                       currentDate = dayjs(currentDate).add(1, 'day');
-                    case 10:
+                    case 13:
                     case "end":
                       return _context27.stop();
                   }

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

@@ -320,7 +320,7 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
         resourcesInType.forEach(function (resource) {
           // 过滤出在时间段内的资源时间片
           var availableTimes = resource.times.filter(function (time) {
-            return !dayjs(time.start_at).isAfter(dayjs(timeSlotStart), 'minute') && !dayjs(time.end_at).isBefore(dayjs(timeSlotEnd), 'minute') || dayjs(time.start_at).isBefore(dayjs(timeSlotEnd), 'minute') && dayjs(time.end_at).isAfter(dayjs(timeSlotStart), 'minute');
+            return !dayjs(time.start_at).isAfter(dayjs(timeSlotStart), 'minute') && !dayjs(time.end_at).isBefore(dayjs(timeSlotEnd), 'minute') || resource.onlyComputed && dayjs(time.start_at).isBefore(dayjs(timeSlotEnd), 'minute') && dayjs(time.end_at).isAfter(dayjs(timeSlotStart), 'minute');
           });
           if (availableTimes.length > 0) {
             // 简化逻辑：如果资源在时间段内有可用时间，就计算其容量

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

@@ -115,7 +115,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/modules/Date/types.d.ts

@@ -20,7 +20,9 @@ export interface ITime {
     date: string;
     week: string;
     weekNum: number;
-    status: 'unavailable' | 'available';
+    status: 'unavailable' | 'available' | 'lots_of_space' | 'filling_up_fast' | 'sold_out';
+    summaryCount?: number;
+    availableCount?: number;
     resource?: any[];
     color?: string[];
 }

package/lib/modules/Rules/index.js

@@ -96,11 +96,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         productList
       };
     }
-    const filteredOldDiscountList = oldDiscountList.filter((discount) => !discount.isEditMode && discount.tag !== "good_pass");
-    const mergedDiscountList = (0, import_utils.uniqueById)((0, import_utils.uniqueById)([
+    const filteredOldDiscountList = oldDiscountList.filter(
+      (discount) => !discount.isEditMode && (discount.tag !== "good_pass" || discount.isScan)
+    );
+    const mergedDiscountList = (0, import_utils.uniqueById)([
       ...filteredOldDiscountList,
       ...newDiscountList
-    ]), "product_id");
+    ]);
     const result = this.calcDiscount({
       discountList: mergedDiscountList,
       productList: [...productList],
@@ -431,9 +433,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           };
         }
         const quantity = flatItem.type === "main" ? product.quantity || 1 : (product.num || 1) * (((_a = flatItem.parentProduct) == null ? void 0 : _a.quantity) || 1);
+        const originalAmount = flatItem.type === "main" ? Number(product.price ?? 0) : Number(flatItem.original_price ?? flatItem.price ?? 0);
         const productData = {
           productId: flatItem._id,
-          amount: Number(product.price || 0),
+          amount: originalAmount,
           quantity
         };
         if (flatItem.type === "bundle") {

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

@@ -316,6 +316,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
+        status: keyof TimeStatusMap;
     }[];
     /**
      * 找到多个资源的公共可用时间段
@@ -343,7 +344,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *
@@ -380,3 +381,9 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     */
     getContactInfo(params: any): Promise<any>;
 }
+interface TimeStatusMap {
+    lots_of_space: true;
+    filling_up_fast: true;
+    sold_out: true;
+}
+export {};

package/lib/solution/BookingByStep/index.js

@@ -1685,7 +1685,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     resources,
     product
   }) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
     const targetProduct = this.store.currentProduct;
     const targetProductData = product || targetProduct;
     let targetSchedules = [];
@@ -1731,17 +1731,22 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const firstEnabledResourceId = (_e = (_d = (_c = targetProductData == null ? void 0 : targetProductData.product_resource) == null ? void 0 : _c.resources) == null ? void 0 : _d.find(
       (n) => n.status === 1
     )) == null ? void 0 : _e.id;
+    const firstEnabledResourceConfig = (_g = (_f = targetProductData == null ? void 0 : targetProductData.product_resource) == null ? void 0 : _f.resources) == null ? void 0 : _g.find(
+      (n) => n.status === 1 && n.id === firstEnabledResourceId
+    );
+    const isMultipleBooking = (firstEnabledResourceConfig == null ? void 0 : firstEnabledResourceConfig.type) === "multiple";
     const formatScheduleTimeSlots = scheduleTimeSlots.map((item) => {
       const resourcesUseableMap = {};
       let count = 0;
       let bookingLeft = 0;
       let summaryCount = 0;
+      let summaryConfigCount = 0;
       allProductResources == null ? void 0 : allProductResources.forEach((m) => {
         let currentResourcesCount = 0;
         let currentResourcesSummaryCount = 0;
         const currentResourcesTimeSlotCanUsedArr = [];
         const mTimes = m.times.filter((n) => {
-          return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(item.start), "minute") && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(item.end), "minute") || (0, import_dayjs.default)(n.start_at).isBefore((0, import_dayjs.default)(item.end), "minute") && (0, import_dayjs.default)(n.end_at).isAfter((0, import_dayjs.default)(item.start), "minute");
+          return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(item.start), "minute") && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(item.end), "minute") || m.onlyComputed && (0, import_dayjs.default)(n.start_at).isBefore((0, import_dayjs.default)(item.end), "minute") && (0, import_dayjs.default)(n.end_at).isAfter((0, import_dayjs.default)(item.start), "minute");
         });
         if (mTimes.length === 0) {
           return;
@@ -1771,6 +1776,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           }
           currentResourcesTimeSlotCanUsedArr.push(res.usable);
         });
+        if (m.form_id === firstEnabledResourceId) {
+          if (isMultipleBooking) {
+            summaryConfigCount += m.capacity;
+          } else {
+            summaryConfigCount += 1;
+          }
+        }
         if (!currentResourcesTimeSlotCanUsedArr.some(
           (n) => n === false
         ) && // 只统计第一种资源的容量和 left
@@ -1884,6 +1896,34 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       });
       const startDayJs = (0, import_dayjs.default)(item.start);
       const endDayJs = (0, import_dayjs.default)(item.end);
+      let timeStatus = "sold_out";
+      if (bookingLeft === 0)
+        timeStatus = "sold_out";
+      else if (isMultipleBooking) {
+        if (summaryConfigCount === 0)
+          timeStatus = "sold_out";
+        else {
+          const usageRatio = summaryCount / summaryConfigCount;
+          if (usageRatio > 0.5)
+            timeStatus = "lots_of_space";
+          else if (summaryCount > 0)
+            timeStatus = "filling_up_fast";
+          else
+            timeStatus = "sold_out";
+        }
+      } else {
+        if (summaryConfigCount === 0)
+          timeStatus = "sold_out";
+        else {
+          const usageRatio = bookingLeft / summaryConfigCount;
+          if (usageRatio > 0.5)
+            timeStatus = "lots_of_space";
+          else if (count > 0)
+            timeStatus = "filling_up_fast";
+          else
+            timeStatus = "sold_out";
+        }
+      }
       return {
         start_time: startDayJs.format("HH:mm"),
         end_time: endDayJs.format("HH:mm"),
@@ -1891,7 +1931,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         end_at: endDayJs,
         count,
         left: bookingLeft,
-        summaryCount
+        summaryCount,
+        status: timeStatus
       };
     });
     return formatScheduleTimeSlots;
@@ -2662,6 +2703,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     while ((0, import_dayjs.default)(currentDate).isBefore((0, import_dayjs.default)(endDate), "day") || (0, import_dayjs.default)(currentDate).isSame((0, import_dayjs.default)(endDate), "day")) {
       const currentDateStr = currentDate.format("YYYY-MM-DD");
       let status = "available";
+      let summaryCount = 0;
+      let availableCount = 0;
       const { latestStartDate, earliestEndDate } = (0, import_resources.checkSessionProductLeadTime)(tempProducts);
       if (latestStartDate || earliestEndDate) {
         if (latestStartDate && (0, import_dayjs.default)(currentDate).isBefore(latestStartDate, "day")) {
@@ -2686,43 +2729,64 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           currentDateStr
         );
         const scheduleTimeSlots = (0, import_utils3.getAllSortedDateRanges)(minTimeMaxTime);
-        const timesSlotCanUse = scheduleTimeSlots.some((item) => {
+        let timesSlotCanUse = false;
+        scheduleTimeSlots.forEach((item) => {
           const resourcesUseableMap = {};
-          return openResources.every((resource) => {
+          let isAllResourceTypesUseable = true;
+          openResources.forEach((resource) => {
             const currentResourcesList = allProductResources.filter(
               (n) => n.form_id === resource.resource_type_id
             );
-            return currentResourcesList == null ? void 0 : currentResourcesList.some((m) => {
+            let isAnyResourceUseableInType = false;
+            currentResourcesList == null ? void 0 : currentResourcesList.forEach((m) => {
               const mTimes = m.times.filter((n) => {
                 return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(item.start), "minute") && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(item.end), "minute");
               });
-              if (mTimes.length === 0) {
+              if (mTimes.length === 0)
                 return;
+              if (resource.type === "multiple") {
+                summaryCount += m.capacity;
+              } else {
+                summaryCount += 1;
               }
-              const targetCanUseTimes = mTimes.some(
-                (childTiem) => {
-                  const res2 = (0, import_resources.getIsUsableByTimeItem)({
-                    timeSlice: {
-                      start_time: item.start,
-                      end_time: item.end,
-                      start_at: (0, import_dayjs.default)(item.start),
-                      end_at: (0, import_dayjs.default)(item.end)
-                    },
-                    time: childTiem,
-                    resource: m,
-                    currentCount: 1,
-                    resourcesUseableMap,
-                    cut_off_time: tempProducts == null ? void 0 : tempProducts.cut_off_time
-                  });
-                  if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false && res2.reason !== "capacityOnly") {
-                    resourcesUseableMap[m.id] = res2.usable;
+              let isAnyTimeSliceUseable = false;
+              mTimes.forEach((childTiem) => {
+                if (isAnyTimeSliceUseable)
+                  return;
+                const res2 = (0, import_resources.getIsUsableByTimeItem)({
+                  timeSlice: {
+                    start_time: item.start,
+                    end_time: item.end,
+                    start_at: (0, import_dayjs.default)(item.start),
+                    end_at: (0, import_dayjs.default)(item.end)
+                  },
+                  time: childTiem,
+                  resource: m,
+                  currentCount: 1,
+                  resourcesUseableMap,
+                  cut_off_time: tempProducts == null ? void 0 : tempProducts.cut_off_time
+                });
+                if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false && res2.reason !== "capacityOnly") {
+                  resourcesUseableMap[m.id] = res2.usable;
+                }
+                if (res2.usable && !m.onlyComputed) {
+                  isAnyTimeSliceUseable = true;
+                  if (resource.type === "multiple") {
+                    availableCount += res2.remainingCapacity;
+                  } else {
+                    availableCount += 1;
                   }
-                  return res2.usable && !m.onlyComputed;
                 }
-              );
-              return targetCanUseTimes;
+                ;
+              });
+              if (isAnyTimeSliceUseable)
+                isAnyResourceUseableInType = true;
             });
+            if (!isAnyResourceUseableInType)
+              isAllResourceTypesUseable = false;
           });
+          if (isAllResourceTypesUseable)
+            timesSlotCanUse = true;
         });
         if (!timesSlotCanUse) {
           status = "unavailable";
@@ -2731,11 +2795,26 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           firstAvailableDate = currentDateStr;
         }
       }
+      let dateStatus;
+      if (status === "unavailable") {
+        if (availableCount === 0 && summaryCount > 0)
+          dateStatus = "sold_out";
+        else
+          dateStatus = "unavailable";
+      } else {
+        const usageRatio = availableCount / summaryCount;
+        if (usageRatio > 0.5)
+          dateStatus = "lots_of_space";
+        else
+          dateStatus = "filling_up_fast";
+      }
       dates.push({
         date: (0, import_dayjs.default)(currentDate).format("YYYY-MM-DD"),
         week: (0, import_dayjs.default)(currentDate).format("ddd"),
         weekNum: (0, import_dayjs.default)(currentDate).day(),
-        status
+        summaryCount,
+        availableCount,
+        status: dateStatus
       });
       if (firstAvailableDate && (0, import_dayjs.default)(currentDate).diff((0, import_dayjs.default)(startDate), "day") > 31) {
         break;

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

@@ -230,7 +230,7 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
       let totalAvailableCapacity = 0;
       resourcesInType.forEach((resource) => {
         const availableTimes = resource.times.filter((time) => {
-          return !(0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && !(0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") || (0, import_dayjs.default)(time.start_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") && (0, import_dayjs.default)(time.end_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute");
+          return !(0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && !(0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") || resource.onlyComputed && (0, import_dayjs.default)(time.start_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") && (0, import_dayjs.default)(time.end_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute");
         });
         if (availableTimes.length > 0) {
           totalAvailableCapacity += resource.capacity || 0;

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

@@ -115,7 +115,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/package.json

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