@pisell/pisellos 0.0.79 → 0.0.81

package/lib/solution/BookingByStep/index.js

@@ -204,7 +204,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       { 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, category_ids, schedule_date: date });
+    return await this.loadProducts({
+      schedule_ids: scheduleIds,
+      product_ids,
+      category_ids,
+      schedule_date: date
+    });
   }
   // 加载当前店铺下所有 schedule
   async loadAllSchedule() {
@@ -267,10 +272,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   // 添加单个账户或者 guest
   async addAccount(account, extra) {
     if ((extra == null ? void 0 : extra.type) === "holder") {
-      const accountModules = await this.store.accountList.addHolderAccounts(
-        [account],
-        extra.customerId
-      );
+      const accountModules = await this.store.accountList.addHolderAccounts({
+        holders: [account],
+        customerId: extra.customerId,
+        type: "unshift"
+      });
       return accountModules[0].getAccount();
     }
     const newAccount = await this.store.accountList.addAccount(
@@ -281,10 +287,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   // 添加账户或者 guest
   async addAccounts(accounts, extra) {
     if ((extra == null ? void 0 : extra.type) === "holder") {
-      this.store.accountList.addHolderAccounts(
-        accounts,
-        extra.customerId
-      );
+      this.store.accountList.addHolderAccounts({
+        holders: accounts,
+        customerId: extra.customerId,
+        type: "unshift"
+      });
       return;
     }
     const res = [];
@@ -342,6 +349,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 获取商品/服务的可用日期
   async getAvailableDate(params = {}) {
+    var _a, _b, _c;
     let { products, startDate, endDate, type } = params;
     if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day") && ((0, import_dayjs.default)(endDate).isAfter((0, import_dayjs.default)(), "day") || (0, import_dayjs.default)(endDate).isSame((0, import_dayjs.default)(), "day"))) {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
@@ -364,8 +372,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       ];
     }
     let dateRange = this.store.date.getDateRange();
-    const tempStartDate = startDate || (dateRange == null ? void 0 : dateRange[0].date);
-    const tempEndDate = endDate || (dateRange == null ? void 0 : dateRange[1].date);
+    const tempStartDate = startDate || ((_a = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _a.date);
+    const tempEndDate = endDate || ((_b = dateRange == null ? void 0 : dateRange[1]) == null ? void 0 : _b.date) || ((_c = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _c.date);
     if (!tempProducts.length) {
       return [];
     }
@@ -489,6 +497,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     if (!targetCartItem) {
       throw new Error(`没有找到${params._id}购物车商品`);
     }
+    let currentResourcesCapacityMap = {};
     if (params.resources) {
       const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
         capacity: (_a = targetCartItem._productOrigin) == null ? void 0 : _a.capacity,
@@ -497,37 +506,71 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
       params.resources = params.resources.map((n) => {
         n.capacity = currentCapacity || 1;
+        currentResourcesCapacityMap[n.id] = currentCapacity;
         (0, import_resources.checkSubResourcesCapacity)(n);
         return n;
       });
     }
     this.store.cart.updateItem(params);
+    const allOriginResources = [];
+    const dateRange = this.store.date.getDateRange();
+    if (dateRange == null ? void 0 : dateRange.length) {
+      dateRange.forEach((n) => {
+        if (n.resource)
+          allOriginResources.push(...n.resource);
+      });
+    }
+    if (!allOriginResources.length) {
+      const dateList = this.store.date.getDateList();
+      dateList.forEach((n) => {
+        if (n.resource)
+          allOriginResources.push(...n.resource);
+      });
+    }
     const cartItems = this.store.cart.getItems();
     cartItems.forEach((item) => {
       var _a2;
-      if (item.holder_id !== (targetCartItem == null ? void 0 : targetCartItem.holder_id)) {
-        const resources = (_a2 = item._origin.resources) == null ? void 0 : _a2.filter((m) => {
-          return !targetCartItem._origin.resources.some((targetRes) => {
-            var _a3, _b;
+      const resources = (_a2 = item._origin.resources) == null ? void 0 : _a2.filter((m) => {
+        return !targetCartItem._origin.resources.some((targetRes) => {
+          var _a3, _b, _c;
+          if (targetRes.resourceType !== "single") {
+            const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
+              capacity: (_a3 = item._productOrigin) == null ? void 0 : _a3.capacity,
+              product_bundle: item._origin.product.product_bundle
+            });
+            const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
+            const originResource = allOriginResources.find((n) => n.id === targetRes.id);
+            if (currentResourcesCapacityMap[targetRes.id] + currentCapacity > (originResource == null ? void 0 : originResource.capacity)) {
+              return true;
+            }
+            return false;
+          }
+          if (item.holder_id !== (targetCartItem == null ? void 0 : targetCartItem.holder_id)) {
             if (targetRes.id === m.id)
               return true;
-            if (((_a3 = targetRes.metadata.combined_resource) == null ? void 0 : _a3.status) === 1 && // 如果现在选择的是组合资源，需要判断
+            if (((_b = targetRes.metadata.combined_resource) == null ? void 0 : _b.status) === 1 && // 如果现在选择的是组合资源，需要判断
             // 1、当前其他购物车里是否选了当前组合资源的子资源
             // 2、如果其他购物车里的商品也是组合资源，出了组合资源本身的 id 需要判断，还需要判断子资源的 id 是否有交集
-            (targetRes.metadata.combined_resource.resource_ids.includes(m.id) || targetRes.metadata.combined_resource.resource_ids.some((n) => {
-              return m.metadata.combined_resource.resource_ids.includes(n);
-            })))
+            (targetRes.metadata.combined_resource.resource_ids.includes(
+              m.id
+            ) || targetRes.metadata.combined_resource.resource_ids.some(
+              (n) => {
+                return m.metadata.combined_resource.resource_ids.includes(
+                  n
+                );
+              }
+            )))
               return true;
-            if (((_b = m.metadata.combined_resource) == null ? void 0 : _b.status) === 1 && m.metadata.combined_resource.resource_ids.includes(targetRes.id))
+            if (((_c = m.metadata.combined_resource) == null ? void 0 : _c.status) === 1 && m.metadata.combined_resource.resource_ids.includes(targetRes.id))
               return true;
-            return false;
-          });
-        });
-        this.store.cart.updateItem({
-          _id: item._id,
-          resources
+          }
+          return false;
         });
-      }
+      });
+      this.store.cart.updateItem({
+        _id: item._id,
+        resources
+      });
     });
   }
   // 删除购物车里某个商品
@@ -613,25 +656,158 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     cartItems.forEach((cartItem) => {
       var _a, _b, _c;
       let selectedResources = [];
+      const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
+        capacity: (_a = cartItem._productOrigin) == null ? void 0 : _a.capacity,
+        product_bundle: cartItem._origin.product.product_bundle
+      });
+      cartItem._origin.metadata.capacity = formatCapacity;
+      const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
       if (cartItem.holder_id) {
         selectedResources = (0, import_resources.getOthersSelectedResources)(
           cartItems,
           cartItem.holder_id,
-          resourcesMap
+          resourcesMap,
+          currentCapacity
         );
       } else {
         selectedResources = (0, import_resources.getOthersCartSelectedResources)(
           cartItems,
           cartItem._id,
-          resourcesMap
+          resourcesMap,
+          currentCapacity
         );
       }
+      const productResources = (0, import_resources.getResourcesByProduct)(
+        resourcesMap,
+        ((_c = (_b = cartItem._productOrigin) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) || [],
+        selectedResources,
+        currentCapacity
+      );
+      if (cartItem._origin.start_time) {
+        const startTime = (0, import_dayjs.default)(
+          `${cartItem._origin.start_date} ${cartItem._origin.start_time}`
+        );
+        const endTime = (0, import_dayjs.default)(
+          `${cartItem._origin.end_date} ${cartItem._origin.end_time}`
+        );
+        const resourcesUseableMap = {};
+        productResources.forEach((n) => {
+          n.renderList = n.renderList.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;
+          });
+          n.renderList = n.renderList.filter((m) => {
+            const recordCount = capacityMap[m.id] || 0;
+            const mTimes = m.times.filter((n2) => {
+              return !(0, import_dayjs.default)(n2.start_at).isAfter((0, import_dayjs.default)(startTime)) && !(0, import_dayjs.default)(n2.end_at).isBefore((0, import_dayjs.default)(endTime));
+            });
+            if (mTimes.length === 0) {
+              return false;
+            }
+            const canUseArr = mTimes.map((item) => {
+              const res = (0, import_resources.getIsUsableByTimeItem)({
+                timeSlice: {
+                  start_time: startTime.format("HH:mm"),
+                  end_time: endTime.format("HH:mm"),
+                  start_at: startTime,
+                  end_at: endTime
+                },
+                time: item,
+                resource: m,
+                currentCount: recordCount + (currentCapacity || 0),
+                resourcesUseableMap
+              });
+              if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== "capacityOnly") {
+                resourcesUseableMap[m.id] = res.usable;
+              }
+              return res.usable;
+            });
+            if (m.onlyComputed)
+              return false;
+            return !canUseArr.some((n2) => n2 === false);
+          });
+        });
+      } else {
+        productResources.forEach((item) => {
+          item.renderList = item.renderList.filter((n) => {
+            var _a2, _b2;
+            const recordCount = n.capacity || 0;
+            if (n.onlyComputed)
+              return false;
+            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;
+          });
+        });
+      }
+      arr.push({
+        id: cartItem.id,
+        // 这里返回的是购物车 id ，后面提交的时候要用的，用这个 id 绑定资源和时间
+        _id: cartItem._id,
+        // 这里返回的是购物车 id ，后面提交的时候要用的，用这个 id 绑定资源和时间
+        product: cartItem._productOrigin,
+        resources: productResources,
+        holder_id: cartItem.holder_id,
+        holder_name: cartItem.holder_title
+      });
+    });
+    return arr;
+  }
+  // 在日期那边点击下一步的时候，检查这一天购物车里的商品是不是都有资源可以用
+  checkResourceListForDate() {
+    const dateRange = this.store.date.getDateRange();
+    const resources = [];
+    if (dateRange == null ? void 0 : dateRange.length) {
+      dateRange.forEach((n) => {
+        if (n.resource)
+          resources.push(...n.resource);
+      });
+    }
+    if (!resources.length) {
+      const dateList = this.store.date.getDateList();
+      dateList.forEach((n) => {
+        if (n.resource)
+          resources.push(...n.resource);
+      });
+    }
+    const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
+    const cartItems = this.store.cart.getItems();
+    const arr = [];
+    const capacityMap = {};
+    cartItems.forEach((cartItem) => {
+      var _a, _b, _c;
+      let selectedResources = [];
       const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
         capacity: (_a = cartItem._productOrigin) == null ? void 0 : _a.capacity,
         product_bundle: cartItem._origin.product.product_bundle
       });
       cartItem._origin.metadata.capacity = formatCapacity;
       const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
+      if (cartItem.holder_id) {
+        selectedResources = (0, import_resources.getOthersSelectedResources)(
+          cartItems,
+          cartItem.holder_id,
+          resourcesMap,
+          currentCapacity
+        );
+      } else {
+        selectedResources = (0, import_resources.getOthersCartSelectedResources)(
+          cartItems,
+          cartItem._id,
+          resourcesMap,
+          currentCapacity
+        );
+      }
       const productResources = (0, import_resources.getResourcesByProduct)(
         resourcesMap,
         ((_c = (_b = cartItem._productOrigin) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) || [],
@@ -710,13 +886,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         // 这里返回的是购物车 id ，后面提交的时候要用的，用这个 id 绑定资源和时间
         _id: cartItem._id,
         // 这里返回的是购物车 id ，后面提交的时候要用的，用这个 id 绑定资源和时间
-        product: cartItem._productOrigin,
-        resources: productResources,
-        holder_id: cartItem.holder_id,
-        holder_name: cartItem.holder_title
+        productResources
       });
     });
