@pisell/pisellos 0.0.399 → 0.0.400

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

@@ -309,7 +309,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 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

@@ -2729,6 +2729,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         allProductResources === null || allProductResources === void 0 || allProductResources.forEach(function (m) {
           // 遍历所有资源的上工时间片
           var currentResourcesCount = 0;
+          var currentResourcesSummaryCount = 0;
           var currentResourcesTimeSlotCanUsedArr = [];
           // 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
@@ -2766,6 +2767,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             if (res.usable && res.remainingCapacity >= count && !m.onlyComputed) {
               currentResourcesCount = res.remainingCapacity;
             }
+            if (res.usable && !m.onlyComputed && res.remainingCapacity >= currentResourcesSummaryCount) {
+              currentResourcesSummaryCount = res.remainingCapacity;
+            }
             currentResourcesTimeSlotCanUsedArr.push(res.usable);
           });
           // 在已经选定时间的情况下，只要canUseTime如果有一个 false 那就不可用
@@ -2779,7 +2783,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             }
             if (!m.onlyComputed) {
               bookingLeft += 1;
-              summaryCount += currentResourcesCount;
+              summaryCount += currentResourcesSummaryCount;
             }
           }
         });

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

@@ -309,7 +309,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 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

@@ -1918,6 +1918,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       let summaryCount = 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");
@@ -1945,6 +1946,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           if (res.usable && res.remainingCapacity >= count && !m.onlyComputed) {
             currentResourcesCount = res.remainingCapacity;
           }
+          if (res.usable && !m.onlyComputed && res.remainingCapacity >= currentResourcesSummaryCount) {
+            currentResourcesSummaryCount = res.remainingCapacity;
+          }
           currentResourcesTimeSlotCanUsedArr.push(res.usable);
         });
         if (!currentResourcesTimeSlotCanUsedArr.some(
@@ -1956,7 +1960,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           }
           if (!m.onlyComputed) {
             bookingLeft += 1;
-            summaryCount += currentResourcesCount;
+            summaryCount += currentResourcesSummaryCount;
           }
         }
       });

package/package.json

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