拍卖

src/main/java/com/izouma/nineth/service/AuctionActivityService.java

@@ -217,12 +217,15 @@ public class AuctionActivityService {
                 return;
             }
         }
-        AuctionActivity recordNew1 = auctionActivityRepo.findById(record.getId())
-                .orElseThrow(new BusinessException("无数据"));
-        if (recordNew1.getStatus().equals(AuctionStatus.ONGOING)) {
-            if (recordNew1.getEndTime().minusSeconds(2).isAfter(LocalDateTime.now())) {
+//        AuctionActivity recordNew1 = auctionActivityRepo.findById(record.getId())
+//                .orElseThrow(new BusinessException("无数据"));
+        if (record.getStatus().equals(AuctionStatus.ONGOING)) {
+            if (record.getEndTime().minusSeconds(2).isAfter(LocalDateTime.now())) {
                 Date date = Date.from(record.getEndTime().atZone(ZoneId.systemDefault()).toInstant());
                 ScheduledFuture<?> future = taskScheduler.schedule(() -> {
+                    AuctionActivity recordNew1 = auctionActivityRepo.findById(record.getId())
+                            .orElseThrow(new BusinessException("无数据"));
+
                     if (ObjectUtils.isNotEmpty(recordNew1.getPurchasePrice())) {
                         log.info("拍卖成交{}", recordNew1.getId());
                         auctionActivityRepo.scheduleOffShelf(recordNew1.getId(), AuctionStatus.PURCHASED);
@@ -244,15 +247,15 @@ public class AuctionActivityService {
                 }, date);
                 tasks.put(record.getId(), future);
             } else {
-                if (ObjectUtils.isNotEmpty(recordNew1.getPurchasePrice())) {
-                    log.info("拍卖成交{}", recordNew1.getId());
-                    auctionActivityRepo.scheduleOffShelf(recordNew1.getId(), AuctionStatus.PURCHASED);
+                if (ObjectUtils.isNotEmpty(record.getPurchasePrice())) {
+                    log.info("拍卖成交{}", record.getId());
+                    auctionActivityRepo.scheduleOffShelf(record.getId(), AuctionStatus.PURCHASED);
                 } else {
-                    log.info("拍卖流拍Task-else{}", recordNew1.getId());
-                    auctionActivityRepo.scheduleOffShelf(recordNew1.getId(), AuctionStatus.PASS);
+                    log.info("拍卖流拍Task-else-else{}", record.getId());
+                    auctionActivityRepo.scheduleOffShelf(record.getId(), AuctionStatus.PASS);
 
                     if (record.getAuctionType().equals(AuctionType.NFT)) {
-                        Asset asset = assetRepo.findById(recordNew1.getAssetId())
+                        Asset asset = assetRepo.findById(record.getAssetId())
                                 .orElseThrow(new BusinessException("暂无"));
                         asset.setStatus(AssetStatus.NORMAL);
                         asset.setConsignment(false);

src/main/java/com/izouma/nineth/service/AuctionRecordService.java

@@ -110,7 +110,12 @@ public class AuctionRecordService {
             AuctionRecordDTO auctionRecordDTO = new AuctionRecordDTO();
             BeanUtils.copyProperties(record, auctionRecordDTO);
             auctionRecordDTO.setAuctionPic(auctionActivity.getPic());
+            auctionRecordDTO.setMinter(auctionActivity.getMinter());
+            auctionRecordDTO.setAuctionPic(auctionActivity.getPic());
             auctionRecordDTO.setActPurchasedId((auctionActivity.getPurchaserId()));
+            auctionRecordDTO.setDeposit(auctionActivity.getDeposit());
+            auctionRecordDTO.setEndTime(auctionActivity.getEndTime());
+            auctionRecordDTO.setAuctionType(auctionActivity.getAuctionType());
             auctionRecordDTO.setCreatedTime(record.getCreatedAt());
             if (auctionRecordDTO.getType().equals(AuctionRecordType.DEPOSIT) || auctionRecordDTO.isPurchased()) {
                 AuctionOrder auctionOrder = auctionOrderRepo.findFirstByAuctionRecordIdOrderByCreatedAt(record.getId());