@pisell/pisellos 3.0.38 → 3.0.40

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

@@ -79,7 +79,7 @@ export declare const formatResources: ({ booking, resources, }: {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, cut_off_time, }: {
+export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, cut_off_time, hasFlexibleDuration, operating_day_boundary }: {
     resource: ResourceItem;
     duration: number;
     split: number;
@@ -96,6 +96,11 @@ export declare const getTimeSlicesByResource: ({ resource, duration, split, curr
             unit: number;
         } | undefined;
     } | undefined;
+    hasFlexibleDuration?: boolean | undefined;
+    operating_day_boundary?: {
+        type: string;
+        time: string;
+    } | undefined;
 }) => TimeSliceItem[];
 /**
  * @title: 获取时间切片列表的交集
@@ -133,7 +138,7 @@ export declare const mergeSubResourcesTimeSlices: (resources: ResourceItem[], re
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, cut_off_time, }: {
+export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, cut_off_time, hasFlexibleDuration, operating_day_boundary }: {
     resourceIds: number[];
     resourcesMap: any;
     duration: number;
@@ -151,6 +156,11 @@ export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, dur
             unit: number;
         } | undefined;
     } | undefined;
+    hasFlexibleDuration?: boolean | undefined;
+    operating_day_boundary?: {
+        type: string;
+        time: string;
+    } | undefined;
 }) => any[];
 /**
  * @title: 获取其他人的已选资源

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

@@ -415,7 +415,9 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref5) {
     capacity = _ref5.capacity,
     _ref5$resourcesUseabl = _ref5.resourcesUseableMap,
     resourcesUseableMap = _ref5$resourcesUseabl === void 0 ? {} : _ref5$resourcesUseabl,
-    cut_off_time = _ref5.cut_off_time;
+    cut_off_time = _ref5.cut_off_time,
+    hasFlexibleDuration = _ref5.hasFlexibleDuration,
+    operating_day_boundary = _ref5.operating_day_boundary;
   var times = resource.times;
 
   // 存储所有时间切片
@@ -424,7 +426,7 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref5) {
   // 处理每个时间范围
   times.forEach(function (time) {
     // 创建今天的日期字符串，用于构建完整的日期时间
-    var today = dayjs(currentDate).format('YYYY-MM-DD');
+    // const today = dayjs(currentDate).format('YYYY-MM-DD');
 
     // 解析开始和结束时间
     var startTime = dayjs("".concat(time.start_at));
@@ -460,6 +462,11 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref5) {
         resourcesUseableMap[resource.id] = _status.usable;
       }
       if (_status.usable) {
+        // 如果有hasFlexibleDuration，且timeSlice.start_at 大于等于operating_day_boundary，则不添加时间切片
+        var operatingBoundaryDateTime = (operating_day_boundary === null || operating_day_boundary === void 0 ? void 0 : operating_day_boundary.type) === 'start_time' ? "23:59" : operating_day_boundary === null || operating_day_boundary === void 0 ? void 0 : operating_day_boundary.time;
+        if (hasFlexibleDuration && operating_day_boundary && timeSlice.start_time >= (operatingBoundaryDateTime || "23:59")) {
+          break;
+        }
         // 添加时间切片  09:00 ~ 10:00   09:20 ~ 10:20   09:00 ~ 10:00   09:20 ~ 10:20  11:00 ~ 12:00   11:20 ~ 12:20
         timeSlices.push(_objectSpread(_objectSpread({}, timeSlice), {}, {
           // 这里需要补充这个时间段内是否可预约
@@ -565,7 +572,9 @@ export var getTimeSlicesByResources = function getTimeSlicesByResources(_ref6) {
     split = _ref6.split,
     capacity = _ref6.capacity,
     resourcesUseableMap = _ref6.resourcesUseableMap,
-    cut_off_time = _ref6.cut_off_time;
+    cut_off_time = _ref6.cut_off_time,
+    hasFlexibleDuration = _ref6.hasFlexibleDuration,
+    operating_day_boundary = _ref6.operating_day_boundary;
   // 获取资源列表
   var resources = getResourcesByIds(resourcesMap, resourceIds);
   mergeSubResourcesTimeSlices(resources, resourcesMap);
@@ -588,7 +597,9 @@ export var getTimeSlicesByResources = function getTimeSlicesByResources(_ref6) {
       currentDate: currentDate,
       capacity: capacity,
       resourcesUseableMap: resourcesUseableMap,
-      cut_off_time: cut_off_time
+      cut_off_time: cut_off_time,
+      hasFlexibleDuration: hasFlexibleDuration,
+      operating_day_boundary: operating_day_boundary
     }));
   }, []);
 

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

@@ -69,8 +69,10 @@ export interface CartItem {
     name?: string;
     /** 商品价格 */
     price?: number | string;
