@pisell/pisellos 0.0.80 → 0.0.82

package/dist/solution/BookingByStep/index.js

@@ -430,7 +430,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               _context7.next = 3;
-              return this.store.accountList.addHolderAccounts([account], extra.customerId);
+              return this.store.accountList.addHolderAccounts({
+                holders: [account],
+                customerId: extra.customerId,
+                type: 'unshift'
+              });
             case 3:
               accountModules = _context7.sent;
               return _context7.abrupt("return", accountModules[0].getAccount());
@@ -463,7 +467,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 _context8.next = 3;
                 break;
               }
-              this.store.accountList.addHolderAccounts(accounts, extra.customerId);
+              this.store.accountList.addHolderAccounts({
+                holders: accounts,
+                customerId: extra.customerId,
+                type: 'unshift'
+              });
               return _context8.abrupt("return");
             case 3:
               res = [];
@@ -643,7 +651,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var _getAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
         var _this3 = this,
           _dateRange$,
-          _dateRange$2;
+          _dateRange$2,
+          _dateRange$3;
         var params,
           products,
           startDate,
@@ -687,7 +696,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
               dateRange = this.store.date.getDateRange();
               tempStartDate = startDate || (dateRange === null || dateRange === void 0 || (_dateRange$ = dateRange[0]) === null || _dateRange$ === void 0 ? void 0 : _dateRange$.date);
