@pisell/pisellos 0.0.418 → 0.0.419

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/dist/solution/BookingByStep/index.js

@@ -2208,12 +2208,22 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       }
       // 计算容量的辅助函数
       var calculateCapacityFromCartItems = function calculateCapacityFromCartItems(items) {
+        var _items$0$_resourceOri;
+        // 还需要增加一个判断，maxCapacity 必须是我单个人里选择的资源只有同一种的情况下才可以累加，否则单个账号都是 1
+        var firstResource = (_items$0$_resourceOri = items[0]._resourceOrigin) === null || _items$0$_resourceOri === void 0 ? void 0 : _items$0$_resourceOri[0].id;
+        var sameResourceLength = items.filter(function (item) {
+          var _item$_resourceOrigin;
+          return ((_item$_resourceOrigin = item._resourceOrigin) === null || _item$_resourceOrigin === void 0 ? void 0 : _item$_resourceOrigin[0].id) === firstResource;
+        }).length;
+        if (sameResourceLength !== items.length) {
+          return 1;
+        }
         return items.reduce(function (total, item) {
           return total + (getCapacityInfoByCartItem(item).currentCapacity || 0);
         }, 0);
       };
 
-      // 如果是多个预约，去要求出几个 holder 下最大的需求容量capacity
+      // 如果是多个人预约，去要求出几个 holder 下最大的商品需求容量capacity
       var maxCapacity = 1;
       if (cartItems !== null && cartItems !== void 0 && cartItems[0].holder_id) {
         accountList.forEach(function (account) {
@@ -2368,6 +2378,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
               // 计算容量的辅助函数
               calculateCapacityFromCartItems = function calculateCapacityFromCartItems(items) {
+                var _items$0$_resourceOri2;
+                // 还需要增加一个判断，maxCapacity 必须是我单个人里选择的资源只有同一种的情况下才可以累加，否则单个账号都是 1
+                var firstResource = (_items$0$_resourceOri2 = items[0]._resourceOrigin) === null || _items$0$_resourceOri2 === void 0 ? void 0 : _items$0$_resourceOri2[0].id;
+                var sameResourceLength = items.filter(function (item) {
+                  var _item$_resourceOrigin2;
+                  return ((_item$_resourceOrigin2 = item._resourceOrigin) === null || _item$_resourceOrigin2 === void 0 ? void 0 : _item$_resourceOrigin2[0].id) === firstResource;
+                }).length;
+                if (sameResourceLength !== items.length) {
+                  return 1;
+                }
                 return items.reduce(function (total, item) {
                   return total + (getCapacityInfoByCartItem(item).currentCapacity || 0);
                 }, 0);
@@ -2743,9 +2763,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) {

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

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

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/lib/solution/BookingByStep/index.js

@@ -1530,6 +1530,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       }, 0);
     }
     const calculateCapacityFromCartItems = (items) => {
+      var _a2;
+      const firstResource = (_a2 = items[0]._resourceOrigin) == null ? void 0 : _a2[0].id;
+      const sameResourceLength = items.filter((item) => {
+        var _a3;
+        return ((_a3 = item._resourceOrigin) == null ? void 0 : _a3[0].id) === firstResource;
+      }).length;
+      if (sameResourceLength !== items.length) {
+        return 1;
+      }
       return items.reduce((total, item) => {
         return total + ((0, import_capacity.getCapacityInfoByCartItem)(item).currentCapacity || 0);
       }, 0);
@@ -1656,6 +1665,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       }, 0);
     }
     const calculateCapacityFromCartItems = (items) => {
+      var _a2;
+      const firstResource = (_a2 = items[0]._resourceOrigin) == null ? void 0 : _a2[0].id;
+      const sameResourceLength = items.filter((item) => {
+        var _a3;
+        return ((_a3 = item._resourceOrigin) == null ? void 0 : _a3[0].id) === firstResource;
+      }).length;
+      if (sameResourceLength !== items.length) {
+        return 1;
+      }
       return items.reduce((total, item) => {
         return total + ((0, import_capacity.getCapacityInfoByCartItem)(item).currentCapacity || 0);
       }, 0);
@@ -1926,7 +1944,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         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;

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

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

package/package.json

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