[#44] 매장 기능 도입 #45

Merged
pricelees merged 116 commits from feat/#44 into main 2025-09-20 03:15:06 +00:00
3 changed files with 4 additions and 4 deletions
Showing only changes of commit 407d7e9a5e - Show all commits

View File

@ -168,7 +168,7 @@ const ReservationDetailView: React.FC<{
)}
<p><strong> / :</strong> {detail.issuerCode}({detail.ownerType}) / {detail.cardType}</p>
<p><strong> :</strong> {detail.cardNumber}</p>
<p><strong> :</strong> {detail.installmentPlanMonths === 0 ? '일시불' : `${detail.installmentPlanMonths}개월`}</p>
<p><strong>:</strong> {detail.installmentPlanMonths === 0 ? '일시불' : `${detail.installmentPlanMonths}개월`}</p>
<p><strong> :</strong> {detail.approvalNumber}</p>
</>
);
@ -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

View File

@ -175,7 +175,7 @@ class ReservationService(
canceledBy = user.id,
cancelReason = cancelReason,
canceledAt = LocalDateTime.now(),
status = CanceledReservationStatus.PROCESSING
status = CanceledReservationStatus.COMPLETED
).also {
canceledReservationRepository.save(it)
}

View File

@ -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