@pisell/pisellos 0.0.81 → 0.0.83

package/dist/modules/AccountList/index.js

@@ -525,27 +525,29 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 5:
               res = _context9.sent;
+              this.store.accountList = [];
+              this.store.accounts = [];
               if (!(res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && (_res$data = _res$data.list) !== null && _res$data !== void 0 && _res$data.length)) {
-                _context9.next = 9;
+                _context9.next = 11;
                 break;
               }
-              _context9.next = 9;
+              _context9.next = 11;
               return this.addHolderAccounts({
                 holders: res.data.list,
                 customerId: customer_id
               });
-            case 9:
-              _context9.next = 14;
-              break;
             case 11:
-              _context9.prev = 11;
+              _context9.next = 16;
+              break;
+            case 13:
+              _context9.prev = 13;
               _context9.t0 = _context9["catch"](2);
               console.error(_context9.t0);
-            case 14:
+            case 16:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, this, [[2, 11]]);
+        }, _callee9, this, [[2, 13]]);
       }));
       function fetchHolderAccounts(_x11) {
         return _fetchHolderAccounts.apply(this, arguments);

package/dist/modules/Product/types.d.ts

@@ -457,4 +457,6 @@ export interface ProductResourceItem {
     updated_at: string;
     /** 可用资源列表 */
     renderList?: any[];
+    /** 资源类型 */
+    type: 'single' | 'multiple' | 'capacity';
 }

package/dist/solution/BookingByStep/index.js

@@ -1092,6 +1092,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               if (currentResourcesCapacityMap[targetRes.id] + _currentCapacity > (originResource === null || originResource === void 0 ? void 0 : originResource.capacity)) {
                 return true;
               }
+              currentResourcesCapacityMap[targetRes.id] += _currentCapacity;
               return false;
             }
             if (item.holder_id !== (targetCartItem === null || targetCartItem === void 0 ? void 0 : targetCartItem.holder_id)) {
@@ -1111,10 +1112,26 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             return false;
           });
         });
-        _this5.store.cart.updateItem({
-          _id: item._id,
-          resources: resources
-        });
+        // session 类商品应该只调用清空 resource 的方法
+        if (item.start_time) {
+          var start_time = item.start_time;
+          var end_time = item.end_time;
+          var start_date = item.start_date;
+          var end_date = item.end_date;
+          _this5.store.cart.updateItem({
+            _id: item._id,
+            resources: resources,
+            date: {
+              startTime: dayjs("".concat(start_date, " ").concat(start_time)).format('YYYY-MM-DD HH:mm'),
+              endTime: dayjs("".concat(end_date, " ").concat(end_time)).format('YYYY-MM-DD HH:mm')
+            }
+          });
+        } else {
+          _this5.store.cart.updateItem({
+            _id: item._id,
+            resources: resources
+          });
+        }
       });
     }
 
@@ -1222,7 +1239,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var resourcesMap = getResourcesMap(cloneDeep(resources));
       var cartItems = this.store.cart.getItems();
       var arr = [];
-      var capacityMap = {};
       cartItems.forEach(function (cartItem) {
         var _cartItem$_productOri, _cartItem$_productOri2;
         var selectedResources = [];
@@ -1235,9 +1251,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           capacity: formatCapacity
         });
         if (cartItem.holder_id) {
-          selectedResources = getOthersSelectedResources(cartItems, cartItem.holder_id, resourcesMap, currentCapacity);
+          selectedResources = getOthersSelectedResources(cartItems, cartItem.holder_id, resourcesMap);
         } else {
-          selectedResources = getOthersCartSelectedResources(cartItems, cartItem._id, resourcesMap, currentCapacity);
+          selectedResources = getOthersCartSelectedResources(cartItems, cartItem._id, resourcesMap);
         }
         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);
         // 如果购物车里已经有了时间片，则需要按照时间片过滤
@@ -1256,7 +1272,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               return 0;
             });
             n.renderList = n.renderList.filter(function (m) {
-              var recordCount = capacityMap[m.id] || 0;
               // m.times 需要做个过滤，假设 timeSlice.start_at 是 09:30 timeSlice.end_at 是 11:30
               // time 是 time.start_at = 2025-05-26 10:30, time.end_at = 2025-05-26 12:30
               // 需要判断 time 的开始结束时间 是否包含timeSlice的开始结束时间
@@ -1277,7 +1292,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   },
                   time: item,
                   resource: m,
-                  currentCount: recordCount + (currentCapacity || 0),
+                  currentCount: currentCapacity || 0,
                   resourcesUseableMap: resourcesUseableMap
                 });
                 // 如果仅仅是因为子资源容量不够，不应该标记子资源是被占用的情况
