feature #112: 정산 수정

Moses249 · Moses249 · commit 44067f05c1b0 · 2025-10-27T16:03:33.000+09:00
정산 내역 조회시 환불 내역이 있으면 환불 상태 반환, 그렇지 않으면 주문 상태 반환
diff --git a/src/main/java/com/irum/come2us/domain/order/application/service/OwnerOrderService.java b/src/main/java/com/irum/come2us/domain/order/application/service/OwnerOrderService.java
@@ -182,10 +182,12 @@ public void updateOrderStatusToDelivered(UUID orderDetailId) {
     /** OrderDetail 상태 목록을 기반으로 집계된(Aggregated) Order의 상태를 결정 */
     private OrderStatus aggregateOrderStatus(OrderDetail orderDetail) {
 
-        Order order =
-                orderRepository
-                        .findByOrderId(orderDetail.getOrder().getOrderId())
-                        .orElseThrow(() -> new CommonException(OrderErrorCode.ORDER_NOT_FOUND));
+        //        Order order =
+        //                orderRepository
+        //                        .findByOrderId(orderDetail.getOrder().getOrderId())
+        //                        .orElseThrow(() -> new
+        // CommonException(OrderErrorCode.ORDER_NOT_FOUND));
+        Order order = orderDetail.getOrder();
         List<OrderDetail> orderDetailList = orderDetailRepository.findAllByOrder(order);
         List<OrderStatus> orderStatusList =
                 orderDetailList.stream().map(OrderDetail::getOrderStatusIndi).toList();
diff --git a/src/main/java/com/irum/come2us/domain/order/application/service/SalesService.java b/src/main/java/com/irum/come2us/domain/order/application/service/SalesService.java
@@ -2,7 +2,6 @@
 
 import com.irum.come2us.domain.member.domain.entity.Member;
 import com.irum.come2us.domain.order.domain.entity.Order;
-import com.irum.come2us.domain.order.domain.entity.enums.OrderStatus;
 import com.irum.come2us.domain.order.domain.repository.OrderRepository;
 import com.irum.come2us.domain.order.presentation.dto.response.SalesResponse;
 import com.irum.come2us.domain.refund.domain.entity.Refund;
@@ -13,9 +12,7 @@
 import com.irum.come2us.global.presentation.advice.exception.CommonException;
 import com.irum.come2us.global.presentation.advice.exception.errorcode.StoreErrorCode;
 import com.irum.come2us.global.util.MemberUtil;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
+import java.util.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -33,27 +30,17 @@ public SalesResponse getSalesList(UUID storeId) {
                 storeRepository
                         .findById(storeId)
                         .orElseThrow(() -> new CommonException(StoreErrorCode.STORE_NOT_FOUND));
-        List<OrderStatus> orderStatuses =
-                List.of(
-                        OrderStatus.DELIVERED,
-                        OrderStatus.PARTIALLY_DELIVERED,
-                        OrderStatus.DELIVERED,
-                        OrderStatus.SHIPPED,
-                        OrderStatus.PREPARING);
-        List<RefundStatus> refundStatuses =
-                List.of(
-                        RefundStatus.APPROVED,
-                        RefundStatus.COMPLETED,
-                        RefundStatus.PENDING,
-                        RefundStatus.REJECTED,
-                        RefundStatus.REQUESTED);
+        memberUtil.assertMemberResourceAccess(store.getMember());
+
         List<Order> orders = orderRepository.findSalesAll(storeId);
         List<SalesResponse.OrderSummary> orderList =
                 orders.stream().map(this::toOrderSummary).toList();
         return new SalesResponse(orderList, null, false);
     }
 
     private SalesResponse.OrderSummary toOrderSummary(Order order) {
+        String displayStatus = DisplayStatus(order);
+
         List<SalesResponse.ProductSummary> productList =
                 order.getOrderDetails().stream()
                         .map(
@@ -65,12 +52,6 @@ private SalesResponse.OrderSummary toOrderSummary(Order order) {
                                                 detail.getPrice(),
                                                 detail.getOptionName()))
                         .toList();
-        Optional<Refund> latestRefund = refundRepository.findLatestByOrder(order);
-
-        String displayStatus = latestRefund
-                .map(r -> r.getRefundStatus().name())
-                .orElse(order.getOrderStatusAll().name());
-
 
         return new SalesResponse.OrderSummary(
                 order.getOrderId(),
@@ -85,4 +66,20 @@ private SalesResponse.OrderSummary toOrderSummary(Order order) {
                 productList,
                 displayStatus);
     }
+
+    // 환불 존재시 환불 상태 반환, 환불 존재하지 않으면 주문 상태 반환
+    private String DisplayStatus(Order order) {
+        Optional<Refund> latestRefundOpt =
+                refundRepository.findTopByOrderOrderByCreatedAtDesc(order);
+
+        if (latestRefundOpt.isPresent()) {
+            Refund latestRefund = latestRefundOpt.get();
+            RefundStatus refundStatus = latestRefund.getRefundStatus();
+
+            if (refundStatus != RefundStatus.REJECTED) {
+                return refundStatus.name();
+            }
+        }
+        return order.getOrderStatusAll().name();
+    }
 }
diff --git a/src/main/java/com/irum/come2us/domain/order/domain/repository/OrderRepository.java b/src/main/java/com/irum/come2us/domain/order/domain/repository/OrderRepository.java
@@ -23,4 +23,6 @@ public interface OrderRepository extends JpaRepository<Order, UUID> {
     @Modifying(clearAutomatically = true)
     @Query("UPDATE Order o SET o.orderStatusAll = 'FAILED' WHERE o.orderId IN :orderIds")
     int updateStatusToFailedByIds(@Param("orderIds") List<UUID> orderIds);
+
+    List<Order> findSalesAll(@Param("storeId") UUID storeId);
 }
diff --git a/src/main/java/com/irum/come2us/domain/order/presentation/controller/OwnerOrderController.java b/src/main/java/com/irum/come2us/domain/order/presentation/controller/OwnerOrderController.java
@@ -1,8 +1,11 @@
 package com.irum.come2us.domain.order.presentation.controller;
 
 import com.irum.come2us.domain.order.application.service.OwnerOrderService;
+import com.irum.come2us.domain.order.application.service.SalesService;
 import com.irum.come2us.domain.order.presentation.dto.request.OwnerOrderShippedRequest;
+import com.irum.come2us.domain.order.presentation.dto.response.OrderDetailResponse;
 import com.irum.come2us.domain.order.presentation.dto.response.OwnerOrderListResponse;
+import com.irum.come2us.domain.order.presentation.dto.response.SalesResponse;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -15,6 +18,7 @@
 @Slf4j
 public class OwnerOrderController {
     private final OwnerOrderService ownerOrderService;
+    private final SalesService salesService;
 
     /** [상점] 배송 준비 중 목록 조회 * */
     @GetMapping("/{storeId}/preparing")
@@ -73,4 +77,18 @@ public ResponseEntity<Void> orderStatusToDeliveredUpdate(@PathVariable UUID orde
         ownerOrderService.updateOrderStatusToDelivered(orderDetailId);
         return ResponseEntity.noContent().build();
     }
+
+    /* [상점] 주문 상세 */
+    @GetMapping("/{orderId}")
+    public ResponseEntity<OrderDetailResponse> ownerOrderDetail(@PathVariable UUID orderId) {
+        OrderDetailResponse response = ownerOrderService.detailResponse(orderId);
+        return ResponseEntity.ok(response);
+    }
+
+    //   정산 내역
+    @GetMapping("/{storeId}/sales")
+    public ResponseEntity<SalesResponse> salesResponse(@PathVariable UUID storeId) {
+        SalesResponse response = salesService.getSalesList(storeId);
+        return ResponseEntity.ok(response);
+    }
 }
diff --git a/src/main/java/com/irum/come2us/domain/refund/domain/repository/RefundRepository.java b/src/main/java/com/irum/come2us/domain/refund/domain/repository/RefundRepository.java
@@ -18,6 +18,5 @@ public interface RefundRepository extends JpaRepository<Refund, UUID> {
     // public interface OrderRepository extends JpaRepository<Order, UUID> {..}
     Optional<Order> findByOrder_OrderId(@Param("orderId") UUID orderId);
 
-    Optional<Refund> findLatestByOrder(Order order);
-
+    Optional<Refund> findTopByOrderOrderByCreatedAtDesc(Order order);
 }

Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,6 @@ public interface OrderRepository extends JpaRepository<Order, UUID> {`
`23`	`23`	`@Modifying(clearAutomatically = true)`
`24`	`24`	`@Query("UPDATE Order o SET o.orderStatusAll = 'FAILED' WHERE o.orderId IN :orderIds")`
`25`	`25`	`int updateStatusToFailedByIds(@Param("orderIds") List<UUID> orderIds);`
	`26`	`+`
	`27`	`+ List<Order> findSalesAll(@Param("storeId") UUID storeId);`
`26`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,5 @@ public interface RefundRepository extends JpaRepository<Refund, UUID> {`
`18`	`18`	`// public interface OrderRepository extends JpaRepository<Order, UUID> {..}`
`19`	`19`	`Optional<Order> findByOrder_OrderId(@Param("orderId") UUID orderId);`
`20`	`20`
`21`		`- Optional<Refund> findLatestByOrder(Order order);`
`22`		`-`
	`21`	`+ Optional<Refund> findTopByOrderOrderByCreatedAtDesc(Order order);`
`23`	`22`	`}`