diff --git a/frontend/src/pages/MyReservationPage.tsx b/frontend/src/pages/MyReservationPage.tsx index d25d07f8..ba07456b 100644 --- a/frontend/src/pages/MyReservationPage.tsx +++ b/frontend/src/pages/MyReservationPage.tsx @@ -168,7 +168,7 @@ const ReservationDetailView: React.FC<{ )}

카드사 / 구분: {detail.issuerCode}({detail.ownerType}) / {detail.cardType}

카드 번호: {detail.cardNumber}

-

할부 방식: {detail.installmentPlanMonths === 0 ? '일시불' : `${detail.installmentPlanMonths}개월`}

+

할부: {detail.installmentPlanMonths === 0 ? '일시불' : `${detail.installmentPlanMonths}개월`}

승인 번호: {detail.approvalNumber}

); @@ -310,8 +310,8 @@ const MyReservationPage: React.FC = () => { try { setIsCancelling(true); setDetailError(null); + await cancelPayment({ reservationId: selectedReservation.id, cancelReason: reason }); await cancelReservation(selectedReservation.id, reason); - cancelPayment({ reservationId: selectedReservation.id, cancelReason: reason }); alert('예약을 취소했어요. 결제 취소까지는 3-5일 정도 소요될 수 있어요.'); handleCloseModal(); await loadReservations(); // Refresh the list diff --git a/src/main/kotlin/roomescape/reservation/business/ReservationService.kt b/src/main/kotlin/roomescape/reservation/business/ReservationService.kt index 7e1ce2a5..eb642bfb 100644 --- a/src/main/kotlin/roomescape/reservation/business/ReservationService.kt +++ b/src/main/kotlin/roomescape/reservation/business/ReservationService.kt @@ -175,7 +175,7 @@ class ReservationService( canceledBy = user.id, cancelReason = cancelReason, canceledAt = LocalDateTime.now(), - status = CanceledReservationStatus.PROCESSING + status = CanceledReservationStatus.COMPLETED ).also { canceledReservationRepository.save(it) } diff --git a/src/main/kotlin/roomescape/reservation/docs/ReservationAPI.kt b/src/main/kotlin/roomescape/reservation/docs/ReservationAPI.kt index 7f59eb26..77379716 100644 --- a/src/main/kotlin/roomescape/reservation/docs/ReservationAPI.kt +++ b/src/main/kotlin/roomescape/reservation/docs/ReservationAPI.kt @@ -19,7 +19,7 @@ import roomescape.reservation.web.* interface ReservationAPI { @Public - @Operation(summary = "결제 대기 예약 저장", tags = ["로그인이 필요한 API"]) + @Operation(summary = "가장 많이 예약된 테마 조회") @ApiResponses(ApiResponse(responseCode = "200", description = "성공", useReturnTypeSchema = true)) fun findMostReservedThemeIds( @RequestParam count: Int