@pisell/pisellos 0.0.56 → 0.0.57

package/dist/solution/BookingByStep/index.js

@@ -1783,8 +1783,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               currentCount: 1
             });
             // 如果资源可用，且是独占资源，remainingCapacity 始终为 1
-            if (res.usable) {
-              count += (res === null || res === void 0 ? void 0 : res.remainingCapacity) || 0;
+            if (res.usable && res.remainingCapacity >= count) {
+              count = res.remainingCapacity;
             }
           });
         });

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

@@ -126,24 +126,24 @@ var checkCapacity = function checkCapacity(_ref) {
     });
   });
 
+  // 减去重叠的总量
+  var conflictCount = getUseableEventCount(conflict, resource.capacity);
+
   // 同一时间段内只能进行一个预约，无论容量是否已满。
   if (resource.resourceType === 'single') {
     // 0代表着不重叠,则满足条件
     if (conflict.length === 0) {
       return {
         status: true,
-        capacity: 1
+        capacity: conflictCount
       };
     } else {
       return {
         status: false,
-        capacity: 1
+        capacity: conflictCount
       };
     }
   } else {
-    // 减去重叠的总量
-    var conflictCount = getUseableEventCount(conflict, resource.capacity);
-
     // 当前预约量 <= 总剩余容量
     if (currentCount <= conflictCount) {
       return {
@@ -533,7 +533,6 @@ export var getOthersCartSelectedResources = function getOthersCartSelectedResour
     if (d._id !== cartItemId) {
       var _d$_origin2;
       if ((_d$_origin2 = d._origin) !== null && _d$_origin2 !== void 0 && _d$_origin2.resources) {
-        debugger;
         d._origin.resources.forEach(function (n) {
           // 如果是组合资源，还需要检查组合资源里子资源是否被占用过
           if (n.metadata.combined_resource && n.metadata.combined_resource.status === 1) {
@@ -643,13 +642,19 @@ export var getSumCapacity = function getSumCapacity(_ref7) {
  */
 export var checkSubResourcesCapacity = function checkSubResourcesCapacity(resource) {
   if (resource.children && resource.children.length) {
-    var countCapacity = resource.capacity;
-    resource.children.forEach(function (child) {
+    var countCapacity = resource.capacity; // 100
+    resource.children.forEach(function (child, index) {
+      if (index === resource.children.length - 1) {
+        // 如果是最后一个资源，直接拿剩余未分配完的容量去占用
+        // 哪怕这个东西会超过资源本身的 capacity也得让他占，PRD 里有写
+        child.capacity = countCapacity;
+        return;
+      }
       if (child.capacity <= countCapacity) {
-        countCapacity -= child.capacity;
+        countCapacity -= child.capacity; // 100 -  = 90
       } else {
-        child.capacity = countCapacity;
-        countCapacity = 0;
+        child.capacity = countCapacity; // 10
+        countCapacity = 0; // 0
       }
     });
   }

package/lib/solution/BookingByStep/index.js

@@ -1145,8 +1145,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             resource: m,
             currentCount: 1
           });
-          if (res.usable) {
-            count += (res == null ? void 0 : res.remainingCapacity) || 0;
+          if (res.usable && res.remainingCapacity >= count) {
+            count = res.remainingCapacity;
           }
         });
       });

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

@@ -93,20 +93,20 @@ var checkCapacity = ({
       { start_at: timeSlice.start_at, end_at: timeSlice.end_at }
     );
   });
+  let conflictCount = getUseableEventCount(conflict, resource.capacity);
   if (resource.resourceType === "single") {
     if (conflict.length === 0) {
       return {
         status: true,
-        capacity: 1
+        capacity: conflictCount
       };
     } else {
       return {
         status: false,
-        capacity: 1
+        capacity: conflictCount
       };
     }
   } else {
-    let conflictCount = getUseableEventCount(conflict, resource.capacity);
     if (currentCount <= conflictCount) {
       return {
         status: true,
@@ -385,7 +385,6 @@ var getOthersCartSelectedResources = (cartItems, cartItemId, resourcesMap) => {
     var _a;
     if (d._id !== cartItemId) {
       if ((_a = d._origin) == null ? void 0 : _a.resources) {
-        debugger;
         d._origin.resources.forEach((n) => {
           if (n.metadata.combined_resource && n.metadata.combined_resource.status === 1) {
             if (n.metadata.combined_resource.resource_ids.some(
@@ -453,7 +452,11 @@ var getSumCapacity = ({ capacity }) => {
 var checkSubResourcesCapacity = (resource) => {
   if (resource.children && resource.children.length) {
     let countCapacity = resource.capacity;
-    resource.children.forEach((child) => {
+    resource.children.forEach((child, index) => {
+      if (index === resource.children.length - 1) {
+        child.capacity = countCapacity;
+        return;
+      }
       if (child.capacity <= countCapacity) {
         countCapacity -= child.capacity;
       } else {

package/package.json

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