@pisell/pisellos 0.0.57 → 0.0.58

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

@@ -146,17 +146,6 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         resources: any[];
         currentResourceId: number;
     }): TimeSliceItem[];
-    autoSelectResource({ resourceProductData, resources, timeSlots, }: {
-        resourceProductData: any;
-        resources: any[];
-        timeSlots?: TimeSliceItem;
-    }): {
-        selectedResource: any;
-        timeSlots?: undefined;
-    } | {
-        timeSlots: any[];
-        selectedResource: any;
-    } | undefined;
     autoSelectAccountResources({ holder_id, resources_code, timeSlots, countMap, capacity, }: {
         holder_id: string;
         resources_code: string | number;

package/dist/solution/BookingByStep/index.js

@@ -1139,6 +1139,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         if (cartItem._origin.start_time) {
           var startTime = dayjs("".concat(cartItem._origin.start_date, " ").concat(cartItem._origin.start_time));
           var endTime = dayjs("".concat(cartItem._origin.end_date, " ").concat(cartItem._origin.end_time));
+          // 资源排下序，把单个资源靠前，组合资源排在后面
+          productResources.sort(function (a, b) {
+            var _a$metadata, _b$metadata;
+            var aIsCombined = ((_a$metadata = a.metadata) === null || _a$metadata === void 0 || (_a$metadata = _a$metadata.combined_resource) === null || _a$metadata === void 0 ? void 0 : _a$metadata.status) === 1;
+            var bIsCombined = ((_b$metadata = b.metadata) === null || _b$metadata === void 0 || (_b$metadata = _b$metadata.combined_resource) === null || _b$metadata === void 0 ? void 0 : _b$metadata.status) === 1;
+            if (aIsCombined && !bIsCombined) return 1;
+            if (!aIsCombined && bIsCombined) return -1;
+            return 0;
+          });
+          var resourcesUseableMap = {};
           productResources.forEach(function (n) {
             n.renderList = n.renderList.filter(function (m) {
               var recordCount = capacityMap[m.id] || 0;
@@ -1152,8 +1162,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   },
                   time: item,
                   resource: m,
-                  currentCount: recordCount + (currentCapacity || 0)
+                  currentCount: recordCount + (currentCapacity || 0),
+                  resourcesUseableMap: resourcesUseableMap
                 });
+                if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false) {
+                  resourcesUseableMap[m.id] = res.usable;
+                }
                 return res.usable;
               });
               return canUseTime;
@@ -1241,87 +1255,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       return timeSlots;
     }
 
-    // 自动分派可用的资源-单种资源类型——此方法目前未使用，未经验证
-  }, {
-    key: "autoSelectResource",
-    value: function autoSelectResource(_ref8) {
-      var resourceProductData = _ref8.resourceProductData,
-        resources = _ref8.resources,
-        timeSlots = _ref8.timeSlots;
-      var dateRange = this.store.date.getDateRange();
-      if (timeSlots) {
-        // 如果 start_time 存在，则直接根据 start_time 算出商品总共需要的时长，然后根据时长去匹配资源
-        // const duration = resourceProductData.product.duration.value;
-        // const start_time = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
-        // const end_time = dayjs(`${dateRange[0].date} ${start_time}`)
-        //   .add(duration, resourceProductData.product.duration.type)
-        //   .format("HH:mm");
-        // 根据 start_time 和 end_time 去匹配资源
-        var targetResource = null;
-        var _iterator2 = _createForOfIteratorHelper(resources),
-          _step2;
-        try {
-          var _loop = function _loop() {
-            var n = _step2.value;
-            var canUseTime = n.times.find(function (item) {
-              var res = getIsUsableByTimeItem({
-                timeSlice: timeSlots,
-                time: item,
-                resource: n,
-                currentCount: 1
-              });
-              return res.usable;
-            });
-            if (canUseTime) {
-              targetResource = n;
-              return 1; // break
-            }
-          };
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            if (_loop()) break;
-          }
-        } catch (err) {
-          _iterator2.e(err);
-        } finally {
-          _iterator2.f();
-        }
-        return {
-          selectedResource: targetResource
-        };
-      } else {
-        // 如果没有传递 timeSlots，证明是第一个资源，则直接拿商品的 duration，到资源列表里找一个公共可用的
-        var duration = resourceProductData.product.duration.value;
-        var resourcesMap = getResourcesMap(resources);
-        var resourceIds = resources.map(function (n) {
-          return n.id;
-        });
-        var _timeSlots = getTimeSlicesByResources({
-          resourceIds: resourceIds,
-          resourcesMap: resourcesMap,
-          duration: duration,
-          currentDate: dateRange[0].date,
-          split: 10
-        });
-        // 如果timeSlots返回了 空数组，代表没有可用的资源了
-        if (!_timeSlots) {
-          return; // 给一个提示？
-        }
-        return {
-          timeSlots: _timeSlots,
-          selectedResource: resources[0]
-        };
-      }
-    }
-
     // 自动分派可用资源-pro 版，ui 传递某个账号，自动给某个账号下所有商品分配第一种资源
   }, {
     key: "autoSelectAccountResources",
-    value: function autoSelectAccountResources(_ref9) {
-      var holder_id = _ref9.holder_id,
-        resources_code = _ref9.resources_code,
-        timeSlots = _ref9.timeSlots,
-        countMap = _ref9.countMap,
-        capacity = _ref9.capacity;
+    value: function autoSelectAccountResources(_ref8) {
+      var holder_id = _ref8.holder_id,
+        resources_code = _ref8.resources_code,
+        timeSlots = _ref8.timeSlots,
+        countMap = _ref8.countMap,
+        capacity = _ref8.capacity;
       var dateRange = this.store.date.getDateRange();
       var cartItems = this.store.cart.getItems();
       // 取到账号下所有的商品，然后根据商品的 duration 和资源列表，获取所有可用的资源
@@ -1349,6 +1291,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           }
         });
       });
