licailing 4 жил өмнө
parent
commit
b435a6d676

+ 1 - 1
src/main/java/com/izouma/nineth/repo/AuctionOrderRepo.java

@@ -31,5 +31,5 @@ public interface AuctionOrderRepo extends JpaRepository<AuctionOrder, Long>, Jpa
 
     AuctionOrder findFirstByAuctionRecordIdOrderByIdDesc(Long recordId);
 
-    AuctionOrder findFirstByAuctionIdAndPaymentTypeAndStatusNotIn(Long auctionId, AuctionPaymentType type, Collection<AuctionOrderStatus> status);
+    AuctionOrder findFirstByAuctionIdAndPaymentTypeAndStatusNotInAndUserIdOrderByIdDesc(Long auctionId, AuctionPaymentType paymentType, Collection<AuctionOrderStatus> status, Long userId);
 }

+ 5 - 4
src/main/java/com/izouma/nineth/service/AuctionRecordService.java

@@ -89,8 +89,9 @@ public class AuctionRecordService {
             Set<AuctionOrderStatus> auctionOrderStatuses = new HashSet<>();
             auctionOrderStatuses.add(AuctionOrderStatus.NOT_PAID);
             auctionOrderStatuses.add(AuctionOrderStatus.CANCELLED);
-            AuctionOrder depositOrder = auctionOrderRepo.findFirstByAuctionIdAndPaymentTypeAndStatusNotIn(record
-                    .getAuctionId(), AuctionPaymentType.DEPOSIT, auctionOrderStatuses);
+            AuctionOrder depositOrder = auctionOrderRepo.findFirstByAuctionIdAndPaymentTypeAndStatusNotInAndUserIdOrderByIdDesc(record
+                    .getAuctionId(), AuctionPaymentType.DEPOSIT, auctionOrderStatuses, SecurityUtils.getAuthenticatedUser()
+                    .getId());
             if (depositOrder != null) {
                 auctionRecordDTO.setDepositStatus(depositOrder.getStatus());
             } else {
@@ -131,8 +132,8 @@ public class AuctionRecordService {
             Set<AuctionOrderStatus> auctionOrderStatuses = new HashSet<>();
             auctionOrderStatuses.add(AuctionOrderStatus.NOT_PAID);
             auctionOrderStatuses.add(AuctionOrderStatus.CANCELLED);
-            AuctionOrder depositOrder = auctionOrderRepo.findFirstByAuctionIdAndPaymentTypeAndStatusNotIn(record
-                    .getAuctionId(), AuctionPaymentType.DEPOSIT, auctionOrderStatuses);
+            AuctionOrder depositOrder = auctionOrderRepo.findFirstByAuctionIdAndPaymentTypeAndStatusNotInAndUserIdOrderByIdDesc(record
+                    .getAuctionId(), AuctionPaymentType.DEPOSIT, auctionOrderStatuses, userId);
             if (depositOrder != null) {
                 auctionRecordDTO.setDepositStatus(depositOrder.getStatus());
             } else {