@@ -1347,7 +1362,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var resourcesMap = getResourcesMap(cloneDeep(resources));
       var cartItems = this.store.cart.getItems();
       var arr = [];
-      var capacityMap = {};
       cartItems.forEach(function (cartItem) {
         var _cartItem$_productOri4, _cartItem$_productOri5;
         var selectedResources = [];
@@ -1360,9 +1374,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           capacity: formatCapacity
         });
         if (cartItem.holder_id) {
-          selectedResources = getOthersSelectedResources(cartItems, cartItem.holder_id, resourcesMap, currentCapacity);
+          selectedResources = getOthersSelectedResources(cartItems, cartItem.holder_id, resourcesMap);
         } else {
-          selectedResources = getOthersCartSelectedResources(cartItems, cartItem._id, resourcesMap, currentCapacity);
+          selectedResources = getOthersCartSelectedResources(cartItems, cartItem._id, resourcesMap);
         }
         var productResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri5 = cartItem._productOrigin) === null || _cartItem$_productOri5 === void 0 || (_cartItem$_productOri5 = _cartItem$_productOri5.product_resource) === null || _cartItem$_productOri5 === void 0 ? void 0 : _cartItem$_productOri5.resources) || [], selectedResources, currentCapacity);
         // 如果购物车里已经有了时间片，则需要按照时间片过滤
@@ -1381,7 +1395,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               return 0;
             });
             n.renderList = n.renderList.filter(function (m) {
-              var recordCount = capacityMap[m.id] || 0;
               // m.times 需要做个过滤，假设 timeSlice.start_at 是 09:30 timeSlice.end_at 是 11:30
               // time 是 time.start_at = 2025-05-26 10:30, time.end_at = 2025-05-26 12:30
               // 需要判断 time 的开始结束时间 是否包含timeSlice的开始结束时间
@@ -1402,7 +1415,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   },
                   time: item,
                   resource: m,
-                  currentCount: recordCount + (currentCapacity || 0),
+                  currentCount: currentCapacity || 0,
                   resourcesUseableMap: resourcesUseableMap
                 });
                 // 如果仅仅是因为子资源容量不够，不应该标记子资源是被占用的情况
@@ -1465,9 +1478,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       dateRange.forEach(function (n) {
         if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
       });
-      // 这里为什么要 cloneDeep：因为 getOthersSelectedResources 和 getOthersCartSelectedResources 会修改 resourcesMap 的 capacity
       // 用于确保后续分配的容量不会超出
-      var resourcesMap = getResourcesMap(cloneDeep(resources));
+      var resourcesMap = getResourcesMap(resources);
       var targetCartItem = cartItems.find(function (n) {
         return n._id === id;
       });