+      // 资源排下序，把单个资源靠前，组合资源排在后面
+      resources.sort(function (a, b) {
+        var _a$metadata2, _b$metadata2;
+        var aIsCombined = ((_a$metadata2 = a.metadata) === null || _a$metadata2 === void 0 || (_a$metadata2 = _a$metadata2.combined_resource) === null || _a$metadata2 === void 0 ? void 0 : _a$metadata2.status) === 1;
+        var bIsCombined = ((_b$metadata2 = b.metadata) === null || _b$metadata2 === void 0 || (_b$metadata2 = _b$metadata2.combined_resource) === null || _b$metadata2 === void 0 ? void 0 : _b$metadata2.status) === 1;
+        if (aIsCombined && !bIsCombined) return 1;
+        if (!aIsCombined && bIsCombined) return -1;
+        return 0;
+      });
+      var resourcesUseableMap = {};
 
       // 如果有选择时间了，则代表不是第一种资源了，则需要根据开始时间去匹配
       // 每个商品
@@ -1359,19 +1311,23 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         //   .format("HH:mm");
         // 根据 start_time 和 end_time 去匹配资源
         var targetResource = null;
-        var _iterator3 = _createForOfIteratorHelper(resources),
-          _step3;
+        var _iterator2 = _createForOfIteratorHelper(resources),
+          _step2;
         try {
-          var _loop2 = function _loop2() {
-            var n = _step3.value;
+          var _loop = function _loop() {
+            var n = _step2.value;
             var recordCount = countMap[n.id] || 0;
             var canUseTime = n.times.find(function (item) {
               var res = getIsUsableByTimeItem({
                 timeSlice: timeSlots,
                 time: item,
                 resource: n,
-                currentCount: recordCount + (capacity || 0)
+                currentCount: recordCount + (capacity || 0),
+                resourcesUseableMap: {}
               });
+              if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[n.id]) !== false) {
+                resourcesUseableMap[n.id] = res.usable;
+              }
               return res.usable;
             });
             if (canUseTime) {
@@ -1379,13 +1335,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               return 1; // break
             }
           };
