@pisell/pisellos 3.0.14 → 3.0.16

package/dist/solution/BookingByStep/index.js

@@ -1196,7 +1196,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           capacity: formatCapacity
         });
         var productResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri2 = cartItem._productOrigin) === null || _cartItem$_productOri2 === void 0 || (_cartItem$_productOri2 = _cartItem$_productOri2.product_resource) === null || _cartItem$_productOri2 === void 0 ? void 0 : _cartItem$_productOri2.resources) || [], selectedResources, currentCapacity);
-        debugger;
         // 如果购物车里已经有了时间片，则需要按照时间片过滤
         if (cartItem._origin.start_time) {
           var startTime = dayjs("".concat(cartItem._origin.start_date, " ").concat(cartItem._origin.start_time));
@@ -1253,10 +1252,19 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         } else {
           productResources.forEach(function (item) {
             // 如果资源的 capacity 已经小于了当前需要的 capacity ，则需要把资源给过滤掉
+            // 同时，在这一步尝试去拉一下时间片，基于商品的时长，看每个资源是否还有空余时间能对这个商品做服务，如果没有则过滤
             item.renderList = item.renderList.filter(function (n) {
+              var _cartItem$_productOri3;
               var recordCount = n.capacity || 0;
               if (n.onlyComputed) return false;
-              return recordCount >= currentCapacity;
+              // 查一下这个资源基于商品的可用时间片
+              var timeSlots = getTimeSlicesByResource({
+                resource: n,
+                duration: ((_cartItem$_productOri3 = cartItem._productOrigin) === null || _cartItem$_productOri3 === void 0 || (_cartItem$_productOri3 = _cartItem$_productOri3.duration) === null || _cartItem$_productOri3 === void 0 ? void 0 : _cartItem$_productOri3.value) || 0,
+                split: 10,
+                currentDate: dateRange[0].date
+              });
+              return recordCount >= currentCapacity && timeSlots.length > 0;
             });
           });
         }
@@ -1352,7 +1360,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "autoSelectAccountResources",
     value: function autoSelectAccountResources(_ref8) {
-      var _cartItem$_productOri3, _allProductResources$;
+      var _cartItem$_productOri4, _allProductResources$;
       var cartItem = _ref8.cartItem,
         holder_id = _ref8.holder_id,
         resources_code = _ref8.resources_code,
@@ -1401,7 +1409,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var resourcesMap = getResourcesMap(cloneDeep(AllResources));
       var allCartItems = cloneDeep(this.store.cart.getItems());
       var selectedResources = getOthersSelectedResources(allCartItems, holder_id, resourcesMap);
-      var allProductResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri3 = cartItem._productOrigin) === null || _cartItem$_productOri3 === void 0 || (_cartItem$_productOri3 = _cartItem$_productOri3.product_resource) === null || _cartItem$_productOri3 === void 0 ? void 0 : _cartItem$_productOri3.resources) || [], selectedResources, 1);
+      var allProductResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri4 = cartItem._productOrigin) === null || _cartItem$_productOri4 === void 0 || (_cartItem$_productOri4 = _cartItem$_productOri4.product_resource) === null || _cartItem$_productOri4 === void 0 ? void 0 : _cartItem$_productOri4.resources) || [], selectedResources, 1);
       var resources = ((_allProductResources$ = allProductResources.find(function (n) {
         return n.code === resources_code;
       })) === null || _allProductResources$ === void 0 ? void 0 : _allProductResources$.renderList) || [];
@@ -1607,8 +1615,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               if ((_n$renderList = n.renderList) !== null && _n$renderList !== void 0 && _n$renderList.length) {
                 // 过滤掉 capacity 小于 currentCapacity 的资源
                 n.renderList = n.renderList.filter(function (m) {
+                  var _item$duration;
                   var recordCount = m.capacity || 0;
-                  return recordCount >= currentCapacity;
+                  var timeSlots = getTimeSlicesByResource({
+                    resource: m,
+                    duration: (item === null || item === void 0 || (_item$duration = item.duration) === null || _item$duration === void 0 ? void 0 : _item$duration.value) || 0,
+                    split: 10,
+                    currentDate: dateRange[0].date
+                  });
+                  return recordCount >= currentCapacity && timeSlots.length > 0;
                 });
                 currentResourcesRenderList.push.apply(currentResourcesRenderList, _toConsumableArray(n.renderList || []));
               }
@@ -1917,9 +1932,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         if (!aIsCombined && bIsCombined) return -1;
         return 0;
       });
