@pisell/pisellos 0.0.72 → 0.0.74

package/dist/solution/BookingByStep/index.js

@@ -1209,7 +1209,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   currentCount: recordCount + (currentCapacity || 0),
                   resourcesUseableMap: resourcesUseableMap
                 });
-                if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false) {
+                // 如果仅仅是因为子资源容量不够，不应该标记子资源是被占用的情况
+                if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
                   resourcesUseableMap[m.id] = res.usable;
                 }
                 return res.usable;
@@ -1389,7 +1390,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 currentCount: recordCount + (capacity || 0),
                 resourcesUseableMap: resourcesUseableMap
               });
-              if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[n.id]) !== false) {
+              // 如果只是因为子资源容量不够，而不是子资源被预约导致没时间片，不应该标记子资源为不可用，从而影响组合资源的情况
+              if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[n.id]) !== false && res.reason !== 'capacityOnly') {
                 resourcesUseableMap[n.id] = res.usable;
               }
               return res.usable;
@@ -1845,7 +1847,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         var count = 0;
         // 遍历所有资源
         allProductResources === null || allProductResources === void 0 || allProductResources.forEach(function (m) {
+          debugger;
           // 遍历所有资源的上工时间片
+          var currentResourcesCount = 0;
+          var currentResourcesTimeSlotCanUsedArr = [];
           m.times.forEach(function (childTiem) {
             // 挨个去匹配某个工作时间段结合当前日程时间，资源能不能用，有多少容量能用
             var res = getIsUsableByTimeItem({
@@ -1858,15 +1863,23 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               time: childTiem,
               resource: m,
               currentCount: 1,
-              resourcesUseableMap: resourcesUseableMap
+              resourcesUseableMap: resourcesUseableMap,
+              cut_off_time: targetProductData === null || targetProductData === void 0 ? void 0 : targetProductData.cut_off_time
             });
-            if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false) {
+            if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
               resourcesUseableMap[m.id] = res.usable;
             }
-            if (res.usable && res.remainingCapacity >= count) {
-              count = res.remainingCapacity;
+            if (res.usable && res.remainingCapacity >= count && !m.onlyComputed) {
+              currentResourcesCount = res.remainingCapacity;
             }
+            currentResourcesTimeSlotCanUsedArr.push(res.usable);
           });
+          // 在已经选定时间的情况下，只要canUseTime 里有一个 false，那就代表不可用
+          if (!currentResourcesTimeSlotCanUsedArr.some(function (n) {
+            return n === false;
+          })) {
+            count = currentResourcesCount;
+          }
         });
         var startDayJs = dayjs(item.start);
         var endDayJs = dayjs(item.end);

package/dist/solution/BookingByStep/utils/resources.d.ts

@@ -27,17 +27,23 @@ interface BookingItem {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, currentCount, resourcesUseableMap, }: {
+export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, currentCount, resourcesUseableMap, cut_off_time, }: {
     timeSlice: TimeSliceItem;
     time: any;
     resource: ResourceItem;
     currentCount: number;
     resourcesUseableMap: Record<string, boolean>;
+    cut_off_time?: {
+        future_day: number;
+        unit: number;
+        unit_type: string;
+    } | undefined;
 }) => {
     afterToDay: boolean;
     capacity: boolean;
     usable: boolean;
     remainingCapacity: number;
+    reason: string;
 };
 /**
  * @title: 获取商品下绑定的资源列表

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

@@ -113,7 +113,8 @@ var checkCapacity = function checkCapacity(_ref) {
   if (currentCount > resource.capacity) {
     return {
       status: false,
-      capacity: resource.capacity
+      capacity: resource.capacity,
+      reason: 'capacityOnly'
     };
   }
   var conflict = (event_list || []).filter(function (d) {
@@ -174,15 +175,24 @@ export var getIsUsableByTimeItem = function getIsUsableByTimeItem(_ref2) {
     _ref2$currentCount = _ref2.currentCount,
     currentCount = _ref2$currentCount === void 0 ? 1 : _ref2$currentCount,
     _ref2$resourcesUseabl = _ref2.resourcesUseableMap,
-    resourcesUseableMap = _ref2$resourcesUseabl === void 0 ? {} : _ref2$resourcesUseabl;
+    resourcesUseableMap = _ref2$resourcesUseabl === void 0 ? {} : _ref2$resourcesUseabl,
+    cut_off_time = _ref2.cut_off_time;
   var status = {
     afterToDay: false,
     capacity: false,
     usable: false,
-    remainingCapacity: 0 // 剩余容量
+    remainingCapacity: 0,
+    // 剩余容量
+    reason: ''
   };
   // 最早可预约时间为 当前日期之后并且提前量之后
   var earliest = dayjs();
+  var _ref3 = cut_off_time || {},
+    unit = _ref3.unit,
+    unit_type = _ref3.unit_type;
+  if (unit) {
+    earliest = earliest.add(unit, unit_type);
+  }
   // 不可预约提前量时间之前的
   if (!checkAfterToDay(timeSlice.start_at, earliest)) {
     return status;
@@ -204,6 +214,7 @@ export var getIsUsableByTimeItem = function getIsUsableByTimeItem(_ref2) {
       }
     });
   }
+  status.reason = checkCapacityResult.reason || '';
   if (!checkCapacityResult.status) {
     return status;
   }
@@ -319,9 +330,9 @@ export var getResourcesByProduct = function getResourcesByProduct(resourcesMap,
  * @Author: zhiwei.Wang
  * @Date: 2024-01-09 13:38
  */
