@pisell/pisellos 0.0.57 → 0.0.59

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,9 +341,20 @@ var getTimeSlicesByResources = ({
   duration,
   currentDate,
   split,
-  capacity
+  capacity,
+  resourcesUseableMap
 }) => {
   let resources = getResourcesByIds(resourcesMap, resourceIds);
+  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;
+  });
   let timeSliceList = resources.reduce(
     (acc, item) => {
       return acc.concat(
@@ -337,7 +363,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.59",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",