@pisell/pisellos 2.3.86 → 2.3.88

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 | 1 | 5 | 2 | 3 | 4 | 6;
+        weekNum: 0 | 1 | 2 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.js

@@ -275,7 +275,10 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
     const prefix = this.normalizeIdPrefix(openDataConfig?.['sale.short_number_prefix'], '');
     const shopOrderPrefix = this.normalizeIdPrefix(openDataConfig?.['sale.sale_number_prefix'], '');
     const resetReceiptSequenceDaily = typeof openDataConfig?.['sale.short_number_daily_reset'] === 'boolean' ? openDataConfig?.['sale.short_number_daily_reset'] : false;
-    const operatingDayBoundary = this.getAppData('operating_day_boundary');
+    const operatingDayBoundary = this.getAppData('operating_day_boundary') || {
+      "type": "start_time",
+      "time": "00:00"
+    };
     const deviceId = await this.getShortNumberOrDeviceId();
     this.setPaymentNumberDevicePrefix(deviceId);
     const businessCode = this.getBookingTicketBusinessCode();
@@ -293,7 +296,7 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
           padReceiptSequence: false,
           receiptSequenceLength,
           resetReceiptSequenceDaily,
-          receiptSequenceResetTime: operatingDayBoundary.time,
+          receiptSequenceResetTime: operatingDayBoundary?.time,
           receiptSequenceStart,
           shopOrderPrefix
         }

package/lib/solution/UnifiedBookingSales/index.js

@@ -58,6 +58,30 @@ function normalizePositiveInteger(value) {
   if (!Number.isInteger(normalized) || normalized <= 0) return undefined;
   return normalized;
 }
+function getCandidateDurationMinutes(candidate) {
+  const startAt = candidate.bookingStartAt || candidate.startAt;
+  const endAt = candidate.bookingEndAt || candidate.endAt;
+  try {
+    const start = (0, _localClock.localDateTimeToScalar)((0, _localClock.parseLocalDateTime)(startAt));
+    const end = (0, _localClock.localDateTimeToScalar)((0, _localClock.parseLocalDateTime)(endAt));
+    const minutes = Math.round((end - start) / 60000);
+    return Number.isInteger(minutes) && minutes > 0 ? minutes : undefined;
+  } catch (_error) {
+    return undefined;
+  }
+}
+function getCandidateStartTime(candidate) {
+  if (/^([01]\d|2[0-3]):[0-5]\d$/.test(candidate.startTime || '')) {
+    return candidate.startTime;
+  }
+  const startAt = candidate.bookingStartAt || candidate.startAt;
+  try {
+    const start = (0, _localClock.parseLocalDateTime)(startAt);
+    return `${String(start.hour).padStart(2, '0')}:${String(start.minute).padStart(2, '0')}`;
+  } catch (_error) {
+    return undefined;
+  }
+}
 function isRecord(value) {
   return !!value && typeof value === 'object' && !Array.isArray(value);
 }
@@ -3027,12 +3051,24 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
         });
       }
       this.assertAvailabilityCommitWriteCAS(commitWriteGuard);
+      const candidateDurationMinutes = getCandidateDurationMinutes(params.candidate);
+      const candidateStartTime = getCandidateStartTime(params.candidate);
       const refreshedRanges = (0, _ResourcePlanner.getProductTimeRanges)(refreshedProjection, {
         productIds: [params.candidate.productId],
         dateRange: {
           startDate: params.candidate.startAt.slice(0, 10),
           endDate: params.candidate.startAt.slice(0, 10)
-        }
+        },
+        ...(candidateDurationMinutes ? {
+          durationMinutesByProductId: {
+            [String(params.candidate.productId)]: candidateDurationMinutes
+          },
+          ...(candidateStartTime ? {
+            durationStartTimesByProductId: {
+              [String(params.candidate.productId)]: [candidateStartTime]
+            }
+          } : {})
+        } : {})
       }).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.3.86",
+  "version": "2.3.88",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",