-          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-            if (_loop2()) break;
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            if (_loop()) break;
           }
         } catch (err) {
-          _iterator3.e(err);
+          _iterator2.e(err);
         } finally {
-          _iterator3.f();
+          _iterator2.f();
         }
         return {
           selectedResource: targetResource
@@ -1395,20 +1351,21 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         var resourceIds = resources.map(function (n) {
           return n.id;
         });
-        var _timeSlots2 = getTimeSlicesByResources({
+        var _timeSlots = getTimeSlicesByResources({
           resourceIds: resourceIds,
           resourcesMap: resourcesMap,
           duration: duration,
           currentDate: dateRange[0].date,
           split: 10,
-          capacity: capacity
+          capacity: capacity,
+          resourcesUseableMap: resourcesUseableMap
         });
         // 如果timeSlots返回了 空数组，代表没有可用的资源了
-        if (!_timeSlots2) {
+        if (!_timeSlots) {
           return; // 给一个提示？
         }
         return {
-          timeSlots: _timeSlots2,
+          timeSlots: _timeSlots,
           selectedResource: resources[0]
         };
       }
@@ -1458,9 +1415,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           }
           if (recordTimeSlots) {
             if (index !== 0 && recordTimeSlots) {
-              var _item$_productOrigin$, _item$_productOrigin4, _ref10, _item$_productOrigin5, _item$_productOrigin$2, _item$_productOrigin6, _ref11, _item$_productOrigin7;
-              var start_at = dayjs(recordTimeSlots.end_time).add((_item$_productOrigin$ = (_item$_productOrigin4 = item._productOrigin) === null || _item$_productOrigin4 === void 0 || (_item$_productOrigin4 = _item$_productOrigin4.duration) === null || _item$_productOrigin4 === void 0 ? void 0 : _item$_productOrigin4.value) !== null && _item$_productOrigin$ !== void 0 ? _item$_productOrigin$ : 0, (_ref10 = (_item$_productOrigin5 = item._productOrigin) === null || _item$_productOrigin5 === void 0 || (_item$_productOrigin5 = _item$_productOrigin5.duration) === null || _item$_productOrigin5 === void 0 ? void 0 : _item$_productOrigin5.type) !== null && _ref10 !== void 0 ? _ref10 : 'minutes');
-              var end_at = start_at.add((_item$_productOrigin$2 = (_item$_productOrigin6 = item._productOrigin) === null || _item$_productOrigin6 === void 0 || (_item$_productOrigin6 = _item$_productOrigin6.duration) === null || _item$_productOrigin6 === void 0 ? void 0 : _item$_productOrigin6.value) !== null && _item$_productOrigin$2 !== void 0 ? _item$_productOrigin$2 : 0, (_ref11 = (_item$_productOrigin7 = item._productOrigin) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.duration) === null || _item$_productOrigin7 === void 0 ? void 0 : _item$_productOrigin7.type) !== null && _ref11 !== void 0 ? _ref11 : 'minutes');
+              var _item$_productOrigin$, _item$_productOrigin4, _ref9, _item$_productOrigin5, _item$_productOrigin$2, _item$_productOrigin6, _ref10, _item$_productOrigin7;
+              var start_at = dayjs(recordTimeSlots.end_time).add((_item$_productOrigin$ = (_item$_productOrigin4 = item._productOrigin) === null || _item$_productOrigin4 === void 0 || (_item$_productOrigin4 = _item$_productOrigin4.duration) === null || _item$_productOrigin4 === void 0 ? void 0 : _item$_productOrigin4.value) !== null && _item$_productOrigin$ !== void 0 ? _item$_productOrigin$ : 0, (_ref9 = (_item$_productOrigin5 = item._productOrigin) === null || _item$_productOrigin5 === void 0 || (_item$_productOrigin5 = _item$_productOrigin5.duration) === null || _item$_productOrigin5 === void 0 ? void 0 : _item$_productOrigin5.type) !== null && _ref9 !== void 0 ? _ref9 : 'minutes');
+              var end_at = start_at.add((_item$_productOrigin$2 = (_item$_productOrigin6 = item._productOrigin) === null || _item$_productOrigin6 === void 0 || (_item$_productOrigin6 = _item$_productOrigin6.duration) === null || _item$_productOrigin6 === void 0 ? void 0 : _item$_productOrigin6.value) !== null && _item$_productOrigin$2 !== void 0 ? _item$_productOrigin$2 : 0, (_ref10 = (_item$_productOrigin7 = item._productOrigin) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.duration) === null || _item$_productOrigin7 === void 0 ? void 0 : _item$_productOrigin7.type) !== null && _ref10 !== void 0 ? _ref10 : 'minutes');
               recordTimeSlots = {
                 start_time: start_at.format('HH:mm'),
                 end_time: end_at.format('HH:mm'),
@@ -1616,12 +1573,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           weekNum: 0
         }];
       }
+      var resourcesUseableMap = {};
       var timeSlots = getTimeSlicesByResources({
         resourceIds: resourceIds,
         resourcesMap: resourcesMap,
         duration: duration,
         currentDate: dateRange[0].date,
-        split: 10
+        split: 10,
+        resourcesUseableMap: resourcesUseableMap
       });
       return timeSlots;
     }