-    return arr;
+    const hasResource = arr.every(
+      (n) => n.productResources.every((m) => m.renderList.length > 0)
+    );
+    return hasResource;
   }
   // 给单个购物车里的商品获取资源列表
   getResourcesListByCartItem(id) {
@@ -734,24 +910,26 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       throw new Error(`没有找到${id}购物车商品`);
     }
     let selectedResources = [];
+    const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
+      capacity: (_a = targetCartItem._productOrigin) == null ? void 0 : _a.capacity,
+      product_bundle: targetCartItem._origin.product.product_bundle
+    });
+    const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
     if (targetCartItem.holder_id) {
       selectedResources = (0, import_resources.getOthersSelectedResources)(
         cartItems,
         targetCartItem.holder_id,
-        resourcesMap
+        resourcesMap,
+        currentCapacity
       );
     } else {
       selectedResources = (0, import_resources.getOthersCartSelectedResources)(
         cartItems,
         targetCartItem._id,
-        resourcesMap
+        resourcesMap,
+        currentCapacity
       );
     }
-    const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
-      capacity: (_a = targetCartItem._productOrigin) == null ? void 0 : _a.capacity,
-      product_bundle: targetCartItem._origin.product.product_bundle
-    });
-    const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
     const productResources = (0, import_resources.getResourcesByProduct)(
       resourcesMap,
       ((_c = (_b = targetCartItem._productOrigin) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) || [],
@@ -833,7 +1011,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const selectedResources = (0, import_resources.getOthersSelectedResources)(
       allCartItems,
       holder_id,
-      resourcesMap
+      resourcesMap,
+      capacity || 0
     );
     let allProductResources = (0, import_resources.getResourcesByProduct)(
       resourcesMap,
@@ -852,7 +1031,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         return -1;
       return 0;
     });
-    const resourcesUseableMap = [...selectedResources].reduce((acc, n) => {
+    const resourcesUseableMap = [
+      ...selectedResources
+    ].reduce((acc, n) => {
       acc[n] = false;
       return acc;
     }, {});
@@ -919,7 +1100,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           resources.push(...n.resource);
       });
     }