@@ -1483,9 +1495,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         capacity: formatCapacity
       });
       if (targetCartItem.holder_id) {
-        selectedResources = getOthersSelectedResources(cartItems, targetCartItem.holder_id, resourcesMap, currentCapacity);
+        selectedResources = getOthersSelectedResources(cartItems, targetCartItem.holder_id, resourcesMap);
       } else {
-        selectedResources = getOthersCartSelectedResources(cartItems, targetCartItem._id, resourcesMap, currentCapacity);
+        selectedResources = getOthersCartSelectedResources(cartItems, targetCartItem._id, resourcesMap);
       }
       var productResources = getResourcesByProduct(resourcesMap, ((_targetCartItem$_prod3 = targetCartItem._productOrigin) === null || _targetCartItem$_prod3 === void 0 || (_targetCartItem$_prod3 = _targetCartItem$_prod3.product_resource) === null || _targetCartItem$_prod3 === void 0 ? void 0 : _targetCartItem$_prod3.resources) || [], selectedResources, currentCapacity);
       productResources.forEach(function (item) {
@@ -1580,7 +1592,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, capacity || 0);
+      var selectedResources = getOthersSelectedResources(allCartItems, holder_id, resourcesMap);
       var allProductResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri7 = cartItem._productOrigin) === null || _cartItem$_productOri7 === void 0 || (_cartItem$_productOri7 = _cartItem$_productOri7.product_resource) === null || _cartItem$_productOri7 === void 0 ? void 0 : _cartItem$_productOri7.resources) || [], selectedResources, 1);
       var resources = ((_allProductResources$ = allProductResources.find(function (n) {
         return n.code === resources_code;
@@ -1595,7 +1607,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         return 0;
       });
       var resourcesUseableMap = _toConsumableArray(selectedResources).reduce(function (acc, n) {
-        acc[n] = false;
+        var _resourcesMap$n;
+        acc[n] = ((_resourcesMap$n = resourcesMap[n]) === null || _resourcesMap$n === void 0 ? void 0 : _resourcesMap$n.resourceType) === 'single' ? false : true;
         return acc;
       }, {});
 
@@ -1730,10 +1743,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             };
           }
           if (recordTimeSlots) {
-            if (index !== 0 && recordTimeSlots) {
-              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');
+            var _item$_productOrigin4;
+            // 同一账号下，如果当前商品不是第一个，则需要根据上一个商品的 end_time 和 duration 计算出当前商品的 start_time 和 end_time
+            // 前提：当前资源是单个预约才需要这么做
+            var currentResourceConfig = (_item$_productOrigin4 = item._productOrigin) === null || _item$_productOrigin4 === void 0 || (_item$_productOrigin4 = _item$_productOrigin4.product_resource) === null || _item$_productOrigin4 === void 0 || (_item$_productOrigin4 = _item$_productOrigin4.resources) === null || _item$_productOrigin4 === void 0 ? void 0 : _item$_productOrigin4.find(function (n) {
+              return n.code === resources_code;
+            });
+            if (index !== 0 && recordTimeSlots && (currentResourceConfig === null || currentResourceConfig === void 0 ? void 0 : currentResourceConfig.type) === 'single') {
+              var _item$_productOrigin$, _item$_productOrigin5, _ref9, _item$_productOrigin6, _item$_productOrigin$2, _item$_productOrigin7, _ref10, _item$_productOrigin8;
+              var start_at = dayjs(recordTimeSlots.end_time).add((_item$_productOrigin$ = (_item$_productOrigin5 = item._productOrigin) === null || _item$_productOrigin5 === void 0 || (_item$_productOrigin5 = _item$_productOrigin5.duration) === null || _item$_productOrigin5 === void 0 ? void 0 : _item$_productOrigin5.value) !== null && _item$_productOrigin$ !== void 0 ? _item$_productOrigin$ : 0, (_ref9 = (_item$_productOrigin6 = item._productOrigin) === null || _item$_productOrigin6 === void 0 || (_item$_productOrigin6 = _item$_productOrigin6.duration) === null || _item$_productOrigin6 === void 0 ? void 0 : _item$_productOrigin6.type) !== null && _ref9 !== void 0 ? _ref9 : 'minutes');
+              var end_at = start_at.add((_item$_productOrigin$2 = (_item$_productOrigin7 = item._productOrigin) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.duration) === null || _item$_productOrigin7 === void 0 ? void 0 : _item$_productOrigin7.value) !== null && _item$_productOrigin$2 !== void 0 ? _item$_productOrigin$2 : 0, (_ref10 = (_item$_productOrigin8 = item._productOrigin) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.duration) === null || _item$_productOrigin8 === void 0 ? void 0 : _item$_productOrigin8.type) !== null && _ref10 !== void 0 ? _ref10 : 'minutes');
               recordTimeSlots = {
                 start_time: start_at.format('HH:mm'),
                 end_time: end_at.format('HH:mm'),
@@ -1775,12 +1794,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               errorList.push(item._id);
             }
           } else {
-            var _item$_productOrigin8, _productResources$fin;
+            var _item$_productOrigin9, _productResources$fin;
             // 这里必须每次循环重新读，避免前一次循环操作了购物车，导致数据变更
             var allCartItems = cloneDeep(_this8.store.cart.getItems());
             // 如果没有传递 timeSlots，代表是第一种资源，则直接拿商品的 duration，到资源列表里找一个公共可用的
             var selectedResources = [];
-            var _resources = cloneDeep(((_item$_productOrigin8 = item._productOrigin) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.product_resource) === null || _item$_productOrigin8 === void 0 ? void 0 : _item$_productOrigin8.resources) || []);
+            var _resources = cloneDeep(((_item$_productOrigin9 = item._productOrigin) === null || _item$_productOrigin9 === void 0 || (_item$_productOrigin9 = _item$_productOrigin9.product_resource) === null || _item$_productOrigin9 === void 0 ? void 0 : _item$_productOrigin9.resources) || []);
             var currentResourcesRenderList = [];
             _resources.forEach(function (n) {
               var _n$renderList;
@@ -1803,9 +1822,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             });
             var resourcesMap = getResourcesMap(currentResourcesRenderList);
             if (item.holder_id) {
-              selectedResources = getOthersSelectedResources(allCartItems, item.holder_id, resourcesMap, currentCapacity);
+              selectedResources = getOthersSelectedResources(allCartItems, item.holder_id, resourcesMap);
             } else {
-              selectedResources = getOthersCartSelectedResources(allCartItems, item._id, resourcesMap, currentCapacity);
+              selectedResources = getOthersCartSelectedResources(allCartItems, item._id, resourcesMap);
             }
             var productResources = getResourcesByProduct(resourcesMap, cloneDeep(_resources), selectedResources, currentCapacity);
             productResources.forEach(function (item) {
@@ -1880,8 +1899,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var resourceIds = [];
       var resourcesTypeId = undefined;
       cartItems.forEach(function (item) {
-        var _item$_productOrigin9, _item$_productOrigin10;
-        (_item$_productOrigin9 = item._productOrigin) === null || _item$_productOrigin9 === void 0 || (_item$_productOrigin9 = _item$_productOrigin9.product_resource) === null || _item$_productOrigin9 === void 0 || (_item$_productOrigin9 = _item$_productOrigin9.resources) === null || _item$_productOrigin9 === void 0 || _item$_productOrigin9.forEach(function (n) {
+        var _item$_productOrigin10, _item$_productOrigin11;
+        (_item$_productOrigin10 = item._productOrigin) === null || _item$_productOrigin10 === void 0 || (_item$_productOrigin10 = _item$_productOrigin10.product_resource) === null || _item$_productOrigin10 === void 0 || (_item$_productOrigin10 = _item$_productOrigin10.resources) === null || _item$_productOrigin10 === void 0 || _item$_productOrigin10.forEach(function (n) {
           if (n.code === resources_code) {
             resources.push.apply(resources, _toConsumableArray(n.renderList || []));
           }
@@ -1892,9 +1911,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         if (item.resource_id) {
           resourceIds.push(item.resource_id);
         }
-        resourcesTypeId = item === null || item === void 0 || (_item$_productOrigin10 = item._productOrigin) === null || _item$_productOrigin10 === void 0 || (_item$_productOrigin10 = _item$_productOrigin10.product_resource) === null || _item$_productOrigin10 === void 0 || (_item$_productOrigin10 = _item$_productOrigin10.resources) === null || _item$_productOrigin10 === void 0 || (_item$_productOrigin10 = _item$_productOrigin10.find(function (n) {
+        resourcesTypeId = item === null || item === void 0 || (_item$_productOrigin11 = item._productOrigin) === null || _item$_productOrigin11 === void 0 || (_item$_productOrigin11 = _item$_productOrigin11.product_resource) === null || _item$_productOrigin11 === void 0 || (_item$_productOrigin11 = _item$_productOrigin11.resources) === null || _item$_productOrigin11 === void 0 || (_item$_productOrigin11 = _item$_productOrigin11.find(function (n) {
           return n.code === resources_code;
-        })) === null || _item$_productOrigin10 === void 0 ? void 0 : _item$_productOrigin10.id;
+        })) === null || _item$_productOrigin11 === void 0 ? void 0 : _item$_productOrigin11.id;
       });
       // 保险起见，在这里如果 dateRange 里也有 resources 的话，也 push 进去
       if ((_dateRange = dateRange) !== null && _dateRange !== void 0 && (_dateRange = _dateRange[0]) !== null && _dateRange !== void 0 && (_dateRange = _dateRange.resource) !== null && _dateRange !== void 0 && _dateRange.length) {
@@ -1914,8 +1933,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var checkDuration = function checkDuration(cartItems) {
         var accountDuration = 0;
         cartItems.forEach(function (item) {
-          var _item$_productOrigin$3, _item$_productOrigin11;
-          accountDuration += (_item$_productOrigin$3 = (_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$3 !== void 0 ? _item$_productOrigin$3 : 0;
+          var _item$_productOrigin$3, _item$_productOrigin12;
+          accountDuration += (_item$_productOrigin$3 = (_item$_productOrigin12 = item._productOrigin) === null || _item$_productOrigin12 === void 0 || (_item$_productOrigin12 = _item$_productOrigin12.duration) === null || _item$_productOrigin12 === void 0 ? void 0 : _item$_productOrigin12.value) !== null && _item$_productOrigin$3 !== void 0 ? _item$_productOrigin$3 : 0;
         });
         if (accountDuration > duration) {
           duration = accountDuration;
@@ -1985,9 +2004,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           var _newResources$;
           var newResources = cloneDeep(item._origin.resources);
           newResources.forEach(function (resource) {
-            var _item$_productOrigin$4, _item$_productOrigin12, _ref11, _item$_productOrigin13;
+            var _item$_productOrigin$4, _item$_productOrigin13, _ref11, _item$_productOrigin14;
             resource.startTime = currentStartTime;
-            resource.endTime = dayjs(currentStartTime).add((_item$_productOrigin$4 = (_item$_productOrigin12 = item._productOrigin) === null || _item$_productOrigin12 === void 0 || (_item$_productOrigin12 = _item$_productOrigin12.duration) === null || _item$_productOrigin12 === void 0 ? void 0 : _item$_productOrigin12.value) !== null && _item$_productOrigin$4 !== void 0 ? _item$_productOrigin$4 : 0, (_ref11 = (_item$_productOrigin13 = item._productOrigin) === null || _item$_productOrigin13 === void 0 || (_item$_productOrigin13 = _item$_productOrigin13.duration) === null || _item$_productOrigin13 === void 0 ? void 0 : _item$_productOrigin13.type) !== null && _ref11 !== void 0 ? _ref11 : 'minutes').format('YYYY-MM-DD HH:mm');
+            resource.endTime = dayjs(currentStartTime).add((_item$_productOrigin$4 = (_item$_productOrigin13 = item._productOrigin) === null || _item$_productOrigin13 === void 0 || (_item$_productOrigin13 = _item$_productOrigin13.duration) === null || _item$_productOrigin13 === void 0 ? void 0 : _item$_productOrigin13.value) !== null && _item$_productOrigin$4 !== void 0 ? _item$_productOrigin$4 : 0, (_ref11 = (_item$_productOrigin14 = item._productOrigin) === null || _item$_productOrigin14 === void 0 || (_item$_productOrigin14 = _item$_productOrigin14.duration) === null || _item$_productOrigin14 === void 0 ? void 0 : _item$_productOrigin14.type) !== null && _ref11 !== void 0 ? _ref11 : 'minutes').format('YYYY-MM-DD HH:mm');
             delete resource.times;
           });
           _this10.store.cart.updateItem({
@@ -2093,7 +2112,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       });
       var cartItems = cloneDeep(this.store.cart.getItems());
       var resourcesMap = getResourcesMap((targetResourceDate === null || targetResourceDate === void 0 ? void 0 : targetResourceDate.resource) || []);
-      var selectedResources = getOthersSelectedResources(cartItems, '', resourcesMap, 1);
+      var selectedResources = getOthersSelectedResources(cartItems, '', resourcesMap);
       var productResources = getResourcesByProduct(resourcesMap, resources || ((_this$store$currentPr2 = this.store.currentProduct) === null || _this$store$currentPr2 === void 0 || (_this$store$currentPr2 = _this$store$currentPr2.getData()) === null || _this$store$currentPr2 === void 0 || (_this$store$currentPr2 = _this$store$currentPr2.product_resource) === null || _this$store$currentPr2 === void 0 ? void 0 : _this$store$currentPr2.resources) || [], selectedResources, 1);
       var minTimeMaxTime = calcMinTimeMaxTimeBySchedules(targetSchedules, {}, date);
       var scheduleTimeSlots = getAllSortedDateRanges(minTimeMaxTime);
@@ -2111,9 +2130,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) {

package/dist/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>, currentCapacity: number) => number[];
+export declare const getOthersSelectedResources: (cartItems: CartItem[], accountId: number | string, resourcesMap: Record<string, ResourceItem>) => 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>, currentCapacity: number) => number[];
+export declare const getOthersCartSelectedResources: (cartItems: CartItem[], cartItemId: number | string, resourcesMap: Record<string, ResourceItem>) => number[];
 interface CapacityItem {
     id: number;
     value: number;

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

@@ -580,7 +580,7 @@ export var getTimeSlicesByResources = function getTimeSlicesByResources(_ref6) {
  * @return {*}
  * @Author: jinglin.tan
  */
-export var getOthersSelectedResources = function getOthersSelectedResources(cartItems, accountId, resourcesMap, currentCapacity) {
+export var getOthersSelectedResources = function getOthersSelectedResources(cartItems, accountId, resourcesMap) {
   return cartItems.reduce(function (acc, d) {
     if (d.holder_id !== accountId) {
       var _d$_origin;
@@ -611,7 +611,7 @@ export var getOthersSelectedResources = function getOthersSelectedResources(cart
             });
           }
           acc.push(n.id);
-          if (resourcesMap[n.id]) resourcesMap[n.id].capacity -= currentCapacity || 0;
+          // if (resourcesMap[n.id]) resourcesMap[n.id].capacity -= currentCapacity || 0;
         });
       }
     }
@@ -627,7 +627,7 @@ export var getOthersSelectedResources = function getOthersSelectedResources(cart
  * @return {*}
  * @Author: jinglin.tan
  */
-export var getOthersCartSelectedResources = function getOthersCartSelectedResources(cartItems, cartItemId, resourcesMap, currentCapacity) {
+export var getOthersCartSelectedResources = function getOthersCartSelectedResources(cartItems, cartItemId, resourcesMap) {
   return cartItems.reduce(function (acc, d) {
     if (d._id !== cartItemId) {
       var _d$_origin2;

package/lib/modules/AccountList/index.js

@@ -300,6 +300,8 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
         num: num || 100,
         skip: skip || 1
       });
+      this.store.accountList = [];
+      this.store.accounts = [];
       if ((_b = (_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) == null ? void 0 : _b.length) {
         await this.addHolderAccounts({
           holders: res.data.list,

package/lib/modules/Product/types.d.ts

@@ -457,4 +457,6 @@ export interface ProductResourceItem {
     updated_at: string;
     /** 可用资源列表 */
     renderList?: any[];
+    /** 资源类型 */
+    type: 'single' | 'multiple' | 'capacity';
 }

package/lib/solution/BookingByStep/index.js

@@ -543,6 +543,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             if (currentResourcesCapacityMap[targetRes.id] + currentCapacity > (originResource == null ? void 0 : originResource.capacity)) {
               return true;
             }
+            currentResourcesCapacityMap[targetRes.id] += currentCapacity;
             return false;
           }
           if (item.holder_id !== (targetCartItem == null ? void 0 : targetCartItem.holder_id)) {
@@ -567,10 +568,25 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           return false;
         });
       });
-      this.store.cart.updateItem({
-        _id: item._id,
-        resources
-      });
+      if (item.start_time) {
+        const start_time = item.start_time;
+        const end_time = item.end_time;
+        const start_date = item.start_date;
+        const end_date = item.end_date;
+        this.store.cart.updateItem({
+          _id: item._id,
+          resources,
+          date: {
+            startTime: (0, import_dayjs.default)(`${start_date} ${start_time}`).format("YYYY-MM-DD HH:mm"),
+            endTime: (0, import_dayjs.default)(`${end_date} ${end_time}`).format("YYYY-MM-DD HH:mm")
+          }
+        });
+      } else {
+        this.store.cart.updateItem({
+          _id: item._id,
+          resources
+        });
+      }
     });
   }
   // 删除购物车里某个商品
@@ -652,7 +668,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     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 = [];
@@ -666,15 +681,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         selectedResources = (0, import_resources.getOthersSelectedResources)(
           cartItems,
           cartItem.holder_id,
-          resourcesMap,
-          currentCapacity
+          resourcesMap
         );
       } else {
         selectedResources = (0, import_resources.getOthersCartSelectedResources)(
           cartItems,
           cartItem._id,
-          resourcesMap,
-          currentCapacity
+          resourcesMap
         );
       }
       const productResources = (0, import_resources.getResourcesByProduct)(
@@ -703,7 +716,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             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));
             });
@@ -720,7 +732,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
                 },
                 time: item,
                 resource: m,
-                currentCount: recordCount + (currentCapacity || 0),
+                currentCount: currentCapacity || 0,
                 resourcesUseableMap
               });
               if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== "capacityOnly") {
@@ -783,7 +795,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     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 = [];
@@ -797,15 +808,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         selectedResources = (0, import_resources.getOthersSelectedResources)(
           cartItems,
           cartItem.holder_id,
-          resourcesMap,
-          currentCapacity
+          resourcesMap
         );
       } else {
         selectedResources = (0, import_resources.getOthersCartSelectedResources)(
           cartItems,
           cartItem._id,
-          resourcesMap,
-          currentCapacity
+          resourcesMap
         );
       }
       const productResources = (0, import_resources.getResourcesByProduct)(
@@ -834,7 +843,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             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));
             });
