|
|
@@ -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 {
|