@pisell/pisellos 0.0.444 → 0.0.445

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

@@ -358,7 +358,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/dist/solution/BookingByStep/index.js

@@ -2554,14 +2554,63 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               var targetResourceTimes = allResources === null || allResources === void 0 || (_allResources$find = allResources.find(function (n) {
                 return n.id === resource.id;
               })) === null || _allResources$find === void 0 ? void 0 : _allResources$find.times;
+              // 找到最晚的 end_at 还没用，因为可能存在资源工作时间是 10:00-19:00，但是资源的 times 里有 16:30-19:00 被 block 的情况
+              // 所以还需要排除掉 block 时间
+              function getEarliestBlockedStartTime(_ref11) {
+                var _earliestBlockStart;
+                var currentStartTime = _ref11.currentStartTime,
+                  times = _ref11.times;
+                var currentStart = dayjs(currentStartTime);
+                var earliestBlockStart;
+                var _iterator3 = _createForOfIteratorHelper(times || []),
+                  _step3;
+                try {
+                  for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                    var time = _step3.value;
+                    var _iterator4 = _createForOfIteratorHelper(time.event_list || []),
+                      _step4;
+                    try {
+                      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                        var event = _step4.value;
+                        var eventStart = dayjs(event.start_at);
+                        var eventEnd = dayjs(event.end_at);
+                        if (eventStart.isBefore(currentStart) && eventEnd.isAfter(currentStart)) {
+                          return currentStart.format('YYYY-MM-DD HH:mm');
+                        }
+                        if (eventStart.isAfter(currentStart)) {
+                          if (!earliestBlockStart || eventStart.isBefore(earliestBlockStart)) {
+                            earliestBlockStart = eventStart;
+                          }
+                        }
+                      }
+                    } catch (err) {
+                      _iterator4.e(err);
+                    } finally {
+                      _iterator4.f();
+                    }
+                  }
+                } catch (err) {
+                  _iterator3.e(err);
+                } finally {
+                  _iterator3.f();
+                }
+                return (_earliestBlockStart = earliestBlockStart) === null || _earliestBlockStart === void 0 ? void 0 : _earliestBlockStart.format('YYYY-MM-DD HH:mm');
+              }
               var resourcesEndTime = targetResourceTimes.reduce(function (acc, curr) {
                 return dayjs(curr.end_at).isAfter(dayjs(acc.end_at)) ? curr : acc;
               }, targetResourceTimes[0]);
+              var earliestBlockedStartTime = getEarliestBlockedStartTime({
+                currentStartTime: currentStartTime,
+                times: targetResourceTimes
+              });
 
               // 将 operating_day_boundary 转换为与 resourcesEndTime.end_at 相同日期的完整日期时间
               var resourceDate = dayjs(resourcesEndTime.end_at).format('YYYY-MM-DD');
               var operatingBoundaryDateTime = "".concat(resourceDate, " ").concat(operating_day_boundary.type === 'start_time' ? '23:59' : operating_day_boundary.time);