-    /** 商品总价 */
+    /** 单个商品包括商品本身价格+套餐价格+规格等价格得出来的 */
     total?: number | string;
+    /** 基于 total 乘以 商品数量的价格 */
+    summaryTotal?: number | string;
     /** 商品原价总价，排除原始价格为0的场景 */
     origin_total?: number | string;
     /** 商品数量 */

package/lib/modules/Cart/utils/cartProduct.js

@@ -74,6 +74,7 @@ var formatProductToCartItem = (params) => {
     cartItem.price = product == null ? void 0 : product.price;
     cartItem.num = num;
     cartItem.total = getProductTotalPrice({ product, bundle, options, num });
+    cartItem.summaryTotal = cartItem.total * (num || 1);
     cartItem.origin_total = getProductOriginTotalPrice({
       product,
       bundle,
@@ -163,7 +164,6 @@ var formatProductToCartItemOrigin = (params) => {
 };
 var getProductTotalPrice = (params) => {
   const { product, bundle, options } = params;
-  const num = params.num || 1;
   let price = Number(product.price);
   if (bundle == null ? void 0 : bundle.length) {
     price = bundle.reduce((accumulator, currentValue) => {
@@ -175,7 +175,7 @@ var getProductTotalPrice = (params) => {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  return price * num;
+  return price;
 };
 var getProductOriginTotalPrice = (params) => {
   const { product, bundle, options } = params;

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

@@ -20,4 +20,5 @@ export declare class DateModule extends BaseModule implements Module, DateModule
     getResourceAvailableTimeList(params: IGetAvailableTimeListParams): Promise<ITime[]>;
     clearDateRange(): void;
     storeChange(): void;
+    getResourcesListByDate(date: string): any[] | undefined;
 }

package/lib/modules/Date/index.js

@@ -125,6 +125,12 @@ var DateModule = class extends import_BaseModule.BaseModule {
       });
     }
   }
+  getResourcesListByDate(date) {
+    var _a;
+    const dateList = this.store.dateList;
+    const resourcesList = (_a = dateList.find((item) => item.date === date)) == null ? void 0 : _a.resource;
+    return resourcesList;
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/modules/Summary/utils.js

@@ -55,7 +55,7 @@ var calculateSubtotal = (items) => {
     return "0.00";
   }
   const subtotal = items.reduce((sum, item) => {
-    const cartItemTotalPrice = new import_decimal.default(item.total || 0);
+    const cartItemTotalPrice = new import_decimal.default(item.summaryTotal || 0);
     return sum.plus(cartItemTotalPrice);
   }, new import_decimal.default(0));
   return subtotal.toFixed(2);
@@ -66,7 +66,7 @@ var calculateTaxFee = (shopInfo, items) => {
   }
   const { is_price_include_tax, tax_rate } = shopInfo || {};
   const totalTaxFee = items.reduce((sum, item) => {
-    const cartItemTotalPrice = new import_decimal.default(item.total || 0);
+    const cartItemTotalPrice = new import_decimal.default(item.summaryTotal || 0);
     const taxRate = new import_decimal.default(tax_rate || 0).div(100);
     const productTaxRate = cartItemTotalPrice.times(taxRate).times((item == null ? void 0 : item.is_charge_tax) || 0).div(taxRate.times(is_price_include_tax || 0).plus(1));
     return sum.plus(productTaxRate);

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

@@ -42,10 +42,11 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * 更新step
      */
     updateStep(key: string, step: IStep): void;
-    loadProducts({ category_ids, product_ids, collection, }: {
+    loadProducts({ category_ids, product_ids, collection, schedule_date, }: {
         category_ids?: number[];
         product_ids?: number[];
         collection?: number | string[];
+        schedule_date?: string;
     }): Promise<any>;
     loadProductByScheduleDate({ date, product_ids, category_ids, }: {
         date: string;

package/lib/solution/BookingByStep/index.js

@@ -69,6 +69,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     if (!this.request) {
       throw new Error("bookingByStep解决方案需要 request 插件支持");
     }
+    if (!this.shopStore) {
+      throw new Error("SummaryModule 需要 shopStore 插件支持");
+    }
     let targetCacheData = {};
     this.cacheId = (_a = this.otherParams) == null ? void 0 : _a.cacheId;
     if ((_b = this.otherParams) == null ? void 0 : _b.cacheId) {
@@ -163,9 +166,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   async loadProducts({
     category_ids = [],
     product_ids = [],
-    collection = []
+    collection = [],
     // schedule_ids = [],
-    // schedule_date,
+    schedule_date
   }) {
     var _a;
     let userPlugin = this.core.getPlugin("user");
@@ -196,9 +199,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         category_ids,
         ids: product_ids,
         collection,
-        front_end_cache_id: this.cacheId
+        front_end_cache_id: this.cacheId,
         // client_schedule_ids: schedule_ids,
-        // schedule_date,
+        schedule_date
       },
       { useCache: true }
     );
@@ -227,8 +230,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     return await this.loadProducts({
       // schedule_ids: scheduleIds,
       product_ids: allProductIds,
-      category_ids
-      // schedule_date: date,
+      category_ids,
+      schedule_date: date
     });
   }
   async updateQuotationPriceAndCart(date) {
@@ -821,7 +824,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
     const arr = [];
     cartItems.forEach((cartItem) => {
-      var _a, _b, _c;
+      var _a, _b, _c, _d, _e, _f, _g;
       let selectedResources = [];
       const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
         capacity: (_a = cartItem._productOrigin) == null ? void 0 : _a.capacity,
@@ -858,9 +861,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         const resourcesUseableMap = {};
         productResources.forEach((n) => {
           n.renderList = n.renderList.sort((a, b) => {
-            var _a2, _b2, _c2, _d;
+            var _a2, _b2, _c2, _d2;
             const aIsCombined = ((_b2 = (_a2 = a.metadata) == null ? void 0 : _a2.combined_resource) == null ? void 0 : _b2.status) === 1;
-            const bIsCombined = ((_d = (_c2 = b.metadata) == null ? void 0 : _c2.combined_resource) == null ? void 0 : _d.status) === 1;
+            const bIsCombined = ((_d2 = (_c2 = b.metadata) == null ? void 0 : _c2.combined_resource) == null ? void 0 : _d2.status) === 1;
             if (aIsCombined && !bIsCombined)
               return 1;
             if (!aIsCombined && bIsCombined)
@@ -900,17 +903,22 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           });
         });
       } else {
+        const hasFlexibleDuration = ((_e = (_d = cartItem._productOrigin) == null ? void 0 : _d.duration) == null ? void 0 : _e.type) === "flexible";
+        const operating_day_boundary = (_g = (_f = this.shopStore.get("core")) == null ? void 0 : _f.core) == null ? void 0 : _g.operating_day_boundary;
         productResources.forEach((item) => {
           item.renderList = item.renderList.filter((n) => {
-            var _a2, _b2;
+            var _a2, _b2, _c2;
             const recordCount = n.capacity || 0;
             if (n.onlyComputed)
               return false;
             const timeSlots = (0, import_resources.getTimeSlicesByResource)({
               resource: n,
-              duration: ((_b2 = (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) || 0,
+              duration: ((_b2 = (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) || 10,
               split: 10,
-              currentDate: dateRange[0].date
+              currentDate: dateRange[0].date,
+              hasFlexibleDuration,
+              cut_off_time: (_c2 = cartItem._productOrigin) == null ? void 0 : _c2.cut_off_time,
+              operating_day_boundary
             });
             return recordCount >= currentCapacity && timeSlots.length > 0;
           });
@@ -1037,7 +1045,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               return false;
             const timeSlots = (0, import_resources.getTimeSlicesByResource)({
               resource: n,
-              duration: ((_b2 = (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) || 0,
+              duration: ((_b2 = (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) || 10,
               split: 10,
               currentDate: dateRange[0].date
             });
@@ -1155,7 +1163,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     let duration = accountCartItems.reduce((acc, n) => {
       var _a2, _b2;
-      return acc + (((_b2 = (_a2 = n._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) ?? 0);
+      return acc + (((_b2 = (_a2 = n._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) || 10);
     }, 0);
     let AllResources = [];
     if (dateRange == null ? void 0 : dateRange.length) {
@@ -1219,6 +1227,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           },
           0
         );
+        if (n.resourceType === "single" && totalCapacity > 0) {
+          continue;
+        }
         const canUseTime = mTimes.find((item) => {
           var _a2;
           const res = (0, import_resources.getIsUsableByTimeItem)({
@@ -1286,8 +1297,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const accountList = this.store.accountList.getAccounts();
     const selectForCartResources = (cartItems2) => {
       let recordTimeSlots = (0, import_lodash_es.cloneDeep)(timeSlots);
+      const hasFlexibleProduct = cartItems2.some((item) => {
+        var _a2, _b;
+        return ((_b = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b.type) === "flexible";
+      });
       cartItems2.forEach((item, index) => {
-        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
         const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
           capacity: (_a2 = item._productOrigin) == null ? void 0 : _a2.capacity,
           product_bundle: item._origin.product.product_bundle
@@ -1305,14 +1320,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           const currentResourceConfig = (_d = (_c = (_b = item._productOrigin) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) == null ? void 0 : _d.find(
             (n) => n.code === resources_code
           );
-          if (index !== 0 && recordTimeSlots && (currentResourceConfig == null ? void 0 : currentResourceConfig.type) === "single" && ((_e = item._productOrigin) == null ? void 0 : _e.duration)) {
+          if (index !== 0 && recordTimeSlots && (currentResourceConfig == null ? void 0 : currentResourceConfig.type) === "single" && ((_e = item._productOrigin) == null ? void 0 : _e.duration) && !hasFlexibleProduct) {
             let start_at = (0, import_dayjs.default)(recordTimeSlots.end_time).add(
-              ((_g = (_f = item._productOrigin) == null ? void 0 : _f.duration) == null ? void 0 : _g.value) ?? 0,
-              ((_i = (_h = item._productOrigin) == null ? void 0 : _h.duration) == null ? void 0 : _i.type) ?? "minutes"
+              ((_g = (_f = item._productOrigin) == null ? void 0 : _f.duration) == null ? void 0 : _g.value) || 10,
+              "minutes"
             );
             let end_at = start_at.add(
-              ((_k = (_j = item._productOrigin) == null ? void 0 : _j.duration) == null ? void 0 : _k.value) ?? 0,
-              ((_m = (_l = item._productOrigin) == null ? void 0 : _l.duration) == null ? void 0 : _m.type) ?? "minutes"
+              ((_i = (_h = item._productOrigin) == null ? void 0 : _h.duration) == null ? void 0 : _i.value) || 10,
+              "minutes"
             );
             recordTimeSlots = {
               start_time: start_at.format("HH:mm"),
@@ -1365,7 +1380,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           const allCartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
           let selectedResources = [];
           const resources2 = (0, import_lodash_es.cloneDeep)(
-            ((_o = (_n = item._productOrigin) == null ? void 0 : _n.product_resource) == null ? void 0 : _o.resources) || []
+            ((_k = (_j = item._productOrigin) == null ? void 0 : _j.product_resource) == null ? void 0 : _k.resources) || []
           );
           const currentResourcesRenderList = [];
           resources2.forEach((n) => {
@@ -1376,7 +1391,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
                 const recordCount = (m.capacity || 0) - (selectResourcesMap[m.id] || 0);
                 const timeSlots2 = (0, import_resources.getTimeSlicesByResource)({
                   resource: m,
-                  duration: ((_a4 = item == null ? void 0 : item.duration) == null ? void 0 : _a4.value) || 0,
+                  duration: ((_a4 = item == null ? void 0 : item.duration) == null ? void 0 : _a4.value) || 10,
                   split: 10,
                   currentDate: dateRange[0].date
                 });
@@ -1413,11 +1428,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               return recordCount >= currentCapacity;
             });
           });
-          const targetRenderList = (_p = productResources.find(
+          const targetRenderList = (_l = productResources.find(
             (n) => n.code === resources_code
-          )) == null ? void 0 : _p.renderList;
+          )) == null ? void 0 : _l.renderList;
           if (targetRenderList && targetRenderList.length > 0) {
-            if ((_q = item._origin.resources) == null ? void 0 : _q.some(
+            if ((_m = item._origin.resources) == null ? void 0 : _m.some(
               (n) => n.form_id === targetRenderList[0].form_id
             )) {
               return;
@@ -1463,7 +1478,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 从购物车中获取已经分配好第一步资源的所有时间片
   getTimeSlotByAllResources(resources_code) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     let dateRange = this.store.date.getDateRange();
     const resources = [];
     const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
@@ -1473,7 +1488,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     let maxCutOffTime = void 0;
     let maxCutOffTimeValue = (0, import_dayjs.default)();
     cartItems.forEach((item) => {
-      var _a2, _b2, _c2, _d2, _e2, _f2, _g, _h, _i;
+      var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i;
       (_c2 = (_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) == null ? void 0 : _c2.forEach((n) => {
         if (n.code === resources_code) {
           resources.push(...n.renderList || []);
@@ -1483,10 +1498,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       if (item.resource_id) {
         resourceIds.push(item.resource_id);
       }
-      resourcesTypeId = (_g = (_f2 = (_e2 = (_d2 = item == null ? void 0 : item._productOrigin) == null ? void 0 : _d2.product_resource) == null ? void 0 : _e2.resources) == null ? void 0 : _f2.find(
+      resourcesTypeId = (_g2 = (_f2 = (_e2 = (_d2 = item == null ? void 0 : item._productOrigin) == null ? void 0 : _d2.product_resource) == null ? void 0 : _e2.resources) == null ? void 0 : _f2.find(
         (n) => n.code === resources_code
-      )) == null ? void 0 : _g.id;
-      if (((_h = item._productOrigin) == null ? void 0 : _h.cut_off_time) && ((_i = item._productOrigin) == null ? void 0 : _i.cut_off_time.type) === "advance") {
+      )) == null ? void 0 : _g2.id;
+      if (((_h2 = item._productOrigin) == null ? void 0 : _h2.cut_off_time) && ((_i = item._productOrigin) == null ? void 0 : _i.cut_off_time.type) === "advance") {
         const currentCutOffTime = (0, import_dayjs.default)().add(
           item._productOrigin.cut_off_time.unit,
           item._productOrigin.cut_off_time.unit_type
@@ -1512,10 +1527,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       cartItems2.forEach((item) => {
         var _a2, _b2, _c2, _d2, _e2, _f2;
         if (isSingleResource) {
-          accountDuration += ((_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) ?? 0;
+          accountDuration += ((_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) || 10;
         } else {
-          if (accountDuration < (((_d2 = (_c2 = item._productOrigin) == null ? void 0 : _c2.duration) == null ? void 0 : _d2.value) ?? 0)) {
-            accountDuration = ((_f2 = (_e2 = item._productOrigin) == null ? void 0 : _e2.duration) == null ? void 0 : _f2.value) ?? 0;
+          if (accountDuration < (((_d2 = (_c2 = item._productOrigin) == null ? void 0 : _c2.duration) == null ? void 0 : _d2.value) || 10)) {
+            accountDuration = ((_f2 = (_e2 = item._productOrigin) == null ? void 0 : _e2.duration) == null ? void 0 : _f2.value) || 10;
           }
         }
       });
@@ -1551,6 +1566,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       ];
     }
     const resourcesUseableMap = {};
+    const hasFlexibleDuration = cartItems.some((item) => {
+      var _a2, _b2;
+      return ((_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.type) === "flexible";
+    });
+    const operating_day_boundary = (_h = (_g = this.shopStore.get("core")) == null ? void 0 : _g.core) == null ? void 0 : _h.operating_day_boundary;
     const timeSlots = (0, import_resources.getTimeSlicesByResources)({
       resourceIds,
       resourcesMap,
@@ -1558,13 +1578,17 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       currentDate: dateRange[0].date,
       split: 10,
       resourcesUseableMap,
-      cut_off_time: maxCutOffTime
+      cut_off_time: maxCutOffTime,
+      hasFlexibleDuration,
+      operating_day_boundary
     });
     return timeSlots;
   }
-  // 提交时间切片，绑定到对应购物车的商品上，更新购物车
+  // 提交时间切片，绑定到对应购物车的商品上，更新购物车---只有 duration 商品
   submitTimeSlot(timeSlots) {
+    var _a, _b;
     const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+    const allResources = this.store.date.getResourcesListByDate(timeSlots.start_at.format("YYYY-MM-DD"));
     const itemsByAccount = cartItems.reduce(
       (acc, item) => {
         const holderId = item.holder_id;
@@ -1576,25 +1600,48 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       },
       {}
     );
+    const operating_day_boundary = (_b = (_a = this.shopStore.get("core")) == null ? void 0 : _a.core) == null ? void 0 : _b.operating_day_boundary;
     Object.values(itemsByAccount).forEach((accountItems) => {
       let currentStartTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
       accountItems.forEach((item, index) => {
-        var _a;
+        var _a2;
         const newResources = (0, import_lodash_es.cloneDeep)(item._origin.resources);
         newResources.forEach((resource) => {
-          var _a2, _b, _c, _d;
-          resource.startTime = currentStartTime;
-          resource.endTime = (0, import_dayjs.default)(currentStartTime).add(
-            ((_b = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b.value) ?? 0,
-            ((_d = (_c = item._productOrigin) == null ? void 0 : _c.duration) == null ? void 0 : _d.type) ?? "minutes"
-          ).format("YYYY-MM-DD HH:mm");
-          delete resource.times;
+          var _a3, _b2, _c, _d, _e;
+          if (((_b2 = (_a3 = item._productOrigin) == null ? void 0 : _a3.duration) == null ? void 0 : _b2.type) === "flexible") {
+            item.duration = {
+              type: "minutes",
+              value: 10
+            };
+            resource.startTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
+            const targetResourceTimes = (_c = allResources == null ? void 0 : allResources.find((n) => n.id === resource.id)) == null ? void 0 : _c.times;
+            const resourcesEndTime = targetResourceTimes.reduce((acc, curr) => {
+              return (0, import_dayjs.default)(curr.end_at).isBefore((0, import_dayjs.default)(acc.end_at)) ? curr : acc;
+            }, targetResourceTimes[0]);
+            const resourceDate = (0, import_dayjs.default)(resourcesEndTime.end_at).format("YYYY-MM-DD");
+            const operatingBoundaryDateTime = `${resourceDate} ${operating_day_boundary.type === "start_time" ? "23:59" : operating_day_boundary.time}`;
+            const endTime = (0, import_dayjs.default)(resourcesEndTime.end_at).isBefore((0, import_dayjs.default)(operatingBoundaryDateTime)) ? resourcesEndTime.end_at : operatingBoundaryDateTime;
+            let formattedEndTime;
+            if (typeof endTime === "string" && endTime.includes(":") && !endTime.includes(" ") && !endTime.includes("T")) {
+              const currentDate = timeSlots.start_at.format("YYYY-MM-DD");
+              formattedEndTime = (0, import_dayjs.default)(`${currentDate} ${endTime}`);
+            } else {
+              formattedEndTime = (0, import_dayjs.default)(endTime);
+            }
+            resource.endTime = formattedEndTime.format("YYYY-MM-DD HH:mm");
+          } else {
+            resource.startTime = currentStartTime;
+            resource.endTime = (0, import_dayjs.default)(currentStartTime).add(
+              ((_e = (_d = item._productOrigin) == null ? void 0 : _d.duration) == null ? void 0 : _e.value) || 10,
+              "minutes"
+            ).format("YYYY-MM-DD HH:mm");
+          }
         });
         this.store.cart.updateItem({
           _id: item._id,
           resources: newResources
         });
-        if (index < accountItems.length - 1 && ((_a = newResources == null ? void 0 : newResources[0]) == null ? void 0 : _a.resourceType) === "single") {
+        if (index < accountItems.length - 1 && ((_a2 = newResources == null ? void 0 : newResources[0]) == null ? void 0 : _a2.resourceType) === "single") {
           currentStartTime = newResources[0].endTime;
         }
       });
@@ -1939,7 +1986,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           return false;
         const timeSlots = (0, import_resources.getTimeSlicesByResource)({
           resource: n,
-          duration: ((_b2 = (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) || 0,
+          duration: ((_b2 = (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) || 10,
           split: 10,
           currentDate: dateRange[0].date
         });

package/lib/solution/BookingByStep/utils/resources.d.ts

@@ -79,7 +79,7 @@ export declare const formatResources: ({ booking, resources, }: {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, cut_off_time, }: {
+export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, cut_off_time, hasFlexibleDuration, operating_day_boundary }: {
     resource: ResourceItem;
     duration: number;
     split: number;
@@ -96,6 +96,11 @@ export declare const getTimeSlicesByResource: ({ resource, duration, split, curr
             unit: number;
         } | undefined;
     } | undefined;
+    hasFlexibleDuration?: boolean | undefined;
+    operating_day_boundary?: {
+        type: string;
+        time: string;
+    } | undefined;
 }) => TimeSliceItem[];
 /**
  * @title: 获取时间切片列表的交集
@@ -133,7 +138,7 @@ export declare const mergeSubResourcesTimeSlices: (resources: ResourceItem[], re
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, cut_off_time, }: {
+export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, cut_off_time, hasFlexibleDuration, operating_day_boundary }: {
     resourceIds: number[];
     resourcesMap: any;
     duration: number;
@@ -151,6 +156,11 @@ export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, dur
             unit: number;
         } | undefined;
     } | undefined;
+    hasFlexibleDuration?: boolean | undefined;
+    operating_day_boundary?: {
+        type: string;
+        time: string;
+    } | undefined;
 }) => any[];
 /**
  * @title: 获取其他人的已选资源

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

@@ -333,12 +333,13 @@ var getTimeSlicesByResource = ({
   currentDate = (0, import_dayjs.default)(),
   capacity,
   resourcesUseableMap = {},
-  cut_off_time
+  cut_off_time,
+  hasFlexibleDuration,
+  operating_day_boundary
 }) => {
   const { times } = resource;
   const timeSlices = [];
   times.forEach((time) => {
-    const today = (0, import_dayjs.default)(currentDate).format("YYYY-MM-DD");
     const startTime = (0, import_dayjs.default)(`${time.start_at}`);
     const endTime = (0, import_dayjs.default)(`${time.end_at}`);
     let currentStart = startTime;
@@ -365,6 +366,10 @@ var getTimeSlicesByResource = ({
         resourcesUseableMap[resource.id] = _status.usable;
       }
       if (_status.usable) {
+        const operatingBoundaryDateTime = (operating_day_boundary == null ? void 0 : operating_day_boundary.type) === "start_time" ? "23:59" : operating_day_boundary == null ? void 0 : operating_day_boundary.time;
+        if (hasFlexibleDuration && operating_day_boundary && timeSlice.start_time >= (operatingBoundaryDateTime || "23:59")) {
+          break;
+        }
         timeSlices.push({
           ...timeSlice,
           // 这里需要补充这个时间段内是否可预约
@@ -422,7 +427,9 @@ var getTimeSlicesByResources = ({
   split,
   capacity,
   resourcesUseableMap,
-  cut_off_time
+  cut_off_time,
+  hasFlexibleDuration,
+  operating_day_boundary
 }) => {
   let resources = getResourcesByIds(resourcesMap, resourceIds);
   mergeSubResourcesTimeSlices(resources, resourcesMap);
@@ -446,7 +453,9 @@ var getTimeSlicesByResources = ({
           currentDate,
           capacity,
           resourcesUseableMap,
-          cut_off_time
+          cut_off_time,
+          hasFlexibleDuration,
+          operating_day_boundary
         })
       );
     },

package/package.json

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