Merge pull request #506 from Podo-Store/develop

[REFACTOR] 환불

Author: pipi-shortstocking

src/main/java/PodoeMarket/podoemarket/order/controller/OrderController.java

@@ -8,6 +8,7 @@
 import PodoeMarket.podoemarket.order.dto.response.OrderInfoResponseDTO;
 import PodoeMarket.podoemarket.order.dto.response.OrderItemResponseDTO;
 import PodoeMarket.podoemarket.order.service.OrderService;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
@@ -40,9 +41,9 @@ public ResponseEntity<?> getPurchaseInfo(@AuthenticationPrincipal UserEntity use
     }
 
     @PostMapping("/item")
-    public ResponseEntity<?> purchase(@AuthenticationPrincipal UserEntity userInfo, @RequestBody OrderRequestDTO dto) {
+    public ResponseEntity<?> purchase(@AuthenticationPrincipal UserEntity userInfo, @RequestBody OrderRequestDTO dto, HttpServletRequest req) {
         try {
-            List<OrderCompleteResponseDTO> resDTO = orderService.purchaseProduct(userInfo, dto);
+            List<OrderCompleteResponseDTO> resDTO = orderService.purchaseProduct(userInfo, dto, req.getParameter("tid"));
 
             return ResponseEntity.ok().body(resDTO);
         } catch(Exception e) {

src/main/java/PodoeMarket/podoemarket/order/dto/request/OrderRequestDTO.java

@@ -16,7 +16,6 @@ public class OrderRequestDTO {
     ApplicantDTO applicant;
     List<OrderItemDTO> orderItem;
     private int paymentMethod;
-    private String tid;
 
     @Data
     @Builder

src/main/java/PodoeMarket/podoemarket/order/service/OrderService.java

@@ -66,12 +66,12 @@ public OrderItemResponseDTO getOrderItemInfo(UserEntity userInfo, OrderInfoReque
     }
 
     @Transactional
-    public List<OrderCompleteResponseDTO> purchaseProduct(UserEntity userInfo, OrderRequestDTO dto) {
+    public List<OrderCompleteResponseDTO> purchaseProduct(UserEntity userInfo, OrderRequestDTO dto, String tid) {
         try {
             final OrdersEntity order = OrdersEntity.builder()
                     .user(userInfo)
                     .paymentMethod(dto.getPaymentMethod())
-                    .tid(dto.getTid())
+                    .tid(tid)
                     .build();
 
             final OrdersEntity orders = orderCreate(order, dto, userInfo);
@@ -196,7 +196,7 @@ protected OrdersEntity orderCreate(final OrdersEntity ordersEntity, final OrderR
 
             ordersEntity.setOrderItem(orderItems);
             ordersEntity.setTotalPrice(orderItems.stream().mapToLong(OrderItemEntity::getTotalPrice).sum());
-            ordersEntity.setTid(orderRequestDTO.getTid());
+            ordersEntity.setTid(ordersEntity.getTid());
 
             return orderRepo.save(ordersEntity);
         } catch (Exception e) {