@pisell/pisellos 0.0.59 → 0.0.61

package/dist/modules/Cart/index.d.ts

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { CartItem, CartModuleAPI, ECartItemInfoType, IAddItemParams, IUpdateItemParams } from './types';
+import { CartItem, CartModuleAPI, ECartItemCheckType, ECartItemInfoType, IAddItemParams, IUpdateItemParams } from './types';
 export * from './types';
 /**
  * 购物车模块实现
@@ -66,4 +66,5 @@ export declare class CartModule extends BaseModule implements Module, CartModule
      */
     clear(): void;
     storeChange(): void;
+    checkCartItemByType(cartItem: CartItem, type: ECartItemCheckType): boolean;
 }

package/dist/modules/Cart/index.js

@@ -22,7 +22,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
-import { ECartItemInfoType } from "./types";
+import { ECartItemCheckType, ECartItemInfoType } from "./types";
 import { createCartItemOrigin, deleteHolderFromCartItem, deleteRelationFormsFromCartItem, deleteResourceFromCartItem, deleteTimeFromCartItem, formatAccountToCartItem, formatDateToCartItem, formatDiscountToCartItem, formatNoteToCartItem, formatProductToCartItem, formatRelationFormsToCartItem, formatResourceToCartItem, getUniqueId } from "./utils";
 import { cloneDeep } from 'lodash-es';
 export * from "./types";
@@ -443,6 +443,33 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
         });
       }
     }
+  }, {
+    key: "checkCartItemByType",
+    value: function checkCartItemByType(cartItem, type) {
+      var result = false;
+      var _ref = cartItem._origin || {},
+        holder = _ref.holder,
+        metadata = _ref.metadata,
+        resources = _ref.resources,
+        start_date = _ref.start_date,
+        end_date = _ref.end_date,
+        relation_forms = _ref.relation_forms;
+      switch (type) {
+        case ECartItemCheckType.Account:
+          result = !!holder || !!(metadata !== null && metadata !== void 0 && metadata.account);
+          break;
+        case ECartItemCheckType.Resource:
+          result = !!(resources !== null && resources !== void 0 && resources.length);
+          break;
+        case ECartItemCheckType.Date:
+          result = !!start_date && !!end_date;
+          break;
+        case ECartItemCheckType.RelationForms:
+          result = !!(relation_forms !== null && relation_forms !== void 0 && relation_forms.length);
+          break;
+      }
+      return result;
+    }
   }]);
   return CartModule;
 }(BaseModule);

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

@@ -20,6 +20,19 @@ export declare enum ECartItemInfoType {
     /** 账户信息 */
     Holder = "holder"
 }