@@ -1650,9 +1609,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         accountItems.forEach(function (item, index) {
           var newResources = cloneDeep(item._origin.resources);
           newResources.forEach(function (resource) {
-            var _item$_productOrigin$4, _item$_productOrigin11, _ref12, _item$_productOrigin12;
+            var _item$_productOrigin$4, _item$_productOrigin11, _ref11, _item$_productOrigin12;
             resource.startTime = currentStartTime;
-            resource.endTime = dayjs(currentStartTime).add((_item$_productOrigin$4 = (_item$_productOrigin11 = item._productOrigin) === null || _item$_productOrigin11 === void 0 || (_item$_productOrigin11 = _item$_productOrigin11.duration) === null || _item$_productOrigin11 === void 0 ? void 0 : _item$_productOrigin11.value) !== null && _item$_productOrigin$4 !== void 0 ? _item$_productOrigin$4 : 0, (_ref12 = (_item$_productOrigin12 = item._productOrigin) === null || _item$_productOrigin12 === void 0 || (_item$_productOrigin12 = _item$_productOrigin12.duration) === null || _item$_productOrigin12 === void 0 ? void 0 : _item$_productOrigin12.type) !== null && _ref12 !== void 0 ? _ref12 : 'minutes').format('YYYY-MM-DD HH:mm');
+            resource.endTime = dayjs(currentStartTime).add((_item$_productOrigin$4 = (_item$_productOrigin11 = item._productOrigin) === null || _item$_productOrigin11 === void 0 || (_item$_productOrigin11 = _item$_productOrigin11.duration) === null || _item$_productOrigin11 === void 0 ? void 0 : _item$_productOrigin11.value) !== null && _item$_productOrigin$4 !== void 0 ? _item$_productOrigin$4 : 0, (_ref11 = (_item$_productOrigin12 = item._productOrigin) === null || _item$_productOrigin12 === void 0 || (_item$_productOrigin12 = _item$_productOrigin12.duration) === null || _item$_productOrigin12 === void 0 ? void 0 : _item$_productOrigin12.type) !== null && _ref11 !== void 0 ? _ref11 : 'minutes').format('YYYY-MM-DD HH:mm');
             delete resource.times;
           });
           _this9.store.cart.updateItem({
@@ -1734,11 +1693,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     }
   }, {
     key: "getTimeslotBySchedule",
-    value: function getTimeslotBySchedule(_ref13) {
+    value: function getTimeslotBySchedule(_ref12) {
       var _this$store$currentPr2;
-      var date = _ref13.date,
-        scheduleIds = _ref13.scheduleIds,
-        resources = _ref13.resources;
+      var date = _ref12.date,
+        scheduleIds = _ref12.scheduleIds,
+        resources = _ref12.resources;
       var targetProduct = this.store.currentProduct;
       var targetProductData = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.getData();
       var targetSchedules = [];
@@ -1763,6 +1722,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var allProductResources = productResources.flatMap(function (n) {
         return n.renderList;
       });
+      // 资源排下序，把单个资源靠前，组合资源排在后面
+      allProductResources.sort(function (a, b) {
+        var _a$metadata3, _b$metadata3;
+        var aIsCombined = ((_a$metadata3 = a.metadata) === null || _a$metadata3 === void 0 || (_a$metadata3 = _a$metadata3.combined_resource) === null || _a$metadata3 === void 0 ? void 0 : _a$metadata3.status) === 1;
+        var bIsCombined = ((_b$metadata3 = b.metadata) === null || _b$metadata3 === void 0 || (_b$metadata3 = _b$metadata3.combined_resource) === null || _b$metadata3 === void 0 ? void 0 : _b$metadata3.status) === 1;
+        if (aIsCombined && !bIsCombined) return 1;
+        if (!aIsCombined && bIsCombined) return -1;
+        return 0;
+      });
+      var resourcesUseableMap = {};
       // 计算每个日程切片下日程可用的资源的容量总和
       var formatScheduleTimeSlots = scheduleTimeSlots.map(function (item) {
         var count = 0;
@@ -1780,8 +1749,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               },
               time: childTiem,
               resource: m,
-              currentCount: 1
+              currentCount: 1,
+              resourcesUseableMap: resourcesUseableMap
             });
+            if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false) {
+              resourcesUseableMap[m.id] = res.usable;
+            }
             // 如果资源可用，且是独占资源，remainingCapacity 始终为 1
             if (res.usable && res.remainingCapacity >= count) {
               count = res.remainingCapacity;
@@ -1802,16 +1775,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     }
   }, {
     key: "addProductToCart",
-    value: function addProductToCart(_ref14) {
+    value: function addProductToCart(_ref13) {
       var _this10 = this;
-      var product = _ref14.product,
-        date = _ref14.date,
-        account = _ref14.account;
-      var _ref15 = product || {},
-        bundle = _ref15.bundle,
-        options = _ref15.options,
-        origin = _ref15.origin,
-        product_variant_id = _ref15.product_variant_id;
+      var product = _ref13.product,
+        date = _ref13.date,
+        account = _ref13.account;
+      var _ref14 = product || {},
+        bundle = _ref14.bundle,
+        options = _ref14.options,
+        origin = _ref14.origin,
+        product_variant_id = _ref14.product_variant_id;
       var productData = _objectSpread(_objectSpread({}, origin), {}, {
         product_variant_id: product_variant_id
       });

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

@@ -27,11 +27,12 @@ interface BookingItem {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, currentCount, }: {
+export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, currentCount, resourcesUseableMap }: {
     timeSlice: TimeSliceItem;
     time: any;
     resource: ResourceItem;
     currentCount: number;
+    resourcesUseableMap: Record<string, boolean>;
 }) => {
     afterToDay: boolean;
     capacity: boolean;
@@ -67,12 +68,13 @@ export declare const formatResources: ({ booking, resources, }: {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, }: {
+export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, }: {
     resource: ResourceItem;
     duration: number;
     split: number;
     currentDate: DateType | string;
     capacity?: number | undefined;
+    resourcesUseableMap?: Record<string, boolean> | undefined;
 }) => TimeSliceItem[];
 /**
  * @title: 获取时间切片列表的交集
@@ -101,13 +103,14 @@ export declare const getResourcesByIds: (resourcesMap: Record<string, ResourceIt
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, }: {
+export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, }: {
     resourceIds: number[];
     resourcesMap: any;
     duration: number;
     currentDate: DateType | string;
     split: number;
     capacity?: number | undefined;
+    resourcesUseableMap: Record<string, boolean>;
 }) => any[];
 /**
  * @title: 获取其他人的已选资源

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

@@ -167,11 +167,14 @@ var checkCapacity = function checkCapacity(_ref) {
  * @Author: zhiwei.Wang
  */
 export var getIsUsableByTimeItem = function getIsUsableByTimeItem(_ref2) {
+  var _resource$combined_re;
   var timeSlice = _ref2.timeSlice,
     time = _ref2.time,
     resource = _ref2.resource,
     _ref2$currentCount = _ref2.currentCount,
-    currentCount = _ref2$currentCount === void 0 ? 1 : _ref2$currentCount;
+    currentCount = _ref2$currentCount === void 0 ? 1 : _ref2$currentCount,
+    _ref2$resourcesUseabl = _ref2.resourcesUseableMap,
+    resourcesUseableMap = _ref2$resourcesUseabl === void 0 ? {} : _ref2$resourcesUseabl;
   var status = {
     afterToDay: false,
     capacity: false,
@@ -180,7 +183,6 @@ export var getIsUsableByTimeItem = function getIsUsableByTimeItem(_ref2) {
   };
   // 最早可预约时间为 当前日期之后并且提前量之后
   var earliest = dayjs();
-
   // 不可预约提前量时间之前的
   if (!checkAfterToDay(timeSlice.start_at, earliest)) {
     return status;
@@ -192,6 +194,16 @@ export var getIsUsableByTimeItem = function getIsUsableByTimeItem(_ref2) {
     resource: resource,
     currentCount: currentCount
   });
+  if ((_resource$combined_re = resource.combined_resource) !== null && _resource$combined_re !== void 0 && _resource$combined_re.status) {
+    // 组合资源中子资源是否可用
+    var resourceIds = resource.combined_resource.resource_ids;
+    resourceIds.forEach(function (id) {
+      // 只要有一个子资源不可用，整个组合资源都不可用
+      if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[id]) === false) {
+        checkCapacityResult.status = false;
+      }
+    });
+  }
   if (!checkCapacityResult.status) {
     return status;
   }
@@ -341,7 +353,9 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref4) {
     split = _ref4$split === void 0 ? 10 : _ref4$split,
     _ref4$currentDate = _ref4.currentDate,
     currentDate = _ref4$currentDate === void 0 ? dayjs() : _ref4$currentDate,
-    capacity = _ref4.capacity;
+    capacity = _ref4.capacity,
+    _ref4$resourcesUseabl = _ref4.resourcesUseableMap,
+    resourcesUseableMap = _ref4$resourcesUseabl === void 0 ? {} : _ref4$resourcesUseabl;
   var times = resource.times;
 
   // 存储所有时间切片
@@ -378,8 +392,12 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref4) {
         timeSlice: timeSlice,
         time: time,
         resource: resource,
-        currentCount: capacity || 1
+        currentCount: capacity || 1,
+        resourcesUseableMap: resourcesUseableMap
       });
+      if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[resource.id]) !== false) {
+        resourcesUseableMap[resource.id] = _status.usable;
+      }
       if (_status.usable) {
         // 添加时间切片  09:00 ~ 10:00   09:20 ~ 10:20   09:00 ~ 10:00   09:20 ~ 10:20  11:00 ~ 12:00   11:20 ~ 12:20
         timeSlices.push(_objectSpread(_objectSpread({}, timeSlice), {}, {
@@ -453,7 +471,8 @@ export var getTimeSlicesByResources = function getTimeSlicesByResources(_ref5) {
     duration = _ref5.duration,
     currentDate = _ref5.currentDate,
     split = _ref5.split,
-    capacity = _ref5.capacity;
+    capacity = _ref5.capacity,
+    resourcesUseableMap = _ref5.resourcesUseableMap;
   // 获取资源列表
   var resources = getResourcesByIds(resourcesMap, resourceIds);
 
@@ -464,7 +483,8 @@ export var getTimeSlicesByResources = function getTimeSlicesByResources(_ref5) {
       duration: duration,
       split: split,
       currentDate: currentDate,
-      capacity: capacity
+      capacity: capacity,
+      resourcesUseableMap: resourcesUseableMap
     }));
   }, []);
 

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

@@ -146,17 +146,6 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         resources: any[];
         currentResourceId: number;
     }): TimeSliceItem[];
