Compare commits
3 Commits
feature/us
...
feature/pa
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d0ef6e7e89 | ||
|
|
123774e06f | ||
|
|
78d6f1a98c |
@@ -24,6 +24,8 @@ public enum ErrorCode {
|
|||||||
BAD_REQUEST_PAYMENT_COMPLETE(BAD_REQUEST, "처리할 결제 정보가 존재하지 않습니다."),
|
BAD_REQUEST_PAYMENT_COMPLETE(BAD_REQUEST, "처리할 결제 정보가 존재하지 않습니다."),
|
||||||
BAD_REQUEST_PAYMENT_READY(BAD_REQUEST, "이미 진행 중인 결제가 존재합니다."),
|
BAD_REQUEST_PAYMENT_READY(BAD_REQUEST, "이미 진행 중인 결제가 존재합니다."),
|
||||||
BAD_REQUEST_PAYMENT_CANCEL(BAD_REQUEST, "취소할 티켓이 존재하지 않습니다."),
|
BAD_REQUEST_PAYMENT_CANCEL(BAD_REQUEST, "취소할 티켓이 존재하지 않습니다."),
|
||||||
|
NOT_REFUNDABLE_TIME(BAD_REQUEST, "환불이 가능한 시간이 지났습니다."),
|
||||||
|
NOT_REFUNDABLE_SEAT(BAD_REQUEST, "환불할 수 있는 좌석이 아닙니다."),
|
||||||
|
|
||||||
/* 403 FORBIDDEN : 접근 권한 제한 */
|
/* 403 FORBIDDEN : 접근 권한 제한 */
|
||||||
VALID_USER_ID(FORBIDDEN, "해당 정보에 접근 권한이 존재하지 않습니다."),
|
VALID_USER_ID(FORBIDDEN, "해당 정보에 접근 권한이 존재하지 않습니다."),
|
||||||
@@ -85,6 +87,14 @@ public enum ErrorCode {
|
|||||||
throw new TicketingException(BAD_REQUEST_PAYMENT_CANCEL);
|
throw new TicketingException(BAD_REQUEST_PAYMENT_CANCEL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static TicketingException throwNotRefundableTime() {
|
||||||
|
throw new TicketingException(NOT_REFUNDABLE_TIME);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static TicketingException throwNotRefundableSeat() {
|
||||||
|
throw new TicketingException(NOT_REFUNDABLE_SEAT);
|
||||||
|
}
|
||||||
|
|
||||||
/* 403 FORBIDDEN : 접근 권한 제한 */
|
/* 403 FORBIDDEN : 접근 권한 제한 */
|
||||||
public static TicketingException throwValidUserId() {
|
public static TicketingException throwValidUserId() {
|
||||||
throw new TicketingException(VALID_USER_ID);
|
throw new TicketingException(VALID_USER_ID);
|
||||||
|
|||||||
@@ -33,12 +33,15 @@ public class PaymentCache {
|
|||||||
|
|
||||||
private Long paymentNumber;
|
private Long paymentNumber;
|
||||||
|
|
||||||
public PaymentCache(String email, String movieTitle, String tid, List<Long> ticketIds, Long userAlternateId, Long paymentNumber) {
|
private Integer totalAmount;
|
||||||
|
|
||||||
|
public PaymentCache(String email, String movieTitle, String tid, List<Long> ticketIds, Long userAlternateId, Long paymentNumber, Integer totalAmount) {
|
||||||
this.email = email;
|
this.email = email;
|
||||||
this.movieTitle = movieTitle;
|
this.movieTitle = movieTitle;
|
||||||
this.tid = tid;
|
this.tid = tid;
|
||||||
this.ticketIds = ticketIds;
|
this.ticketIds = ticketIds;
|
||||||
this.userAlternateId = userAlternateId;
|
this.userAlternateId = userAlternateId;
|
||||||
this.paymentNumber = paymentNumber;
|
this.paymentNumber = paymentNumber;
|
||||||
|
this.totalAmount = totalAmount;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ public class TicketController {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("payments/{paymentId}")
|
@GetMapping("/payments/{paymentId}")
|
||||||
@Secured(USER)
|
@Secured(USER)
|
||||||
public ResponseEntity<TicketDetailsResponse> findTicketsByPaymentId(
|
public ResponseEntity<TicketDetailsResponse> findTicketsByPaymentId(
|
||||||
@PathVariable("paymentId") @NotNull Long paymentId) {
|
@PathVariable("paymentId") @NotNull Long paymentId) {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package com.ticketing.server.movie.domain;
|
|||||||
import com.ticketing.server.global.dto.repository.AbstractEntity;
|
import com.ticketing.server.global.dto.repository.AbstractEntity;
|
||||||
import com.ticketing.server.global.exception.ErrorCode;
|
import com.ticketing.server.global.exception.ErrorCode;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
import java.time.temporal.ChronoUnit;
|
||||||
import javax.persistence.Entity;
|
import javax.persistence.Entity;
|
||||||
import javax.persistence.EnumType;
|
import javax.persistence.EnumType;
|
||||||
import javax.persistence.Enumerated;
|
import javax.persistence.Enumerated;
|
||||||
@@ -78,6 +79,26 @@ public class Ticket extends AbstractEntity {
|
|||||||
}
|
}
|
||||||
|
|
||||||
status = TicketStatus.SALE;
|
status = TicketStatus.SALE;
|
||||||
|
paymentId = null;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Ticket refund(LocalDateTime dateTime) {
|
||||||
|
long seconds = ChronoUnit.SECONDS.between(dateTime, getStartAt());
|
||||||
|
if (600L > seconds) {
|
||||||
|
throw ErrorCode.throwNotRefundableTime();
|
||||||
|
}
|
||||||
|
|
||||||
|
return refund();
|
||||||
|
}
|
||||||
|
|
||||||
|
public Ticket refund() {
|
||||||
|
if (!TicketStatus.SOLD.equals(status)) {
|
||||||
|
throw ErrorCode.throwNotRefundableSeat();
|
||||||
|
}
|
||||||
|
|
||||||
|
status = TicketStatus.SALE;
|
||||||
|
paymentId = null;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,14 +9,19 @@ import com.ticketing.server.movie.domain.repository.TicketRepository;
|
|||||||
import com.ticketing.server.movie.service.dto.TicketDTO;
|
import com.ticketing.server.movie.service.dto.TicketDTO;
|
||||||
import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
|
import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
|
||||||
import com.ticketing.server.movie.service.dto.TicketListDTO;
|
import com.ticketing.server.movie.service.dto.TicketListDTO;
|
||||||
|
import com.ticketing.server.movie.service.dto.TicketRefundDTO;
|
||||||
import com.ticketing.server.movie.service.dto.TicketReservationDTO;
|
import com.ticketing.server.movie.service.dto.TicketReservationDTO;
|
||||||
import com.ticketing.server.movie.service.dto.TicketSoldDTO;
|
import com.ticketing.server.movie.service.dto.TicketSoldDTO;
|
||||||
import com.ticketing.server.movie.service.dto.TicketsCancelDTO;
|
import com.ticketing.server.movie.service.dto.TicketsCancelDTO;
|
||||||
|
import com.ticketing.server.movie.service.dto.TicketsRefundDTO;
|
||||||
import com.ticketing.server.movie.service.dto.TicketsReservationDTO;
|
import com.ticketing.server.movie.service.dto.TicketsReservationDTO;
|
||||||
import com.ticketing.server.movie.service.dto.TicketsSoldDTO;
|
import com.ticketing.server.movie.service.dto.TicketsSoldDTO;
|
||||||
import com.ticketing.server.movie.service.interfaces.TicketService;
|
import com.ticketing.server.movie.service.interfaces.TicketService;
|
||||||
import com.ticketing.server.payment.service.dto.TicketDetailDTO;
|
import com.ticketing.server.payment.service.dto.TicketDetailDTO;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.function.Function;
|
||||||
|
import java.util.function.UnaryOperator;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
@@ -104,6 +109,19 @@ public class TicketServiceImpl implements TicketService {
|
|||||||
return new TicketsCancelDTO(ticketIds);
|
return new TicketsCancelDTO(ticketIds);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Transactional
|
||||||
|
public TicketsRefundDTO ticketsRefund(@NotNull Long paymentId, UnaryOperator<Ticket> refund) {
|
||||||
|
List<Ticket> tickets = ticketRepository.findTicketFetchJoinByPaymentId(paymentId);
|
||||||
|
|
||||||
|
List<TicketRefundDTO> refundDtoList = tickets.stream()
|
||||||
|
.map(refund)
|
||||||
|
.map(TicketRefundDTO::new)
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
|
return new TicketsRefundDTO(refundDtoList);
|
||||||
|
}
|
||||||
|
|
||||||
private List<Ticket> getTicketsByInTicketIds(List<Long> ticketIds) {
|
private List<Ticket> getTicketsByInTicketIds(List<Long> ticketIds) {
|
||||||
List<Ticket> tickets = ticketRepository.findTicketFetchJoinByTicketIds(ticketIds);
|
List<Ticket> tickets = ticketRepository.findTicketFetchJoinByTicketIds(ticketIds);
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package com.ticketing.server.movie.service.dto;
|
||||||
|
|
||||||
|
import com.ticketing.server.movie.domain.Ticket;
|
||||||
|
import com.ticketing.server.movie.domain.TicketStatus;
|
||||||
|
import lombok.AccessLevel;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
|
public class TicketRefundDTO {
|
||||||
|
|
||||||
|
private Long ticketId;
|
||||||
|
private TicketStatus ticketStatus;
|
||||||
|
|
||||||
|
public TicketRefundDTO(Ticket ticket) {
|
||||||
|
this(ticket.getId(), ticket.getStatus());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package com.ticketing.server.movie.service.dto;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class TicketsRefundDTO {
|
||||||
|
|
||||||
|
private List<TicketRefundDTO> tickets;
|
||||||
|
|
||||||
|
public TicketsRefundResponse toResponse() {
|
||||||
|
return new TicketsRefundResponse(tickets);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
package com.ticketing.server.movie.service.dto;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class TicketsRefundResponse {
|
||||||
|
|
||||||
|
private final List<TicketRefundDTO> tickets;
|
||||||
|
|
||||||
|
public List<Long> getTicketIds() {
|
||||||
|
return tickets.stream()
|
||||||
|
.mapToLong(TicketRefundDTO::getTicketId)
|
||||||
|
.boxed()
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,12 +1,15 @@
|
|||||||
package com.ticketing.server.movie.service.interfaces;
|
package com.ticketing.server.movie.service.interfaces;
|
||||||
|
|
||||||
import com.ticketing.server.global.validator.constraints.NotEmptyCollection;
|
import com.ticketing.server.global.validator.constraints.NotEmptyCollection;
|
||||||
|
import com.ticketing.server.movie.domain.Ticket;
|
||||||
import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
|
import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
|
||||||
import com.ticketing.server.movie.service.dto.TicketListDTO;
|
import com.ticketing.server.movie.service.dto.TicketListDTO;
|
||||||
import com.ticketing.server.movie.service.dto.TicketsCancelDTO;
|
import com.ticketing.server.movie.service.dto.TicketsCancelDTO;
|
||||||
|
import com.ticketing.server.movie.service.dto.TicketsRefundDTO;
|
||||||
import com.ticketing.server.movie.service.dto.TicketsReservationDTO;
|
import com.ticketing.server.movie.service.dto.TicketsReservationDTO;
|
||||||
import com.ticketing.server.movie.service.dto.TicketsSoldDTO;
|
import com.ticketing.server.movie.service.dto.TicketsSoldDTO;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.function.UnaryOperator;
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
|
|
||||||
public interface TicketService {
|
public interface TicketService {
|
||||||
@@ -21,4 +24,6 @@ public interface TicketService {
|
|||||||
|
|
||||||
TicketsCancelDTO ticketCancel(@NotEmptyCollection List<Long> ticketIds);
|
TicketsCancelDTO ticketCancel(@NotEmptyCollection List<Long> ticketIds);
|
||||||
|
|
||||||
|
TicketsRefundDTO ticketsRefund(@NotNull Long paymentId, UnaryOperator<Ticket> refund);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ MovieSetupService {
|
|||||||
initTheater();
|
initTheater();
|
||||||
initMovieTime();
|
initMovieTime();
|
||||||
initTicket();
|
initTicket();
|
||||||
initPayment();
|
// initPayment();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void initMovie() {
|
private void initMovie() {
|
||||||
@@ -125,7 +125,8 @@ MovieSetupService {
|
|||||||
"T2d03c9130bf237a9700",
|
"T2d03c9130bf237a9700",
|
||||||
List.of(1L, 2L),
|
List.of(1L, 2L),
|
||||||
user.getAlternateId(),
|
user.getAlternateId(),
|
||||||
124124231513245L
|
124124231513245L,
|
||||||
|
30_000
|
||||||
);
|
);
|
||||||
|
|
||||||
Payment payment = new Payment(paymentCache, PaymentType.KAKAO_PAY, PaymentStatus.SOLD, 30_000);
|
Payment payment = new Payment(paymentCache, PaymentType.KAKAO_PAY, PaymentStatus.SOLD, 30_000);
|
||||||
|
|||||||
@@ -3,8 +3,10 @@ package com.ticketing.server.payment.api;
|
|||||||
import static org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED_VALUE;
|
import static org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED_VALUE;
|
||||||
|
|
||||||
import com.ticketing.server.payment.api.dto.requset.KakaoPayApproveRequest;
|
import com.ticketing.server.payment.api.dto.requset.KakaoPayApproveRequest;
|
||||||
|
import com.ticketing.server.payment.api.dto.requset.KakaoPayCancelRequest;
|
||||||
import com.ticketing.server.payment.api.dto.requset.KakaoPayReadyRequest;
|
import com.ticketing.server.payment.api.dto.requset.KakaoPayReadyRequest;
|
||||||
import com.ticketing.server.payment.api.dto.response.KakaoPayApproveResponse;
|
import com.ticketing.server.payment.api.dto.response.KakaoPayApproveResponse;
|
||||||
|
import com.ticketing.server.payment.api.dto.response.KakaoPayCancelResponse;
|
||||||
import com.ticketing.server.payment.api.dto.response.KakaoPayReadyResponse;
|
import com.ticketing.server.payment.api.dto.response.KakaoPayReadyResponse;
|
||||||
import feign.Headers;
|
import feign.Headers;
|
||||||
import org.springframework.cloud.openfeign.FeignClient;
|
import org.springframework.cloud.openfeign.FeignClient;
|
||||||
@@ -23,4 +25,8 @@ public interface KakaoPayClient {
|
|||||||
@Headers("Content-Type: application/x-www-form-urlencoded;charset=utf-8")
|
@Headers("Content-Type: application/x-www-form-urlencoded;charset=utf-8")
|
||||||
KakaoPayApproveResponse approve(@RequestHeader(value = "Authorization") String authorization, KakaoPayApproveRequest request);
|
KakaoPayApproveResponse approve(@RequestHeader(value = "Authorization") String authorization, KakaoPayApproveRequest request);
|
||||||
|
|
||||||
|
@PostMapping(value = "/cancel", consumes = APPLICATION_FORM_URLENCODED_VALUE)
|
||||||
|
@Headers("Content-Type: application/x-www-form-urlencoded;charset=utf-8")
|
||||||
|
KakaoPayCancelResponse cancel(@RequestHeader(value = "Authorization") String authorization, KakaoPayCancelRequest request);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,11 +2,14 @@ package com.ticketing.server.payment.api;
|
|||||||
|
|
||||||
import com.ticketing.server.movie.application.request.TicketCancelRequest;
|
import com.ticketing.server.movie.application.request.TicketCancelRequest;
|
||||||
import com.ticketing.server.movie.application.request.TicketReservationRequest;
|
import com.ticketing.server.movie.application.request.TicketReservationRequest;
|
||||||
|
import com.ticketing.server.movie.application.request.TicketSoldRequest;
|
||||||
import com.ticketing.server.movie.application.response.TicketCancelResponse;
|
import com.ticketing.server.movie.application.response.TicketCancelResponse;
|
||||||
import com.ticketing.server.movie.application.response.TicketDetailsResponse;
|
import com.ticketing.server.movie.application.response.TicketDetailsResponse;
|
||||||
import com.ticketing.server.movie.application.response.TicketReservationResponse;
|
import com.ticketing.server.movie.application.response.TicketReservationResponse;
|
||||||
import com.ticketing.server.movie.application.request.TicketSoldRequest;
|
|
||||||
import com.ticketing.server.movie.application.response.TicketSoldResponse;
|
import com.ticketing.server.movie.application.response.TicketSoldResponse;
|
||||||
|
import com.ticketing.server.movie.service.dto.TicketsRefundResponse;
|
||||||
|
import com.ticketing.server.payment.api.impl.TicketsRefundRequest;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
|
|
||||||
public interface MovieClient {
|
public interface MovieClient {
|
||||||
@@ -18,4 +21,8 @@ public interface MovieClient {
|
|||||||
TicketSoldResponse ticketSold(@NotNull TicketSoldRequest request);
|
TicketSoldResponse ticketSold(@NotNull TicketSoldRequest request);
|
||||||
|
|
||||||
TicketCancelResponse ticketCancel(@NotNull TicketCancelRequest request);
|
TicketCancelResponse ticketCancel(@NotNull TicketCancelRequest request);
|
||||||
|
|
||||||
|
TicketsRefundResponse ticketRefundByDateTime(TicketsRefundRequest request, LocalDateTime dateTime);
|
||||||
|
|
||||||
|
TicketsRefundResponse ticketRefund(TicketsRefundRequest request);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,47 @@
|
|||||||
|
package com.ticketing.server.payment.api.dto.requset;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonInclude.Include;
|
||||||
|
import javax.validation.constraints.NotEmpty;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@JsonInclude(Include.NON_NULL)
|
||||||
|
public class KakaoPayCancelRequest {
|
||||||
|
|
||||||
|
@NotEmpty
|
||||||
|
private String cid = "TC0ONETIME";
|
||||||
|
|
||||||
|
@feign.form.FormProperty("cid_secret")
|
||||||
|
private String cidSecret;
|
||||||
|
|
||||||
|
@NotEmpty
|
||||||
|
private String tid;
|
||||||
|
|
||||||
|
@NotEmpty
|
||||||
|
@feign.form.FormProperty("cancel_amount")
|
||||||
|
private Integer cancelAmount;
|
||||||
|
|
||||||
|
@NotEmpty
|
||||||
|
@feign.form.FormProperty("cancel_tax_free_amount")
|
||||||
|
private Integer cancelTaxFreeAmount;
|
||||||
|
|
||||||
|
@feign.form.FormProperty("cancel_vat_amount")
|
||||||
|
private Integer cancelVatAmount;
|
||||||
|
|
||||||
|
@feign.form.FormProperty("cancel_available_amount")
|
||||||
|
private Integer cancelAvailableAmount;
|
||||||
|
|
||||||
|
private String payload;
|
||||||
|
|
||||||
|
public KakaoPayCancelRequest(String tid, Integer cancelAmount) {
|
||||||
|
this(tid, cancelAmount, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
public KakaoPayCancelRequest(String tid, Integer cancelAmount, int cancelTaxFreeAmount) {
|
||||||
|
this.tid = tid;
|
||||||
|
this.cancelAmount = cancelAmount;
|
||||||
|
this.cancelTaxFreeAmount = cancelTaxFreeAmount;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package com.ticketing.server.payment.api.dto.response;
|
||||||
|
|
||||||
|
import com.ticketing.server.payment.api.dto.SnakeCaseStrategy;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
public class ApprovedCancelAmount extends SnakeCaseStrategy {
|
||||||
|
|
||||||
|
private Integer total;
|
||||||
|
private Integer taxFree;
|
||||||
|
private Integer vat;
|
||||||
|
private Integer point;
|
||||||
|
private Integer discount;
|
||||||
|
private Integer greenDeposit;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package com.ticketing.server.payment.api.dto.response;
|
||||||
|
|
||||||
|
import com.ticketing.server.payment.api.dto.SnakeCaseStrategy;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
public class CancelAvailableAmount extends SnakeCaseStrategy {
|
||||||
|
|
||||||
|
private Integer total;
|
||||||
|
private Integer taxFree;
|
||||||
|
private Integer vat;
|
||||||
|
private Integer point;
|
||||||
|
private Integer discount;
|
||||||
|
private Integer greenDeposit;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package com.ticketing.server.payment.api.dto.response;
|
||||||
|
|
||||||
|
import com.ticketing.server.payment.api.dto.SnakeCaseStrategy;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
public class CanceledAmount extends SnakeCaseStrategy {
|
||||||
|
|
||||||
|
private Integer total;
|
||||||
|
private Integer taxFree;
|
||||||
|
private Integer vat;
|
||||||
|
private Integer point;
|
||||||
|
private Integer discount;
|
||||||
|
private Integer greenDeposit;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
package com.ticketing.server.payment.api.dto.response;
|
||||||
|
|
||||||
|
import com.ticketing.server.payment.api.dto.SnakeCaseStrategy;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
public class KakaoPayCancelResponse extends SnakeCaseStrategy {
|
||||||
|
|
||||||
|
private String aid;
|
||||||
|
|
||||||
|
private String tid;
|
||||||
|
|
||||||
|
private String cid;
|
||||||
|
|
||||||
|
private String status;
|
||||||
|
|
||||||
|
private String partnerOrderId;
|
||||||
|
|
||||||
|
private String partnerUserId;
|
||||||
|
|
||||||
|
private String paymentMethodType;
|
||||||
|
|
||||||
|
private Amount amount;
|
||||||
|
|
||||||
|
private ApprovedCancelAmount approvedCancelAmount;
|
||||||
|
|
||||||
|
private CanceledAmount canceledAmount;
|
||||||
|
|
||||||
|
private CancelAvailableAmount cancelAvailableAmount;
|
||||||
|
|
||||||
|
private String itemName;
|
||||||
|
|
||||||
|
private String itemCode;
|
||||||
|
|
||||||
|
private Integer quantity;
|
||||||
|
|
||||||
|
private LocalDateTime createdAt;
|
||||||
|
|
||||||
|
private LocalDateTime approvedAt;
|
||||||
|
|
||||||
|
private LocalDateTime canceledAt;
|
||||||
|
|
||||||
|
private String payload;
|
||||||
|
|
||||||
|
public Integer getTotalAmount() {
|
||||||
|
return amount.getTotal();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -7,12 +7,16 @@ import com.ticketing.server.movie.application.response.TicketCancelResponse;
|
|||||||
import com.ticketing.server.movie.application.response.TicketDetailsResponse;
|
import com.ticketing.server.movie.application.response.TicketDetailsResponse;
|
||||||
import com.ticketing.server.movie.application.response.TicketReservationResponse;
|
import com.ticketing.server.movie.application.response.TicketReservationResponse;
|
||||||
import com.ticketing.server.movie.application.response.TicketSoldResponse;
|
import com.ticketing.server.movie.application.response.TicketSoldResponse;
|
||||||
|
import com.ticketing.server.movie.domain.Ticket;
|
||||||
import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
|
import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
|
||||||
import com.ticketing.server.movie.service.dto.TicketsCancelDTO;
|
import com.ticketing.server.movie.service.dto.TicketsCancelDTO;
|
||||||
|
import com.ticketing.server.movie.service.dto.TicketsRefundDTO;
|
||||||
|
import com.ticketing.server.movie.service.dto.TicketsRefundResponse;
|
||||||
import com.ticketing.server.movie.service.dto.TicketsReservationDTO;
|
import com.ticketing.server.movie.service.dto.TicketsReservationDTO;
|
||||||
import com.ticketing.server.movie.service.dto.TicketsSoldDTO;
|
import com.ticketing.server.movie.service.dto.TicketsSoldDTO;
|
||||||
import com.ticketing.server.movie.service.interfaces.TicketService;
|
import com.ticketing.server.movie.service.interfaces.TicketService;
|
||||||
import com.ticketing.server.payment.api.MovieClient;
|
import com.ticketing.server.payment.api.MovieClient;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@@ -49,4 +53,16 @@ public class MovieClientImpl implements MovieClient {
|
|||||||
return ticketsCancelDto.toResponse();
|
return ticketsCancelDto.toResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public TicketsRefundResponse ticketRefundByDateTime(TicketsRefundRequest request, LocalDateTime dateTime) {
|
||||||
|
TicketsRefundDTO ticketsRefundDto = ticketService.ticketsRefund(request.getPaymentId(), ticket -> ticket.refund(dateTime));
|
||||||
|
return ticketsRefundDto.toResponse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public TicketsRefundResponse ticketRefund(TicketsRefundRequest request) {
|
||||||
|
TicketsRefundDTO ticketsRefundDto = ticketService.ticketsRefund(request.getPaymentId(), Ticket::refund);
|
||||||
|
return ticketsRefundDto.toResponse();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
package com.ticketing.server.payment.api.impl;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class TicketsRefundRequest {
|
||||||
|
|
||||||
|
private final Long paymentId;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,18 +1,25 @@
|
|||||||
package com.ticketing.server.payment.application;
|
package com.ticketing.server.payment.application;
|
||||||
|
|
||||||
|
import static com.ticketing.server.user.domain.UserGrade.ROLES.STAFF;
|
||||||
|
import static com.ticketing.server.user.domain.UserGrade.ROLES.USER;
|
||||||
|
|
||||||
import com.ticketing.server.payment.application.request.PaymentReadyRequest;
|
import com.ticketing.server.payment.application.request.PaymentReadyRequest;
|
||||||
import com.ticketing.server.payment.application.response.PaymentDetailResponse;
|
import com.ticketing.server.payment.application.request.PaymentRefundRequest;
|
||||||
import com.ticketing.server.payment.application.response.SimplePaymentsResponse;
|
|
||||||
import com.ticketing.server.payment.service.dto.PaymentCancelDTO;
|
|
||||||
import com.ticketing.server.payment.application.response.PaymentCancelResponse;
|
import com.ticketing.server.payment.application.response.PaymentCancelResponse;
|
||||||
import com.ticketing.server.payment.service.dto.PaymentCompleteDTO;
|
|
||||||
import com.ticketing.server.payment.application.response.PaymentCompleteResponse;
|
import com.ticketing.server.payment.application.response.PaymentCompleteResponse;
|
||||||
|
import com.ticketing.server.payment.application.response.PaymentDetailResponse;
|
||||||
|
import com.ticketing.server.payment.application.response.PaymentRefundResponse;
|
||||||
|
import com.ticketing.server.payment.application.response.SimplePaymentsResponse;
|
||||||
|
import com.ticketing.server.payment.service.AdminKakaoPayRefundService;
|
||||||
|
import com.ticketing.server.payment.service.MyKakaoPayRefundService;
|
||||||
|
import com.ticketing.server.payment.service.dto.PaymentCancelDTO;
|
||||||
|
import com.ticketing.server.payment.service.dto.PaymentCompleteDTO;
|
||||||
import com.ticketing.server.payment.service.dto.PaymentDetailDTO;
|
import com.ticketing.server.payment.service.dto.PaymentDetailDTO;
|
||||||
import com.ticketing.server.payment.service.dto.PaymentReadyDTO;
|
import com.ticketing.server.payment.service.dto.PaymentReadyDTO;
|
||||||
|
import com.ticketing.server.payment.service.dto.PaymentRefundDTO;
|
||||||
import com.ticketing.server.payment.service.dto.SimplePaymentsDTO;
|
import com.ticketing.server.payment.service.dto.SimplePaymentsDTO;
|
||||||
import com.ticketing.server.payment.service.interfaces.PaymentApisService;
|
import com.ticketing.server.payment.service.interfaces.PaymentApisService;
|
||||||
import com.ticketing.server.payment.service.interfaces.PaymentService;
|
import com.ticketing.server.payment.service.interfaces.PaymentService;
|
||||||
import com.ticketing.server.user.domain.UserGrade;
|
|
||||||
import javax.validation.Valid;
|
import javax.validation.Valid;
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
@@ -37,9 +44,11 @@ public class PaymentController {
|
|||||||
|
|
||||||
private final PaymentApisService paymentApisService;
|
private final PaymentApisService paymentApisService;
|
||||||
private final PaymentService paymentService;
|
private final PaymentService paymentService;
|
||||||
|
private final AdminKakaoPayRefundService adminKakaoPayRefundService;
|
||||||
|
private final MyKakaoPayRefundService myKakaoPayRefundService;
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Secured(UserGrade.ROLES.USER)
|
@Secured(USER)
|
||||||
public ResponseEntity<SimplePaymentsResponse> simplePayments(@NotNull Long userAlternateId) {
|
public ResponseEntity<SimplePaymentsResponse> simplePayments(@NotNull Long userAlternateId) {
|
||||||
SimplePaymentsDTO simplePayments = paymentService.findSimplePayments(userAlternateId);
|
SimplePaymentsDTO simplePayments = paymentService.findSimplePayments(userAlternateId);
|
||||||
|
|
||||||
@@ -48,7 +57,7 @@ public class PaymentController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/detail")
|
@GetMapping("/detail")
|
||||||
@Secured(UserGrade.ROLES.USER)
|
@Secured(USER)
|
||||||
public ResponseEntity<PaymentDetailResponse> detail(@NotNull Long paymentId) {
|
public ResponseEntity<PaymentDetailResponse> detail(@NotNull Long paymentId) {
|
||||||
PaymentDetailDTO paymentDetail = paymentApisService.findPaymentDetail(paymentId);
|
PaymentDetailDTO paymentDetail = paymentApisService.findPaymentDetail(paymentId);
|
||||||
|
|
||||||
@@ -57,7 +66,7 @@ public class PaymentController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/ready")
|
@PostMapping("/ready")
|
||||||
@Secured(UserGrade.ROLES.USER)
|
@Secured(USER)
|
||||||
public ResponseEntity<PaymentReadyDTO> ready(@RequestBody @Valid PaymentReadyRequest request) {
|
public ResponseEntity<PaymentReadyDTO> ready(@RequestBody @Valid PaymentReadyRequest request) {
|
||||||
PaymentReadyDTO paymentReadyDto = paymentApisService.ready(request.getTicketIds());
|
PaymentReadyDTO paymentReadyDto = paymentApisService.ready(request.getTicketIds());
|
||||||
|
|
||||||
@@ -66,7 +75,7 @@ public class PaymentController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/complete")
|
@GetMapping("/complete")
|
||||||
@Secured(UserGrade.ROLES.USER)
|
@Secured(USER)
|
||||||
public ResponseEntity<PaymentCompleteResponse> complete(
|
public ResponseEntity<PaymentCompleteResponse> complete(
|
||||||
@AuthenticationPrincipal UserDetails userRequest,
|
@AuthenticationPrincipal UserDetails userRequest,
|
||||||
@RequestParam("pg_token") String pgToken) {
|
@RequestParam("pg_token") String pgToken) {
|
||||||
@@ -77,7 +86,7 @@ public class PaymentController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/cancel")
|
@GetMapping("/cancel")
|
||||||
@Secured(UserGrade.ROLES.USER)
|
@Secured(USER)
|
||||||
public ResponseEntity<PaymentCancelResponse> cancel(@AuthenticationPrincipal UserDetails userRequest) {
|
public ResponseEntity<PaymentCancelResponse> cancel(@AuthenticationPrincipal UserDetails userRequest) {
|
||||||
PaymentCancelDTO paymentCancelDto = paymentApisService.cancel(userRequest.getUsername());
|
PaymentCancelDTO paymentCancelDto = paymentApisService.cancel(userRequest.getUsername());
|
||||||
|
|
||||||
@@ -85,4 +94,22 @@ public class PaymentController {
|
|||||||
.body(paymentCancelDto.toResponse());
|
.body(paymentCancelDto.toResponse());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostMapping("/refund")
|
||||||
|
@Secured(USER)
|
||||||
|
public ResponseEntity<PaymentRefundResponse> refund(@RequestBody @Valid PaymentRefundRequest request) {
|
||||||
|
PaymentRefundDTO paymentRefundDto = myKakaoPayRefundService.refund(request.getPaymentId());
|
||||||
|
|
||||||
|
return ResponseEntity.status(HttpStatus.OK)
|
||||||
|
.body(paymentRefundDto.toResponse());
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/staff/refund")
|
||||||
|
@Secured(STAFF)
|
||||||
|
public ResponseEntity<PaymentRefundResponse> adminRefund(@RequestBody @Valid PaymentRefundRequest request) {
|
||||||
|
PaymentRefundDTO paymentRefundDto = adminKakaoPayRefundService.refund(request.getPaymentId());
|
||||||
|
|
||||||
|
return ResponseEntity.status(HttpStatus.OK)
|
||||||
|
.body(paymentRefundDto.toResponse());
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
package com.ticketing.server.payment.application.request;
|
||||||
|
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
public class PaymentRefundRequest {
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
private Long paymentId;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package com.ticketing.server.payment.application.response;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.List;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class PaymentRefundResponse {
|
||||||
|
|
||||||
|
private Long paymentId;
|
||||||
|
private List<Long> ticketIds;
|
||||||
|
private String movieTitle;
|
||||||
|
private Integer cancelAmount;
|
||||||
|
private LocalDateTime canceledAt;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -82,4 +82,7 @@ public class Payment extends AbstractEntity {
|
|||||||
this.totalPrice = totalPrice;
|
this.totalPrice = totalPrice;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void refund() {
|
||||||
|
status = PaymentStatus.REFUNDED;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
package com.ticketing.server.payment.service;
|
||||||
|
|
||||||
|
import com.ticketing.server.global.exception.ErrorCode;
|
||||||
|
import com.ticketing.server.movie.service.dto.TicketsRefundResponse;
|
||||||
|
import com.ticketing.server.payment.api.KakaoPayClient;
|
||||||
|
import com.ticketing.server.payment.api.KakaoPayProperties;
|
||||||
|
import com.ticketing.server.payment.api.MovieClient;
|
||||||
|
import com.ticketing.server.payment.api.impl.TicketsRefundRequest;
|
||||||
|
import com.ticketing.server.payment.domain.Payment;
|
||||||
|
import com.ticketing.server.payment.domain.repository.PaymentRepository;
|
||||||
|
import com.ticketing.server.payment.service.interfaces.AbstractKakaoPayRefund;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
public class AdminKakaoPayRefundService extends AbstractKakaoPayRefund {
|
||||||
|
|
||||||
|
private final PaymentRepository paymentRepository;
|
||||||
|
private final MovieClient movieClient;
|
||||||
|
|
||||||
|
public AdminKakaoPayRefundService(KakaoPayClient kakaoPayClient, KakaoPayProperties kakaoPayProperties, PaymentRepository paymentRepository, MovieClient movieClient) {
|
||||||
|
super(kakaoPayClient, kakaoPayProperties);
|
||||||
|
this.paymentRepository = paymentRepository;
|
||||||
|
this.movieClient = movieClient;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Payment getPayment(Long paymentId) {
|
||||||
|
return paymentRepository.findById(paymentId)
|
||||||
|
.orElseThrow(ErrorCode::throwPaymentIdNotFound);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected TicketsRefundResponse movieAndPaymentRefund(Payment payment) {
|
||||||
|
TicketsRefundResponse refundResponse = movieClient.ticketRefund(new TicketsRefundRequest(payment.getId()));
|
||||||
|
payment.refund();
|
||||||
|
|
||||||
|
return refundResponse;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
package com.ticketing.server.payment.service;
|
||||||
|
|
||||||
|
import com.ticketing.server.global.exception.ErrorCode;
|
||||||
|
import com.ticketing.server.movie.service.dto.TicketsRefundResponse;
|
||||||
|
import com.ticketing.server.payment.api.KakaoPayClient;
|
||||||
|
import com.ticketing.server.payment.api.KakaoPayProperties;
|
||||||
|
import com.ticketing.server.payment.api.MovieClient;
|
||||||
|
import com.ticketing.server.payment.api.UserClient;
|
||||||
|
import com.ticketing.server.payment.api.dto.response.UserDetailResponse;
|
||||||
|
import com.ticketing.server.payment.api.impl.TicketsRefundRequest;
|
||||||
|
import com.ticketing.server.payment.domain.Payment;
|
||||||
|
import com.ticketing.server.payment.domain.repository.PaymentRepository;
|
||||||
|
import com.ticketing.server.payment.service.interfaces.AbstractKakaoPayRefund;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
public class MyKakaoPayRefundService extends AbstractKakaoPayRefund {
|
||||||
|
|
||||||
|
private final PaymentRepository paymentRepository;
|
||||||
|
private final MovieClient movieClient;
|
||||||
|
private final UserClient userClient;
|
||||||
|
|
||||||
|
public MyKakaoPayRefundService(KakaoPayClient kakaoPayClient, KakaoPayProperties kakaoPayProperties, PaymentRepository paymentRepository,
|
||||||
|
MovieClient movieClient, UserClient userClient) {
|
||||||
|
super(kakaoPayClient, kakaoPayProperties);
|
||||||
|
this.paymentRepository = paymentRepository;
|
||||||
|
this.movieClient = movieClient;
|
||||||
|
this.userClient = userClient;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Payment getPayment(Long paymentId) {
|
||||||
|
UserDetailResponse userDetail = userClient.detail();
|
||||||
|
Payment payment = paymentRepository.findById(paymentId)
|
||||||
|
.orElseThrow(ErrorCode::throwPaymentIdNotFound);
|
||||||
|
|
||||||
|
if (userDetail.hasUserAlternateId(payment)) {
|
||||||
|
throw ErrorCode.throwValidUserId();
|
||||||
|
}
|
||||||
|
|
||||||
|
return payment;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected TicketsRefundResponse movieAndPaymentRefund(Payment payment) {
|
||||||
|
LocalDateTime now = LocalDateTime.now();
|
||||||
|
TicketsRefundResponse refundResponse = movieClient.ticketRefundByDateTime(new TicketsRefundRequest(payment.getId()), now);
|
||||||
|
payment.refund();
|
||||||
|
|
||||||
|
return refundResponse;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -76,6 +76,10 @@ public class PaymentApisServiceImpl implements PaymentApisService {
|
|||||||
UserDetailResponse userResponse = userClient.detail();
|
UserDetailResponse userResponse = userClient.detail();
|
||||||
Long userAlternateId = userResponse.getUserAlternateId();
|
Long userAlternateId = userResponse.getUserAlternateId();
|
||||||
|
|
||||||
|
// 다른 결제중인 데이터가 있다면, 예외처리
|
||||||
|
paymentCacheRepository.findByEmail(userResponse.getEmail())
|
||||||
|
.ifPresent(paymentCache -> ErrorCode.throwBadRequestPaymentReady());
|
||||||
|
|
||||||
// Ticket 정보 조회 - 영화제목, 티켓가격이 필요함.
|
// Ticket 정보 조회 - 영화제목, 티켓가격이 필요함.
|
||||||
TicketReservationResponse ticketResponse = movieClient.ticketReservation(new TicketReservationRequest(ticketIds));
|
TicketReservationResponse ticketResponse = movieClient.ticketReservation(new TicketReservationRequest(ticketIds));
|
||||||
String movieTitle = ticketResponse.getMovieTitle();
|
String movieTitle = ticketResponse.getMovieTitle();
|
||||||
@@ -95,19 +99,16 @@ public class PaymentApisServiceImpl implements PaymentApisService {
|
|||||||
);
|
);
|
||||||
KakaoPayReadyResponse response = kakaoPayClient.ready(kakaoPayProperties.getAuthorization(), request);
|
KakaoPayReadyResponse response = kakaoPayClient.ready(kakaoPayProperties.getAuthorization(), request);
|
||||||
|
|
||||||
PaymentCache paymentReady = new PaymentCache(
|
paymentCacheRepository.save(
|
||||||
|
new PaymentCache(
|
||||||
userResponse.getEmail(),
|
userResponse.getEmail(),
|
||||||
movieTitle,
|
movieTitle,
|
||||||
response.getTid(),
|
response.getTid(),
|
||||||
ticketIds,
|
ticketIds,
|
||||||
userAlternateId,
|
userAlternateId,
|
||||||
paymentNumber
|
paymentNumber,
|
||||||
);
|
request.getTotalAmount()
|
||||||
|
)
|
||||||
paymentCacheRepository.findByEmail(userResponse.getEmail())
|
|
||||||
.ifPresentOrElse(
|
|
||||||
paymentCache -> ErrorCode.throwBadRequestPaymentReady()
|
|
||||||
, () -> paymentCacheRepository.save(paymentReady)
|
|
||||||
);
|
);
|
||||||
|
|
||||||
return new PaymentReadyDTO(response);
|
return new PaymentReadyDTO(response);
|
||||||
@@ -119,6 +120,13 @@ public class PaymentApisServiceImpl implements PaymentApisService {
|
|||||||
PaymentCache paymentCache = paymentCacheRepository.findByEmail(email)
|
PaymentCache paymentCache = paymentCacheRepository.findByEmail(email)
|
||||||
.orElseThrow(ErrorCode::throwBadRequestPaymentComplete);
|
.orElseThrow(ErrorCode::throwBadRequestPaymentComplete);
|
||||||
|
|
||||||
|
Payment payment = new Payment(paymentCache, PaymentType.KAKAO_PAY, PaymentStatus.SOLD, paymentCache.getTotalAmount());
|
||||||
|
payment = paymentRepository.save(payment);
|
||||||
|
|
||||||
|
movieClient.ticketSold(new TicketSoldRequest(payment.getId(), paymentCache.getTicketIds()));
|
||||||
|
paymentCacheRepository.delete(paymentCache);
|
||||||
|
|
||||||
|
// 카카오페이 결제완료
|
||||||
String paymentNumberToString = paymentCache.getPaymentNumber().toString();
|
String paymentNumberToString = paymentCache.getPaymentNumber().toString();
|
||||||
String userAlternateIdToString = paymentCache.getUserAlternateId().toString();
|
String userAlternateIdToString = paymentCache.getUserAlternateId().toString();
|
||||||
KakaoPayApproveRequest kakaoPayApproveRequest = new KakaoPayApproveRequest(
|
KakaoPayApproveRequest kakaoPayApproveRequest = new KakaoPayApproveRequest(
|
||||||
@@ -132,12 +140,6 @@ public class PaymentApisServiceImpl implements PaymentApisService {
|
|||||||
kakaoPayApproveRequest
|
kakaoPayApproveRequest
|
||||||
);
|
);
|
||||||
|
|
||||||
Payment payment = new Payment(paymentCache, PaymentType.KAKAO_PAY, PaymentStatus.SOLD, kakaoPayApproveResponse.getTotalAmount());
|
|
||||||
payment = paymentRepository.save(payment);
|
|
||||||
|
|
||||||
movieClient.ticketSold(new TicketSoldRequest(payment.getId(), paymentCache.getTicketIds()));
|
|
||||||
paymentCacheRepository.delete(paymentCache);
|
|
||||||
|
|
||||||
return new PaymentCompleteDTO(email, kakaoPayApproveResponse);
|
return new PaymentCompleteDTO(email, kakaoPayApproveResponse);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,41 @@
|
|||||||
|
package com.ticketing.server.payment.service.dto;
|
||||||
|
|
||||||
|
import com.ticketing.server.movie.service.dto.TicketsRefundResponse;
|
||||||
|
import com.ticketing.server.payment.api.dto.response.KakaoPayCancelResponse;
|
||||||
|
import com.ticketing.server.payment.application.response.PaymentRefundResponse;
|
||||||
|
import com.ticketing.server.payment.domain.Payment;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.List;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class PaymentRefundDTO {
|
||||||
|
|
||||||
|
private Long paymentId;
|
||||||
|
private List<Long> ticketIds;
|
||||||
|
private String movieTitle;
|
||||||
|
private Integer cancelAmount;
|
||||||
|
private LocalDateTime canceledAt;
|
||||||
|
|
||||||
|
public PaymentRefundDTO(Payment payment, KakaoPayCancelResponse kakaoPayCancelResponse, TicketsRefundResponse refundResponse) {
|
||||||
|
this(
|
||||||
|
payment.getId(),
|
||||||
|
refundResponse.getTicketIds(),
|
||||||
|
kakaoPayCancelResponse.getItemName(),
|
||||||
|
kakaoPayCancelResponse.getTotalAmount(),
|
||||||
|
kakaoPayCancelResponse.getCanceledAt()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public PaymentRefundResponse toResponse() {
|
||||||
|
return new PaymentRefundResponse(
|
||||||
|
paymentId,
|
||||||
|
ticketIds,
|
||||||
|
movieTitle,
|
||||||
|
cancelAmount,
|
||||||
|
canceledAt
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
package com.ticketing.server.payment.service.interfaces;
|
||||||
|
|
||||||
|
import com.ticketing.server.movie.service.dto.TicketsRefundResponse;
|
||||||
|
import com.ticketing.server.payment.api.KakaoPayClient;
|
||||||
|
import com.ticketing.server.payment.api.KakaoPayProperties;
|
||||||
|
import com.ticketing.server.payment.api.dto.requset.KakaoPayCancelRequest;
|
||||||
|
import com.ticketing.server.payment.api.dto.response.KakaoPayCancelResponse;
|
||||||
|
import com.ticketing.server.payment.domain.Payment;
|
||||||
|
import com.ticketing.server.payment.service.dto.PaymentRefundDTO;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
@Validated
|
||||||
|
public abstract class AbstractKakaoPayRefund {
|
||||||
|
|
||||||
|
private final KakaoPayClient kakaoPayClient;
|
||||||
|
private final KakaoPayProperties kakaoPayProperties;
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public PaymentRefundDTO refund(@NotNull Long paymentId) {
|
||||||
|
Payment payment = getPayment(paymentId);
|
||||||
|
|
||||||
|
// 내부 환불
|
||||||
|
TicketsRefundResponse refundResponse = movieAndPaymentRefund(payment);
|
||||||
|
|
||||||
|
// 카카오페이 환불
|
||||||
|
KakaoPayCancelResponse kakaoPayCancelResponse = kakaoPayClient.cancel(
|
||||||
|
kakaoPayProperties.getAuthorization(),
|
||||||
|
new KakaoPayCancelRequest(payment.getTid(), payment.getTotalPrice())
|
||||||
|
);
|
||||||
|
|
||||||
|
return new PaymentRefundDTO(payment, kakaoPayCancelResponse, refundResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected abstract Payment getPayment(Long paymentId);
|
||||||
|
|
||||||
|
protected abstract TicketsRefundResponse movieAndPaymentRefund(Payment payment);
|
||||||
|
|
||||||
|
}
|
||||||
@@ -8,6 +8,7 @@ import static org.junit.jupiter.api.Assertions.assertAll;
|
|||||||
|
|
||||||
import com.ticketing.server.global.exception.ErrorCode;
|
import com.ticketing.server.global.exception.ErrorCode;
|
||||||
import com.ticketing.server.global.exception.TicketingException;
|
import com.ticketing.server.global.exception.TicketingException;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import org.junit.jupiter.api.BeforeEach;
|
import org.junit.jupiter.api.BeforeEach;
|
||||||
@@ -165,10 +166,94 @@ public class TicketTest {
|
|||||||
ticket.makeSold(123L);
|
ticket.makeSold(123L);
|
||||||
|
|
||||||
// then
|
// then
|
||||||
assertThatThrownBy(() -> ticket.cancel())
|
assertThatThrownBy(ticket::cancel)
|
||||||
.isInstanceOf(TicketingException.class)
|
.isInstanceOf(TicketingException.class)
|
||||||
.extracting("errorCode")
|
.extracting("errorCode")
|
||||||
.isEqualTo(ErrorCode.BAD_REQUEST_PAYMENT_CANCEL);
|
.isEqualTo(ErrorCode.BAD_REQUEST_PAYMENT_CANCEL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@DisplayName("시간 비교 환불 성공")
|
||||||
|
void refundByDateTimeSuccess() {
|
||||||
|
// given
|
||||||
|
LocalDateTime now = LocalDateTime.now();
|
||||||
|
LocalDateTime dateTime = LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 7, 50);
|
||||||
|
Ticket ticket = tickets.get(0);
|
||||||
|
|
||||||
|
// when
|
||||||
|
ticket.makeSold(123L);
|
||||||
|
ticket.refund(dateTime);
|
||||||
|
|
||||||
|
// then
|
||||||
|
assertAll(
|
||||||
|
() -> assertThat(ticket.getStatus()).isEqualTo(TicketStatus.SALE),
|
||||||
|
() -> assertThat(ticket.getPaymentId()).isNull()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@DisplayName("시간 비교 환불 실패 - 상영시작 시간 10분보다 작을경우")
|
||||||
|
void refundByDateTimeFail() {
|
||||||
|
// given
|
||||||
|
LocalDateTime now = LocalDateTime.now();
|
||||||
|
LocalDateTime dateTime = LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 7, 51);
|
||||||
|
Ticket ticket = tickets.get(0);
|
||||||
|
|
||||||
|
// when
|
||||||
|
ticket.makeSold(123L);
|
||||||
|
|
||||||
|
// then
|
||||||
|
assertThatThrownBy(() -> ticket.refund(dateTime))
|
||||||
|
.isInstanceOf(TicketingException.class)
|
||||||
|
.extracting("errorCode")
|
||||||
|
.isEqualTo(ErrorCode.NOT_REFUNDABLE_TIME);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@DisplayName("관리자 환불 성공")
|
||||||
|
void refundSuccess() {
|
||||||
|
// given
|
||||||
|
Ticket ticket = tickets.get(0);
|
||||||
|
|
||||||
|
// when
|
||||||
|
ticket.makeSold(123L);
|
||||||
|
ticket.refund();
|
||||||
|
|
||||||
|
// then
|
||||||
|
assertAll(
|
||||||
|
() -> assertThat(ticket.getStatus()).isEqualTo(TicketStatus.SALE),
|
||||||
|
() -> assertThat(ticket.getPaymentId()).isNull()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@DisplayName("관리자 환불 실패 - 상태 SALE")
|
||||||
|
void refundFail_SALE() {
|
||||||
|
// given
|
||||||
|
Ticket ticket = tickets.get(0);
|
||||||
|
|
||||||
|
// when
|
||||||
|
// then
|
||||||
|
assertThatThrownBy(ticket::refund)
|
||||||
|
.isInstanceOf(TicketingException.class)
|
||||||
|
.extracting("errorCode")
|
||||||
|
.isEqualTo(ErrorCode.NOT_REFUNDABLE_SEAT);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@DisplayName("관리자 환불 실패 - 상태 RESERVATION")
|
||||||
|
void refundFail_RESERVATION() {
|
||||||
|
// given
|
||||||
|
Ticket ticket = tickets.get(0);
|
||||||
|
|
||||||
|
// when
|
||||||
|
ticket.makeReservation();
|
||||||
|
|
||||||
|
// then
|
||||||
|
assertThatThrownBy(ticket::refund)
|
||||||
|
.isInstanceOf(TicketingException.class)
|
||||||
|
.extracting("errorCode")
|
||||||
|
.isEqualTo(ErrorCode.NOT_REFUNDABLE_SEAT);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -57,7 +57,8 @@ class PaymentServiceImplTest {
|
|||||||
"T2d03c9130bf237a97001",
|
"T2d03c9130bf237a97001",
|
||||||
List.of(3L),
|
List.of(3L),
|
||||||
userAlternateId,
|
userAlternateId,
|
||||||
1241242343245L
|
1241242343245L,
|
||||||
|
15_000
|
||||||
),
|
),
|
||||||
KAKAO_PAY,
|
KAKAO_PAY,
|
||||||
SOLD,
|
SOLD,
|
||||||
@@ -70,7 +71,8 @@ class PaymentServiceImplTest {
|
|||||||
"T2d03c9130bf237a97002",
|
"T2d03c9130bf237a97002",
|
||||||
List.of(3L),
|
List.of(3L),
|
||||||
userAlternateId,
|
userAlternateId,
|
||||||
12412343212445L
|
12412343212445L,
|
||||||
|
30_000
|
||||||
),
|
),
|
||||||
KAKAO_PAY,
|
KAKAO_PAY,
|
||||||
SOLD,
|
SOLD,
|
||||||
|
|||||||
@@ -76,7 +76,8 @@ class UserApisServiceImplTest {
|
|||||||
"T2d03c9130bf237a9700",
|
"T2d03c9130bf237a9700",
|
||||||
List.of(1L, 2L),
|
List.of(1L, 2L),
|
||||||
user.getAlternateId(),
|
user.getAlternateId(),
|
||||||
124124231513245L
|
124124231513245L,
|
||||||
|
15_000
|
||||||
),
|
),
|
||||||
KAKAO_PAY,
|
KAKAO_PAY,
|
||||||
SOLD,
|
SOLD,
|
||||||
@@ -91,7 +92,8 @@ class UserApisServiceImplTest {
|
|||||||
"T2d03c9130bf237a97001",
|
"T2d03c9130bf237a97001",
|
||||||
List.of(3L),
|
List.of(3L),
|
||||||
user.getAlternateId(),
|
user.getAlternateId(),
|
||||||
1241242343245L
|
1241242343245L,
|
||||||
|
15_000
|
||||||
),
|
),
|
||||||
KAKAO_PAY,
|
KAKAO_PAY,
|
||||||
SOLD,
|
SOLD,
|
||||||
|
|||||||
Reference in New Issue
Block a user