-    const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
     const errorList = [];
     const selectResourcesMap = {};
     const accountList = this.store.accountList.getAccounts();
@@ -1001,7 +1181,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             if ((_a3 = n.renderList) == null ? void 0 : _a3.length) {
               n.renderList = n.renderList.filter((m) => {
                 var _a4;
-                const recordCount = m.capacity || 0;
+                const recordCount = (m.capacity || 0) - (selectResourcesMap[m.id] || 0);
                 const timeSlots2 = (0, import_resources.getTimeSlicesByResource)({
                   resource: m,
                   duration: ((_a4 = item == null ? void 0 : item.duration) == null ? void 0 : _a4.value) || 0,
@@ -1013,29 +1193,31 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               currentResourcesRenderList.push(...n.renderList || []);
             }
           });
-          const resourcesMap2 = (0, import_utils.getResourcesMap)(currentResourcesRenderList);
+          const resourcesMap = (0, import_utils.getResourcesMap)(currentResourcesRenderList);
           if (item.holder_id) {
             selectedResources = (0, import_resources.getOthersSelectedResources)(
               allCartItems,
               item.holder_id,
-              resourcesMap2
+              resourcesMap,
+              currentCapacity
             );
           } else {
             selectedResources = (0, import_resources.getOthersCartSelectedResources)(
               allCartItems,
               item._id,
-              resourcesMap2
+              resourcesMap,
+              currentCapacity
             );
           }
           const productResources = (0, import_resources.getResourcesByProduct)(
-            resourcesMap2,
+            resourcesMap,
             (0, import_lodash_es.cloneDeep)(resources2),
             selectedResources,
             currentCapacity
           );
           productResources.forEach((item2) => {
             item2.renderList = item2.renderList.filter((n) => {
-              const recordCount = n.capacity || 0;
+              const recordCount = (n.capacity || 0) - (selectResourcesMap[n.id] || 0);
               if (n.onlyComputed)
                 return false;
               return recordCount >= currentCapacity;
@@ -1053,6 +1235,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             const targetResource = targetRenderList[0];
             targetResource.capacity = currentCapacity;
             (0, import_resources.checkSubResourcesCapacity)(targetResource);
+            if (!selectResourcesMap[targetResource.id]) {
+              selectResourcesMap[targetResource.id] = currentCapacity;
+            } else {
+              selectResourcesMap[targetResource.id] += currentCapacity;
+            }
             this.store.cart.updateItem({
               _id: item._id,
               resources: [
@@ -1162,23 +1349,27 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   // 提交时间切片，绑定到对应购物车的商品上，更新购物车
   submitTimeSlot(timeSlots) {
     const cartItems = (0, import_lodash_es.cloneDeep)(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) => {
+        var _a;
         const newResources = (0, import_lodash_es.cloneDeep)(item._origin.resources);
         newResources.forEach((resource) => {
-          var _a, _b, _c, _d;
+          var _a2, _b, _c, _d;
           resource.startTime = currentStartTime;
           resource.endTime = (0, import_dayjs.default)(currentStartTime).add(
-            ((_b = (_a = item._productOrigin) == null ? void 0 : _a.duration) == null ? void 0 : _b.value) ?? 0,
+            ((_b = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b.value) ?? 0,
             ((_d = (_c = item._productOrigin) == null ? void 0 : _c.duration) == null ? void 0 : _d.type) ?? "minutes"
           ).format("YYYY-MM-DD HH:mm");
           delete resource.times;
@@ -1187,7 +1378,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           _id: item._id,
           resources: newResources
         });
-        if (index < accountItems.length - 1) {
+        if (index < accountItems.length - 1 && ((_a = newResources == null ? void 0 : newResources[0]) == null ? void 0 : _a.resourceType) === "single") {
           currentStartTime = newResources[0].endTime;
         }
       });
@@ -1260,7 +1451,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const selectedResources = (0, import_resources.getOthersSelectedResources)(
       cartItems,
       "",
-      resourcesMap
+      resourcesMap,
+      1
     );
     const productResources = (0, import_resources.getResourcesByProduct)(
       resourcesMap,

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

@@ -135,7 +135,7 @@ export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, dur
  * @return {*}
  * @Author: jinglin.tan
  */
-export declare const getOthersSelectedResources: (cartItems: CartItem[], accountId: number | string, resourcesMap: Record<string, ResourceItem>) => number[];
+export declare const getOthersSelectedResources: (cartItems: CartItem[], accountId: number | string, resourcesMap: Record<string, ResourceItem>, currentCapacity: number) => number[];
 /**
  * @title: 获取其他购物车内商品的已选资源
  * @description:
@@ -144,7 +144,7 @@ export declare const getOthersSelectedResources: (cartItems: CartItem[], account
  * @return {*}
  * @Author: jinglin.tan
  */
-export declare const getOthersCartSelectedResources: (cartItems: CartItem[], cartItemId: number | string, resourcesMap: Record<string, ResourceItem>) => number[];
+export declare const getOthersCartSelectedResources: (cartItems: CartItem[], cartItemId: number | string, resourcesMap: Record<string, ResourceItem>, currentCapacity: number) => number[];
 interface CapacityItem {
     id: number;
     value: number;

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

@@ -180,7 +180,9 @@ var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacit
       );
       let optional_resource = item.optional_resource.reduce(
         (childAcc, d) => {
-          if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id)) {
+          var _a;
+          const isSelectSingleResources = ((_a = resourcesMap[d]) == null ? void 0 : _a.resourceType) === "single" && selectedResources.includes(resourcesMap[d].id);
+          if (resourcesMap[d] && !isSelectSingleResources) {
             const combiningResources = [];
             if (resourcesMap[d].combined_resource && resourcesMap[d].combined_resource.status === 1) {
               resourcesMap[d].combined_resource.resource_ids.forEach(
@@ -222,7 +224,9 @@ var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacit
       );
       let default_resource = item.default_resource.reduce(
         (childAcc, d) => {
-          if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id)) {
+          var _a;
+          const isSelectSingleResources = ((_a = resourcesMap[d]) == null ? void 0 : _a.resourceType) === "single" && selectedResources.includes(resourcesMap[d].id);
+          if (resourcesMap[d] && !isSelectSingleResources) {
             const combiningResources = [];
             if (resourcesMap[d].combined_resource && resourcesMap[d].combined_resource.status === 1) {
               resourcesMap[d].combined_resource.resource_ids.forEach(
@@ -429,7 +433,7 @@ var getTimeSlicesByResources = ({
   let intersection = getTimesIntersection(timeSliceList, resources.length);
   return intersection;
 };
-var getOthersSelectedResources = (cartItems, accountId, resourcesMap) => {
+var getOthersSelectedResources = (cartItems, accountId, resourcesMap, currentCapacity) => {
   return cartItems.reduce((acc, d) => {
     var _a;
     if (d.holder_id !== accountId) {
@@ -442,28 +446,25 @@ var getOthersSelectedResources = (cartItems, accountId, resourcesMap) => {
               return acc;
             }
             acc.push(...n.metadata.combined_resource.resource_ids);
-            n.metadata.combined_resource.resource_ids.forEach((m) => {
-              resourcesMap[m].capacity -= n.num;
-            });
           } else {
             Object.values(resourcesMap).forEach((m) => {
               if (m.combined_resource && m.combined_resource.status === 1) {
                 if (m.combined_resource.resource_ids.includes(n.id)) {
                   acc.push(m.id);
-                  resourcesMap[m.id].capacity -= n.num;
                 }
               }
             });
           }
           acc.push(n.id);
-          resourcesMap[n.id].capacity -= n.num;
+          if (resourcesMap[n.id])
+            resourcesMap[n.id].capacity -= currentCapacity || 0;
         });
       }
     }
     return acc;
   }, []);
 };
-var getOthersCartSelectedResources = (cartItems, cartItemId, resourcesMap) => {
+var getOthersCartSelectedResources = (cartItems, cartItemId, resourcesMap, currentCapacity) => {
   return cartItems.reduce((acc, d) => {
     var _a;
     if (d._id !== cartItemId) {
@@ -476,21 +477,16 @@ var getOthersCartSelectedResources = (cartItems, cartItemId, resourcesMap) => {
               return acc;
             }
             acc.push(...n.metadata.combined_resource.resource_ids);
-            n.metadata.combined_resource.resource_ids.forEach((m) => {
-              resourcesMap[m].capacity -= n.num;
-            });
           } else {
             Object.values(resourcesMap).forEach((m) => {
               if (m.combined_resource && m.combined_resource.status === 1) {
                 if (m.combined_resource.resource_ids.includes(n.id)) {
                   acc.push(m.id);
-                  resourcesMap[m.id].capacity -= n.num;
                 }
               }
             });
           }
           acc.push(n.id);
-          resourcesMap[n.id].capacity -= n.num;
         });
       }
     }

package/package.json

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