-    autoSelectResource({ resourceProductData, resources, timeSlots, }: {
-        resourceProductData: any;
-        resources: any[];
-        timeSlots?: TimeSliceItem;
-    }): {
-        selectedResource: any;
-        timeSlots?: undefined;
-    } | {
-        timeSlots: any[];
-        selectedResource: any;
-    } | undefined;
     autoSelectAccountResources({ holder_id, resources_code, timeSlots, countMap, capacity, }: {
         holder_id: string;
         resources_code: string | number;

package/lib/solution/BookingByStep/index.js

@@ -184,7 +184,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     product_ids
   }) {
     const scheduleList = this.store.schedule.getAvailabilityScheduleDateList();
-    this.setDateRange([{ date, status: "available", week: "", weekNum: 0 }, { date, status: "available", week: "", weekNum: 0 }]);
+    this.setDateRange([
+      { date, status: "available", week: "", weekNum: 0 },
+      { date, status: "available", week: "", weekNum: 0 }
+    ]);
     const scheduleIds = scheduleList.filter((n) => n.date === date).flatMap((n) => n.schedule_id);
     return await this.loadProducts({ schedule_ids: scheduleIds, product_ids });
   }
@@ -598,6 +601,17 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         const endTime = (0, import_dayjs.default)(
           `${cartItem._origin.end_date} ${cartItem._origin.end_time}`
         );
