chore: get my order list that are paid

Orange-Co · Sep 11, 2024 · 7b931f2 · 7b931f2
1 parent a71ef53
commit 7b931f2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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<Order, String> {
 
-    List<Order> findByBuyer(User user);
+    @Query("SELECT o from Order o where o.buyer  = :user AND o.status <>'ORDER_PENDING'")
+    List<Order> findByBuyerAndStatus(User user);
 
     @Query("SELECT o from Order o where o.item  = :item")
     Optional<Order> 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
@@ -254,7 +254,7 @@ public Integer getMyOrderCount(User user){
     }
 
     public List<MyOrder> getMyOrderList(User user){
-        List<Order> orderList = orderRepository.findByBuyer(user);
+        List<Order> orderList = orderRepository.findByBuyerAndStatus(user);
 
         List<MyOrder> orderProductList = new ArrayList<>();