@pisell/pisellos 1.0.113 → 1.0.114

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

@@ -308,7 +308,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -355,7 +355,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
      *

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);

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

@@ -444,6 +444,10 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref5) {
     // 解析开始和结束时间
     var startTime = dayjs("".concat(time.start_at));
     var endTime = dayjs("".concat(time.end_at));
+    // 结束时间要做修复，如果time.end_at 是超过了 currentDate 的那一天，则把 end_at 设置为 currentDate 那一天的 23:59:59
+    if (endTime.isAfter(dayjs(currentDate).endOf('day'))) {
+      endTime = dayjs(currentDate).endOf('day');
+    }
 
     // 当前切片的开始时间
     var currentStart = startTime;

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

@@ -308,7 +308,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -355,7 +355,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
      *

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);

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

@@ -353,7 +353,10 @@ var getTimeSlicesByResource = ({
   });
   times.forEach((time) => {
     const startTime = (0, import_dayjs.default)(`${time.start_at}`);
-    const endTime = (0, import_dayjs.default)(`${time.end_at}`);
+    let endTime = (0, import_dayjs.default)(`${time.end_at}`);
+    if (endTime.isAfter((0, import_dayjs.default)(currentDate).endOf("day"))) {
+      endTime = (0, import_dayjs.default)(currentDate).endOf("day");
+    }
     let currentStart = startTime;
     while (true) {
       const currentEnd = currentStart.add(duration, "minute");

package/package.json

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