+        productResources.sort((a, b) => {
+          var _a2, _b2, _c2, _d;
+          const aIsCombined = ((_b2 = (_a2 = a.metadata) == null ? void 0 : _a2.combined_resource) == null ? void 0 : _b2.status) === 1;
+          const bIsCombined = ((_d = (_c2 = b.metadata) == null ? void 0 : _c2.combined_resource) == null ? void 0 : _d.status) === 1;
+          if (aIsCombined && !bIsCombined)
+            return 1;
+          if (!aIsCombined && bIsCombined)
+            return -1;
+          return 0;
+        });
+        const resourcesUseableMap = {};
         productResources.forEach((n) => {
           n.renderList = n.renderList.filter((m) => {
             const recordCount = capacityMap[m.id] || 0;
@@ -611,8 +625,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
                 },
                 time: item,
                 resource: m,
-                currentCount: recordCount + (currentCapacity || 0)
+                currentCount: recordCount + (currentCapacity || 0),
+                resourcesUseableMap
               });
+              if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false) {
+                resourcesUseableMap[m.id] = res.usable;
+              }
               return res.usable;
             });
             return canUseTime;
@@ -700,53 +718,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     });
     return timeSlots;
   }
-  // 自动分派可用的资源-单种资源类型——此方法目前未使用，未经验证
-  autoSelectResource({
-    resourceProductData,
-    resources,
-    timeSlots
-  }) {
-    const dateRange = this.store.date.getDateRange();
-    if (timeSlots) {
-      let targetResource = null;
-      for (const n of resources) {
-        const canUseTime = n.times.find((item) => {
-          const res = (0, import_resources.getIsUsableByTimeItem)({
-            timeSlice: timeSlots,
-            time: item,
-            resource: n,
-            currentCount: 1
-          });
-          return res.usable;
-        });
-        if (canUseTime) {
-          targetResource = n;
-          break;
-        }
-      }
-      return {
-        selectedResource: targetResource
-      };
-    } else {
-      const duration = resourceProductData.product.duration.value;
-      const resourcesMap = (0, import_utils.getResourcesMap)(resources);
-      const resourceIds = resources.map((n) => n.id);
-      const timeSlots2 = (0, import_resources.getTimeSlicesByResources)({
-        resourceIds,
-        resourcesMap,
-        duration,
-        currentDate: dateRange[0].date,
-        split: 10
-      });
-      if (!timeSlots2) {
-        return;
-      }
-      return {
-        timeSlots: timeSlots2,
-        selectedResource: resources[0]
-      };
-    }
-  }
   // 自动分派可用资源-pro 版，ui 传递某个账号，自动给某个账号下所有商品分配第一种资源
   autoSelectAccountResources({
     holder_id,
@@ -765,7 +736,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       var _a, _b;
       return acc + (((_b = (_a = n._productOrigin) == null ? void 0 : _a.duration) == null ? void 0 : _b.value) ?? 0);
     }, 0);
