@pisell/pisellos 2.0.5 → 2.0.7

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

@@ -44,9 +44,10 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         collection?: number | string[];
         schedule_ids?: number[];
     }): Promise<any>;
-    loadProductByScheduleDate({ date, product_ids, }: {
+    loadProductByScheduleDate({ date, product_ids, category_ids, }: {
         date: string;
         product_ids?: number[];
+        category_ids?: number[];
     }): Promise<any>;
     loadAllSchedule(): Promise<void>;
     loadScheduleAvailableDate({ startDate, endDate, custom_page_id, }: {
@@ -132,6 +133,12 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      */
     deleteCartItemInfo(type: ECartItemInfoType, _id?: string): void;
     checkCartItemByType(cartItem: CartItem, type: ECartItemCheckType): boolean;
+    /**
+     * 检查购物车商品是否符合条件
+     * @param type 类型
+     * @returns 不符合条件的购物车商品ID列表
+     */
+    checkCartItems(type: ECartItemCheckType): string[];
     destroy(): void;
     getResourcesList(): any[];
     getResourcesListByCartItem(id: string | number): {

package/dist/solution/BookingByStep/index.js

@@ -243,11 +243,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadProductByScheduleDate",
     value: function () {
       var _loadProductByScheduleDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref2) {
-        var date, product_ids, scheduleList, scheduleIds;
+        var date, product_ids, _ref2$category_ids, category_ids, scheduleList, scheduleIds;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              date = _ref2.date, product_ids = _ref2.product_ids;
+              date = _ref2.date, product_ids = _ref2.product_ids, _ref2$category_ids = _ref2.category_ids, category_ids = _ref2$category_ids === void 0 ? [] : _ref2$category_ids;
               scheduleList = this.store.schedule.getAvailabilityScheduleDateList(); // 缓存下这次选择的结果，如果是先选日期再选 duration 类商品，后面用得到
               this.setDateRange([{
                 date: date,
@@ -268,7 +268,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               _context3.next = 6;
               return this.loadProducts({
                 schedule_ids: scheduleIds,
-                product_ids: product_ids
+                product_ids: product_ids,
+                category_ids: category_ids
               });
             case 6:
               return _context3.abrupt("return", _context3.sent);
@@ -1104,6 +1105,26 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: function checkCartItemByType(cartItem, type) {
       return this.store.cart.checkCartItemByType(cartItem, type);
     }
+
+    /**
+     * 检查购物车商品是否符合条件
+     * @param type 类型
+     * @returns 不符合条件的购物车商品ID列表
+     */
+  }, {
+    key: "checkCartItems",
+    value: function checkCartItems(type) {
+      var _this7 = this;
+      var cartItems = this.store.cart.getItems();
+      var errorCartItemIds = [];
+      cartItems.forEach(function (cartItem) {
+        var result = _this7.store.cart.checkCartItemByType(cartItem, type);
+        if (!result) {
+          errorCartItemIds.push(cartItem._id);
+        }
+      });
+      return errorCartItemIds;
+    }
   }, {
     key: "destroy",
     value: function destroy() {
@@ -1398,7 +1419,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "autoSelectAllProductResources",
     value: function autoSelectAllProductResources(resources_code, timeSlots) {
       var _dateRange$,
-        _this7 = this;
+        _this8 = this;
       var dateRange = this.store.date.getDateRange();
       var resources = [];
       if (dateRange !== null && dateRange !== void 0 && (_dateRange$ = dateRange[0]) !== null && _dateRange$ !== void 0 && _dateRange$.date) {
@@ -1448,7 +1469,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               };
             }
             // 如果传递了 timeSlots，代表是第二种资源，则直接拿 timeSlots 去匹配
-            var res = _this7.autoSelectAccountResources({
+            var res = _this8.autoSelectAccountResources({
               holder_id: item.holder_id,
               resources_code: resources_code,
               timeSlots: recordTimeSlots,
@@ -1467,7 +1488,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
               res.selectedResource.capacity = currentCapacity;
               checkSubResourcesCapacity(res.selectedResource);
-              _this7.store.cart.updateItem({
+              _this8.store.cart.updateItem({
                 _id: item._id,
                 // 这里要做去重，避免出现同样类型的资源被塞进同一个商品
                 resources: [].concat(_toConsumableArray((item._origin.resources || []).filter(function (existingRes) {
@@ -1481,15 +1502,24 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           } else {
             var _item$_productOrigin8, _productResources$fin;
             // 这里必须每次循环重新读，避免前一次循环操作了购物车，导致数据变更
-            var allCartItems = cloneDeep(_this7.store.cart.getItems());
+            var allCartItems = cloneDeep(_this8.store.cart.getItems());
             // 如果没有传递 timeSlots，代表是第一种资源，则直接拿商品的 duration，到资源列表里找一个公共可用的
             var selectedResources = [];
+            var _resources = cloneDeep(((_item$_productOrigin8 = item._productOrigin) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.product_resource) === null || _item$_productOrigin8 === void 0 ? void 0 : _item$_productOrigin8.resources) || []);
+            var currentResourcesRenderList = [];
+            _resources.forEach(function (n) {
+              var _n$renderList;
+              if ((_n$renderList = n.renderList) !== null && _n$renderList !== void 0 && _n$renderList.length) {
+                currentResourcesRenderList.push.apply(currentResourcesRenderList, _toConsumableArray(n.renderList || []));
+              }
+            });
+            var _resourcesMap = getResourcesMap(currentResourcesRenderList);
             if (item.holder_id) {
-              selectedResources = getOthersSelectedResources(allCartItems, item.holder_id, resourcesMap);
+              selectedResources = getOthersSelectedResources(allCartItems, item.holder_id, _resourcesMap);
             } else {
-              selectedResources = getOthersCartSelectedResources(allCartItems, item._id, resourcesMap);
+              selectedResources = getOthersCartSelectedResources(allCartItems, item._id, _resourcesMap);
             }
-            var productResources = getResourcesByProduct(resourcesMap, ((_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) || [], selectedResources, currentCapacity);
+            var productResources = getResourcesByProduct(_resourcesMap, cloneDeep(_resources), selectedResources, currentCapacity);
             // 自动选择 productResources 中对应 resources_code 的资源
             var targetRenderList = (_productResources$fin = productResources.find(function (n) {
               return n.code === resources_code;
@@ -1506,7 +1536,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               targetResource.capacity = currentCapacity;
               // 在这里处理 children 的数据
               checkSubResourcesCapacity(targetResource);
-              _this7.store.cart.updateItem({
+              _this8.store.cart.updateItem({
                 _id: item._id,
                 resources: [].concat(_toConsumableArray((item._origin.resources || []).filter(function (existingRes) {
                   return existingRes.resourceType !== targetRenderList[0].resourceType;
@@ -1524,7 +1554,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       // 如果购物车里没有 holderid数据，证明不按 holder 类流程预约走，给所有购物车一次性分派即可，不做账号下资源互斥逻辑
       if (cartItems !== null && cartItems !== void 0 && cartItems[0].holder_id) {
         accountList.forEach(function (account) {
-          var cartItems = _this7.store.cart.getCartByAccount(account.getId());
+          var cartItems = _this8.store.cart.getCartByAccount(account.getId());
           selectForCartResources(cartItems);
         });
       } else {
@@ -1538,7 +1568,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTimeSlotByAllResources",
     value: function getTimeSlotByAllResources(resources_code) {
-      var _this8 = this,
+      var _this9 = this,
         _cartItems$,
         _cartItems$2;
       var dateRange = this.store.date.getDateRange();
@@ -1577,7 +1607,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       };
       if (cartItems !== null && cartItems !== void 0 && cartItems[0].holder_id) {
         accountList.forEach(function (account) {
-          var cartItems = _this8.store.cart.getCartByAccount(account.getId());
+          var cartItems = _this9.store.cart.getCartByAccount(account.getId());
           checkDuration(cartItems);
         });
       } else {
@@ -1618,7 +1648,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitTimeSlot",
     value: function submitTimeSlot(timeSlots) {
-      var _this9 = this;
+      var _this10 = this;
       // 以账号为维度处理数据。购物车里每一项的 startTime应该是前一个商品的 endTime，如果是第一个商品则用 timeSlots.start_at
       var cartItems = cloneDeep(this.store.cart.getItems());
 
@@ -1643,7 +1673,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             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');
             delete resource.times;
           });
-          _this9.store.cart.updateItem({
+          _this10.store.cart.updateItem({
             _id: item._id,
             resources: newResources
           });
@@ -1805,7 +1835,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProductToCart",
     value: function addProductToCart(_ref13) {
-      var _this10 = this;
+      var _this11 = this;
       var product = _ref13.product,
         date = _ref13.date,
         account = _ref13.account;
@@ -1838,7 +1868,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         });
         if (cartItemsByDate.length) {
           cartItemsByDate.forEach(function (n) {
-            _this10.store.cart.removeItem(n._id);
+            _this11.store.cart.removeItem(n._id);
           });
         }
       }

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

@@ -44,9 +44,10 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         collection?: number | string[];
         schedule_ids?: number[];
     }): Promise<any>;
-    loadProductByScheduleDate({ date, product_ids, }: {
+    loadProductByScheduleDate({ date, product_ids, category_ids, }: {
         date: string;
         product_ids?: number[];
+        category_ids?: number[];
     }): Promise<any>;
     loadAllSchedule(): Promise<void>;
     loadScheduleAvailableDate({ startDate, endDate, custom_page_id, }: {
@@ -132,6 +133,12 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      */
     deleteCartItemInfo(type: ECartItemInfoType, _id?: string): void;
     checkCartItemByType(cartItem: CartItem, type: ECartItemCheckType): boolean;
+    /**
+     * 检查购物车商品是否符合条件
+     * @param type 类型
+     * @returns 不符合条件的购物车商品ID列表
+     */
+    checkCartItems(type: ECartItemCheckType): string[];
     destroy(): void;
     getResourcesList(): any[];
     getResourcesListByCartItem(id: string | number): {

package/lib/solution/BookingByStep/index.js

@@ -187,7 +187,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   async loadProductByScheduleDate({
     date,
-    product_ids
+    product_ids,
+    category_ids = []
   }) {
     const scheduleList = this.store.schedule.getAvailabilityScheduleDateList();
     this.setDateRange([
@@ -195,7 +196,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       { date, status: "available", week: "", weekNum: 0 }
     ]);
     const scheduleIds = scheduleList.filter((n) => n.date === date).flatMap((n) => n.schedule_id);
-    return await this.loadProducts({ schedule_ids: scheduleIds, product_ids });
+    return await this.loadProducts({ schedule_ids: scheduleIds, product_ids, category_ids });
   }
   // 加载当前店铺下所有 schedule
   async loadAllSchedule() {
@@ -548,6 +549,22 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   checkCartItemByType(cartItem, type) {
     return this.store.cart.checkCartItemByType(cartItem, type);
   }
+  /**
+   * 检查购物车商品是否符合条件
+   * @param type 类型
+   * @returns 不符合条件的购物车商品ID列表
+   */
+  checkCartItems(type) {
+    const cartItems = this.store.cart.getItems();
+    const errorCartItemIds = [];
+    cartItems.forEach((cartItem) => {
+      const result = this.store.cart.checkCartItemByType(cartItem, type);
+      if (!result) {
+        errorCartItemIds.push(cartItem._id);
+      }
+    });
+    return errorCartItemIds;
+  }
   destroy() {
     var _a, _b, _c, _d, _e, _f;
     (_a = this.store.cart) == null ? void 0 : _a.destroy();
@@ -896,22 +913,31 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         } else {
           const allCartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
           let selectedResources = [];
+          const resources2 = (0, import_lodash_es.cloneDeep)(((_k = (_j = item._productOrigin) == null ? void 0 : _j.product_resource) == null ? void 0 : _k.resources) || []);
+          const currentResourcesRenderList = [];
+          resources2.forEach((n) => {
+            var _a3;
+            if ((_a3 = n.renderList) == null ? void 0 : _a3.length) {
+              currentResourcesRenderList.push(...n.renderList || []);
+            }
+          });
+          const resourcesMap2 = (0, import_utils.getResourcesMap)(currentResourcesRenderList);
           if (item.holder_id) {
             selectedResources = (0, import_resources.getOthersSelectedResources)(
               allCartItems,
               item.holder_id,
-              resourcesMap
+              resourcesMap2
             );
           } else {
             selectedResources = (0, import_resources.getOthersCartSelectedResources)(
               allCartItems,
               item._id,
-              resourcesMap
+              resourcesMap2
             );
           }
           const productResources = (0, import_resources.getResourcesByProduct)(
-            resourcesMap,
-            ((_k = (_j = item._productOrigin) == null ? void 0 : _j.product_resource) == null ? void 0 : _k.resources) || [],
+            resourcesMap2,
+            (0, import_lodash_es.cloneDeep)(resources2),
             selectedResources,
             currentCapacity
           );

package/package.json

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