@pisell/pisellos 2.2.297 → 2.2.299

package/dist/modules/ResourcePlanner/planner.js

@@ -62,13 +62,21 @@ function resolveRequestedDurationMinutes(product, request) {
 }
 function resolveRequestedDurationStartTimes(product, request) {
   var _request$durationStar;
-  if (product.kind !== 'duration') return [];
+  var allowSessionCustomRanges = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  if (product.kind !== 'duration' && !(product.kind === 'session' && allowSessionCustomRanges)) return [];
   var values = (_request$durationStar = request.durationStartTimesByProductId) === null || _request$durationStar === void 0 ? void 0 : _request$durationStar[String(product.id)];
   if (!Array.isArray(values)) return [];
   return Array.from(new Set(values.filter(function (value) {
     return typeof value === 'string' && /^([01]\d|2[0-3]):[0-5]\d$/.test(value);
   })));
 }
+function resolveRequestedSessionDurationMinutes(product, request, allowSessionCustomRanges) {
+  var _request$durationMinu2;
+  if (product.kind !== 'session' || !allowSessionCustomRanges) return undefined;
+  var override = (_request$durationMinu2 = request.durationMinutesByProductId) === null || _request$durationMinu2 === void 0 ? void 0 : _request$durationMinu2[String(product.id)];
+  var normalized = Number(override);
+  return Number.isInteger(normalized) && normalized > 0 ? normalized : undefined;
+}
 function toDateTime(value, _timezoneName) {
   try {
     return localDateTimeToScalar(parseLocalDateTime(value));
@@ -1029,18 +1037,32 @@ export function getProductTimeRanges(projection) {
       };
     }
     if (product.kind === 'session' || product.kind === 'venue_slot') {
+      var fixedRanges = getSessionRangesForProduct(projection, product, dateRange);
+      var customRanges = [];
+      var customDurationMinutes = resolveRequestedSessionDurationMinutes(product, request, runtimeOptions.allowSessionCustomRanges === true);
+      var _requestedStartTimes = resolveRequestedDurationStartTimes(product, request, runtimeOptions.allowSessionCustomRanges === true);
+      if (product.kind === 'session' && customDurationMinutes && dateRange.startDate === dateRange.endDate) {
+        _requestedStartTimes.forEach(function (startTime) {
+          var start = toDateTimeInDate(dateRange.startDate, startTime, projection.meta.timezone);
+          if (!Number.isFinite(start)) return;
+          customRanges.push(createDurationTimeRange(product, start, customDurationMinutes, projection, fixedOffsetMinutes));
+        });
+      }
       return {
         productId: product.id,
         title: product.title,
         kind: product.kind,
         slotStepMinutes: slotStepMinutes,
-        ranges: getSessionRangesForProduct(projection, product, dateRange)
+        ranges: dedupeProductRanges([].concat(_toConsumableArray(fixedRanges), customRanges))
       };
     }
     var requiredGroups = (product.requirementGroups || []).filter(function (group) {
       return group.required !== false;
     });
     var operatingRanges = buildOperatingRanges(projection, dateRange);
+    var operatingEndAt = dateRange.startDate === dateRange.endDate && operatingRanges.length > 0 ? formatDateTime(Math.max.apply(Math, _toConsumableArray(operatingRanges.map(function (range) {
+      return range.end;
+    }))), projection.meta.timezone, fixedOffsetMinutes) : undefined;
     var resourceRanges = requiredGroups.length ? requiredGroups.map(function (group) {
       return buildGroupWorkingRanges({
         projection: projection,
@@ -1108,13 +1130,16 @@ export function getProductTimeRanges(projection) {
         ranges.push(createDurationTimeRange(product, start, durationMinutes, projection, fixedOffsetMinutes));
       });
     }
-    return {
+    return _objectSpread(_objectSpread({
       productId: product.id,
       title: product.title,
       kind: product.kind,
-      slotStepMinutes: slotStepMinutes,
+      slotStepMinutes: slotStepMinutes
+    }, operatingEndAt ? {
+      operatingEndAt: operatingEndAt
+    } : {}), {}, {
       ranges: dedupeProductRanges(ranges)
-    };
+    });
   });
 }
 function aggregateMatchedCells(productId, requirementGroupId, resourceId, candidateRange, indexedCells) {

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

@@ -213,6 +213,8 @@ export interface ProductTimeRangeGroup {
     title?: string;
     kind: AvailabilityProductKind;
     slotStepMinutes?: number;
+    /** 单日查询对应营业窗口的最终结束时刻，不受资源排班是否为空影响。 */
+    operatingEndAt?: string;
     ranges: ProductTimeRange[];
 }
 export interface AvailabilityAssignment extends AvailabilityAbsoluteRange {
@@ -243,6 +245,13 @@ export interface GetProductTimeRangesRequest {
 }
 export interface GetProductTimeRangesRuntimeOptions {
     evaluatedAt?: string;
+    /**
+     * Internal POS capability: allow explicit duration/start overrides to append
+     * a custom duration candidate for Session products. Fixed Session ranges are
+     * still returned unchanged. Callers outside the POS facade must leave this
+     * disabled.
+     */
+    allowSessionCustomRanges?: boolean;
 }
 export interface QueryAvailabilityBaseRequest {
     productIds?: AvailabilityId[];

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 6 | 4 | 3 | 5;
+        weekNum: 0 | 2 | 3 | 1 | 5 | 6 | 4;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/UnifiedBookingSales/index.js

@@ -1029,7 +1029,7 @@ function buildBookingFromAvailabilitySelection(params) {
   var timeSlotId = (_candidate$primarySch3 = (_candidate$primarySch4 = candidate.primaryScheduleRef) === null || _candidate$primarySch4 === void 0 ? void 0 : _candidate$primarySch4.timeSlotId) !== null && _candidate$primarySch3 !== void 0 ? _candidate$primarySch3 : (_assignments$find2 = assignments.find(function (assignment) {
     return assignment.timeSlotId != null;
   })) === null || _assignments$find2 === void 0 ? void 0 : _assignments$find2.timeSlotId;
-  if (product.kind === 'session' && scheduleId == null) {
+  if (product.kind === 'session' && candidate.source === 'session_schedule' && scheduleId == null) {
     throw new AvailabilityError('REVALIDATION_FAILED', 'session 候选缺少真实 schedule identity', {
       productId: product.id,
       candidateKey: candidate.key,
@@ -1038,15 +1038,16 @@ function buildBookingFromAvailabilitySelection(params) {
   }
   var normalizedHolder = holder && _typeof(holder) === 'object' ? cloneDeep(holder) : undefined;
   var normalizedHolderIds = Array.isArray(holderIds) ? cloneDeep(holderIds) : holderIds;
-  return _objectSpread(_objectSpread({
+  return _objectSpread(_objectSpread(_objectSpread({
     start_date: bookingStartAt.slice(0, 10),
     start_time: bookingStartAt.slice(11, 16),
     end_date: bookingEndAt.slice(0, 10),
     end_time: bookingEndAt.slice(11, 16),
     duration: Math.max(1, Math.trunc((endScalar - startScalar) / (60 * 1000))),
-    like_status: 'common',
+    like_status: 'common'
+  }, product.kind === 'session' && candidate.source === 'duration_window' ? {} : {
     schedule_id: scheduleId !== null && scheduleId !== void 0 ? scheduleId : 0
-  }, normalizedHolder ? {
+  }), normalizedHolder ? {
     holder: normalizedHolder
   } : {}), {}, {
     resources: assignments.map(function (assignment) {
@@ -4209,6 +4210,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
           context,
           projectionEntry,
           contextVersion,
+          isPosAvailabilityRequest,
           allowOutsideOperatingHoursForRequestedStartTimes,
           _args35 = arguments;
         return _regeneratorRuntime().wrap(function _callee35$(_context35) {
@@ -4222,13 +4224,15 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               context = _yield$this$ensureAva.context;
               projectionEntry = _yield$this$ensureAva.projectionEntry;
               contextVersion = context.activeVersion;
-              allowOutsideOperatingHoursForRequestedStartTimes = String((_this$otherParams$pla = (_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.platform) !== null && _this$otherParams$pla !== void 0 ? _this$otherParams$pla : '').trim().toLowerCase() === 'pos' && Object.values(request.durationStartTimesByProductId || {}).some(function (startTimes) {
+              isPosAvailabilityRequest = String((_this$otherParams$pla = (_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.platform) !== null && _this$otherParams$pla !== void 0 ? _this$otherParams$pla : '').trim().toLowerCase() === 'pos';
+              allowOutsideOperatingHoursForRequestedStartTimes = isPosAvailabilityRequest && Object.values(request.durationStartTimesByProductId || {}).some(function (startTimes) {
                 return Array.isArray(startTimes) && startTimes.length > 0;
               });
               return _context35.abrupt("return", getProjectionProductTimeRanges(projectionEntry.projection, _objectSpread(_objectSpread({}, request), allowOutsideOperatingHoursForRequestedStartTimes ? {
                 allowOutsideOperatingHoursForRequestedStartTimes: true
               } : {}), {
-                evaluatedAt: this.getAvailabilityRuntimeDateTime()
+                evaluatedAt: this.getAvailabilityRuntimeDateTime(),
+                allowSessionCustomRanges: isPosAvailabilityRequest
               }).map(function (group) {
                 return _objectSpread(_objectSpread({}, group), {}, {
                   ranges: group.ranges.map(function (candidate) {
@@ -4236,7 +4240,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
                   })
                 });
               }));
-            case 9:
+            case 10:
             case "end":
               return _context35.stop();
           }
@@ -4615,7 +4619,9 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
                 durationStartTimesByProductId: _defineProperty({}, String(params.candidate.productId), [candidateStartTime])
               }, allowPosAvailabilityOverride ? {
                 allowOutsideOperatingHoursForRequestedStartTimes: true
-              } : {}) : {}) : {})).flatMap(function (group) {
+              } : {}) : {}) : {}), {
+                allowSessionCustomRanges: allowPosAvailabilityOverride
+              }).flatMap(function (group) {
                 return group.ranges;
               });
               refreshedCandidateBase = refreshedRanges.find(function (candidate) {

package/lib/modules/ResourcePlanner/planner.js

@@ -55,12 +55,18 @@ function resolveRequestedDurationMinutes(product, request) {
   const normalized = Number(override);
   return Number.isInteger(normalized) && normalized > 0 ? normalized : configured;
 }
-function resolveRequestedDurationStartTimes(product, request) {
-  if (product.kind !== 'duration') return [];
+function resolveRequestedDurationStartTimes(product, request, allowSessionCustomRanges = false) {
+  if (product.kind !== 'duration' && !(product.kind === 'session' && allowSessionCustomRanges)) return [];
   const values = request.durationStartTimesByProductId?.[String(product.id)];
   if (!Array.isArray(values)) return [];
   return Array.from(new Set(values.filter(value => typeof value === 'string' && /^([01]\d|2[0-3]):[0-5]\d$/.test(value))));
 }
+function resolveRequestedSessionDurationMinutes(product, request, allowSessionCustomRanges) {
+  if (product.kind !== 'session' || !allowSessionCustomRanges) return undefined;
+  const override = request.durationMinutesByProductId?.[String(product.id)];
+  const normalized = Number(override);
+  return Number.isInteger(normalized) && normalized > 0 ? normalized : undefined;
+}
 function toDateTime(value, _timezoneName) {
   try {
     return (0, _localClock.localDateTimeToScalar)((0, _localClock.parseLocalDateTime)(value));
@@ -923,16 +929,28 @@ function getProductTimeRanges(projection, request = {}, runtimeOptions = {}) {
       };
     }
     if (product.kind === 'session' || product.kind === 'venue_slot') {
+      const fixedRanges = getSessionRangesForProduct(projection, product, dateRange);
+      const customRanges = [];
+      const customDurationMinutes = resolveRequestedSessionDurationMinutes(product, request, runtimeOptions.allowSessionCustomRanges === true);
+      const requestedStartTimes = resolveRequestedDurationStartTimes(product, request, runtimeOptions.allowSessionCustomRanges === true);
+      if (product.kind === 'session' && customDurationMinutes && dateRange.startDate === dateRange.endDate) {
+        requestedStartTimes.forEach(startTime => {
+          const start = toDateTimeInDate(dateRange.startDate, startTime, projection.meta.timezone);
+          if (!Number.isFinite(start)) return;
+          customRanges.push(createDurationTimeRange(product, start, customDurationMinutes, projection, fixedOffsetMinutes));
+        });
+      }
       return {
         productId: product.id,
         title: product.title,
         kind: product.kind,
         slotStepMinutes,
-        ranges: getSessionRangesForProduct(projection, product, dateRange)
+        ranges: dedupeProductRanges([...fixedRanges, ...customRanges])
       };
     }
     const requiredGroups = (product.requirementGroups || []).filter(group => group.required !== false);
     const operatingRanges = buildOperatingRanges(projection, dateRange);
+    const operatingEndAt = dateRange.startDate === dateRange.endDate && operatingRanges.length > 0 ? formatDateTime(Math.max(...operatingRanges.map(range => range.end)), projection.meta.timezone, fixedOffsetMinutes) : undefined;
     const resourceRanges = requiredGroups.length ? requiredGroups.map(group => buildGroupWorkingRanges({
       projection,
       product,
@@ -999,6 +1017,9 @@ function getProductTimeRanges(projection, request = {}, runtimeOptions = {}) {
       title: product.title,
       kind: product.kind,
       slotStepMinutes,
+      ...(operatingEndAt ? {
+        operatingEndAt
+      } : {}),
       ranges: dedupeProductRanges(ranges)
     };
   });

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

@@ -213,6 +213,8 @@ export interface ProductTimeRangeGroup {
     title?: string;
     kind: AvailabilityProductKind;
     slotStepMinutes?: number;
+    /** 单日查询对应营业窗口的最终结束时刻，不受资源排班是否为空影响。 */
+    operatingEndAt?: string;
     ranges: ProductTimeRange[];
 }
 export interface AvailabilityAssignment extends AvailabilityAbsoluteRange {
@@ -243,6 +245,13 @@ export interface GetProductTimeRangesRequest {
 }
 export interface GetProductTimeRangesRuntimeOptions {
     evaluatedAt?: string;
+    /**
+     * Internal POS capability: allow explicit duration/start overrides to append
+     * a custom duration candidate for Session products. Fixed Session ranges are
+     * still returned unchanged. Callers outside the POS facade must leave this
+     * disabled.
+     */
+    allowSessionCustomRanges?: boolean;
 }
 export interface QueryAvailabilityBaseRequest {
     productIds?: AvailabilityId[];

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 6 | 4 | 3 | 5;
+        weekNum: 0 | 2 | 3 | 1 | 5 | 6 | 4;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/UnifiedBookingSales/index.js

@@ -945,7 +945,7 @@ function buildBookingFromAvailabilitySelection(params) {
   const endScalar = (0, _localClock.localDateTimeToScalar)((0, _localClock.parseLocalDateTime)(bookingEndAt));
   const scheduleId = candidate.primaryScheduleRef?.scheduleId ?? assignments.find(assignment => assignment.scheduleId != null)?.scheduleId;
   const timeSlotId = candidate.primaryScheduleRef?.timeSlotId ?? assignments.find(assignment => assignment.timeSlotId != null)?.timeSlotId;
-  if (product.kind === 'session' && scheduleId == null) {
+  if (product.kind === 'session' && candidate.source === 'session_schedule' && scheduleId == null) {
     throw new _ResourcePlanner.AvailabilityError('REVALIDATION_FAILED', 'session 候选缺少真实 schedule identity', {
       productId: product.id,
       candidateKey: candidate.key,
@@ -961,7 +961,9 @@ function buildBookingFromAvailabilitySelection(params) {
     end_time: bookingEndAt.slice(11, 16),
     duration: Math.max(1, Math.trunc((endScalar - startScalar) / (60 * 1000))),
     like_status: 'common',
-    schedule_id: scheduleId ?? 0,
+    ...(product.kind === 'session' && candidate.source === 'duration_window' ? {} : {
+      schedule_id: scheduleId ?? 0
+    }),
     ...(normalizedHolder ? {
       holder: normalizedHolder
     } : {}),
@@ -2809,14 +2811,16 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
       projectionEntry
     } = await this.ensureAvailabilityContextProjection(contextId, 'get_product_time_ranges');
     const contextVersion = context.activeVersion;
-    const allowOutsideOperatingHoursForRequestedStartTimes = String(this.otherParams?.platform ?? '').trim().toLowerCase() === 'pos' && Object.values(request.durationStartTimesByProductId || {}).some(startTimes => Array.isArray(startTimes) && startTimes.length > 0);
+    const isPosAvailabilityRequest = String(this.otherParams?.platform ?? '').trim().toLowerCase() === 'pos';
+    const allowOutsideOperatingHoursForRequestedStartTimes = isPosAvailabilityRequest && Object.values(request.durationStartTimesByProductId || {}).some(startTimes => Array.isArray(startTimes) && startTimes.length > 0);
     return (0, _ResourcePlanner.getProductTimeRanges)(projectionEntry.projection, {
       ...request,
       ...(allowOutsideOperatingHoursForRequestedStartTimes ? {
         allowOutsideOperatingHoursForRequestedStartTimes: true
       } : {})
     }, {
-      evaluatedAt: this.getAvailabilityRuntimeDateTime()
+      evaluatedAt: this.getAvailabilityRuntimeDateTime(),
+      allowSessionCustomRanges: isPosAvailabilityRequest
     }).map(group => ({
       ...group,
       ranges: group.ranges.map(candidate => this.decorateAvailabilityCandidate(context.contextId, contextVersion, candidate))
@@ -3087,6 +3091,8 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
             } : {})
           } : {})
         } : {})
+      }, {
+        allowSessionCustomRanges: allowPosAvailabilityOverride
       }).flatMap(group => group.ranges);
       const refreshedCandidateBase = refreshedRanges.find(candidate => candidate.startAt === params.candidate.startAt && candidate.endAt === params.candidate.endAt && candidate.bookingStartAt === params.candidate.bookingStartAt && candidate.bookingEndAt === params.candidate.bookingEndAt);
       if (!refreshedCandidateBase) {

package/package.json

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