npm - @pisell/pisellos - Versions diffs - 0.0.80 → 0.0.81 - Mend

@pisell/pisellos 0.0.80 → 0.0.81

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/dist/modules/AccountList/index.d.ts +6 -3
package/dist/modules/AccountList/index.js +57 -37
package/dist/solution/BookingByStep/index.js +109 -59
package/dist/solution/BookingByStep/utils/resources.d.ts +2 -2
package/dist/solution/BookingByStep/utils/resources.js +20 -14
package/lib/modules/AccountList/index.d.ts +6 -3
package/lib/modules/AccountList/index.js +30 -9
package/lib/solution/BookingByStep/index.js +104 -58
package/lib/solution/BookingByStep/utils/resources.d.ts +2 -2
package/lib/solution/BookingByStep/utils/resources.js +10 -14
package/package.json +1 -1

package/dist/modules/AccountList/index.d.ts CHANGED Viewed

@@ -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/dist/modules/AccountList/index.js CHANGED Viewed

@@ -97,42 +97,56 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
      * 创建账号并添加到列表中
      * @param account 账号信息
      * @param needEmit 是否需要触发事件
+     * @param type 添加类型
      */
   }, {
     key: "createAccountAndAdd",
     value: (function () {
       var _createAccountAndAdd = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(account) {
         var needEmit,
+          type,
           tempAccountModule,
+          newAccountList,
           accountModule,
           _args2 = arguments;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               needEmit = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : true;
+              type = _args2.length > 2 ? _args2[2] : undefined;
               tempAccountModule = this.store.accounts.find(function (a) {
                 return a.getId() === account.id;
               }); // 如果账号已经存在，则直接返回
               if (!tempAccountModule) {
-                _context2.next = 4;
+                _context2.next = 5;
                 break;
               }
               return _context2.abrupt("return", tempAccountModule);
-            case 4:
-              this.store.accountList.push(account);
+            case 5:
+              newAccountList = _toConsumableArray(this.store.accountList || []);
+              if (type === 'unshift') {
+                newAccountList.unshift(account);
+              } else {
+                newAccountList.push(account);
+              }
+              this.store.accountList = newAccountList;
               accountModule = new AccountModule("account_".concat(account.id));
               this.core.registerModule(accountModule);
               accountModule.setAccountInfo(account);
-              this.store.accounts = [].concat(_toConsumableArray(this.store.accounts || []), [accountModule]);
+              if (type === 'unshift') {
+                this.store.accounts = [accountModule].concat(_toConsumableArray(this.store.accounts || []));
+              } else {
+                this.store.accounts = [].concat(_toConsumableArray(this.store.accounts || []), [accountModule]);
+              }
               if (!needEmit) {
-                _context2.next = 12;
+                _context2.next = 15;
                 break;
               }
-              _context2.next = 12;
+              _context2.next = 15;
               return this.core.effects.emit(AccountListHooks.OnAccountListUpdate, this.store);
-            case 12:
+            case 15:
               return _context2.abrupt("return", accountModule);
-            case 13:
+            case 16:
             case "end":
               return _context2.stop();
           }
@@ -425,59 +439,62 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
     /**
      * 批量添加holder类型账号
-     * @param holders 账号信息列表
-     * @param customerId 账户id
      */
   }, {
     key: "addHolderAccounts",
     value: (function () {
-      var _addHolderAccounts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(holders, customerId) {
-        var accountModules, _iterator, _step, holder, account, accountModule;
+      var _addHolderAccounts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params) {
+        var holders, customerId, _params$type, type, accountModules, _iterator, _step, holder, account, accountModule;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
+              holders = params.holders, customerId = params.customerId, _params$type = params.type, type = _params$type === void 0 ? 'push' : _params$type;
               accountModules = [];
               _iterator = _createForOfIteratorHelper(holders);
-              _context8.prev = 2;
+              _context8.prev = 3;
               _iterator.s();
-            case 4:
+            case 5:
               if ((_step = _iterator.n()).done) {
-                _context8.next = 13;
+                _context8.next = 14;
                 break;
               }
               holder = _step.value;
               account = createHolderAccount(holder, customerId);
-              _context8.next = 9;
-              return this.createAccountAndAdd(account, false);
-            case 9:
+              _context8.next = 10;
+              return this.createAccountAndAdd(account, false, type);
+            case 10:
               accountModule = _context8.sent;
-              accountModules.push(accountModule);
-            case 11:
-              _context8.next = 4;
+              if (type === 'unshift') {
+                accountModules.unshift(accountModule);
+              } else {
+                accountModules.push(accountModule);
+              }
+            case 12:
+              _context8.next = 5;
               break;
-            case 13:
-              _context8.next = 18;
+            case 14:
+              _context8.next = 19;
               break;
-            case 15:
-              _context8.prev = 15;
-              _context8.t0 = _context8["catch"](2);
+            case 16:
+              _context8.prev = 16;
+              _context8.t0 = _context8["catch"](3);
               _iterator.e(_context8.t0);
-            case 18:
-              _context8.prev = 18;
+            case 19:
+              _context8.prev = 19;
               _iterator.f();
-              return _context8.finish(18);
-            case 21:
-              _context8.next = 23;
+              return _context8.finish(19);
+            case 22:
+              _context8.next = 24;
               return this.core.effects.emit(AccountListHooks.OnAccountListUpdate, this.store);
-            case 23:
-              return _context8.abrupt("return", accountModules);
             case 24:
+              return _context8.abrupt("return", accountModules);
+            case 25:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, this, [[2, 15, 18, 21]]);
+        }, _callee8, this, [[3, 16, 19, 22]]);
       }));