-              var endTime = dayjs(resourcesEndTime.end_at).isBefore(dayjs(operatingBoundaryDateTime)) ? resourcesEndTime.end_at : operatingBoundaryDateTime;
+              var endTimeCandidates = [resourcesEndTime.end_at, operatingBoundaryDateTime].concat(_toConsumableArray(earliestBlockedStartTime ? [earliestBlockedStartTime] : []));
+              var endTime = endTimeCandidates.reduce(function (earliest, value) {
+                return dayjs(value).isBefore(dayjs(earliest)) ? value : earliest;
+              }, endTimeCandidates[0]);
               // 修复：如果 endTime 只是时间格式（如 "17:00"），需要加上日期
               var formattedEndTime;
               if (typeof endTime === 'string' && endTime.includes(':') && !endTime.includes(' ') && !endTime.includes('T')) {
@@ -2702,14 +2751,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     // 通过商品和 schedule 来获取视频可用的时间片、时间片内资源可用的数据
   }, {
     key: "getTimeslotBySchedule",
-    value: function getTimeslotBySchedule(_ref11) {
+    value: function getTimeslotBySchedule(_ref12) {
       var _this$store$currentPr2,
         _targetProductData$pr,
         _this15 = this;
-      var date = _ref11.date,
-        scheduleIds = _ref11.scheduleIds,
-        resources = _ref11.resources,
-        product = _ref11.product;
+      var date = _ref12.date,
+        scheduleIds = _ref12.scheduleIds,
+        resources = _ref12.resources,
+        product = _ref12.product;
       var targetProduct = this.store.currentProduct;
       // 如果外面传递了product 优先用外面的
       var targetProductData = product || targetProduct;
@@ -3268,12 +3317,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             // 检查资源类型（单个预约 vs 多个预约）
             // 从商品配置中获取资源类型信息
             var resourceTypeConfig = null;
-            var _iterator3 = _createForOfIteratorHelper(items),
-              _step3;
+            var _iterator5 = _createForOfIteratorHelper(items),
+              _step5;
             try {
-              for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+              for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
                 var _cartItem$_productOri12;
-                var cartItem = _step3.value;
+                var cartItem = _step5.value;
                 if ((_cartItem$_productOri12 = cartItem._productOrigin) !== null && _cartItem$_productOri12 !== void 0 && (_cartItem$_productOri12 = _cartItem$_productOri12.product_resource) !== null && _cartItem$_productOri12 !== void 0 && _cartItem$_productOri12.resources) {
                   resourceTypeConfig = cartItem._productOrigin.product_resource.resources.find(function (r) {
                     return r.code === resourceCode && r.status === 1;
@@ -3282,9 +3331,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               }
             } catch (err) {
-              _iterator3.e(err);
+              _iterator5.e(err);
             } finally {
-              _iterator3.f();
+              _iterator5.f();
             }
             var isMultipleBooking = ((_resourceTypeConfig = resourceTypeConfig) === null || _resourceTypeConfig === void 0 ? void 0 : _resourceTypeConfig.type) === 'multiple';
             var totalAvailable;
@@ -3487,17 +3536,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
      */
   }, {
     key: "convertProductToCartItem",
-    value: function convertProductToCartItem(_ref12) {
-      var product = _ref12.product,
-        date = _ref12.date,
-        account = _ref12.account;
-      var _ref13 = product || {},
-        bundle = _ref13.bundle,
-        options = _ref13.options,
-        origin = _ref13.origin,
-        product_variant_id = _ref13.product_variant_id,
-        _ref13$quantity = _ref13.quantity,
-        quantity = _ref13$quantity === void 0 ? 1 : _ref13$quantity;
+    value: function convertProductToCartItem(_ref13) {
+      var product = _ref13.product,
+        date = _ref13.date,
+        account = _ref13.account;
+      var _ref14 = product || {},
+        bundle = _ref14.bundle,
+        options = _ref14.options,
+        origin = _ref14.origin,
+        product_variant_id = _ref14.product_variant_id,
+        _ref14$quantity = _ref14.quantity,
+        quantity = _ref14$quantity === void 0 ? 1 : _ref14$quantity;
 
       // 处理商品数据，类似 addProductToCart 中的逻辑
       var productData = _objectSpread(_objectSpread({}, origin), {}, {
@@ -3552,11 +3601,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     }
   }, {
     key: "checkMaxDurationCapacityForDetailNums",
-    value: function checkMaxDurationCapacityForDetailNums(_ref14) {
+    value: function checkMaxDurationCapacityForDetailNums(_ref15) {
       var _this17 = this;
-      var product = _ref14.product,
-        date = _ref14.date,
-        account = _ref14.account;
+      var product = _ref15.product,
+        date = _ref15.date,
+        account = _ref15.account;
       var cartItems = this.store.cart.getItems().filter(function (item) {
         return !isNormalProduct(item._productOrigin);
       });
@@ -3701,12 +3750,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             // 检查资源类型（单个预约 vs 多个预约）
             // 从商品配置中获取资源类型信息
             var resourceTypeConfig = null;
-            var _iterator4 = _createForOfIteratorHelper(items),
-              _step4;
+            var _iterator6 = _createForOfIteratorHelper(items),
+              _step6;
             try {
-              for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+              for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
                 var _cartItem$_productOri15;
-                var cartItem = _step4.value;
+                var cartItem = _step6.value;
                 if ((_cartItem$_productOri15 = cartItem._productOrigin) !== null && _cartItem$_productOri15 !== void 0 && (_cartItem$_productOri15 = _cartItem$_productOri15.product_resource) !== null && _cartItem$_productOri15 !== void 0 && _cartItem$_productOri15.resources) {
                   resourceTypeConfig = cartItem._productOrigin.product_resource.resources.find(function (r) {
                     return r.code === resourceCode && r.status === 1;
@@ -3715,9 +3764,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               }
             } catch (err) {
-              _iterator4.e(err);
+              _iterator6.e(err);
             } finally {
-              _iterator4.f();
+              _iterator6.f();
             }
             var isMultipleBooking = ((_resourceTypeConfig2 = resourceTypeConfig) === null || _resourceTypeConfig2 === void 0 ? void 0 : _resourceTypeConfig2.type) === 'multiple';
             var totalAvailable;
@@ -4088,12 +4137,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTimeslotsScheduleByDateRange",
     value: (function () {
-      var _getTimeslotsScheduleByDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(_ref15) {
+      var _getTimeslotsScheduleByDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(_ref16) {
         var startDate, endDate, scheduleIds, resources, dates, currentDate, end, results, _i5, _dates, date;
         return _regeneratorRuntime().wrap(function _callee27$(_context28) {
           while (1) switch (_context28.prev = _context28.next) {
             case 0:
-              startDate = _ref15.startDate, endDate = _ref15.endDate, scheduleIds = _ref15.scheduleIds, resources = _ref15.resources;
+              startDate = _ref16.startDate, endDate = _ref16.endDate, scheduleIds = _ref16.scheduleIds, resources = _ref16.resources;
               console.log('appoimentBooking-session-date-getTimeslotsScheduleByDateRange', {
                 startDate: startDate,
                 endDate: endDate,

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

@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -358,7 +358,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/lib/solution/BookingByStep/index.js

@@ -1768,6 +1768,28 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         newResources.forEach((resource) => {
           var _a3, _b2, _c, _d, _e, _f, _g, _h, _i, _j, _k;
           if (((_b2 = (_a3 = item._productOrigin) == null ? void 0 : _a3.duration) == null ? void 0 : _b2.type) === "flexible") {
+            let getEarliestBlockedStartTime = function({
+              currentStartTime: currentStartTime2,
+              times
+            }) {
+              const currentStart = (0, import_dayjs.default)(currentStartTime2);
+              let earliestBlockStart;
+              for (const time of times || []) {
+                for (const event of time.event_list || []) {
+                  const eventStart = (0, import_dayjs.default)(event.start_at);
+                  const eventEnd = (0, import_dayjs.default)(event.end_at);
+                  if (eventStart.isBefore(currentStart) && eventEnd.isAfter(currentStart)) {
+                    return currentStart.format("YYYY-MM-DD HH:mm");
+                  }
+                  if (eventStart.isAfter(currentStart)) {
+                    if (!earliestBlockStart || eventStart.isBefore(earliestBlockStart)) {
+                      earliestBlockStart = eventStart;
+                    }
+                  }
+                }
+              }
+              return earliestBlockStart == null ? void 0 : earliestBlockStart.format("YYYY-MM-DD HH:mm");
+            };
             item.duration = {
               type: "minutes",
               value: 10
@@ -1782,13 +1804,22 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               },
               targetResourceTimes[0]
             );
+            const earliestBlockedStartTime = getEarliestBlockedStartTime({
+              currentStartTime,
+              times: targetResourceTimes
+            });
             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;
+            const endTimeCandidates = [
+              resourcesEndTime.end_at,
+              operatingBoundaryDateTime,
+              ...earliestBlockedStartTime ? [earliestBlockedStartTime] : []
+            ];
+            const endTime = endTimeCandidates.reduce((earliest, value) => {
+              return (0, import_dayjs.default)(value).isBefore((0, import_dayjs.default)(earliest)) ? value : earliest;
+            }, endTimeCandidates[0]);
             let formattedEndTime;
             if (typeof endTime === "string" && endTime.includes(":") && !endTime.includes(" ") && !endTime.includes("T")) {
               const currentDate = timeSlots.start_at.format("YYYY-MM-DD");

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

@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/package.json

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