feature: 카드 결제 기능 추가 (PG 연동 및 결제 상태 관리 포함)

yeonjiyeon · yeonjiyeon · commit dfff4739a419 · 2025-12-04T20:07:14.000+09:00
diff --git a/apps/commerce-api/src/main/java/com/loopers/CommerceApiApplication.java b/apps/commerce-api/src/main/java/com/loopers/CommerceApiApplication.java
@@ -5,7 +5,9 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 import java.util.TimeZone;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
+@EnableFeignClients
 @ConfigurationPropertiesScan
 @SpringBootApplication
 public class CommerceApiApplication {
diff --git a/apps/commerce-api/src/main/java/com/loopers/application/order/OrderFacade.java b/apps/commerce-api/src/main/java/com/loopers/application/order/OrderFacade.java
@@ -5,7 +5,8 @@
 import com.loopers.domain.order.OrderCommand.PlaceOrder;
 import com.loopers.domain.order.OrderItem;
 import com.loopers.domain.order.OrderService;
-import com.loopers.domain.point.PointService;
+import com.loopers.domain.payment.Payment;
+import com.loopers.domain.payment.PaymentService;
 import com.loopers.domain.product.Product;
 import com.loopers.domain.product.ProductService;
 import com.loopers.domain.user.User;
@@ -27,7 +28,7 @@ public class OrderFacade {
   private final ProductService productService;
   private final UserService userService;
   private final OrderService orderService;
-  private final PointService pointService;
+  private final PaymentService paymentService;
 
   @Transactional
   public OrderInfo placeOrder(PlaceOrder command) {
@@ -43,12 +44,16 @@ public OrderInfo placeOrder(PlaceOrder command) {
 
     List<OrderItem> orderItems = buildOrderItems(products, command.items());
     Order order = orderService.createOrder(user.getId(), orderItems);
-    long totalAmount = order.getTotalAmount().getValue();
 
     productService.deductStock(products, orderItems);
-    pointService.deductPoint(user, totalAmount);
 
-    return OrderInfo.from(order);
+    Payment payment = paymentService.processPayment(
+        user,
+        order,
+        command.cardType(),
+        command.cardNo()
+    );
+    return OrderInfo.from(order, payment);
   }
 
   private List<OrderItem> buildOrderItems(List<Product> products, List<Item> items) {
diff --git a/apps/commerce-api/src/main/java/com/loopers/application/order/OrderInfo.java b/apps/commerce-api/src/main/java/com/loopers/application/order/OrderInfo.java
@@ -3,21 +3,26 @@
 import com.loopers.domain.money.Money;
 import com.loopers.domain.order.Order;
 import com.loopers.domain.order.OrderItem;
+import com.loopers.domain.payment.Payment;
 import java.util.List;
 
 public record OrderInfo(
     Long orderId,
     Long userId,
     List<OrderItemInfo> items,
-    long totalAmount
+    long totalAmount,
+    String transactionId,
+    String paymentStatus
 ) {
 
-  public static OrderInfo from(Order order) {
+  public static OrderInfo from(Order order, Payment payment) {
     return new OrderInfo(
         order.getId(),
         order.getUserId(),
         order.getOrderItems().stream().map(OrderItemInfo::from).toList(),
-        order.getTotalAmount().getValue()
+        order.getTotalAmount().getValue(),
+        payment.getTransactionId(),
+        payment.getStatus().name()
     );
   }
 
diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderCommand.java b/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderCommand.java
@@ -6,7 +6,9 @@ public class OrderCommand {
 
   public record PlaceOrder(
       Long userId,
-      List<Item> items
+      List<Item> items,
+      String cardType,
+      String cardNo
   ) {
 
   }
diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/payment/Payment.java b/apps/commerce-api/src/main/java/com/loopers/domain/payment/Payment.java
@@ -13,9 +13,11 @@
 import jakarta.persistence.Table;
 import java.util.UUID;
 import lombok.AccessLevel;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.springframework.util.StringUtils;
 
+@Getter
 @Entity
 @Table(name = "payment")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -30,8 +32,9 @@ public class Payment extends BaseEntity {
   @Column(name = "transaction_id", nullable = false, unique = true)
   private String transactionId;//멱등키
 
+  @Enumerated(EnumType.STRING)
   @Column(name = "card_type", nullable = false)
-  private String cardType;
+  private CardType cardType;
 
   @Column(name = "card_no", nullable = false)
   private String cardNo;
@@ -47,8 +50,8 @@ public class Payment extends BaseEntity {
   @Column(name = "pg_txn_id")
   private String pgTxnId;
 
-  public Payment(Long orderId, Long userId, Money amount, String cardType, String cardNo) {
-    validateConstructor(orderId, userId, amount, cardType, cardNo);
+  public Payment(Long orderId, Long userId, Money amount, CardType cardType, String cardNo) {
+    validateConstructor(orderId, userId, amount, cardNo);
 
     this.orderId = orderId;
     this.userId = userId;
@@ -60,7 +63,7 @@ public Payment(Long orderId, Long userId, Money amount, String cardType, String
     this.transactionId = UUID.randomUUID().toString();
   }
 
-  private void validateConstructor(Long orderId, Long userId, Money amount, String cardType, String cardNo) {
+  private void validateConstructor(Long orderId, Long userId, Money amount, String cardNo) {
     if (orderId == null) {
       throw new CoreException(ErrorType.BAD_REQUEST, "주문 정보는 필수입니다.");
     }
@@ -70,11 +73,18 @@ private void validateConstructor(Long orderId, Long userId, Money amount, String
     if (amount == null) {
       throw new CoreException(ErrorType.BAD_REQUEST, "결제 금액은 필수입니다.");
     }
-    if (!StringUtils.hasText(cardType)) {
-      throw new CoreException(ErrorType.BAD_REQUEST, "카드 종류는 필수입니다.");
-    }
     if (!StringUtils.hasText(cardNo)) {
       throw new CoreException(ErrorType.BAD_REQUEST, "카드 번호는 필수입니다.");
     }
   }
+
+  public void completePayment(String pgTxnId) {
+    this.pgTxnId = pgTxnId;
+    this.status = PaymentStatus.PAID;
+  }
+
+  public void failPayment() {
+    this.status = PaymentStatus.FAILED;
+  }
+
 }
diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentExecutor.java b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentExecutor.java
@@ -0,0 +1,6 @@
+package com.loopers.domain.payment;
+
+public interface PaymentExecutor {
+
+  String execute(Payment payment);
+}
diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentService.java b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentService.java
@@ -11,17 +11,29 @@
 public class PaymentService {
 
   private final PaymentRepository paymentRepository;
+  private final PaymentExecutor paymentExecutor;
 
   @Transactional
-  public Payment createPendingPayment(User user, Order order, String cardType, String cardNo) {
+  public Payment processPayment(User user, Order order, String cardType, String cardNo) {
     Payment payment = new Payment(
         order.getId(),
         user.getId(),
         order.getTotalAmount(),
-        cardType,
+        CardType.valueOf(cardType),
         cardNo
     );
 
-    return paymentRepository.save(payment);
+    paymentRepository.save(payment);
+    try {
+      String pgTxnId = paymentExecutor.execute(payment);
+
+      payment.completePayment(pgTxnId);
+
+    } catch (Exception e) {
+      payment.failPayment();
+      throw e;
+    }
+
+    return payment;
   }
 }
diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/product/Product.java b/apps/commerce-api/src/main/java/com/loopers/domain/product/Product.java
@@ -91,6 +91,12 @@ public int getLikeCount() {
   }
 
   public void deductStock(int quantity) {
+    if (quantity <= 0) {
+      throw new CoreException(ErrorType.BAD_REQUEST, "차감할 재고 수량은 0보다 커야 합니다.");
+    }
+    if (this.stock - quantity < 0) {
+      throw new CoreException(ErrorType.BAD_REQUEST, "재고가 부족합니다.");
+    }
     this.stock -= quantity;
   }
 
@@ -100,7 +106,7 @@ public int increaseLikeCount() {
   }
 
   public int decreaseLikeCount() {
-    if (this.likeCount < 0) {
+    if (this.likeCount <= 0) {
       throw new CoreException(ErrorType.BAD_REQUEST, "좋아요수는 0보다 작을 수 없습니다.");
     }
     this.likeCount--;
diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/pg/LoopersPgExecutor.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/pg/LoopersPgExecutor.java
@@ -0,0 +1,45 @@
+package com.loopers.infrastructure.pg;
+
+import com.loopers.domain.payment.Payment;
+import com.loopers.domain.payment.PaymentExecutor;
+import com.loopers.infrastructure.pg.PgV1Dto.PgApiResponse;
+import com.loopers.infrastructure.pg.PgV1Dto.PgApproveRequest;
+import com.loopers.infrastructure.pg.PgV1Dto.PgApproveResponse;
+import com.loopers.support.error.CoreException;
+import com.loopers.support.error.ErrorType;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class LoopersPgExecutor implements PaymentExecutor {
+
+  private final PgClient pgClient;
+
+  @Override
+  public String execute(Payment payment) {
+    try {
+      PgApproveRequest request = new PgApproveRequest(
+          payment.getTransactionId(),
+          payment.getCardType().name(),
+          payment.getCardNo(),
+          payment.getAmount().getValue(),
+          "http://localhost:8080/api/v1/callback"
+      );
+
+      PgApiResponse<PgApproveResponse> responseWrapper =
+          pgClient.requestPayment(payment.getUserId(), request);
+
+      if ("SUCCESS".equals(responseWrapper.result()) && responseWrapper.data() != null) {
+        return responseWrapper.data().transactionKey();
+      } else {
+        throw new CoreException(ErrorType.BAD_REQUEST, "결제에 실패했습니다.");
+      }
+
+    } catch (CoreException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new CoreException(ErrorType.BAD_REQUEST, "PG 연동 오류: " + e.getMessage());
+    }
+  }
+}
diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/pg/PgClient.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/pg/PgClient.java
@@ -0,0 +1,17 @@
+package com.loopers.infrastructure.pg;
+import com.loopers.infrastructure.pg.PgV1Dto.PgApiResponse;
+import com.loopers.infrastructure.pg.PgV1Dto.PgApproveRequest;
+import com.loopers.infrastructure.pg.PgV1Dto.PgApproveResponse;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+
+@FeignClient(name = "pg-client", url = "http://localhost:8082")
+public interface PgClient {
+  @PostMapping("/api/v1/payments")
+  PgApiResponse<PgApproveResponse> requestPayment(
+      @RequestHeader("X-USER-ID") Long userId,
+      @RequestBody PgApproveRequest request
+  );
+}
diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/pg/PgV1Dto.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/pg/PgV1Dto.java
@@ -0,0 +1,24 @@
+package com.loopers.infrastructure.pg;
+
+public class PgV1Dto {
+
+  public record PgApiResponse<T>(
+      String result,
+      T data,
+      String message
+  ) {}
+
+  public record PgApproveRequest(
+      String orderId,
+      String cardType,
+      String cardNo,
+      Long amount,
+      String callbackUrl
+  ) {}
+
+  public record PgApproveResponse(
+      String transactionKey,
+      String status,
+      String reason
+  ) {}
+}
diff --git a/apps/commerce-api/src/main/java/com/loopers/interfaces/api/order/OrderV1Dto.java b/apps/commerce-api/src/main/java/com/loopers/interfaces/api/order/OrderV1Dto.java
@@ -2,40 +2,60 @@
 
 import com.loopers.application.order.OrderInfo;
 import com.loopers.domain.order.OrderCommand;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Positive;
 import java.util.List;
 
 public class OrderV1Dto {
+  public record OrderRequest(
+      @NotEmpty(message = "주문 상품은 필수입니다.")
+      List<OrderItemRequest> items,
 
-  public record OrderRequest(List<OrderItemRequest> items) {
+      @NotBlank(message = "카드 종류는 필수입니다.")
+      String cardType,
+
+      @NotBlank(message = "카드 번호는 필수입니다.")
+      String cardNo
+  ) {
 
     public OrderCommand.PlaceOrder toCommand(Long userId) {
       List<OrderCommand.Item> commandItems = items.stream()
           .map(item -> new OrderCommand.Item(item.productId(), item.quantity()))
           .toList();
 
-      return new OrderCommand.PlaceOrder(userId, commandItems);
+      return new OrderCommand.PlaceOrder(
+          userId,
+          commandItems,
+          cardType,
+          cardNo
+      );
     }
   }
 
-  public record OrderItemRequest(@NotNull Long productId,
-                                 @Positive int quantity
-  ) {
-
-  }
-
-  public record OrderResponse(Long orderId,
-                              Long userId,
-                              long totalPrice
+  public record OrderItemRequest(
+      @NotNull Long productId,
+      @Positive int quantity
+  ) {}
+
+  public record OrderResponse(
+      Long orderId,
+      Long userId,
+      long totalPrice,
+      String transactionId,
+      String paymentStatus
   ) {
 
     public static OrderResponse from(OrderInfo response) {
       return new OrderResponse(
           response.orderId(),
           response.userId(),
-          response.totalAmount()
+          response.totalAmount(),
+          response.transactionId(), 
+          response.paymentStatus()
       );
     }
   }
 }
+
diff --git a/apps/commerce-api/src/test/java/com/loopers/application/order/OrderConcurrencyTest.java b/apps/commerce-api/src/test/java/com/loopers/application/order/OrderConcurrencyTest.java
diff --git a/apps/commerce-api/src/test/java/com/loopers/application/order/OrderFacadeIntegrationTest.java b/apps/commerce-api/src/test/java/com/loopers/application/order/OrderFacadeIntegrationTest.java
diff --git a/apps/commerce-api/src/test/java/com/loopers/infrastructure/pg/LoopersPgExecutorTest.java b/apps/commerce-api/src/test/java/com/loopers/infrastructure/pg/LoopersPgExecutorTest.java

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,9 @@ public class OrderCommand {`
`6`	`6`
`7`	`7`	`public record PlaceOrder(`
`8`	`8`	`Long userId,`
`9`		`- List<Item> items`
	`9`	`+ List<Item> items,`
	`10`	`+ String cardType,`
	`11`	`+ String cardNo`
`10`	`12`	`) {`
`11`	`13`
`12`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,12 @@ public int getLikeCount() {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`public void deductStock(int quantity) {`
	`94`	`+ if (quantity <= 0) {`
	`95`	`+ throw new CoreException(ErrorType.BAD_REQUEST, "차감할 재고 수량은 0보다 커야 합니다.");`
	`96`	`+ }`
	`97`	`+ if (this.stock - quantity < 0) {`
	`98`	`+ throw new CoreException(ErrorType.BAD_REQUEST, "재고가 부족합니다.");`
	`99`	`+ }`
`94`	`100`	`this.stock -= quantity;`
`95`	`101`	`}`
`96`	`102`
`@@ -100,7 +106,7 @@ public int increaseLikeCount() {`
`100`	`106`	`}`
`101`	`107`
`102`	`108`	`public int decreaseLikeCount() {`
`103`		`- if (this.likeCount < 0) {`
	`109`	`+ if (this.likeCount <= 0) {`
`104`	`110`	`throw new CoreException(ErrorType.BAD_REQUEST, "좋아요수는 0보다 작을 수 없습니다.");`
`105`	`111`	`}`
`106`	`112`	`this.likeCount--;`