-export var formatResources = function formatResources(_ref3) {
-  var booking = _ref3.booking,
-    resources = _ref3.resources;
+export var formatResources = function formatResources(_ref4) {
+  var booking = _ref4.booking,
+    resources = _ref4.resources;
   try {
     var _list = _toConsumableArray(resources);
     var maps = {};
@@ -367,16 +378,16 @@ export var formatResources = function formatResources(_ref3) {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref4) {
-  var resource = _ref4.resource,
-    duration = _ref4.duration,
-    _ref4$split = _ref4.split,
-    split = _ref4$split === void 0 ? 10 : _ref4$split,
-    _ref4$currentDate = _ref4.currentDate,
-    currentDate = _ref4$currentDate === void 0 ? dayjs() : _ref4$currentDate,
-    capacity = _ref4.capacity,
-    _ref4$resourcesUseabl = _ref4.resourcesUseableMap,
-    resourcesUseableMap = _ref4$resourcesUseabl === void 0 ? {} : _ref4$resourcesUseabl;
+export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref5) {
+  var resource = _ref5.resource,
+    duration = _ref5.duration,
+    _ref5$split = _ref5.split,
+    split = _ref5$split === void 0 ? 10 : _ref5$split,
+    _ref5$currentDate = _ref5.currentDate,
+    currentDate = _ref5$currentDate === void 0 ? dayjs() : _ref5$currentDate,
+    capacity = _ref5.capacity,
+    _ref5$resourcesUseabl = _ref5.resourcesUseableMap,
+    resourcesUseableMap = _ref5$resourcesUseabl === void 0 ? {} : _ref5$resourcesUseabl;
   var times = resource.times;
 
   // 存储所有时间切片
@@ -517,14 +528,14 @@ export var mergeSubResourcesTimeSlices = function mergeSubResourcesTimeSlices(re
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export var getTimeSlicesByResources = function getTimeSlicesByResources(_ref5) {
-  var resourceIds = _ref5.resourceIds,
-    resourcesMap = _ref5.resourcesMap,
-    duration = _ref5.duration,
-    currentDate = _ref5.currentDate,
-    split = _ref5.split,
-    capacity = _ref5.capacity,
-    resourcesUseableMap = _ref5.resourcesUseableMap;
+export var getTimeSlicesByResources = function getTimeSlicesByResources(_ref6) {
+  var resourceIds = _ref6.resourceIds,
+    resourcesMap = _ref6.resourcesMap,
+    duration = _ref6.duration,
+    currentDate = _ref6.currentDate,
+    split = _ref6.split,
+    capacity = _ref6.capacity,
+    resourcesUseableMap = _ref6.resourcesUseableMap;
   // 获取资源列表
   var resources = getResourcesByIds(resourcesMap, resourceIds);
   mergeSubResourcesTimeSlices(resources, resourcesMap);
@@ -656,9 +667,9 @@ export var getOthersCartSelectedResources = function getOthersCartSelectedResour
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export var formatDefaultCapacitys = function formatDefaultCapacitys(_ref6) {
-  var capacity = _ref6.capacity,
-    product_bundle = _ref6.product_bundle;
+export var formatDefaultCapacitys = function formatDefaultCapacitys(_ref7) {
+  var capacity = _ref7.capacity,
+    product_bundle = _ref7.product_bundle;
   if ((capacity === null || capacity === void 0 ? void 0 : capacity.type) === 'package') {
     return (product_bundle || []).map(function (d) {
       var id = d.bundle_product_id;
@@ -697,8 +708,8 @@ export var formatDefaultCapacitys = function formatDefaultCapacitys(_ref6) {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export var getSumCapacity = function getSumCapacity(_ref7) {
-  var capacity = _ref7.capacity;
+export var getSumCapacity = function getSumCapacity(_ref8) {
+  var capacity = _ref8.capacity;
   var sum = 0;
   var _iterator2 = _createForOfIteratorHelper(capacity || []),
     _step2;

package/lib/solution/BookingByStep/index.js

@@ -661,7 +661,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
                 currentCount: recordCount + (currentCapacity || 0),
                 resourcesUseableMap
               });
-              if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false) {
+              if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== "capacityOnly") {
                 resourcesUseableMap[m.id] = res.usable;
               }
               return res.usable;
@@ -820,7 +820,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             currentCount: recordCount + (capacity || 0),
             resourcesUseableMap
           });
-          if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[n.id]) !== false) {
+          if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[n.id]) !== false && res.reason !== "capacityOnly") {
             resourcesUseableMap[n.id] = res.usable;
           }
           return res.usable;
@@ -1218,6 +1218,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const formatScheduleTimeSlots = scheduleTimeSlots.map((item) => {
       let count = 0;
       allProductResources == null ? void 0 : allProductResources.forEach((m) => {
+        debugger;
+        let currentResourcesCount = 0;
+        const currentResourcesTimeSlotCanUsedArr = [];
         m.times.forEach((childTiem) => {
           const res = (0, import_resources.getIsUsableByTimeItem)({
             timeSlice: {
@@ -1229,15 +1232,20 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             time: childTiem,
             resource: m,
             currentCount: 1,
-            resourcesUseableMap
+            resourcesUseableMap,
+            cut_off_time: targetProductData == null ? void 0 : targetProductData.cut_off_time
           });
-          if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false) {
+          if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== "capacityOnly") {
             resourcesUseableMap[m.id] = res.usable;
           }
-          if (res.usable && res.remainingCapacity >= count) {
-            count = res.remainingCapacity;
+          if (res.usable && res.remainingCapacity >= count && !m.onlyComputed) {
+            currentResourcesCount = res.remainingCapacity;
           }
+          currentResourcesTimeSlotCanUsedArr.push(res.usable);
         });
+        if (!currentResourcesTimeSlotCanUsedArr.some((n) => n === false)) {
+          count = currentResourcesCount;
+        }
       });
       const startDayJs = (0, import_dayjs.default)(item.start);
       const endDayJs = (0, import_dayjs.default)(item.end);

package/lib/solution/BookingByStep/utils/resources.d.ts

@@ -27,17 +27,23 @@ interface BookingItem {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, currentCount, resourcesUseableMap, }: {
+export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, currentCount, resourcesUseableMap, cut_off_time, }: {
     timeSlice: TimeSliceItem;
     time: any;
     resource: ResourceItem;
     currentCount: number;
     resourcesUseableMap: Record<string, boolean>;
+    cut_off_time?: {
+        future_day: number;
+        unit: number;
+        unit_type: string;
+    } | undefined;
 }) => {
     afterToDay: boolean;
     capacity: boolean;
     usable: boolean;
     remainingCapacity: number;
+    reason: string;
 };
 /**
  * @title: 获取商品下绑定的资源列表

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

@@ -85,7 +85,8 @@ var checkCapacity = ({
   if (currentCount > resource.capacity) {
     return {
       status: false,
-      capacity: resource.capacity
+      capacity: resource.capacity,
+      reason: "capacityOnly"
     };
   }
   let conflict = (event_list || []).filter((d) => {
@@ -126,17 +127,23 @@ var getIsUsableByTimeItem = ({
   time,
   resource,
   currentCount = 1,
-  resourcesUseableMap = {}
+  resourcesUseableMap = {},
+  cut_off_time
 }) => {
   var _a;
   let status = {
     afterToDay: false,
     capacity: false,
     usable: false,
-    remainingCapacity: 0
+    remainingCapacity: 0,
     // 剩余容量
+    reason: ""
   };
   let earliest = (0, import_dayjs.default)();
+  const { unit, unit_type } = cut_off_time || {};
+  if (unit) {
+    earliest = earliest.add(unit, unit_type);
+  }
   if (!checkAfterToDay(timeSlice.start_at, earliest)) {
     return status;
   }
@@ -155,6 +162,7 @@ var getIsUsableByTimeItem = ({
       }
     });
   }
+  status.reason = checkCapacityResult.reason || "";
   if (!checkCapacityResult.status) {
     return status;
   }
@@ -370,7 +378,9 @@ var mergeSubResourcesTimeSlices = (resources, resourcesMap) => {
         const subResource = resourcesMap[id];
         if (subResource) {
           subResource.times.forEach((time) => {
-            const fatherResourcesTime = item.times.find((n) => n.start_at === time.start_at && n.end_at === time.end_at);
+            const fatherResourcesTime = item.times.find(
+              (n) => n.start_at === time.start_at && n.end_at === time.end_at
+            );
             if (fatherResourcesTime) {
               fatherResourcesTime.event_list.push(...time.event_list || []);
             }

package/package.json

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