feat: order 추가 테이블 정보 기입

TEAM-SYLUV · Aug 3, 2024 · 460d5b8 · 460d5b8
1 parent b9e84a9
commit 460d5b8
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/api-module/src/main/java/com/likelion/apimodule/payment/dto/request/ApprovalRequest.java b/api-module/src/main/java/com/likelion/apimodule/payment/dto/request/ApprovalRequest.java
@@ -4,7 +4,12 @@
 
 public record ApprovalRequest(
         List<Long> menuIds,
+        String orderNum,
         String paymentKey,
-        Integer amount
+        Integer amount,
+        String pickUpRoute,
+        Integer visitHour,
+        Integer visitMin,
+        String phoneNum
 ) {
 }
diff --git a/api-module/src/main/java/com/likelion/apimodule/payment/service/PaymentClient.java b/api-module/src/main/java/com/likelion/apimodule/payment/service/PaymentClient.java
@@ -32,11 +32,11 @@ public PaymentClient(WebClient webClient, PaymentAuthorizationHeaderProvider.Fac
 
     }
 
-    public TossPaymentResponse confirmPayment(ApprovalRequest request, String orderNum) {
+    public TossPaymentResponse confirmPayment(ApprovalRequest request) {
 
         ApproveFinalReq finalReq = new ApproveFinalReq(
                 request.amount(),
-                orderNum,
+                request.orderNum(),
                 request.paymentKey()
         );
 

diff --git a/api-module/src/main/java/com/likelion/apimodule/payment/service/PaymentService.java b/api-module/src/main/java/com/likelion/apimodule/payment/service/PaymentService.java
@@ -47,15 +47,15 @@ public ApprovalResponse approval(String accessToken, ApprovalRequest request) {
         User user = userQueryService.findByEmail(email);
         Store store = storeQueryService.findStoreById(request.menuIds().get(0));
 
-        String orderNum = generateOrderNumber(LocalDateTime.now());
-
         // 토스 페이 결제 승인
-        TossPaymentResponse tossPaymentResponse = paymentClient.confirmPayment(request, orderNum);
+        TossPaymentResponse tossPaymentResponse = paymentClient.confirmPayment(request);
 
         // 방문 리스트 준비 중으로 저장 + 주문 테이블 저장
         marketQueryService.saveVisitListToPreparing(store.getId(), user.getEmail());
 
-        final Order order = Order.builder().orderNum(orderNum).user(user).build();
+        final Order order = Order.builder().orderNum(request.orderNum()).user(user).
+                phoneNum(request.phoneNum()).pickUpRoute(request.pickUpRoute()).
+                visitHour(request.visitHour()).visitMin(request.visitMin()).build();
         orderQueryService.saveOrder(order);
 
         for (int i = 0; i < request.menuIds().size(); i++) {

diff --git a/core-module/src/main/java/com/likelion/coremodule/order/domain/Order.java b/core-module/src/main/java/com/likelion/coremodule/order/domain/Order.java
@@ -22,5 +22,11 @@ public class Order extends BaseEntity {
     @JoinColumn(name = "user_id")
     private User user;
 
+    @Column(nullable = false, unique = true)
     private String orderNum;
+
+    private String phoneNum;
+    private Integer visitHour;
+    private Integer visitMin;
+    private String pickUpRoute;
 }