@pisell/pisellos 0.0.60 → 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

@@ -319,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;
               }
@@ -342,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;
               }
@@ -651,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) {
@@ -888,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;
@@ -903,6 +903,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 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;
               });
@@ -1096,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() {
@@ -1129,7 +1137,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         });
       }
       var resourcesMap = getResourcesMap(cloneDeep(resources));
-      var cartItems = cloneDeep(this.store.cart.getItems());
+      var cartItems = this.store.cart.getItems();
       var arr = [];
       var capacityMap = {};
       cartItems.forEach(function (cartItem) {

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

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

package/lib/modules/Date/index.js

@@ -1,8 +1,6 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -16,14 +14,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/modules/Date/index.ts
@@ -32,7 +22,6 @@ __export(Date_exports, {
   DateModule: () => DateModule
 });
 module.exports = __toCommonJS(Date_exports);
-var import_dayjs = __toESM(require("dayjs"));
 var import_BaseModule = require("../BaseModule");
 var import_utils = require("./utils");
 var DateModule = class extends import_BaseModule.BaseModule {
@@ -85,19 +74,16 @@ var DateModule = class extends import_BaseModule.BaseModule {
       return [];
     }
     let dates = (0, import_utils.generateMonthDates)(start_date, end_date, type);
-    if (!(resource_ids == null ? void 0 : resource_ids.length) || (0, import_dayjs.default)(end_date).isBefore((0, import_dayjs.default)().startOf("day"))) {
+    if (!(resource_ids == null ? void 0 : resource_ids.length)) {
       return (0, import_utils.disableAllDates)(dates);
     }
     try {
-      const res = await this.request.get(
-        fetchUrl,
-        {
-          start_date,
-          end_date,
-          resource_ids,
-          front_end_cache_id: this.cacheId
-        }
-      );
+      const res = await this.request.get(fetchUrl, {
+        start_date,
+        end_date,
+        resource_ids,
+        front_end_cache_id: this.cacheId
+      });
       if (!((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.length)) {
         return (0, import_utils.disableAllDates)(dates);
       }

package/lib/modules/Date/utils.js

@@ -42,7 +42,7 @@ var generateMonthDates = (startDate, endDate, type) => {
   const end = (0, import_dayjs.default)(endDate).format("YYYY-MM-DD");
   const dates = [];
   let currentDate = (0, import_dayjs.default)(start);
-  while ((0, import_dayjs.default)(currentDate).isBefore((0, import_dayjs.default)(end)) || (0, import_dayjs.default)(currentDate).isSame((0, import_dayjs.default)(end))) {
+  while ((0, import_dayjs.default)(currentDate).isBefore((0, import_dayjs.default)(end), "day") || (0, import_dayjs.default)(currentDate).isSame((0, import_dayjs.default)(end), "day")) {
     dates.push({
       date: (0, import_dayjs.default)(currentDate).format("YYYY-MM-DD"),
       week: (0, import_dayjs.default)(currentDate).format("ddd"),
@@ -59,7 +59,7 @@ var disableAllDates = (dates) => {
 var disableDatesBeforeOneDay = (dates, oneDay) => {
   const day = oneDay ? (0, import_dayjs.default)(oneDay).format("YYYY-MM-DD") : (0, import_dayjs.default)().format("YYYY-MM-DD");
   return dates.map((date) => {
-    if ((0, import_dayjs.default)(date.date).isBefore(day)) {
+    if ((0, import_dayjs.default)(date.date).isBefore(day, "day")) {
       return { ...date, status: "unavailable" };
     } else {
       return date;
@@ -108,10 +108,13 @@ var handleAvailableDatesByRules = (dates, rules) => {
     var _a, _b;
     if ((_a = rule == null ? void 0 : rule.schedule) == null ? void 0 : _a.length) {
       for (const item of rule.schedule) {
-        if ((0, import_dayjs.default)(item.date).isBefore((0, import_dayjs.default)(newDates[0].date))) {
+        if ((0, import_dayjs.default)(item.date).isBefore((0, import_dayjs.default)(newDates[0].date), "day")) {
           continue;
         }
-        if ((0, import_dayjs.default)(item.date).isAfter((0, import_dayjs.default)(newDates[newDates.length - 1].date))) {
+        if ((0, import_dayjs.default)(item.date).isAfter(
+          (0, import_dayjs.default)(newDates[newDates.length - 1].date),
+          "day"
+        )) {
           break;
         }
         if (!scheduleMap[item.date]) {
@@ -126,12 +129,12 @@ var handleAvailableDatesByRules = (dates, rules) => {
     const { future_day, unit, unit_type } = (rule == null ? void 0 : rule.cut_off_time) || {};
     if (future_day) {
       const endDate = (0, import_dayjs.default)().add(future_day, "day");
-      if (!earliestEndDate || endDate.isBefore((0, import_dayjs.default)(earliestEndDate))) {
+      if (!earliestEndDate || endDate.isBefore((0, import_dayjs.default)(earliestEndDate), "day")) {
         earliestEndDate = endDate.format("YYYY-MM-DD");
       }
     } else if (future_day === 0) {
       const endDate = (0, import_dayjs.default)();
-      if (!earliestEndDate || endDate.isBefore((0, import_dayjs.default)(earliestEndDate))) {
+      if (!earliestEndDate || endDate.isBefore((0, import_dayjs.default)(earliestEndDate), "day")) {
         earliestEndDate = endDate.format("YYYY-MM-DD");
       }
     }
@@ -139,7 +142,7 @@ var handleAvailableDatesByRules = (dates, rules) => {
       const startDate = (0, import_dayjs.default)(
         (0, import_dayjs.default)().add(unit, unit_type).format("YYYY-MM-DD")
       );
-      if (!latestStartDate || startDate.isAfter((0, import_dayjs.default)(latestStartDate))) {
+      if (!latestStartDate || startDate.isAfter((0, import_dayjs.default)(latestStartDate), "day")) {
         latestStartDate = startDate.format("YYYY-MM-DD");
       }
     }
@@ -165,10 +168,10 @@ var handleAvailableDatesByRules = (dates, rules) => {
       return disabledDate;
     }
     if (latestStartDate || earliestEndDate) {
-      if (latestStartDate && (0, import_dayjs.default)(date.date).isBefore(latestStartDate)) {
+      if (latestStartDate && (0, import_dayjs.default)(date.date).isBefore(latestStartDate, "day")) {
         return disabledDate;
       }
-      if (earliestEndDate && (0, import_dayjs.default)(date.date).isAfter(earliestEndDate)) {
+      if (earliestEndDate && (0, import_dayjs.default)(date.date).isAfter(earliestEndDate, "day")) {
         return disabledDate;
       }
     }

package/lib/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/lib/solution/BookingByStep/index.js

@@ -210,12 +210,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     custom_page_id
   }) {
     var _a;
-    if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)())) {
+    if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day")) {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
     }
     let dates = (0, import_utils3.generateMonthDates)(startDate, endDate);
     dates = (0, import_utils3.disableAllDates)(dates);
-    if ((0, import_dayjs.default)(endDate).isBefore((0, import_dayjs.default)())) {
+    if ((0, import_dayjs.default)(endDate).isBefore((0, import_dayjs.default)(), "day")) {
       return dates;
     }
     const res = await this.request.get(
@@ -227,7 +227,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       }
     );
     this.store.schedule.setAvailabilityScheduleDateList(res.data.date_list);
-    if (!((_a = res.data.date_list) == null ? void 0 : _a.length) || (0, import_dayjs.default)(endDate).isBefore((0, import_dayjs.default)())) {
+    if (!((_a = res.data.date_list) == null ? void 0 : _a.length) || (0, import_dayjs.default)(endDate).isBefore((0, import_dayjs.default)(), "day")) {
       return dates;
     }
     res.data.date_list.forEach((n) => {
@@ -334,7 +334,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   // 获取商品/服务的可用日期
   async getAvailableDate(params = {}) {
     let { products, startDate, endDate, type } = params;
-    if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)()) && ((0, import_dayjs.default)(endDate).isAfter((0, import_dayjs.default)()) || (0, import_dayjs.default)(endDate).isSame((0, import_dayjs.default)()))) {
+    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");
     }
     let tempProducts = products || this.store.cart.getItems().map((p) => p._productOrigin);
@@ -436,7 +436,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const cartItems = this.store.cart.getItems();
     const newCartItems = (0, import_lodash_es.cloneDeep)(cartItems);
     newCartItems.forEach((item) => {
-      var _a;
+      var _a, _b;
       item._origin.resources = item._origin.resources.map((n) => {
         const newResourcesItem = (0, import_lodash_es.cloneDeep)(n);
         delete newResourcesItem.id;
@@ -449,6 +449,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         product_bundle: item._origin.product.product_bundle
       });
       const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
+      if (!((_b = item._origin) == null ? void 0 : _b.metadata)) {
+        item._origin.metadata = {};
+      }
       item._origin.metadata.capacity = formatCapacity;
       item._origin.number = currentCapacity;
     });
@@ -542,6 +545,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   deleteCartItemInfo(type, _id) {
     this.store.cart.deleteCartItemInfo(type, _id);
   }
+  checkCartItemByType(cartItem, type) {
+    return this.store.cart.checkCartItemByType(cartItem, type);
+  }
   destroy() {
     var _a, _b, _c, _d, _e, _f;
     (_a = this.store.cart) == null ? void 0 : _a.destroy();
@@ -571,7 +577,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       });
     }
     const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
-    const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
+    const cartItems = this.store.cart.getItems();
     const arr = [];
     const capacityMap = {};
     cartItems.forEach((cartItem) => {
@@ -1019,17 +1025,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   // 提交时间切片，绑定到对应购物车的商品上，更新购物车
   submitTimeSlot(timeSlots) {
     const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
-    const itemsByAccount = cartItems.reduce(
-      (acc, item) => {
-        const holderId = item.holder_id;
-        if (!acc[holderId]) {
-          acc[holderId] = [];
-        }
-        acc[holderId].push(item);
-        return acc;
-      },
-      {}
-    );
+    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) => {

package/package.json

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