-      function addHolderAccounts(_x10, _x11) {
+      function addHolderAccounts(_x10) {
         return _addHolderAccounts.apply(this, arguments);
       }
       return addHolderAccounts;
@@ -513,7 +530,10 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               _context9.next = 9;
-              return this.addHolderAccounts(res.data.list, customer_id);
+              return this.addHolderAccounts({
+                holders: res.data.list,
+                customerId: customer_id
+              });
             case 9:
               _context9.next = 14;
               break;
@@ -527,7 +547,7 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee9, this, [[2, 11]]);
       }));
-      function fetchHolderAccounts(_x12) {
+      function fetchHolderAccounts(_x11) {
         return _fetchHolderAccounts.apply(this, arguments);
       }
       return fetchHolderAccounts;

package/dist/solution/BookingByStep/index.js CHANGED Viewed

@@ -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,52 @@ 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;
+              }
+              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,14 +1107,14 @@ 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;
-            });
-          });
-          _this5.store.cart.updateItem({
-            _id: item._id,
-            resources: resources
+            }
+            return false;
           });
-        }
+        });
+        _this5.store.cart.updateItem({
+          _id: item._id,
+          resources: resources
+        });
       });
     }
@@ -1183,11 +1226,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       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 +1234,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         var currentCapacity = getSumCapacity({
           capacity: formatCapacity
         });
+        if (cartItem.holder_id) {
+          selectedResources = getOthersSelectedResources(cartItems, cartItem.holder_id, resourcesMap, currentCapacity);
+        } else {
+          selectedResources = getOthersCartSelectedResources(cartItems, cartItem._id, resourcesMap, currentCapacity);
+        }
         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) {
@@ -1308,11 +1351,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       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 +1359,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         var currentCapacity = getSumCapacity({
           capacity: formatCapacity
         });
+        if (cartItem.holder_id) {
+          selectedResources = getOthersSelectedResources(cartItems, cartItem.holder_id, resourcesMap, currentCapacity);
+        } else {
+          selectedResources = getOthersCartSelectedResources(cartItems, cartItem._id, resourcesMap, currentCapacity);
+        }
         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) {
@@ -1432,11 +1475,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 +1482,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var currentCapacity = getSumCapacity({
         capacity: formatCapacity
       });
+      if (targetCartItem.holder_id) {
+        selectedResources = getOthersSelectedResources(cartItems, targetCartItem.holder_id, resourcesMap, currentCapacity);
+      } else {
+        selectedResources = getOthersCartSelectedResources(cartItems, targetCartItem._id, resourcesMap, currentCapacity);
+      }
       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) {
@@ -1537,7 +1580,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);
+      var selectedResources = getOthersSelectedResources(allCartItems, holder_id, resourcesMap, capacity || 0);
       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;
