pricelees/roomescape-refactored
1
0
Fork 0
generated from pricelees/issue-pr-template
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Merged
pricelees merged 116 commits from feat/#44 into main 2025-09-20 03:15:06 +00:00
Conversation 0 Commits 116 Files Changed 133 +4 -4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 407d7e9a5e - Show all commits

4
frontend/src/pages/MyReservationPage.tsx
View File

@ -168,7 +168,7 @@ const ReservationDetailView: React.FC<{
)} )}
<p><strong>카드사 / 구분:</strong> {detail.issuerCode}({detail.ownerType}) / {detail.cardType}</p> <p><strong>카드사 / 구분:</strong> {detail.issuerCode}({detail.ownerType}) / {detail.cardType}</p>
<p><strong>카드 번호:</strong> {detail.cardNumber}</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> <p><strong>승인 번호:</strong> {detail.approvalNumber}</p>
</> </>
); );
@ -310,8 +310,8 @@ const MyReservationPage: React.FC = () => {
try { try {
setIsCancelling(true); setIsCancelling(true);
setDetailError(null); setDetailError(null);
await cancelPayment({ reservationId: selectedReservation.id, cancelReason: reason });
await cancelReservation(selectedReservation.id, reason); await cancelReservation(selectedReservation.id, reason);
cancelPayment({ reservationId: selectedReservation.id, cancelReason: reason });
alert('예약을 취소했어요. 결제 취소까지는 3-5일 정도 소요될 수 있어요.'); alert('예약을 취소했어요. 결제 취소까지는 3-5일 정도 소요될 수 있어요.');
handleCloseModal(); handleCloseModal();
await loadReservations(); // Refresh the list await loadReservations(); // Refresh the list

2
src/main/kotlin/roomescape/reservation/business/ReservationService.kt
View File

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

2
src/main/kotlin/roomescape/reservation/docs/ReservationAPI.kt
View File

@ -19,7 +19,7 @@ import roomescape.reservation.web.*
interface ReservationAPI { interface ReservationAPI {
@Public @Public
@Operation(summary = "결제 대기 예약 저장", tags = ["로그인이 필요한 API"]) @Operation(summary = "가장 많이 예약된 테마 조회")
@ApiResponses(ApiResponse(responseCode = "200", description = "성공", useReturnTypeSchema = true)) @ApiResponses(ApiResponse(responseCode = "200", description = "성공", useReturnTypeSchema = true))
fun findMostReservedThemeIds( fun findMostReservedThemeIds(
@RequestParam count: Int @RequestParam count: Int