-              tempEndDate = endDate || (dateRange === null || dateRange === void 0 || (_dateRange$2 = dateRange[1]) === null || _dateRange$2 === void 0 ? void 0 : _dateRange$2.date);
+              tempEndDate = endDate || (dateRange === null || dateRange === void 0 || (_dateRange$2 = dateRange[1]) === null || _dateRange$2 === void 0 ? void 0 : _dateRange$2.date) || (dateRange === null || dateRange === void 0 || (_dateRange$3 = dateRange[0]) === null || _dateRange$3 === void 0 ? void 0 : _dateRange$3.date);
               if (tempProducts.length) {
                 _context13.next = 11;
                 break;
@@ -1028,6 +1037,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       if (!targetCartItem) {
         throw new Error("\u6CA1\u6709\u627E\u5230".concat(params._id, "\u8D2D\u7269\u8F66\u5546\u54C1"));
       }
+      var currentResourcesCapacityMap = {};
       if (params.resources) {
         var _targetCartItem$_prod;
         var formatCapacity = formatDefaultCapacitys({
@@ -1039,19 +1049,53 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         });
         params.resources = params.resources.map(function (n) {
           n.capacity = currentCapacity || 1;
+          currentResourcesCapacityMap[n.id] = currentCapacity;
           checkSubResourcesCapacity(n);
           return n;
         });
       }
       this.store.cart.updateItem(params);
-      // 更新购物车后，需要判定购物车里是否存在多个账号选择了相同资源的情况，如果是，则要把选择了相同资源的 product._origin.resources 给去除
+      var allOriginResources = [];
+      var dateRange = this.store.date.getDateRange();
+      if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
+        dateRange.forEach(function (n) {
+          if (n.resource) allOriginResources.push.apply(allOriginResources, _toConsumableArray(n.resource));
+        });
+      }
+      // 如果此时 resources 为空，视作购物车里已经有了 dateRange 数据，此时 dateList 里明确就是那一天的数据
+      if (!allOriginResources.length) {
+        var dateList = this.store.date.getDateList();
+        dateList.forEach(function (n) {
+          if (n.resource) allOriginResources.push.apply(allOriginResources, _toConsumableArray(n.resource));
+        });
+      }
+      // 更新购物车后，需要判定购物车里是否存在多个账号选择了相同资源的情况，如果是，且资源是单个预约，则要把选择了相同资源的 product._origin.resources 给去除
       var cartItems = this.store.cart.getItems();
       cartItems.forEach(function (item) {
-        if (item.holder_id !== (targetCartItem === null || targetCartItem === void 0 ? void 0 : targetCartItem.holder_id)) {
-          var _item$_origin$resourc;
-          var resources = (_item$_origin$resourc = item._origin.resources) === null || _item$_origin$resourc === void 0 ? void 0 : _item$_origin$resourc.filter(function (m) {
-            // 检查当前资源是否与目标资源的任何资源匹配
-            return !targetCartItem._origin.resources.some(function (targetRes) {
+        var _item$_origin$resourc;
+        var resources = (_item$_origin$resourc = item._origin.resources) === null || _item$_origin$resourc === void 0 ? void 0 : _item$_origin$resourc.filter(function (m) {
+          // 检查当前资源是否与目标资源的任何资源匹配
+          return !targetCartItem._origin.resources.some(function (targetRes) {
+            // 如果新更新进来的资源不是单个预约，其实就不需要检测了资源重叠了，但是需要检测资源 capacity 是否足够
+            if (targetRes.resourceType !== 'single') {
+              var _item$_productOrigin2;
+              var _formatCapacity = formatDefaultCapacitys({
+                capacity: (_item$_productOrigin2 = item._productOrigin) === null || _item$_productOrigin2 === void 0 ? void 0 : _item$_productOrigin2.capacity,
+                product_bundle: item._origin.product.product_bundle
+              });
+              var _currentCapacity = getSumCapacity({
+                capacity: _formatCapacity
+              });
+              var originResource = allOriginResources.find(function (n) {
+                return n.id === targetRes.id;
+              });
+              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)) {
               var _targetRes$metadata$c, _m$metadata$combined_;
               // 检查主资源ID是否匹配
               if (targetRes.id === m.id) return true;
@@ -1064,9 +1108,25 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 return m.metadata.combined_resource.resource_ids.includes(n);
               }))) return true;
               if (((_m$metadata$combined_ = m.metadata.combined_resource) === null || _m$metadata$combined_ === void 0 ? void 0 : _m$metadata$combined_.status) === 1 && m.metadata.combined_resource.resource_ids.includes(targetRes.id)) return true;
-              return false;
-            });
+            }
+            return false;
+          });
+        });
+        // 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
@@ -1179,15 +1239,9 @@ 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 = [];
-        if (cartItem.holder_id) {
-          selectedResources = getOthersSelectedResources(cartItems, cartItem.holder_id, resourcesMap);
-        } else {
-          selectedResources = getOthersCartSelectedResources(cartItems, cartItem._id, resourcesMap);
-        }
         var formatCapacity = formatDefaultCapacitys({
           capacity: (_cartItem$_productOri = cartItem._productOrigin) === null || _cartItem$_productOri === void 0 ? void 0 : _cartItem$_productOri.capacity,
           product_bundle: cartItem._origin.product.product_bundle
@@ -1196,6 +1250,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         var currentCapacity = getSumCapacity({
           capacity: formatCapacity
         });
+        if (cartItem.holder_id) {
+          selectedResources = getOthersSelectedResources(cartItems, cartItem.holder_id, resourcesMap);
+        } else {
+          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);
         // 如果购物车里已经有了时间片，则需要按照时间片过滤
         if (cartItem._origin.start_time) {
@@ -1213,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的开始结束时间
@@ -1234,7 +1292,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   },
                   time: item,
                   resource: m,
-                  currentCount: recordCount + (currentCapacity || 0),
+                  currentCount: currentCapacity || 0,
                   resourcesUseableMap: resourcesUseableMap
                 });
                 // 如果仅仅是因为子资源容量不够，不应该标记子资源是被占用的情况
@@ -1304,15 +1362,9 @@ 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 = [];
-        if (cartItem.holder_id) {
-          selectedResources = getOthersSelectedResources(cartItems, cartItem.holder_id, resourcesMap);
-        } else {
-          selectedResources = getOthersCartSelectedResources(cartItems, cartItem._id, resourcesMap);
-        }
         var formatCapacity = formatDefaultCapacitys({
           capacity: (_cartItem$_productOri4 = cartItem._productOrigin) === null || _cartItem$_productOri4 === void 0 ? void 0 : _cartItem$_productOri4.capacity,
           product_bundle: cartItem._origin.product.product_bundle
@@ -1321,6 +1373,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         var currentCapacity = getSumCapacity({
           capacity: formatCapacity
         });
+        if (cartItem.holder_id) {
+          selectedResources = getOthersSelectedResources(cartItems, cartItem.holder_id, resourcesMap);
+        } else {
+          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);
         // 如果购物车里已经有了时间片，则需要按照时间片过滤
         if (cartItem._origin.start_time) {
@@ -1338,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的开始结束时间
@@ -1359,7 +1415,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   },
                   time: item,
                   resource: m,
-                  currentCount: recordCount + (currentCapacity || 0),
+                  currentCount: currentCapacity || 0,
                   resourcesUseableMap: resourcesUseableMap
                 });
                 // 如果仅仅是因为子资源容量不够，不应该标记子资源是被占用的情况