@@ -851,7 +859,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
                 },
                 time: item,
                 resource: m,
-                currentCount: recordCount + (currentCapacity || 0),
+                currentCount: currentCapacity || 0,
                 resourcesUseableMap
               });
               if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== "capacityOnly") {
@@ -904,7 +912,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       if (n.resource)
         resources.push(...n.resource);
     });
-    const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
+    const resourcesMap = (0, import_utils.getResourcesMap)(resources);
     const targetCartItem = cartItems.find((n) => n._id === id);
     if (!targetCartItem) {
       throw new Error(`没有找到${id}购物车商品`);
@@ -919,15 +927,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       selectedResources = (0, import_resources.getOthersSelectedResources)(
         cartItems,
         targetCartItem.holder_id,
-        resourcesMap,
-        currentCapacity
+        resourcesMap
       );
     } else {
       selectedResources = (0, import_resources.getOthersCartSelectedResources)(
         cartItems,
         targetCartItem._id,
-        resourcesMap,
-        currentCapacity
+        resourcesMap
       );
     }
     const productResources = (0, import_resources.getResourcesByProduct)(
@@ -1011,8 +1017,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const selectedResources = (0, import_resources.getOthersSelectedResources)(
       allCartItems,
       holder_id,
-      resourcesMap,
-      capacity || 0
+      resourcesMap
     );
     let allProductResources = (0, import_resources.getResourcesByProduct)(
       resourcesMap,
@@ -1034,7 +1039,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const resourcesUseableMap = [
       ...selectedResources
     ].reduce((acc, n) => {
-      acc[n] = false;
+      var _a2;
+      acc[n] = ((_a2 = resourcesMap[n]) == null ? void 0 : _a2.resourceType) === "single" ? false : true;
       return acc;
     }, {});
     if (timeSlots) {
@@ -1106,7 +1112,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const selectForCartResources = (cartItems2) => {
       let recordTimeSlots = (0, import_lodash_es.cloneDeep)(timeSlots);
       cartItems2.forEach((item, index) => {
-        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
         const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
           capacity: (_a2 = item._productOrigin) == null ? void 0 : _a2.capacity,
           product_bundle: item._origin.product.product_bundle
@@ -1121,14 +1127,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           };
         }
         if (recordTimeSlots) {
-          if (index !== 0 && recordTimeSlots) {
+          const currentResourceConfig = (_d = (_c = (_b = item._productOrigin) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) == null ? void 0 : _d.find((n) => n.code === resources_code);
+          if (index !== 0 && recordTimeSlots && (currentResourceConfig == null ? void 0 : currentResourceConfig.type) === "single") {
             let start_at = (0, import_dayjs.default)(recordTimeSlots.end_time).add(
-              ((_c = (_b = item._productOrigin) == null ? void 0 : _b.duration) == null ? void 0 : _c.value) ?? 0,
-              ((_e = (_d = item._productOrigin) == null ? void 0 : _d.duration) == null ? void 0 : _e.type) ?? "minutes"
+              ((_f = (_e = item._productOrigin) == null ? void 0 : _e.duration) == null ? void 0 : _f.value) ?? 0,
+              ((_h = (_g = item._productOrigin) == null ? void 0 : _g.duration) == null ? void 0 : _h.type) ?? "minutes"
             );
             let end_at = start_at.add(
-              ((_g = (_f = item._productOrigin) == null ? void 0 : _f.duration) == null ? void 0 : _g.value) ?? 0,
-              ((_i = (_h = item._productOrigin) == null ? void 0 : _h.duration) == null ? void 0 : _i.type) ?? "minutes"
+              ((_j = (_i = item._productOrigin) == null ? void 0 : _i.duration) == null ? void 0 : _j.value) ?? 0,
+              ((_l = (_k = item._productOrigin) == null ? void 0 : _k.duration) == null ? void 0 : _l.type) ?? "minutes"
             );
             recordTimeSlots = {
               start_time: start_at.format("HH:mm"),
@@ -1173,7 +1180,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           const allCartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
           let selectedResources = [];
           const resources2 = (0, import_lodash_es.cloneDeep)(
-            ((_k = (_j = item._productOrigin) == null ? void 0 : _j.product_resource) == null ? void 0 : _k.resources) || []
+            ((_n = (_m = item._productOrigin) == null ? void 0 : _m.product_resource) == null ? void 0 : _n.resources) || []
           );
           const currentResourcesRenderList = [];
           resources2.forEach((n) => {
@@ -1198,15 +1205,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             selectedResources = (0, import_resources.getOthersSelectedResources)(
               allCartItems,
               item.holder_id,
-              resourcesMap,
-              currentCapacity
+              resourcesMap
             );
           } else {
             selectedResources = (0, import_resources.getOthersCartSelectedResources)(
               allCartItems,
               item._id,
-              resourcesMap,
-              currentCapacity
+              resourcesMap
             );
           }
           const productResources = (0, import_resources.getResourcesByProduct)(
@@ -1223,11 +1228,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               return recordCount >= currentCapacity;
             });
           });
-          const targetRenderList = (_l = productResources.find(
+          const targetRenderList = (_o = productResources.find(
             (n) => n.code === resources_code
-          )) == null ? void 0 : _l.renderList;
+          )) == null ? void 0 : _o.renderList;
           if (targetRenderList && targetRenderList.length > 0) {
-            if ((_m = item._origin.resources) == null ? void 0 : _m.some(
+            if ((_p = item._origin.resources) == null ? void 0 : _p.some(
               (n) => n.form_id === targetRenderList[0].form_id
             )) {
               return;
@@ -1451,8 +1456,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const selectedResources = (0, import_resources.getOthersSelectedResources)(
       cartItems,
       "",
-      resourcesMap,
-      1
+      resourcesMap
     );
     const productResources = (0, import_resources.getResourcesByProduct)(
       resourcesMap,
@@ -1478,8 +1482,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;

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>, currentCapacity: number) => number[];
+export declare const getOthersSelectedResources: (cartItems: CartItem[], accountId: number | string, resourcesMap: Record<string, ResourceItem>) => 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>, currentCapacity: number) => number[];
+export declare const getOthersCartSelectedResources: (cartItems: CartItem[], cartItemId: number | string, resourcesMap: Record<string, ResourceItem>) => number[];
 interface CapacityItem {
     id: number;
     value: number;

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

@@ -433,7 +433,7 @@ var getTimeSlicesByResources = ({
   let intersection = getTimesIntersection(timeSliceList, resources.length);
   return intersection;
 };
-var getOthersSelectedResources = (cartItems, accountId, resourcesMap, currentCapacity) => {
+var getOthersSelectedResources = (cartItems, accountId, resourcesMap) => {
   return cartItems.reduce((acc, d) => {
     var _a;
     if (d.holder_id !== accountId) {
@@ -456,15 +456,13 @@ var getOthersSelectedResources = (cartItems, accountId, resourcesMap, currentCap
             });
           }
           acc.push(n.id);
-          if (resourcesMap[n.id])
-            resourcesMap[n.id].capacity -= currentCapacity || 0;
         });
       }
     }
     return acc;
   }, []);
 };
-var getOthersCartSelectedResources = (cartItems, cartItemId, resourcesMap, currentCapacity) => {
+var getOthersCartSelectedResources = (cartItems, cartItemId, resourcesMap) => {
   return cartItems.reduce((acc, d) => {
     var _a;
     if (d._id !== cartItemId) {

package/package.json

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