feature #112: 정산 수정

정산 내역 조회시 환불 내역이 있으면 환불 상태 반환, 그렇지 않으면 주문 상태 반환 및 기타 수정

Author: Moses249

src/main/java/com/irum/come2us/domain/coupon/domain/repository/AppliedCouponRepository.java

@@ -5,7 +5,9 @@
 import java.util.List;
 import java.util.UUID;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface AppliedCouponRepository extends JpaRepository<AppliedCoupon, UUID> {
     List<AppliedCoupon> findByCouponId(UUID couponId);
 

src/main/java/com/irum/come2us/domain/order/application/service/OwnerOrderService.java

@@ -1,6 +1,5 @@
 package com.irum.come2us.domain.order.application.service;
 
-import com.irum.come2us.domain.coupon.domain.repository.AppliedCouponRepository;
 import com.irum.come2us.domain.order.application.mapper.OrderMapper;
 import com.irum.come2us.domain.order.domain.entity.Order;
 import com.irum.come2us.domain.order.domain.entity.OrderDetail;
@@ -13,6 +12,7 @@
 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.payment.domain.repository.PaymentRepository;
 import com.irum.come2us.global.presentation.advice.exception.CommonException;
 import com.irum.come2us.global.presentation.advice.exception.errorcode.OrderErrorCode;
 import java.util.List;
@@ -34,7 +34,7 @@ public class OwnerOrderService {
     private final OrderRepository orderRepository;
     private final OrderRepositoryCustom orderRepositoryCustom;
     private final OrderMapper orderMapper;
-    private final AppliedCouponRepository appliedCouponRepository;
+    private final PaymentRepository paymentRepository;
 
     @Transactional(readOnly = true)
     public OwnerOrderListResponse getPreparingOrderList(UUID storeId, UUID cursor, Integer size) {
@@ -249,8 +249,8 @@ public OrderDetailResponse detailResponse(UUID orderId) {
                                                 od.getQuantity(),
                                                 od.getOptionName()))
                         .toList();
-        String couponName = getCouponName(order.getPaymentId());
-        int discountAmount = getDiscountAmount(order.getPaymentId());
+        String couponName = getCouponName(order.getPayment().getPaymentId());
+        int discountAmount = getDiscountAmount(order.getPayment().getPaymentId());
         // 아직 결제 상태 Field 없음
         String trackingNumber =
                 order.getOrderDetails().stream()
@@ -291,14 +291,14 @@ public OrderDetailResponse detailResponse(UUID orderId) {
     }
 
     private String getCouponName(UUID paymentId) {
-        return appliedCouponRepository.findByPaymentIdWithCoupon(paymentId).stream()
+        return paymentRepository.findByPayment_Id(paymentId).stream()
                 .findFirst()
                 .map(ac -> ac.getCoupon().getName())
                 .orElse(null);
     }
 
     private int getDiscountAmount(UUID paymentId) {
-        Integer sum = appliedCouponRepository.getTotalDiscountByPaymentId(paymentId);
+        Integer sum = paymentRepository.getTotalDiscountByPaymentId(paymentId);
         return sum != null ? sum : 0;
     }
 }

src/main/java/com/irum/come2us/domain/order/application/service/SalesService.java

@@ -32,7 +32,7 @@ public SalesResponse getSalesList(UUID storeId) {
                         .orElseThrow(() -> new CommonException(StoreErrorCode.STORE_NOT_FOUND));
         memberUtil.assertMemberResourceAccess(store.getMember());
 
-        List<Order> orders = orderRepository.findSalesAll(storeId);
+        List<Order> orders = orderRepository.findAllByStore_Id(storeId);
         List<SalesResponse.OrderSummary> orderList =
                 orders.stream().map(this::toOrderSummary).toList();
         return new SalesResponse(orderList, null, false);

src/main/java/com/irum/come2us/domain/order/domain/repository/OrderRepository.java

@@ -24,5 +24,5 @@ public interface OrderRepository extends JpaRepository<Order, UUID> {
     @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);
+    List<Order> findAllByStore_Id(@Param("storeId") UUID storeId);
 }

src/main/java/com/irum/come2us/domain/payment/domain/entity/Payment.java

@@ -1,12 +1,15 @@
 package com.irum.come2us.domain.payment.domain.entity;
 
+import com.irum.come2us.domain.coupon.domain.entity.AppliedCoupon;
 import com.irum.come2us.domain.member.domain.entity.Member;
 import com.irum.come2us.domain.payment.application.client.dto.TossPaymentsResponse;
 import com.irum.come2us.domain.payment.domain.entity.enums.PaymentCorp;
 import com.irum.come2us.domain.payment.domain.entity.enums.PaymentMethod;
 import com.irum.come2us.domain.payment.domain.entity.enums.PaymentStatus;
 import com.irum.come2us.global.domain.BaseEntity;
 import jakarta.persistence.*;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.UUID;
 import lombok.*;
 import org.hibernate.annotations.SQLDelete;
@@ -50,6 +53,9 @@ public class Payment extends BaseEntity {
     @JoinColumn(name = "member_id")
     private Member member;
 
+    @OneToMany(mappedBy = "payment", fetch = FetchType.LAZY)
+    private List<AppliedCoupon> appliedCoupons = new ArrayList<>();
+
     public void updateStatus(PaymentStatus paymentStatus) {
         this.paymentStatus = paymentStatus;
     }

src/main/java/com/irum/come2us/domain/payment/domain/repository/PaymentRepository.java

@@ -1,5 +1,6 @@
 package com.irum.come2us.domain.payment.domain.repository;
 
+import com.irum.come2us.domain.coupon.domain.entity.AppliedCoupon;
 import com.irum.come2us.domain.payment.domain.entity.Payment;
 import java.util.List;
 import java.util.UUID;
@@ -15,4 +16,10 @@ public interface PaymentRepository extends JpaRepository<Payment, UUID> {
     @Modifying(clearAutomatically = true)
     @Query("UPDATE Payment p SET p.paymentStatus = 'FAILED' WHERE p.paymentId IN :paymentIds")
     int updateStatusToFailedByIds(@Param("paymentIds") List<UUID> paymentIds);
+
+    @Query("SELECT ac FROM AppliedCoupon ac JOIN ac.payment p WHERE p.id = :paymentId")
+    List<AppliedCoupon> findByPayment_Id(@Param("paymentId") UUID paymentId);
+
+    @Query("SELECT p.totalDiscountAmount FROM Payment p WHERE p.id = :paymentId")
+    Integer getTotalDiscountByPaymentId(@Param("paymentId") UUID paymentId);
 }