wangqifan 4 years ago
parent
commit
17c6617236
1 changed files with 16 additions and 10 deletions
  1. 16 10
      src/main/java/com/izouma/nineth/service/AuctionActivityService.java

+ 16 - 10
src/main/java/com/izouma/nineth/service/AuctionActivityService.java

@@ -191,11 +191,14 @@ public class AuctionActivityService {
                         auctionActivityRepo.scheduleOffShelf(nowRecord.getId(), AuctionStatus.PURCHASED);
                     } else {
                         auctionActivityRepo.scheduleOffShelf(nowRecord.getId(), AuctionStatus.PASS);
-                        Asset asset = assetRepo.findById(nowRecord.getId()).orElseThrow(new BusinessException("暂无"));
-                        asset.setStatus(AssetStatus.NORMAL);
-                        asset.setConsignment(false);
-                        asset.setPublicShow(false);
-                        assetRepo.save(asset);
+                        if (record.getAuctionType().equals(AuctionType.NFT)) {
+                            Asset asset = assetRepo.findById(nowRecord.getAssetId())
+                                    .orElseThrow(new BusinessException("暂无"));
+                            asset.setStatus(AssetStatus.NORMAL);
+                            asset.setConsignment(false);
+                            asset.setPublicShow(false);
+                            assetRepo.save(asset);
+                        }
                     }
                     tasks.remove(record.getId());
                 }, date);
@@ -205,11 +208,14 @@ public class AuctionActivityService {
                     auctionActivityRepo.scheduleOffShelf(recordNew1.getId(), AuctionStatus.PURCHASED);
                 } else {
                     auctionActivityRepo.scheduleOffShelf(recordNew1.getId(), AuctionStatus.PASS);
-                    Asset asset = assetRepo.findById(recordNew1.getId()).orElseThrow(new BusinessException("暂无"));
-                    asset.setStatus(AssetStatus.NORMAL);
-                    asset.setConsignment(false);
-                    asset.setPublicShow(false);
-                    assetRepo.save(asset);
+                    if (record.getAuctionType().equals(AuctionType.NFT)) {
+                        Asset asset = assetRepo.findById(recordNew1.getAssetId())
+                                .orElseThrow(new BusinessException("暂无"));
+                        asset.setStatus(AssetStatus.NORMAL);
+                        asset.setConsignment(false);
+                        asset.setPublicShow(false);
+                        assetRepo.save(asset);
+                    }
                 }
             }
         }