@pisell/pisellos 1.0.3 → 1.0.5

package/dist/solution/BookingByStep/index.js

@@ -1909,6 +1909,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 var hasOverlap = !dayjs(item.time.start_at).isAfter(dayjs(timeSlots.start_at)) && !dayjs(item.time.end_at).isBefore(dayjs(timeSlots.end_at));
                 return hasOverlap ? sum + item.pax : sum;
               }, 0);
+
+              // 如果资源是单个预约，并且有 totalCapacity，则认为在当前 timeSlots 资源已经被选择过，就不可用了
+              if (n.resourceType === 'single' && totalCapacity > 0) {
+                return 0; // continue
+              }
               var canUseTime = mTimes.find(function (item) {
                 var _cartItem$_productOri12;
                 var res = getIsUsableByTimeItem({
@@ -2357,7 +2362,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               var resourcesEndTime = targetResourceTimes.reduce(function (acc, curr) {
                 return dayjs(curr.end_at).isBefore(dayjs(acc.end_at)) ? curr : acc;
               }, targetResourceTimes[0]);
-              var endTime = dayjs(resourcesEndTime.end_at).isBefore(dayjs(operating_day_boundary)) ? resourcesEndTime.end_at : operating_day_boundary;
+
+              // 将 operating_day_boundary 转换为与 resourcesEndTime.end_at 相同日期的完整日期时间
+              var resourceDate = dayjs(resourcesEndTime.end_at).format('YYYY-MM-DD');
+              var operatingBoundaryDateTime = "".concat(resourceDate, " ").concat(operating_day_boundary);
+              var endTime = dayjs(resourcesEndTime.end_at).isBefore(dayjs(operatingBoundaryDateTime)) ? resourcesEndTime.end_at : operatingBoundaryDateTime;
               // 修复：如果 endTime 只是时间格式（如 "17:00"），需要加上日期
               var formattedEndTime;
               if (typeof endTime === 'string' && endTime.includes(':') && !endTime.includes(' ') && !endTime.includes('T')) {

package/lib/solution/BookingByStep/index.js

@@ -1227,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)({
@@ -1615,7 +1618,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             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 endTime = (0, import_dayjs.default)(resourcesEndTime.end_at).isBefore((0, import_dayjs.default)(operating_day_boundary)) ? resourcesEndTime.end_at : operating_day_boundary;
+            const resourceDate = (0, import_dayjs.default)(resourcesEndTime.end_at).format("YYYY-MM-DD");
+            const operatingBoundaryDateTime = `${resourceDate} ${operating_day_boundary}`;
+            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");

package/package.json

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