|
|
@@ -216,14 +216,12 @@ public class AuctionActivityService {
|
|
|
if (recordNew1.getEndTime().minusSeconds(2).isAfter(LocalDateTime.now())) {
|
|
|
Date date = Date.from(record.getEndTime().atZone(ZoneId.systemDefault()).toInstant());
|
|
|
ScheduledFuture<?> future = taskScheduler.schedule(() -> {
|
|
|
- AuctionActivity nowRecord = auctionActivityRepo.findById(record.getId())
|
|
|
- .orElseThrow(new BusinessException("无数据"));
|
|
|
- if (nowRecord.getPurchasePrice() != null) {
|
|
|
- auctionActivityRepo.scheduleOffShelf(nowRecord.getId(), AuctionStatus.PURCHASED);
|
|
|
+ if (recordNew1.getPurchasePrice() != null) {
|
|
|
+ auctionActivityRepo.scheduleOffShelf(recordNew1.getId(), AuctionStatus.PURCHASED);
|
|
|
} else {
|
|
|
- auctionActivityRepo.scheduleOffShelf(nowRecord.getId(), AuctionStatus.PASS);
|
|
|
+ auctionActivityRepo.scheduleOffShelf(recordNew1.getId(), AuctionStatus.PASS);
|
|
|
if (record.getAuctionType().equals(AuctionType.NFT)) {
|
|
|
- Asset asset = assetRepo.findById(nowRecord.getAssetId())
|
|
|
+ Asset asset = assetRepo.findById(recordNew1.getAssetId())
|
|
|
.orElseThrow(new BusinessException("暂无"));
|
|
|
asset.setStatus(AssetStatus.NORMAL);
|
|
|
asset.setConsignment(false);
|