@@ -1422,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;
       });
@@ -1432,11 +1487,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         throw new Error("\u6CA1\u6709\u627E\u5230".concat(id, "\u8D2D\u7269\u8F66\u5546\u54C1"));
       }
       var selectedResources = [];
-      if (targetCartItem.holder_id) {
-        selectedResources = getOthersSelectedResources(cartItems, targetCartItem.holder_id, resourcesMap);
-      } else {
-        selectedResources = getOthersCartSelectedResources(cartItems, targetCartItem._id, resourcesMap);
-      }
       var formatCapacity = formatDefaultCapacitys({
         capacity: (_targetCartItem$_prod2 = targetCartItem._productOrigin) === null || _targetCartItem$_prod2 === void 0 ? void 0 : _targetCartItem$_prod2.capacity,
         product_bundle: targetCartItem._origin.product.product_bundle
@@ -1444,6 +1494,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var currentCapacity = getSumCapacity({
         capacity: formatCapacity
       });
+      if (targetCartItem.holder_id) {
+        selectedResources = getOthersSelectedResources(cartItems, targetCartItem.holder_id, resourcesMap);
+      } else {
+        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) {
         item.renderList = item.renderList.filter(function (n) {
@@ -1552,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;
       }, {});
 
@@ -1648,16 +1704,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "autoSelectAllProductResources",
     value: function autoSelectAllProductResources(resources_code, timeSlots) {
-      var _dateRange$3,
+      var _dateRange$4,
         _this8 = this;
       var dateRange = this.store.date.getDateRange();
       var resources = [];
-      if (dateRange !== null && dateRange !== void 0 && (_dateRange$3 = dateRange[0]) !== null && _dateRange$3 !== void 0 && _dateRange$3.date) {
+      if (dateRange !== null && dateRange !== void 0 && (_dateRange$4 = dateRange[0]) !== null && _dateRange$4 !== void 0 && _dateRange$4.date) {
         dateRange.forEach(function (n) {
           if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
         });
       }
-      var resourcesMap = getResourcesMap(cloneDeep(resources));
+      // const resourcesMap = getResourcesMap(cloneDeep(resources));
       // 一个账号一个账号处理
       var errorList = [];
       var selectResourcesMap = {};
@@ -1669,9 +1725,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         // 第一个商品分配完以后，第二个商品分配的start_time应该是第一个商品的 end_time ,然后 end_time 应该是 start_time+duration
 
         cartItems.forEach(function (item, index) {
-          var _item$_productOrigin2;
+          var _item$_productOrigin3;
           var formatCapacity = formatDefaultCapacitys({
-            capacity: (_item$_productOrigin2 = item._productOrigin) === null || _item$_productOrigin2 === void 0 ? void 0 : _item$_productOrigin2.capacity,
+            capacity: (_item$_productOrigin3 = item._productOrigin) === null || _item$_productOrigin3 === void 0 ? void 0 : _item$_productOrigin3.capacity,
             product_bundle: item._origin.product.product_bundle
           });
           var currentCapacity = getSumCapacity({
@@ -1687,10 +1743,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             };
           }
           if (recordTimeSlots) {
-            if (index !== 0 && recordTimeSlots) {
-              var _item$_productOrigin$, _item$_productOrigin3, _ref9, _item$_productOrigin4, _item$_productOrigin$2, _item$_productOrigin5, _ref10, _item$_productOrigin6;
-              var start_at = dayjs(recordTimeSlots.end_time).add((_item$_productOrigin$ = (_item$_productOrigin3 = item._productOrigin) === null || _item$_productOrigin3 === void 0 || (_item$_productOrigin3 = _item$_productOrigin3.duration) === null || _item$_productOrigin3 === void 0 ? void 0 : _item$_productOrigin3.value) !== null && _item$_productOrigin$ !== void 0 ? _item$_productOrigin$ : 0, (_ref9 = (_item$_productOrigin4 = item._productOrigin) === null || _item$_productOrigin4 === void 0 || (_item$_productOrigin4 = _item$_productOrigin4.duration) === null || _item$_productOrigin4 === void 0 ? void 0 : _item$_productOrigin4.type) !== null && _ref9 !== void 0 ? _ref9 : 'minutes');
-              var end_at = start_at.add((_item$_productOrigin$2 = (_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$2 !== void 0 ? _item$_productOrigin$2 : 0, (_ref10 = (_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 && _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'),
@@ -1732,12 +1794,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               errorList.push(item._id);
             }
           } else {
-            var _item$_productOrigin7, _productResources$fin;
+            var _item$_productOrigin9, _productResources$fin;
             // 这里必须每次循环重新读，避免前一次循环操作了购物车，导致数据变更
             var allCartItems = cloneDeep(_this8.store.cart.getItems());
             // 如果没有传递 timeSlots，代表是第一种资源，则直接拿商品的 duration，到资源列表里找一个公共可用的
             var selectedResources = [];
-            var _resources = cloneDeep(((_item$_productOrigin7 = item._productOrigin) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.product_resource) === null || _item$_productOrigin7 === void 0 ? void 0 : _item$_productOrigin7.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;
@@ -1745,7 +1807,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 // 过滤掉 capacity 小于 currentCapacity 的资源
                 n.renderList = n.renderList.filter(function (m) {
                   var _item$duration;
-                  var recordCount = m.capacity || 0;
+                  // 同时 还需要减去 selectResourcesMap 里已经选中的资源的数量
+                  var recordCount = (m.capacity || 0) - (selectResourcesMap[m.id] || 0);
                   var timeSlots = getTimeSlicesByResource({
                     resource: m,
                     duration: (item === null || item === void 0 || (_item$duration = item.duration) === null || _item$duration === void 0 ? void 0 : _item$duration.value) || 0,
@@ -1757,16 +1820,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 currentResourcesRenderList.push.apply(currentResourcesRenderList, _toConsumableArray(n.renderList || []));
               }
             });
-            var _resourcesMap2 = getResourcesMap(currentResourcesRenderList);
+            var resourcesMap = getResourcesMap(currentResourcesRenderList);
             if (item.holder_id) {
-              selectedResources = getOthersSelectedResources(allCartItems, item.holder_id, _resourcesMap2);
+              selectedResources = getOthersSelectedResources(allCartItems, item.holder_id, resourcesMap);
             } else {
-              selectedResources = getOthersCartSelectedResources(allCartItems, item._id, _resourcesMap2);
+              selectedResources = getOthersCartSelectedResources(allCartItems, item._id, resourcesMap);
             }
-            var productResources = getResourcesByProduct(_resourcesMap2, cloneDeep(_resources), selectedResources, currentCapacity);
+            var productResources = getResourcesByProduct(resourcesMap, cloneDeep(_resources), selectedResources, currentCapacity);
             productResources.forEach(function (item) {
               item.renderList = item.renderList.filter(function (n) {
-                var recordCount = n.capacity || 0;
+                var recordCount = (n.capacity || 0) - (selectResourcesMap[n.id] || 0);
                 if (n.onlyComputed) return false;
                 return recordCount >= currentCapacity;
               });
@@ -1787,6 +1850,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               targetResource.capacity = currentCapacity;
               // 在这里处理 children 的数据
               checkSubResourcesCapacity(targetResource);
+              if (!selectResourcesMap[targetResource.id]) {
+                selectResourcesMap[targetResource.id] = currentCapacity;
+              } else {
+                selectResourcesMap[targetResource.id] += currentCapacity;
+              }
               _this8.store.cart.updateItem({
                 _id: item._id,
                 resources: [].concat(_toConsumableArray((item._origin.resources || []).filter(function (existingRes) {
@@ -1831,8 +1899,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var resourceIds = [];
       var resourcesTypeId = undefined;
       cartItems.forEach(function (item) {
-        var _item$_productOrigin8, _item$_productOrigin9;
-        (_item$_productOrigin8 = item._productOrigin) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.product_resource) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.resources) === null || _item$_productOrigin8 === void 0 || _item$_productOrigin8.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 || []));
           }
@@ -1843,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$_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 = _item$_productOrigin9.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$_productOrigin9 === void 0 ? void 0 : _item$_productOrigin9.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) {
@@ -1865,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$_productOrigin10;
-          accountDuration += (_item$_productOrigin$3 = (_item$_productOrigin10 = item._productOrigin) === null || _item$_productOrigin10 === void 0 || (_item$_productOrigin10 = _item$_productOrigin10.duration) === null || _item$_productOrigin10 === void 0 ? void 0 : _item$_productOrigin10.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;
@@ -1933,11 +2001,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       Object.values(itemsByAccount).forEach(function (accountItems) {
         var currentStartTime = timeSlots.start_at.format('YYYY-MM-DD HH:mm');
         accountItems.forEach(function (item, index) {
+          var _newResources$;
           var newResources = cloneDeep(item._origin.resources);
           newResources.forEach(function (resource) {
-            var _item$_productOrigin$4, _item$_productOrigin11, _ref11, _item$_productOrigin12;
+            var _item$_productOrigin$4, _item$_productOrigin13, _ref11, _item$_productOrigin14;
             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, (_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');
+            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({
@@ -1946,7 +2015,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           });
 
           // 更新下一个商品的开始时间为当前商品的结束时间
-          if (index < accountItems.length - 1) {
+          if (index < accountItems.length - 1 && (newResources === null || newResources === void 0 || (_newResources$ = newResources[0]) === null || _newResources$ === void 0 ? void 0 : _newResources$.resourceType) === 'single') {
             currentStartTime = newResources[0].endTime;
           }
         });
@@ -2061,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.js

@@ -242,7 +242,11 @@ export var getResourcesByProduct = function getResourcesByProduct(resourcesMap,
         return item.default_resource.indexOf(d) == -1;
       });
       var optional_resource = item.optional_resource.reduce(function (childAcc, d) {
-        if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id)) {
+        var _resourcesMap$d;
+        // 如果其他资源选择过，并且这个资源是单个预约，则不可以选中此资源
+        // TODO: 如果容量超了这里怎么处理？
+        var isSelectSingleResources = ((_resourcesMap$d = resourcesMap[d]) === null || _resourcesMap$d === void 0 ? void 0 : _resourcesMap$d.resourceType) === 'single' && selectedResources.includes(resourcesMap[d].id);
+        if (resourcesMap[d] && !isSelectSingleResources) {
           // 拼装组合资源的数据
           var combiningResources = [];
           if (resourcesMap[d].combined_resource && resourcesMap[d].combined_resource.status === 1) {
@@ -274,7 +278,9 @@ export var getResourcesByProduct = function getResourcesByProduct(resourcesMap,
         return childAcc;
       }, []);
       var default_resource = item.default_resource.reduce(function (childAcc, d) {
-        if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id)) {
+        var _resourcesMap$d2;
+        var isSelectSingleResources = ((_resourcesMap$d2 = resourcesMap[d]) === null || _resourcesMap$d2 === void 0 ? void 0 : _resourcesMap$d2.resourceType) === 'single' && selectedResources.includes(resourcesMap[d].id);
+        if (resourcesMap[d] && !isSelectSingleResources) {
           // 拼装组合资源的数据
           var combiningResources = [];
           if (resourcesMap[d].combined_resource && resourcesMap[d].combined_resource.status === 1) {
@@ -589,9 +595,9 @@ export var getOthersSelectedResources = function getOthersSelectedResources(cart
               return acc;
             }
             acc.push.apply(acc, _toConsumableArray(n.metadata.combined_resource.resource_ids));
-            n.metadata.combined_resource.resource_ids.forEach(function (m) {
-              resourcesMap[m].capacity -= n.num;
-            });
+            // n.metadata.combined_resource.resource_ids.forEach((m: number) => {
+            //   if (resourcesMap[m]) resourcesMap[m].capacity -= d.num || 0;
+            // });
           } else {
             // 如果当前选中的不是组合资源，但是是别的组合资源里的子资源，则还需要把别的组合资源也加进来
             // 去 resourcesMap 里找一下 n.id 是不是别的组合资源里的子资源，是的话把别的组合资源也加进来
@@ -599,13 +605,13 @@ export var getOthersSelectedResources = function getOthersSelectedResources(cart
               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;
+                  // if (resourcesMap[m.id]) resourcesMap[m.id].capacity -= d.num || 0;
                 }
               }
             });
           }
           acc.push(n.id);
-          resourcesMap[n.id].capacity -= n.num;
+          // if (resourcesMap[n.id]) resourcesMap[n.id].capacity -= currentCapacity || 0;
         });
       }
     }
@@ -636,9 +642,9 @@ export var getOthersCartSelectedResources = function getOthersCartSelectedResour
               return acc;
             }
             acc.push.apply(acc, _toConsumableArray(n.metadata.combined_resource.resource_ids));
-            n.metadata.combined_resource.resource_ids.forEach(function (m) {
-              resourcesMap[m].capacity -= n.num;
-            });
+            // n.metadata.combined_resource.resource_ids.forEach((m: number) => {
+            //   resourcesMap[m].capacity -= n.num;
+            // });
           } else {
             // 如果当前选中的不是组合资源，但是是别的组合资源里的子资源，则还需要把别的组合资源也加进来
             // 去 resourcesMap 里找一下 n.id 是不是别的组合资源里的子资源，是的话把别的组合资源也加进来
@@ -646,14 +652,14 @@ export var getOthersCartSelectedResources = function getOthersCartSelectedResour
               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;
+                  // resourcesMap[m.id].capacity -= n.num;
                 }
               }
             });
           }
           acc.push(n.id);
           // push 完以后，把 resourceMap 的 capacity 减掉当前的商品数量
-          resourcesMap[n.id].capacity -= n.num;
+          // resourcesMap[n.id].capacity -= currentCapacity || 0;
         });
       }
     }

package/lib/modules/AccountList/index.d.ts

@@ -16,6 +16,7 @@ export declare class AccountListModule extends BaseModule implements Module {
      * 创建账号并添加到列表中
      * @param account 账号信息
      * @param needEmit 是否需要触发事件
+     * @param type 添加类型
      */
     private createAccountAndAdd;
     addAccount(account: Account): Promise<AccountModule>;
@@ -30,10 +31,12 @@ export declare class AccountListModule extends BaseModule implements Module {
     storeChange(): void;
     /**
      * 批量添加holder类型账号
-     * @param holders 账号信息列表
-     * @param customerId 账户id
      */
-    addHolderAccounts(holders: IHolder[], customerId: number): Promise<AccountModule[]>;
+    addHolderAccounts(params: {
+        holders: IHolder[];
+        customerId: number;
+        type?: 'unshift' | 'push';
+    }): Promise<AccountModule[]>;
     /**
      * 获取holder类型账户列表
      * @param params

package/lib/modules/AccountList/index.js

@@ -69,19 +69,30 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
    * 创建账号并添加到列表中
    * @param account 账号信息
    * @param needEmit 是否需要触发事件
+   * @param type 添加类型
    */
-  async createAccountAndAdd(account, needEmit = true) {
+  async createAccountAndAdd(account, needEmit = true, type) {
     const tempAccountModule = this.store.accounts.find(
       (a) => a.getId() === account.id
     );
     if (tempAccountModule) {
       return tempAccountModule;
     }
-    this.store.accountList.push(account);
+    const newAccountList = [...this.store.accountList || []];
+    if (type === "unshift") {
+      newAccountList.unshift(account);
+    } else {
+      newAccountList.push(account);
+    }
+    this.store.accountList = newAccountList;
     const accountModule = new import_Account.AccountModule(`account_${account.id}`);
     this.core.registerModule(accountModule);
     accountModule.setAccountInfo(account);
-    this.store.accounts = [...this.store.accounts || [], accountModule];
+    if (type === "unshift") {
+      this.store.accounts = [accountModule, ...this.store.accounts || []];
+    } else {
+      this.store.accounts = [...this.store.accounts || [], accountModule];
+    }
     if (needEmit) {
       await this.core.effects.emit(
         import_types.AccountListHooks.OnAccountListUpdate,
@@ -250,15 +261,22 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
   }
   /**
    * 批量添加holder类型账号
-   * @param holders 账号信息列表
-   * @param customerId 账户id
    */
-  async addHolderAccounts(holders, customerId) {
+  async addHolderAccounts(params) {
+    const { holders, customerId, type = "push" } = params;
     const accountModules = [];
     for (const holder of holders) {
       const account = (0, import_utils.createHolderAccount)(holder, customerId);
-      const accountModule = await this.createAccountAndAdd(account, false);
-      accountModules.push(accountModule);
+      const accountModule = await this.createAccountAndAdd(
+        account,
+        false,
+        type
+      );
+      if (type === "unshift") {
+        accountModules.unshift(accountModule);
+      } else {
+        accountModules.push(accountModule);
+      }
     }
     await this.core.effects.emit(
       import_types.AccountListHooks.OnAccountListUpdate,
@@ -283,7 +301,10 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
         skip: skip || 1
       });
       if ((_b = (_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) == null ? void 0 : _b.length) {
-        await this.addHolderAccounts(res.data.list, customer_id);
+        await this.addHolderAccounts({
+          holders: res.data.list,
+          customerId: customer_id
+        });
       }
     } catch (error) {
       console.error(error);