MIKKI-216

backend/build.gradle

@@ -116,6 +116,10 @@ sourceSets {
     main.java.srcDirs += [generated]
 }
 
+test {
+    maxParallelForks = 1
+}
+
 // gradle clean 시에 QClass 디렉토리 삭제
 clean {
     delete file(generated)

backend/src/main/java/com/backend/domain/reservation/controller/ReservationController.java

@@ -5,6 +5,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,6 +21,7 @@
 import com.backend.global.dto.request.GlobalRequest;
 import com.backend.global.dto.response.GenericResponse;
 import com.backend.global.dto.response.ScrollResponse;
+import com.backend.global.payment.dto.request.TossPaymentRequest;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -36,6 +38,29 @@ public class ReservationController {
 
 	private final ReservationService reservationService;
 
+	@PostMapping("/prepare")
+	@Operation(summary = "예약 준비 - 주문서 생성", description = "결제를 위한 예약 주문서 생성")
+	public ResponseEntity<GenericResponse<ReservationResponse.Detail>> prepareReservation(
+		@RequestBody @Valid final ReservationRequest.Reserve requestDto,
+		@AuthenticationPrincipal final CustomOAuth2User user) {
+
+		ReservationResponse.Detail response = reservationService.prepareReservation(requestDto, user.getId());
+
+		return ResponseEntity.created(URI.create("/api/v1/reservations/" + response.reservationId()))
+			.body(GenericResponse.of(true, response));
+	}
+
+	@GetMapping("/confirm")
+	@Operation(summary = "결제 승인 및 예약 확정", description = "Toss 결제 성공 후 결제 승인 API 호출")
+	public ResponseEntity<GenericResponse<Void>> confirmReservationPayment(
+		@ModelAttribute final TossPaymentRequest request,
+		@AuthenticationPrincipal final CustomOAuth2User user) {
+
+		reservationService.confirmReservationPayment(request, user.getId());
+
+		return ResponseEntity.ok(GenericResponse.of(true));
+	}
+
 	@PostMapping
 	@Operation(summary = "예약 신청 및 생성", description = "유저가 선상 낚시를 예약 할 때 사용하는 API")
 	public ResponseEntity<GenericResponse<ReservationResponse.Detail>> saveReservation(

backend/src/main/java/com/backend/domain/reservation/dto/response/ReservationResponse.java

@@ -129,6 +129,21 @@ public record DetailWithName(
 	) {
 	}
 
+	/**
+	 *
+	 * @param reservationId
+	 * @param shipFishingPostId
+	 * @param reservationNumber
+	 * @param subject
+	 * @param reservationDate
+	 * @param startTime
+	 * @param location
+	 * @param guestCount
+	 * @param totalPrice
+	 * @param reservationStatus
+	 * @param fileIdList
+	 * @param createdAt
+	 */
 	@Builder
 	public record DetailQueryDto(
 		Long reservationId,
@@ -149,6 +164,21 @@ public record DetailQueryDto(
 		}
 	}
 
+	/**
+	 *
+	 * @param reservationId
+	 * @param shipFishingPostId
+	 * @param reservationNumber
+	 * @param subject
+	 * @param reservationDate
+	 * @param startTime
+	 * @param location
+	 * @param guestCount
+	 * @param totalPrice
+	 * @param reservationStatus
+	 * @param fileUrlList
+	 * @param createdAt
+	 */
 	@Builder
 	public record DetailReservationList(
 		Long reservationId,

backend/src/main/java/com/backend/domain/reservation/entity/Reservation.java

@@ -1,8 +1,10 @@
 package com.backend.domain.reservation.entity;
 
 import java.time.LocalDate;
+import java.time.OffsetDateTime;
 
 import com.backend.global.baseentity.BaseEntity;
+import com.backend.global.payment.dto.response.TossPaymentResponse;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -58,7 +60,28 @@ public class Reservation extends BaseEntity {
 	@Builder.Default
 	@Enumerated(EnumType.STRING)
 	@Column(nullable = false)
-	private ReservationStatus status = ReservationStatus.CONFIRMED;
+	private ReservationStatus status = ReservationStatus.PENDING;
+
+	@Column(length = 100)
+	private String paymentKey;
+
+	@Column(length = 20)
+	private String paymentMethod;
+
+	@Column(length = 50)
+	private String cardNumber;
+
+	@Column(length = 20)
+	private String cardApproveNo;
+
+	@Column(length = 1024)
+	private String receiptUrl;
+
+	@Column
+	private Long totalAmount;
+
+	@Column
+	private OffsetDateTime approvedAt;
 
 	public void updatePending(final Boolean isSuccess) {
 		this.status = isSuccess ? ReservationStatus.CONFIRMED : ReservationStatus.REJECTED;
@@ -67,4 +90,18 @@ public void updatePending(final Boolean isSuccess) {
 	public void updateCanceled() {
 		this.status = this.status == ReservationStatus.CONFIRMED ? ReservationStatus.CANCELLED : this.status;
 	}
+
+	public void updateTossPaymentInfo(final TossPaymentResponse response) {
+		this.paymentKey = response.getPaymentKey();
+		this.approvedAt = response.getApprovedAt();
+		this.paymentMethod = response.getMethod();
+		this.totalAmount = response.getTotalAmount();
+		if (response.getCard() != null) {
+			this.cardNumber = response.getCard().getNumber();
+			this.cardApproveNo = response.getCard().getApproveNo();
+		}
+		if (response.getReceipt() != null) {
+			this.receiptUrl = response.getReceipt().getUrl();
+		}
+	}
 }

backend/src/main/java/com/backend/domain/reservation/exception/ReservationErrorCode.java

@@ -15,7 +15,8 @@ public enum ReservationErrorCode implements ErrorCode {
 	WRONG_PRICE_VALUE(HttpStatus.BAD_REQUEST, 11002, "예약 금액이 일치하지 않습니다."),
 	NOT_AVAILABLE_DATE_RESERVATION(HttpStatus.CONFLICT, 11003, "예약 가능한 일자가 아닙니다."),
 	NOT_AVAILABLE_END_RESERVATION(HttpStatus.CONFLICT, 11004, "예약 정원 초과 입니다."),
-	NOT_AUTHORITY_RESERVATION(HttpStatus.FORBIDDEN, 11005, "해당 예약에 대한 권한이 없습니다.");
+	NOT_AUTHORITY_RESERVATION(HttpStatus.FORBIDDEN, 11005, "해당 예약에 대한 권한이 없습니다."),
+	ALREADY_CONFIRMED_RESERVATION(HttpStatus.BAD_REQUEST, 11006, "해당 예약은 이미 완료되었습니다.");
 
 	private final HttpStatus httpStatus;
 	private final Integer code;

backend/src/main/java/com/backend/domain/reservation/repository/ReservationJpaRepository.java

@@ -1,5 +1,7 @@
 package com.backend.domain.reservation.repository;
 
+import java.util.Optional;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import com.backend.domain.reservation.entity.Reservation;
@@ -9,4 +11,5 @@ public interface ReservationJpaRepository extends JpaRepository<Reservation, Lon
 
 	Long countByMemberIdAndStatus(final Long memberId, final ReservationStatus status);
 
+	Optional<Reservation> findByReservationNumber(final String reservationNumber);
 }

backend/src/main/java/com/backend/domain/reservation/repository/ReservationRepository.java

@@ -28,6 +28,15 @@ public interface ReservationRepository {
 	 */
 	Optional<Reservation> findById(final Long reservationId);
 
+	/**
+	 * 예약 번호로 예약 정보 조회 메서드
+	 *
+	 * @param reservationNumber 예약번호
+	 * @return 예약 데이터
+	 * @implSpec 예약 번호와 일치하는 예약 정보를 조회합니다.
+	 */
+	Optional<Reservation> findByReservationNumber(final String reservationNumber);
+
 	/**
 	 * 유저의 예약 내역 횟수를 조회합니다.
 	 *

backend/src/main/java/com/backend/domain/reservation/repository/ReservationRepositoryImpl.java

@@ -32,6 +32,12 @@ public Optional<Reservation> findById(final Long reservationId) {
 		return reservationJpaRepository.findById(reservationId);
 	}
 
+	@Override
+	public Optional<Reservation> findByReservationNumber(final String reservationNumber) {
+
+		return reservationJpaRepository.findByReservationNumber(reservationNumber);
+	}
+
 	@Override
 	public Long getReservationCount(final Long memberId) {
 

backend/src/main/java/com/backend/domain/reservation/service/ReservationService.java

@@ -4,9 +4,26 @@
 import com.backend.domain.reservation.dto.response.ReservationResponse;
 import com.backend.global.dto.request.GlobalRequest;
 import com.backend.global.dto.response.ScrollResponse;
+import com.backend.global.payment.dto.request.TossPaymentRequest;
 
 public interface ReservationService {
 
+	/**
+	 * 예약 전에 주문서를 생성하는 메서드
+	 *
+	 * @param requestDto 예약 정보
+	 * @param memberId 유저 ID
+	 * @return 주문서 정보
+	 */
+	ReservationResponse.Detail prepareReservation(final ReservationRequest.Reserve requestDto, final Long memberId);
+
+	/**
+	 * 결제 요청 후 재고 차감 여부로 결제 메서드
+	 *
+	 * @param requestDto 토스 결제 정보
+	 */
+	void confirmReservationPayment(final TossPaymentRequest requestDto, final Long memberId);
+
 	/**
 	 * 예약을 생성하는 메서드
 	 *