@pisell/pisellos 0.0.27 → 0.0.28

package/dist/modules/AccountList/index.js

@@ -213,6 +213,7 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
                 return account;
               });
               this.core.effects.emit("".concat(this.name, ":changed"), {
+                path: 'accounts',
                 value: this.store.accountList
               });
             case 2:

package/dist/solution/BookingByStep/index.d.ts

@@ -106,10 +106,11 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         timeSlots: any[];
         selectedResource: any;
     } | undefined;
-    autoSelectAccountResources({ holder_id, resources_code, timeSlots, }: {
+    autoSelectAccountResources({ holder_id, resources_code, timeSlots, countMap }: {
         holder_id: string;
         resources_code: string | number;
         timeSlots?: TimeSliceItem;
+        countMap: Record<number, number>;
     }): {
         selectedResource: any;
         timeSlots?: undefined;

package/dist/solution/BookingByStep/index.js

@@ -479,16 +479,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _setLoginAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(accountId, accountInfo) {
         var _this4 = this;
-        var account, cartItems;
+        var account, stateAccountId, cartItems;
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
               account = this.store.accountList.getAccount(accountId);
               if (!account) {
-                _context11.next = 8;
+                _context11.next = 9;
                 break;
               }
-              this.store.accountList.updateAccountListById(account.getId(), accountInfo);
+              stateAccountId = account.getId();
               account.setAccountInfo(accountInfo);
               // 然后去购物车，把原先关联了 holder_id 为 accountId 的商品，替换为 holder_id = accountInfo.id
               cartItems = this.store.cart.getItems();
@@ -500,11 +500,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   });
                 }
               });
-              _context11.next = 9;
+              this.store.accountList.updateAccountListById(stateAccountId, accountInfo);
+              _context11.next = 10;
               break;
-            case 8:
-              throw new Error("\u6CA1\u6709\u627E\u5230".concat(accountId, "\u8D26\u6237"));
             case 9:
+              throw new Error("\u6CA1\u6709\u627E\u5230".concat(accountId, "\u8D26\u6237"));
+            case 10:
             case "end":
               return _context11.stop();
           }
@@ -916,7 +917,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var _accountCartItems$0$_, _accountCartItems$;
       var holder_id = _ref7.holder_id,
         resources_code = _ref7.resources_code,
-        timeSlots = _ref7.timeSlots;
+        timeSlots = _ref7.timeSlots,
+        countMap = _ref7.countMap;
       var dateRange = this.store.date.getDateRange();
       var cartItems = this.store.cart.getItems();
       // 取到账号下所有的商品，然后根据商品的 duration 和资源列表，获取所有可用的资源