-    const resources = [];
+    let resources = [];
     accountCartItems.forEach((item) => {
       var _a, _b, _c;
       (_c = (_b = (_a = item._productOrigin) == null ? void 0 : _a.product_resource) == null ? void 0 : _b.resources) == null ? void 0 : _c.forEach((n) => {
@@ -774,6 +745,17 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       });
     });
+    resources.sort((a, b) => {
+      var _a, _b, _c, _d;
+      const aIsCombined = ((_b = (_a = a.metadata) == null ? void 0 : _a.combined_resource) == null ? void 0 : _b.status) === 1;
+      const bIsCombined = ((_d = (_c = b.metadata) == null ? void 0 : _c.combined_resource) == null ? void 0 : _d.status) === 1;
+      if (aIsCombined && !bIsCombined)
+        return 1;
+      if (!aIsCombined && bIsCombined)
+        return -1;
+      return 0;
+    });
+    const resourcesUseableMap = {};
     if (timeSlots) {
       let targetResource = null;
       for (const n of resources) {
@@ -783,8 +765,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             timeSlice: timeSlots,
             time: item,
             resource: n,
-            currentCount: recordCount + (capacity || 0)
+            currentCount: recordCount + (capacity || 0),
+            resourcesUseableMap: {}
           });
+          if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[n.id]) !== false) {
+            resourcesUseableMap[n.id] = res.usable;
+          }
           return res.usable;
         });
         if (canUseTime) {
@@ -804,7 +790,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         duration,
         currentDate: dateRange[0].date,
         split: 10,
-        capacity
+        capacity,
+        resourcesUseableMap
       });
       if (!timeSlots2) {
         return;
@@ -1007,26 +994,31 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       ];
     }