+/**
+ * 购物车商品检查类型
+ */
+export declare enum ECartItemCheckType {
+    /** 账户信息 */
+    Account = "account",
+    /** 资源信息 */
+    Resource = "resource",
+    /** 时间信息 */
+    Date = "date",
+    /** 关联表单信息 */
+    RelationForms = "relationForms"
+}
 export interface CartModuleAPI {
     /** 添加商品到购物车 */
     addItem: (item: IAddItemParams) => Promise<void>;
@@ -41,6 +54,8 @@ export interface CartModuleAPI {
     clear: () => void;
     /** 清除购物车商品中的信息 */
     deleteCartItemInfo: (type: ECartItemInfoType, _id?: string) => void;
+    /** 检查购物车商品 */
+    checkCartItemByType: (cartItem: CartItem, type: ECartItemCheckType) => boolean;
 }
 /**
  * 购物车商品接口

package/dist/modules/Cart/types.js

@@ -17,6 +17,17 @@ export var ECartItemInfoType = /*#__PURE__*/function (ECartItemInfoType) {
   return ECartItemInfoType;
 }({});
 
+/**
+ * 购物车商品检查类型
+ */
+export var ECartItemCheckType = /*#__PURE__*/function (ECartItemCheckType) {
+  ECartItemCheckType["Account"] = "account";
+  ECartItemCheckType["Resource"] = "resource";
+  ECartItemCheckType["Date"] = "date";
+  ECartItemCheckType["RelationForms"] = "relationForms";
+  return ECartItemCheckType;
+}({});
+
 /**
  * 购物车商品接口
  */

package/dist/modules/Cart/utils.d.ts

@@ -28,6 +28,7 @@ export declare const createCartItemOrigin: () => {
     end_time: null;
     end_date: null;
     metadata: {};
+    holder: null;
 };
 /**
  * 格式化商品到购物车

package/dist/modules/Cart/utils.js

@@ -63,10 +63,9 @@ export var createCartItemOrigin = function createCartItemOrigin() {
     // 所选结束时间
     end_date: null,
     // 额外信息
-    metadata: {}
-
+    metadata: {},
     // holder相关
-    // holder: null,
+    holder: null
   };
 };
 
@@ -105,7 +104,6 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
     cartItem.isNormalProduct = isNormalProduct(product);
     cartItem.is_charge_tax = product === null || product === void 0 ? void 0 : product.is_charge_tax;
   }
-  console.log('cartItem>>>>>>', cartItem);
   if (bundle !== null && bundle !== void 0 && bundle.length) {
     cartItem.bundle = formatBundle(bundle);
   }

package/dist/modules/Date/index.js

@@ -15,7 +15,6 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import dayjs from 'dayjs';
 import { BaseModule } from "../BaseModule";
 import { disableAllDates, generateMonthDates, handleAvailableDateByResource, handleAvailableDatesByRules } from "./utils";
 export var DateModule = /*#__PURE__*/function (_BaseModule) {
@@ -132,7 +131,7 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
             case 5:
               // 1.生成当前月份的所有日期，默认都是可用的
               dates = generateMonthDates(start_date, end_date, type); // 如果没有资源或者结束日期在今天之前，则所有日期均不可用
-              if (!(!(resource_ids !== null && resource_ids !== void 0 && resource_ids.length) || dayjs(end_date).isBefore(dayjs().startOf('day')))) {
+              if (resource_ids !== null && resource_ids !== void 0 && resource_ids.length) {
                 _context3.next = 8;
                 break;
               }

package/dist/modules/Date/utils.js

@@ -28,7 +28,7 @@ export var generateMonthDates = function generateMonthDates(startDate, endDate,
   var end = dayjs(endDate).format('YYYY-MM-DD');
   var dates = [];
   var currentDate = dayjs(start);
-  while (dayjs(currentDate).isBefore(dayjs(end)) || dayjs(currentDate).isSame(dayjs(end))) {
+  while (dayjs(currentDate).isBefore(dayjs(end), 'day') || dayjs(currentDate).isSame(dayjs(end), 'day')) {
     dates.push({
       date: dayjs(currentDate).format('YYYY-MM-DD'),
       week: dayjs(currentDate).format('ddd'),
@@ -62,7 +62,7 @@ export var disableAllDates = function disableAllDates(dates) {
 export var disableDatesBeforeOneDay = function disableDatesBeforeOneDay(dates, oneDay) {
   var day = oneDay ? dayjs(oneDay).format('YYYY-MM-DD') : dayjs().format('YYYY-MM-DD');
   return dates.map(function (date) {
-    if (dayjs(date.date).isBefore(day)) {
+    if (dayjs(date.date).isBefore(day, 'day')) {
       return _objectSpread(_objectSpread({}, date), {}, {
         status: 'unavailable'
       });
@@ -153,11 +153,11 @@ export var handleAvailableDatesByRules = function handleAvailableDatesByRules(da
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var item = _step.value;
           // 判断item.date是否在dates的开始和结束日期范围内，如果不在则跳过
-          if (dayjs(item.date).isBefore(dayjs(newDates[0].date))) {
+          if (dayjs(item.date).isBefore(dayjs(newDates[0].date), 'day')) {
             continue;
           }
           // 判断日程日期是否超过了dates中的最后一个日期，如果超过了则循环break
-          if (dayjs(item.date).isAfter(dayjs(newDates[newDates.length - 1].date))) {
+          if (dayjs(item.date).isAfter(dayjs(newDates[newDates.length - 1].date), 'day')) {
             break;
           }
           // 在范围内的日程如果scheduleMap中不存在，则加入到scheduleMap
@@ -182,12 +182,12 @@ export var handleAvailableDatesByRules = function handleAvailableDatesByRules(da
     // 预定天数存在，则开始计算从当前时间开始往后推预定天数作为结束时间
     if (future_day) {
       var endDate = dayjs().add(future_day, 'day');
-      if (!earliestEndDate || endDate.isBefore(dayjs(earliestEndDate))) {
+      if (!earliestEndDate || endDate.isBefore(dayjs(earliestEndDate), 'day')) {
         earliestEndDate = endDate.format('YYYY-MM-DD');
       }
     } else if (future_day === 0) {
       var _endDate = dayjs();
-      if (!earliestEndDate || _endDate.isBefore(dayjs(earliestEndDate))) {
+      if (!earliestEndDate || _endDate.isBefore(dayjs(earliestEndDate), 'day')) {
         earliestEndDate = _endDate.format('YYYY-MM-DD');
       }
     }
@@ -195,7 +195,7 @@ export var handleAvailableDatesByRules = function handleAvailableDatesByRules(da
     // 如果存在提前预约时间，则开始计算从当前时间开始往后推提前预约时间作为开始时间
     if (unit && unit_type) {
       var startDate = dayjs(dayjs().add(unit, unit_type).format('YYYY-MM-DD'));
-      if (!latestStartDate || startDate.isAfter(dayjs(latestStartDate))) {
+      if (!latestStartDate || startDate.isAfter(dayjs(latestStartDate), 'day')) {
         latestStartDate = startDate.format('YYYY-MM-DD');
       }
     }
@@ -231,11 +231,11 @@ export var handleAvailableDatesByRules = function handleAvailableDatesByRules(da
     }
     if (latestStartDate || earliestEndDate) {
       // 如果时间在最早开始时间之前，则设置为不可用
-      if (latestStartDate && dayjs(date.date).isBefore(latestStartDate)) {
+      if (latestStartDate && dayjs(date.date).isBefore(latestStartDate, 'day')) {
         return disabledDate;
       }
       // 如果时间在最早结束时间之后，则设置为不可用
-      if (earliestEndDate && dayjs(date.date).isAfter(earliestEndDate)) {
+      if (earliestEndDate && dayjs(date.date).isAfter(earliestEndDate, 'day')) {
         return disabledDate;
       }
     }

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

@@ -2,7 +2,7 @@ import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { Response } from '../../plugins';
 import { BookingByStepState } from './types';
-import { CartItem, IUpdateItemParams, ProductData, ProductResourceItem, ECartItemInfoType } from '../../modules';
+import { CartItem, IUpdateItemParams, ProductData, ProductResourceItem, ECartItemInfoType, ECartItemCheckType } from '../../modules';
 import { Account } from '../../modules/Account/types';
 import { IStep } from '../../modules/Step/tyeps';
 import { TimeSliceItem } from './utils/resources';
@@ -131,6 +131,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * 从购物车中按类别删除信息
      */
     deleteCartItemInfo(type: ECartItemInfoType, _id?: string): void;
+    checkCartItemByType(cartItem: CartItem, type: ECartItemCheckType): boolean;
     destroy(): void;
     getResourcesList(): any[];
     getResourcesListByCartItem(id: string | number): {

package/dist/solution/BookingByStep/index.js

@@ -192,12 +192,22 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadProducts",
     value: function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref) {
-        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, _ref$schedule_ids, schedule_ids, productsData;
+        var _schedule_ids;
+        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, _ref$schedule_ids, schedule_ids, schedule_ids_data, productsData;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, _ref$schedule_ids = _ref.schedule_ids, schedule_ids = _ref$schedule_ids === void 0 ? [] : _ref$schedule_ids;
-              _context2.next = 3;
+              // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
+              if (!((_schedule_ids = schedule_ids) !== null && _schedule_ids !== void 0 && _schedule_ids.length)) {
+                schedule_ids_data = this.store.schedule.getScheduleListByIds(schedule_ids).map(function (n) {
+                  return n.id;
+                });
+                if (schedule_ids_data.length) {
+                  schedule_ids = schedule_ids_data;
+                }
+              }
+              _context2.next = 4;
               return this.request.post("/product/query", {
                 open_quotation: 1,
                 open_bundle: 1,
@@ -214,11 +224,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }, {
                 useCache: true
               });
-            case 3:
+            case 4:
               productsData = _context2.sent;
               this.store.products.addProduct(productsData.data.list);
               return _context2.abrupt("return", productsData.data.list);
-            case 6:
+            case 7:
             case "end":
               return _context2.stop();
           }
@@ -309,14 +319,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             case 0:
               startDate = _ref3.startDate, endDate = _ref3.endDate, custom_page_id = _ref3.custom_page_id;
               // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天，需要把 startDate 置为今天
-              if (dayjs(startDate).isBefore(dayjs())) {
+              if (dayjs(startDate).isBefore(dayjs(), 'day')) {
                 startDate = dayjs().format('YYYY-MM-DD');
               }
               // 1.生成当前月份的所有日期，默认都不可用
               dates = generateMonthDates(startDate, endDate);
               dates = disableAllDates(dates);
               // 如果 endDate 在今天之前，则不用查接口，直接返回 dates
-              if (!dayjs(endDate).isBefore(dayjs())) {
+              if (!dayjs(endDate).isBefore(dayjs(), 'day')) {
                 _context5.next = 6;
                 break;
               }
@@ -332,7 +342,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               res = _context5.sent;
               this.store.schedule.setAvailabilityScheduleDateList(res.data.date_list);
               // 如果没有schedule或者结束日期在今天之前，则所有日期均不可用
-              if (!(!((_res$data$date_list = res.data.date_list) !== null && _res$data$date_list !== void 0 && _res$data$date_list.length) || dayjs(endDate).isBefore(dayjs()))) {
+              if (!(!((_res$data$date_list = res.data.date_list) !== null && _res$data$date_list !== void 0 && _res$data$date_list.length) || dayjs(endDate).isBefore(dayjs(), 'day'))) {
                 _context5.next = 12;
                 break;
               }
@@ -641,7 +651,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               params = _args13.length > 0 && _args13[0] !== undefined ? _args13[0] : {};
               // 开始日期如果小于今天，直接以今天当做开始日期
               products = params.products, startDate = params.startDate, endDate = params.endDate, type = params.type; // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天 且 endDate 小于或等于今天，需要把 startDate 置为今天
-              if (dayjs(startDate).isBefore(dayjs()) && (dayjs(endDate).isAfter(dayjs()) || dayjs(endDate).isSame(dayjs()))) {
+              if (dayjs(startDate).isBefore(dayjs(), 'day') && (dayjs(endDate).isAfter(dayjs(), 'day') || dayjs(endDate).isSame(dayjs(), 'day'))) {
                 startDate = dayjs().format('YYYY-MM-DD');
               }
               tempProducts = products || this.store.cart.getItems().map(function (p) {
@@ -878,7 +888,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               cartItems = this.store.cart.getItems();
               newCartItems = cloneDeep(cartItems); // 先整个临时的逻辑，把购物车里所有商品的资源给他格式化一下
               newCartItems.forEach(function (item) {
-                var _item$_productOrigin;
+                var _item$_productOrigin, _item$_origin;
                 item._origin.resources = item._origin.resources.map(function (n) {
                   var newResourcesItem = cloneDeep(n);
                   delete newResourcesItem.id;
@@ -890,7 +900,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   capacity: (_item$_productOrigin = item._productOrigin) === null || _item$_productOrigin === void 0 ? void 0 : _item$_productOrigin.capacity,
                   product_bundle: item._origin.product.product_bundle
                 });
+                var currentCapacity = getSumCapacity({
+                  capacity: formatCapacity
+                });
+                if (!((_item$_origin = item._origin) !== null && _item$_origin !== void 0 && _item$_origin.metadata)) {
+                  item._origin.metadata = {};
+                }
                 item._origin.metadata.capacity = formatCapacity;
+                item._origin.number = currentCapacity;
               });
               return _context20.abrupt("return", this.store.order.submitOrder({
                 query: {
@@ -1082,6 +1099,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: function deleteCartItemInfo(type, _id) {
       this.store.cart.deleteCartItemInfo(type, _id);
     }
+  }, {
+    key: "checkCartItemByType",
+    value: function checkCartItemByType(cartItem, type) {
+      return this.store.cart.checkCartItemByType(cartItem, type);
+    }
   }, {
     key: "destroy",
     value: function destroy() {
@@ -1193,7 +1215,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getResourcesListByCartItem",
     value: function getResourcesListByCartItem(id) {
       var _targetCartItem$_prod2, _targetCartItem$_prod3;
-      var cartItems = this.store.cart.getItems();
+      var cartItems = cloneDeep(this.store.cart.getItems());
       var dateRange = this.store.date.getDateRange();
       var resources = [];
       dateRange.forEach(function (n) {
@@ -1265,7 +1287,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         countMap = _ref8.countMap,
         capacity = _ref8.capacity;
       var dateRange = this.store.date.getDateRange();
-      var cartItems = this.store.cart.getItems();
+      var cartItems = cloneDeep(this.store.cart.getItems());
       // 取到账号下所有的商品，然后根据商品的 duration 和资源列表，获取所有可用的资源
       var accountCartItems = cartItems.filter(function (n) {
         return n.holder_id === holder_id;
@@ -1459,7 +1481,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           } else {
             var _item$_productOrigin8, _productResources$fin;
             // 这里必须每次循环重新读，避免前一次循环操作了购物车，导致数据变更
-            var allCartItems = _this7.store.cart.getItems();
+            var allCartItems = cloneDeep(_this7.store.cart.getItems());
             // 如果没有传递 timeSlots，代表是第一种资源，则直接拿商品的 duration，到资源列表里找一个公共可用的
             var selectedResources = [];
             if (item.holder_id) {
@@ -1497,7 +1519,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           }
         });
       };
-      var cartItems = this.store.cart.getItems();
+      var cartItems = cloneDeep(this.store.cart.getItems());
 
       // 如果购物车里没有 holderid数据，证明不按 holder 类流程预约走，给所有购物车一次性分派即可，不做账号下资源互斥逻辑
       if (cartItems !== null && cartItems !== void 0 && cartItems[0].holder_id) {
@@ -1516,11 +1538,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTimeSlotByAllResources",
     value: function getTimeSlotByAllResources(resources_code) {
-      var _this8 = this;
+      var _this8 = this,
+        _cartItems$,
+        _cartItems$2;
       var dateRange = this.store.date.getDateRange();
       // 取出购物车中所有一已选择的第一步资源
       var resources = [];
-      var cartItems = this.store.cart.getItems();
+      var cartItems = cloneDeep(this.store.cart.getItems());
       // if (cartItems?.[0].start_date) return [];
       var resourceIds = [];
       cartItems.forEach(function (item) {
@@ -1559,15 +1583,20 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       } else {
         checkDuration(cartItems);
       }
+      // 如果 cartItem 上既没有时间，也没有资源，认为外部属于异常调用，直接丢一个空数组出去
+      // 同时 session 类商品的流程也不应该调用这个方法
+      if (!(cartItems !== null && cartItems !== void 0 && (_cartItems$ = cartItems[0]) !== null && _cartItems$ !== void 0 && _cartItems$.start_date) && !(cartItems !== null && cartItems !== void 0 && (_cartItems$2 = cartItems[0]) !== null && _cartItems$2 !== void 0 && _cartItems$2.resource_id) || !(cartItems !== null && cartItems !== void 0 && cartItems[0].duration)) {
+        return [];
+      }
       if (cartItems !== null && cartItems !== void 0 && cartItems[0].start_date && !dateRange) {
-        var _cartItems$, _cartItems$2;
+        var _cartItems$3, _cartItems$4;
         dateRange = [{
           date: cartItems === null || cartItems === void 0 ? void 0 : cartItems[0].start_date,
           status: 'available',
           week: '',
           weekNum: 0
         }, {
-          date: (cartItems === null || cartItems === void 0 || (_cartItems$ = cartItems[0]) === null || _cartItems$ === void 0 ? void 0 : _cartItems$.end_date) || (cartItems === null || cartItems === void 0 || (_cartItems$2 = cartItems[0]) === null || _cartItems$2 === void 0 ? void 0 : _cartItems$2.start_date) || '',
+          date: (cartItems === null || cartItems === void 0 || (_cartItems$3 = cartItems[0]) === null || _cartItems$3 === void 0 ? void 0 : _cartItems$3.end_date) || (cartItems === null || cartItems === void 0 || (_cartItems$4 = cartItems[0]) === null || _cartItems$4 === void 0 ? void 0 : _cartItems$4.start_date) || '',
           status: 'available',
           week: '',
           weekNum: 0
@@ -1591,7 +1620,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: function submitTimeSlot(timeSlots) {
       var _this9 = this;
       // 以账号为维度处理数据。购物车里每一项的 startTime应该是前一个商品的 endTime，如果是第一个商品则用 timeSlots.start_at
-      var cartItems = this.store.cart.getItems();
+      var cartItems = cloneDeep(this.store.cart.getItems());
 
       // 按账号分组
       var itemsByAccount = cartItems.reduce(function (acc, item) {
@@ -1711,7 +1740,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var targetResourceDate = resourcesDates.find(function (n) {
         return n.date === date;
       });
-      var cartItems = this.store.cart.getItems();
+      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 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);
@@ -1803,7 +1832,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       });
       // 检测，有传递 date，检查购物车里其他商品的 date 是否在同一天，如果不在，清空那些不在同一天的商品
       if (date) {
-        var cartItems = this.store.cart.getItems();
+        var cartItems = cloneDeep(this.store.cart.getItems());
         var cartItemsByDate = cartItems.filter(function (n) {
           return !dayjs(n.start_date).isSame(dayjs(date.startTime), 'day');
         });

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

@@ -231,7 +231,7 @@ 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) && capacity <= resourcesMap[d].capacity) {
+        if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id)) {
           // 拼装组合资源的数据
           var combiningResources = [];
           if (resourcesMap[d].combined_resource && resourcesMap[d].combined_resource.status === 1) {
@@ -253,7 +253,7 @@ 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) && capacity <= resourcesMap[d].capacity) {
+        if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id)) {
           // 拼装组合资源的数据
           var combiningResources = [];
           if (resourcesMap[d].combined_resource && resourcesMap[d].combined_resource.status === 1) {
@@ -282,6 +282,7 @@ export var getResourcesByProduct = function getResourcesByProduct(resourcesMap,
         var latestTime = d.times.reduce(function (latest, current) {
           return dayjs(current.end_at).isAfter(dayjs(latest.end_at)) ? current : latest;
         }, d.times[0]);
+        // TODO,在这拉时间切片出来，如果可用 timeSlots.length > 1 才可以被选择
         return dayjs(latestTime.end_at).isAfter(dayjs());
       });
       item.form_id = form_id;

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

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { CartItem, CartModuleAPI, ECartItemInfoType, IAddItemParams, IUpdateItemParams } from './types';
+import { CartItem, CartModuleAPI, ECartItemCheckType, ECartItemInfoType, IAddItemParams, IUpdateItemParams } from './types';
 export * from './types';
 /**
  * 购物车模块实现
@@ -66,4 +66,5 @@ export declare class CartModule extends BaseModule implements Module, CartModule
      */
     clear(): void;
     storeChange(): void;
+    checkCartItemByType(cartItem: CartItem, type: ECartItemCheckType): boolean;
 }

package/lib/modules/Cart/index.js

@@ -274,6 +274,32 @@ var CartModule = class extends import_BaseModule.BaseModule {
       });
     }
   }
+  checkCartItemByType(cartItem, type) {
+    let result = false;
+    const {
+      holder,
+      metadata,
+      resources,
+      start_date,
+      end_date,
+      relation_forms
+    } = cartItem._origin || {};
+    switch (type) {
+      case import_types.ECartItemCheckType.Account:
+        result = !!holder || !!(metadata == null ? void 0 : metadata.account);
+        break;
+      case import_types.ECartItemCheckType.Resource:
+        result = !!(resources == null ? void 0 : resources.length);
+        break;
+      case import_types.ECartItemCheckType.Date:
+        result = !!start_date && !!end_date;
+        break;
+      case import_types.ECartItemCheckType.RelationForms:
+        result = !!(relation_forms == null ? void 0 : relation_forms.length);
+        break;
+    }
+    return result;
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -20,6 +20,19 @@ export declare enum ECartItemInfoType {
     /** 账户信息 */
     Holder = "holder"
 }
+/**
+ * 购物车商品检查类型
+ */
+export declare enum ECartItemCheckType {
+    /** 账户信息 */
+    Account = "account",
+    /** 资源信息 */
+    Resource = "resource",
+    /** 时间信息 */
+    Date = "date",
+    /** 关联表单信息 */
+    RelationForms = "relationForms"
+}
 export interface CartModuleAPI {
     /** 添加商品到购物车 */
     addItem: (item: IAddItemParams) => Promise<void>;
@@ -41,6 +54,8 @@ export interface CartModuleAPI {
     clear: () => void;
     /** 清除购物车商品中的信息 */
     deleteCartItemInfo: (type: ECartItemInfoType, _id?: string) => void;
+    /** 检查购物车商品 */
+    checkCartItemByType: (cartItem: CartItem, type: ECartItemCheckType) => boolean;
 }
 /**
  * 购物车商品接口

package/lib/modules/Cart/types.js

@@ -20,6 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var types_exports = {};
 __export(types_exports, {
   CartHooks: () => CartHooks,
+  ECartItemCheckType: () => ECartItemCheckType,
   ECartItemInfoType: () => ECartItemInfoType
 });
 module.exports = __toCommonJS(types_exports);
@@ -37,8 +38,16 @@ var ECartItemInfoType = /* @__PURE__ */ ((ECartItemInfoType2) => {
   ECartItemInfoType2["Holder"] = "holder";
   return ECartItemInfoType2;
 })(ECartItemInfoType || {});
+var ECartItemCheckType = /* @__PURE__ */ ((ECartItemCheckType2) => {
+  ECartItemCheckType2["Account"] = "account";
+  ECartItemCheckType2["Resource"] = "resource";
+  ECartItemCheckType2["Date"] = "date";
+  ECartItemCheckType2["RelationForms"] = "relationForms";
+  return ECartItemCheckType2;
+})(ECartItemCheckType || {});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CartHooks,
+  ECartItemCheckType,
   ECartItemInfoType
 });

package/lib/modules/Cart/utils.d.ts

@@ -28,6 +28,7 @@ export declare const createCartItemOrigin: () => {
     end_time: null;
     end_date: null;
     metadata: {};
+    holder: null;
 };
 /**
  * 格式化商品到购物车

package/lib/modules/Cart/utils.js

@@ -103,9 +103,9 @@ var createCartItemOrigin = () => {
     // 所选结束时间
     end_date: null,
     // 额外信息
-    metadata: {}
+    metadata: {},
     // holder相关
-    // holder: null,
+    holder: null
   };
 };
 var formatProductToCartItem = (params) => {
@@ -130,7 +130,6 @@ var formatProductToCartItem = (params) => {
     cartItem.isNormalProduct = isNormalProduct(product);
     cartItem.is_charge_tax = product == null ? void 0 : product.is_charge_tax;
   }
-  console.log("cartItem>>>>>>", cartItem);
   if (bundle == null ? void 0 : bundle.length) {
     cartItem.bundle = formatBundle(bundle);
   }