@@ -958,6 +960,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         try {
           var _loop2 = function _loop2() {
             var n = _step2.value;
+            var recordCount = countMap[n.id] || 0;
             var canUseTime = n.times.find(function (item) {
               return getIsUsableByTimeItem({
                 timeSlice: item,
@@ -966,7 +969,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   end_time: end_time
                 },
                 resource: n,
-                currentCount: 1
+                currentCount: recordCount + 1
               });
             });
             if (canUseTime) {
@@ -1021,6 +1024,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var resourcesMap = getResourcesMap(resources);
       // 一个账号一个账号处理
       var errorList = [];
+      var selectResourcesMap = {};
       this.store.accountList.getAccounts().forEach(function (account) {
         var cartItems = _this7.store.cart.getCartByAccount(account.getId());
         // 这里必须每次循环重新读，避免前一次循环操作了购物车，导致数据变更
@@ -1031,9 +1035,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             var res = _this7.autoSelectAccountResources({
               holder_id: item.holder_id,
               resources_code: resources_code,
-              timeSlots: timeSlots
+              timeSlots: timeSlots,
+              countMap: selectResourcesMap
             });
             if (res !== null && res !== void 0 && res.selectedResource) {
+              if (!selectResourcesMap[res.selectedResource.id]) {
+                selectResourcesMap[res.selectedResource.id] = 1;
+              } else {
+                selectResourcesMap[res.selectedResource.id]++;
+              }
               console.log(_this7.store.cart.getItems());
               _this7.store.cart.updateItem({
                 _id: item._id,
@@ -1122,47 +1132,43 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     }
 
     // 提交时间切片，绑定到对应购物车的商品上，更新购物车
-    // submitTimeSlot({
-    //   resourceProductData,
-    //   selectedResources,
-    //   timeSlots,
-    // }: {
-    //   resourceProductData: any;
-    //   selectedResources: any[];
-    //   timeSlots: TimeSliceItem;
-    // }) {
-    //   const newResources = cloneDeep(selectedResources);
-    //   newResources.forEach((n) => {
-    //     n.startTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
-    //     n.endTime = dayjs(n.startTime)
-    //       .add(
-    //         resourceProductData.product.duration.value,
-    //         resourceProductData.product.duration.type
-    //       )
-    //       .format("YYYY-MM-DD HH:mm");
-    //     delete n.times;
-    //   });
-    //   this.store.cart.updateItem({
-    //     _id: resourceProductData._id,
-    //     resources: newResources,
-    //   });
-    // }
   }, {
     key: "submitTimeSlot",
     value: function submitTimeSlot(timeSlots) {
       var _this9 = this;
+      // 以账号为维度处理数据。购物车里每一项的 startTime应该是前一个商品的 endTime，如果是第一个商品则用 timeSlots.start_at
       var cartItems = this.store.cart.getItems();
-      cartItems.forEach(function (item) {
-        var newResources = cloneDeep(item._origin.resources);
-        newResources.forEach(function (n) {
-          var _item$_productOrigin$2, _item$_productOrigin4, _ref8, _item$_productOrigin5;
-          n.startTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
-          n.endTime = dayjs(n.startTime).add((_item$_productOrigin$2 = (_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$2 !== void 0 ? _item$_productOrigin$2 : 0, (_ref8 = (_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 && _ref8 !== void 0 ? _ref8 : "minutes").format("YYYY-MM-DD HH:mm");
-          delete n.times;
-        });
-        _this9.store.cart.updateItem({
-          _id: item._id,
-          resources: newResources
+
+      // 按账号分组
+      var itemsByAccount = cartItems.reduce(function (acc, item) {
+        var holderId = item.holder_id;
+        if (!acc[holderId]) {
+          acc[holderId] = [];
+        }
+        acc[holderId].push(item);
+        return acc;
+      }, {});
+
+      // 处理每个账号的商品
+      Object.values(itemsByAccount).forEach(function (accountItems) {
+        var currentStartTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
+        accountItems.forEach(function (item, index) {
+          var newResources = cloneDeep(item._origin.resources);
+          newResources.forEach(function (resource) {
+            var _item$_productOrigin$2, _item$_productOrigin4, _ref8, _item$_productOrigin5;
+            resource.startTime = currentStartTime;
+            resource.endTime = dayjs(currentStartTime).add((_item$_productOrigin$2 = (_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$2 !== void 0 ? _item$_productOrigin$2 : 0, (_ref8 = (_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 && _ref8 !== void 0 ? _ref8 : "minutes").format("YYYY-MM-DD HH:mm");
+            delete resource.times;
+          });
+          _this9.store.cart.updateItem({
+            _id: item._id,
+            resources: newResources
+          });
+
+          // 更新下一个商品的开始时间为当前商品的结束时间
+          if (index < accountItems.length - 1) {
+            currentStartTime = newResources[0].endTime;
+          }
         });
       });
     }

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

@@ -110,6 +110,9 @@ var checkCapacity = function checkCapacity(_ref) {
     resource = _ref.resource,
     _ref$currentCount = _ref.currentCount,
     currentCount = _ref$currentCount === void 0 ? 1 : _ref$currentCount;
+  if (currentCount > resource.capacity) {
+    return false;
+  }
   var conflict = (event_list || []).filter(function (d) {
     return isConflict({
       start_at: d.start_at,

package/lib/modules/AccountList/index.js

@@ -116,7 +116,7 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
       }
       return account;
     });
-    this.core.effects.emit(`${this.name}:changed`, { value: this.store.accountList });
+    this.core.effects.emit(`${this.name}:changed`, { path: "accounts", value: this.store.accountList });
   }
   async removeAccount(id) {
     try {

package/lib/solution/BookingByStep/index.d.ts

@@ -106,10 +106,11 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         timeSlots: any[];
         selectedResource: any;
     } | undefined;
-    autoSelectAccountResources({ holder_id, resources_code, timeSlots, }: {
+    autoSelectAccountResources({ holder_id, resources_code, timeSlots, countMap }: {
         holder_id: string;
         resources_code: string | number;
         timeSlots?: TimeSliceItem;
+        countMap: Record<number, number>;
     }): {
         selectedResource: any;
         timeSlots?: undefined;

package/lib/solution/BookingByStep/index.js

@@ -238,7 +238,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   async setLoginAccount(accountId, accountInfo) {
     const account = this.store.accountList.getAccount(accountId);
     if (account) {
-      this.store.accountList.updateAccountListById(account.getId(), accountInfo);
+      let stateAccountId = account.getId();
       account.setAccountInfo(accountInfo);
       const cartItems = this.store.cart.getItems();
       cartItems.forEach((item) => {
@@ -249,6 +249,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           });
         }
       });
+      this.store.accountList.updateAccountListById(stateAccountId, accountInfo);
     } else {
       throw new Error(`没有找到${accountId}账户`);
     }
@@ -476,7 +477,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   autoSelectAccountResources({
     holder_id,
     resources_code,
-    timeSlots
+    timeSlots,
+    countMap
   }) {
     var _a, _b, _c;
     const dateRange = this.store.date.getDateRange();
@@ -506,12 +508,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       const end_time = (0, import_dayjs.default)(`${dateRange[0].date} ${start_time}`).add(duration, durationType).format("HH:mm");
       let targetResource = null;
       for (const n of resources) {
+        const recordCount = countMap[n.id] || 0;
         const canUseTime = n.times.find(
           (item) => (0, import_resources.getIsUsableByTimeItem)({
             timeSlice: item,
             time: { start_time, end_time },
             resource: n,
-            currentCount: 1
+            currentCount: recordCount + 1
           })
         );
         if (canUseTime) {
@@ -551,6 +554,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     });
     const resourcesMap = (0, import_utils.getResourcesMap)(resources);
     const errorList = [];
+    const selectResourcesMap = {};
     this.store.accountList.getAccounts().forEach((account) => {
       const cartItems = this.store.cart.getCartByAccount(account.getId());
       const allCartItems = this.store.cart.getItems();
@@ -560,9 +564,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           const res = this.autoSelectAccountResources({
             holder_id: item.holder_id,
             resources_code,
-            timeSlots
+            timeSlots,
+            countMap: selectResourcesMap
           });
           if (res == null ? void 0 : res.selectedResource) {
+            if (!selectResourcesMap[res.selectedResource.id]) {
+              selectResourcesMap[res.selectedResource.id] = 1;
+            } else {
+              selectResourcesMap[res.selectedResource.id]++;
+            }
             console.log(this.store.cart.getItems());
             this.store.cart.updateItem({
               _id: item._id,
@@ -639,47 +649,33 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     return timeSlots;
   }
   // 提交时间切片，绑定到对应购物车的商品上，更新购物车
-  // submitTimeSlot({
-  //   resourceProductData,
-  //   selectedResources,
-  //   timeSlots,
-  // }: {
-  //   resourceProductData: any;
-  //   selectedResources: any[];
-  //   timeSlots: TimeSliceItem;
-  // }) {
-  //   const newResources = cloneDeep(selectedResources);
-  //   newResources.forEach((n) => {
-  //     n.startTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
-  //     n.endTime = dayjs(n.startTime)
-  //       .add(
-  //         resourceProductData.product.duration.value,
-  //         resourceProductData.product.duration.type
-  //       )
-  //       .format("YYYY-MM-DD HH:mm");
-  //     delete n.times;
-  //   });
-  //   this.store.cart.updateItem({
-  //     _id: resourceProductData._id,
-  //     resources: newResources,
-  //   });
-  // }
   submitTimeSlot(timeSlots) {
     const cartItems = this.store.cart.getItems();
-    cartItems.forEach((item) => {
-      const newResources = (0, import_lodash_es.cloneDeep)(item._origin.resources);
-      newResources.forEach((n) => {
-        var _a, _b, _c, _d;
-        n.startTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
-        n.endTime = (0, import_dayjs.default)(n.startTime).add(
-          ((_b = (_a = item._productOrigin) == null ? void 0 : _a.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 n.times;
-      });
-      this.store.cart.updateItem({
-        _id: item._id,
-        resources: newResources
+    const itemsByAccount = cartItems.reduce((acc, item) => {
+      const holderId = item.holder_id;
+      if (!acc[holderId]) {
+        acc[holderId] = [];
+      }
+      acc[holderId].push(item);
+      return acc;
+    }, {});
+    Object.values(itemsByAccount).forEach((accountItems) => {
+      let currentStartTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
+      accountItems.forEach((item, index) => {
+        const newResources = (0, import_lodash_es.cloneDeep)(item._origin.resources);
+        newResources.forEach((resource) => {
+          var _a, _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, ((_d = (_c = item._productOrigin) == null ? void 0 : _c.duration) == null ? void 0 : _d.type) ?? "minutes").format("YYYY-MM-DD HH:mm");
+          delete resource.times;
+        });
+        this.store.cart.updateItem({
+          _id: item._id,
+          resources: newResources
+        });
+        if (index < accountItems.length - 1) {
+          currentStartTime = newResources[0].endTime;
+        }
       });
     });
   }

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

@@ -72,6 +72,9 @@ var formatResource = (resourceItem, booking) => {
   return _resourceItem;
 };
 var checkCapacity = ({ event_list, timeSlice, resource, currentCount = 1 }) => {
+  if (currentCount > resource.capacity) {
+    return false;
+  }
   let conflict = (event_list || []).filter((d) => {
     return isConflict({ start_at: d.start_at, end_at: d.end_at }, { start_at: timeSlice.start_at, end_at: timeSlice.end_at });
   });

package/package.json

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