+    const resourcesUseableMap = {};
     const timeSlots = (0, import_resources.getTimeSlicesByResources)({
       resourceIds,
       resourcesMap,
       duration,
       currentDate: dateRange[0].date,
-      split: 10
+      split: 10,
+      resourcesUseableMap
     });
     return timeSlots;
   }
   // 提交时间切片，绑定到对应购物车的商品上，更新购物车
   submitTimeSlot(timeSlots) {
     const cartItems = this.store.cart.getItems();
-    const itemsByAccount = cartItems.reduce((acc, item) => {
-      const holderId = item.holder_id;
-      if (!acc[holderId]) {
-        acc[holderId] = [];
-      }
-      acc[holderId].push(item);
-      return acc;
-    }, {});
+    const itemsByAccount = cartItems.reduce(
+      (acc, item) => {
+        const holderId = item.holder_id;
+        if (!acc[holderId]) {
+          acc[holderId] = [];
+        }
+        acc[holderId].push(item);
+        return acc;
+      },
+      {}
+    );
     Object.values(itemsByAccount).forEach((accountItems) => {
       let currentStartTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
       accountItems.forEach((item, index) => {
@@ -1129,7 +1121,18 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     );
     const scheduleTimeSlots = (0, import_utils2.getAllSortedDateRanges)(minTimeMaxTime);
     console.log("scheduleTimeSlots:", scheduleTimeSlots, productResources);
-    const allProductResources = productResources.flatMap((n) => n.renderList);
+    let allProductResources = productResources.flatMap((n) => n.renderList);
+    allProductResources.sort((a, b) => {
+      var _a2, _b2, _c2, _d;
+      const aIsCombined = ((_b2 = (_a2 = a.metadata) == null ? void 0 : _a2.combined_resource) == null ? void 0 : _b2.status) === 1;
+      const bIsCombined = ((_d = (_c2 = b.metadata) == null ? void 0 : _c2.combined_resource) == null ? void 0 : _d.status) === 1;
+      if (aIsCombined && !bIsCombined)
+        return 1;
+      if (!aIsCombined && bIsCombined)
+        return -1;
+      return 0;
+    });
+    const resourcesUseableMap = {};
     const formatScheduleTimeSlots = scheduleTimeSlots.map((item) => {
       let count = 0;
       allProductResources == null ? void 0 : allProductResources.forEach((m) => {
@@ -1143,8 +1146,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             },
             time: childTiem,
             resource: m,
-            currentCount: 1
+            currentCount: 1,
+            resourcesUseableMap
           });
+          if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false) {
+            resourcesUseableMap[m.id] = res.usable;
+          }
           if (res.usable && res.remainingCapacity >= count) {
             count = res.remainingCapacity;
           }

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

@@ -27,11 +27,12 @@ interface BookingItem {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, currentCount, }: {
+export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, currentCount, resourcesUseableMap }: {
     timeSlice: TimeSliceItem;
     time: any;
     resource: ResourceItem;
     currentCount: number;
+    resourcesUseableMap: Record<string, boolean>;
 }) => {
     afterToDay: boolean;
     capacity: boolean;
@@ -67,12 +68,13 @@ export declare const formatResources: ({ booking, resources, }: {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, }: {
+export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, }: {
     resource: ResourceItem;
     duration: number;
     split: number;
     currentDate: DateType | string;
     capacity?: number | undefined;
+    resourcesUseableMap?: Record<string, boolean> | undefined;
 }) => TimeSliceItem[];
 /**
  * @title: 获取时间切片列表的交集
@@ -101,13 +103,14 @@ export declare const getResourcesByIds: (resourcesMap: Record<string, ResourceIt
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, }: {
+export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, }: {
     resourceIds: number[];
     resourcesMap: any;
     duration: number;
     currentDate: DateType | string;
     split: number;
     capacity?: number | undefined;
+    resourcesUseableMap: Record<string, boolean>;
 }) => any[];
 /**
  * @title: 获取其他人的已选资源

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

@@ -124,8 +124,10 @@ var getIsUsableByTimeItem = ({
   timeSlice,
   time,
   resource,
-  currentCount = 1
+  currentCount = 1,
+  resourcesUseableMap = {}
 }) => {
+  var _a;
   let status = {
     afterToDay: false,
     capacity: false,
@@ -144,6 +146,14 @@ var getIsUsableByTimeItem = ({
     resource,
     currentCount
   });
+  if ((_a = resource.combined_resource) == null ? void 0 : _a.status) {
+    const resourceIds = resource.combined_resource.resource_ids;
+    resourceIds.forEach((id) => {
+      if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[id]) === false) {
+        checkCapacityResult.status = false;
+      }
+    });
+  }
   if (!checkCapacityResult.status) {
     return status;
   }
@@ -264,7 +274,8 @@ var getTimeSlicesByResource = ({
   duration,
   split = 10,
   currentDate = (0, import_dayjs.default)(),
-  capacity
+  capacity,
+  resourcesUseableMap = {}
 }) => {
   const { times } = resource;
   const timeSlices = [];
@@ -288,8 +299,12 @@ var getTimeSlicesByResource = ({
         timeSlice,
         time,
         resource,
-        currentCount: capacity || 1
+        currentCount: capacity || 1,
+        resourcesUseableMap
       });
+      if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[resource.id]) !== false) {
+        resourcesUseableMap[resource.id] = _status.usable;
+      }
       if (_status.usable) {
         timeSlices.push({
           ...timeSlice,
@@ -326,7 +341,8 @@ var getTimeSlicesByResources = ({
   duration,
   currentDate,
   split,
-  capacity
+  capacity,
+  resourcesUseableMap
 }) => {
   let resources = getResourcesByIds(resourcesMap, resourceIds);
   let timeSliceList = resources.reduce(
@@ -337,7 +353,8 @@ var getTimeSlicesByResources = ({
           duration,
           split,
           currentDate,
-          capacity
+          capacity,
+          resourcesUseableMap
         })
       );
     },

package/package.json

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