-      var resourcesUseableMap = {};
+
       // 计算每个日程切片下日程可用的资源的容量总和
       var formatScheduleTimeSlots = scheduleTimeSlots.map(function (item) {
+        // 用来计算资源的可使用情况，针对单个schedule 时间片
+        var resourcesUseableMap = {};
         var count = 0;
         // 遍历所有资源
         allProductResources === null || allProductResources === void 0 || allProductResources.forEach(function (m) {
@@ -1962,7 +1979,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           // 在已经选定时间的情况下，只要canUseTime如果有一个 false 那就不可用
           if (!currentResourcesTimeSlotCanUsedArr.some(function (n) {
             return n === false;
-          })) {
+          }) && currentResourcesCount >= count) {
             count = currentResourcesCount;
           }
         });

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

@@ -110,7 +110,10 @@ var checkCapacity = function checkCapacity(_ref) {
     resource = _ref.resource,
     _ref$currentCount = _ref.currentCount,
     currentCount = _ref$currentCount === void 0 ? 1 : _ref$currentCount;
-  if (currentCount > resource.capacity) {
+  // 单个预约：如果当前资源容量不足以满足需求的容量，且当前资源是没有被占用的，返回资源不可用标记，但在外部运算会通过 reason=capacityOnly 来处理组合资源可用
+  // 多个预约：只需判断容量是否足够
+  var isMultipleBooking = resource.resourceType === 'multiple';
+  if (currentCount > resource.capacity && (isMultipleBooking || !isMultipleBooking && event_list.length === 0)) {
     return {
       status: false,
       capacity: resource.capacity,

package/lib/solution/BookingByStep/index.js

@@ -638,7 +638,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         selectedResources,
         currentCapacity
       );
-      debugger;
       if (cartItem._origin.start_time) {
         const startTime = (0, import_dayjs.default)(
           `${cartItem._origin.start_date} ${cartItem._origin.start_time}`
@@ -692,10 +691,17 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       } else {
         productResources.forEach((item) => {
           item.renderList = item.renderList.filter((n) => {
+            var _a2, _b2;
             const recordCount = n.capacity || 0;
             if (n.onlyComputed)
               return false;
-            return recordCount >= currentCapacity;
+            const timeSlots = (0, import_resources.getTimeSlicesByResource)({
+              resource: n,
+              duration: ((_b2 = (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) || 0,
+              split: 10,
+              currentDate: dateRange[0].date
+            });
+            return recordCount >= currentCapacity && timeSlots.length > 0;
           });
         });
       }
@@ -994,8 +1000,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             var _a3;
             if ((_a3 = n.renderList) == null ? void 0 : _a3.length) {
               n.renderList = n.renderList.filter((m) => {
+                var _a4;
                 const recordCount = m.capacity || 0;
-                return recordCount >= currentCapacity;
+                const timeSlots2 = (0, import_resources.getTimeSlicesByResource)({
+                  resource: m,
+                  duration: ((_a4 = item == null ? void 0 : item.duration) == null ? void 0 : _a4.value) || 0,
+                  split: 10,
+                  currentDate: dateRange[0].date
+                });
+                return recordCount >= currentCapacity && timeSlots2.length > 0;
               });
               currentResourcesRenderList.push(...n.renderList || []);
             }
@@ -1273,8 +1286,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         return -1;
       return 0;
     });
-    const resourcesUseableMap = {};
     const formatScheduleTimeSlots = scheduleTimeSlots.map((item) => {
+      const resourcesUseableMap = {};
       let count = 0;
       allProductResources == null ? void 0 : allProductResources.forEach((m) => {
         let currentResourcesCount = 0;
@@ -1307,7 +1320,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           }
           currentResourcesTimeSlotCanUsedArr.push(res.usable);
         });
-        if (!currentResourcesTimeSlotCanUsedArr.some((n) => n === false)) {
+        if (!currentResourcesTimeSlotCanUsedArr.some((n) => n === false) && currentResourcesCount >= count) {
           count = currentResourcesCount;
         }
       });

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

@@ -82,7 +82,8 @@ var checkCapacity = ({
   resource,
   currentCount = 1
 }) => {
-  if (currentCount > resource.capacity) {
+  const isMultipleBooking = resource.resourceType === "multiple";
+  if (currentCount > resource.capacity && (isMultipleBooking || !isMultipleBooking && event_list.length === 0)) {
     return {
       status: false,
       capacity: resource.capacity,

package/package.json

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