diff --git a/src/main/java/co/orange/ddanzi/repository/OrderRepository.java b/src/main/java/co/orange/ddanzi/repository/OrderRepository.java index 5bdd38d5..64d7a106 100644 --- a/src/main/java/co/orange/ddanzi/repository/OrderRepository.java +++ b/src/main/java/co/orange/ddanzi/repository/OrderRepository.java @@ -14,7 +14,8 @@ public interface OrderRepository extends JpaRepository { - List findByBuyer(User user); + @Query("SELECT o from Order o where o.buyer = :user AND o.status <>'ORDER_PENDING'") + List findByBuyerAndStatus(User user); @Query("SELECT o from Order o where o.item = :item") Optional findByItem(@Param("item") Item item); diff --git a/src/main/java/co/orange/ddanzi/service/OrderService.java b/src/main/java/co/orange/ddanzi/service/OrderService.java index f94e333d..aea35614 100644 --- a/src/main/java/co/orange/ddanzi/service/OrderService.java +++ b/src/main/java/co/orange/ddanzi/service/OrderService.java @@ -254,7 +254,7 @@ public Integer getMyOrderCount(User user){ } public List getMyOrderList(User user){ - List orderList = orderRepository.findByBuyer(user); + List orderList = orderRepository.findByBuyerAndStatus(user); List orderProductList = new ArrayList<>();