@@ -1648,16 +1691,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 +1712,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({
@@ -1688,9 +1731,9 @@ 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$_productOrigin$, _item$_productOrigin4, _ref9, _item$_productOrigin5, _item$_productOrigin$2, _item$_productOrigin6, _ref10, _item$_productOrigin7;
+              var start_at = dayjs(recordTimeSlots.end_time).add((_item$_productOrigin$ = (_item$_productOrigin4 = item._productOrigin) === null || _item$_productOrigin4 === void 0 || (_item$_productOrigin4 = _item$_productOrigin4.duration) === null || _item$_productOrigin4 === void 0 ? void 0 : _item$_productOrigin4.value) !== null && _item$_productOrigin$ !== void 0 ? _item$_productOrigin$ : 0, (_ref9 = (_item$_productOrigin5 = item._productOrigin) === null || _item$_productOrigin5 === void 0 || (_item$_productOrigin5 = _item$_productOrigin5.duration) === null || _item$_productOrigin5 === void 0 ? void 0 : _item$_productOrigin5.type) !== null && _ref9 !== void 0 ? _ref9 : 'minutes');
+              var end_at = start_at.add((_item$_productOrigin$2 = (_item$_productOrigin6 = item._productOrigin) === null || _item$_productOrigin6 === void 0 || (_item$_productOrigin6 = _item$_productOrigin6.duration) === null || _item$_productOrigin6 === void 0 ? void 0 : _item$_productOrigin6.value) !== null && _item$_productOrigin$2 !== void 0 ? _item$_productOrigin$2 : 0, (_ref10 = (_item$_productOrigin7 = item._productOrigin) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.duration) === null || _item$_productOrigin7 === void 0 ? void 0 : _item$_productOrigin7.type) !== null && _ref10 !== void 0 ? _ref10 : 'minutes');
               recordTimeSlots = {
                 start_time: start_at.format('HH:mm'),
                 end_time: end_at.format('HH:mm'),
@@ -1732,12 +1775,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               errorList.push(item._id);
             }
           } else {
-            var _item$_productOrigin7, _productResources$fin;
+            var _item$_productOrigin8, _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$_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 currentResourcesRenderList = [];
             _resources.forEach(function (n) {
               var _n$renderList;
@@ -1745,7 +1788,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 +1801,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, currentCapacity);
             } else {
-              selectedResources = getOthersCartSelectedResources(allCartItems, item._id, _resourcesMap2);
+              selectedResources = getOthersCartSelectedResources(allCartItems, item._id, resourcesMap, currentCapacity);
             }
-            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 +1831,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 +1880,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$_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) {
           if (n.code === resources_code) {
             resources.push.apply(resources, _toConsumableArray(n.renderList || []));
           }
@@ -1843,9 +1892,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$_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) {
           return n.code === resources_code;
-        })) === null || _item$_productOrigin9 === void 0 ? void 0 : _item$_productOrigin9.id;
+        })) === null || _item$_productOrigin10 === void 0 ? void 0 : _item$_productOrigin10.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 +1914,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$_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;
         });
         if (accountDuration > duration) {
           duration = accountDuration;
@@ -1933,11 +1982,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$_productOrigin12, _ref11, _item$_productOrigin13;
             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$_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');
             delete resource.times;
           });
           _this10.store.cart.updateItem({
@@ -1946,7 +1996,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;
           }
         });
@@ -2043,7 +2093,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);
+      var selectedResources = getOthersSelectedResources(cartItems, '', resourcesMap, 1);
       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);

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

@@ -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/dist/solution/BookingByStep/utils/resources.js CHANGED Viewed

@@ -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) {
@@ -574,7 +580,7 @@ export var getTimeSlicesByResources = function getTimeSlicesByResources(_ref6) {
  * @return {*}
  * @Author: jinglin.tan
  */
-export var getOthersSelectedResources = function getOthersSelectedResources(cartItems, accountId, resourcesMap) {
+export var getOthersSelectedResources = function getOthersSelectedResources(cartItems, accountId, resourcesMap, currentCapacity) {
   return cartItems.reduce(function (acc, d) {
     if (d.holder_id !== accountId) {
       var _d$_origin;
@@ -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;
         });
       }
     }
@@ -621,7 +627,7 @@ export var getOthersSelectedResources = function getOthersSelectedResources(cart
  * @return {*}
  * @Author: jinglin.tan
  */
-export var getOthersCartSelectedResources = function getOthersCartSelectedResources(cartItems, cartItemId, resourcesMap) {
+export var getOthersCartSelectedResources = function getOthersCartSelectedResources(cartItems, cartItemId, resourcesMap, currentCapacity) {
   return cartItems.reduce(function (acc, d) {
     if (d._id !== cartItemId) {
       var _d$_origin2;
@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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);

package/lib/solution/BookingByStep/index.js CHANGED Viewed

@@ -272,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(
@@ -286,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 = [];
@@ -347,7 +349,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 获取商品/服务的可用日期
   async getAvailableDate(params = {}) {
-    var _a, _b;
+    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");
@@ -371,7 +373,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     let dateRange = this.store.date.getDateRange();
     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);
+    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 [];
     }
@@ -495,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,
@@ -503,21 +506,49 @@ 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(
@@ -530,16 +561,16 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               }
             )))
               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
+      });
     });
   }
   // 删除购物车里某个商品
@@ -625,25 +656,27 @@ 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 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 });
       const productResources = (0, import_resources.getResourcesByProduct)(
         resourcesMap,
         ((_c = (_b = cartItem._productOrigin) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) || [],
@@ -754,25 +787,27 @@ 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 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 });
       const productResources = (0, import_resources.getResourcesByProduct)(
         resourcesMap,
         ((_c = (_b = cartItem._productOrigin) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) || [],
@@ -875,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) || [],
@@ -974,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,
@@ -1062,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();
@@ -1144,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,
@@ -1156,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;
@@ -1196,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: [
@@ -1319,12 +1363,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     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;
@@ -1333,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;
         }
       });
@@ -1406,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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

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