拍卖

src/main/java/com/izouma/nineth/repo/AuctionActivityRepo.java

@@ -32,13 +32,15 @@ public interface AuctionActivityRepo extends JpaRepository<AuctionActivity, Long
 
     @Transactional
     @Modifying
-    @Query("update AuctionActivity c set  c.status = ?2 where  c.id = ?1")
+    @Query("update AuctionActivity c set c.status = ?2 where c.id = ?1")
     void scheduleOnShelf(Long id, AuctionStatus status);
 
     @Transactional
     @Modifying
-    @Query("update AuctionActivity c set  c.status = ?2 where  c.id = ?1")
+    @Query("update AuctionActivity c set c.status = ?2 where c.id = ?1")
     void scheduleOffShelf(Long id, AuctionStatus status);
 
     List<AuctionActivity> findAllByStatus(AuctionStatus auctionStatus);
+
+    List<AuctionActivity> findAllByAssetId(Long assetId);
 }

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

@@ -113,10 +113,6 @@ public class AuctionActivityService {
                 throw new BusinessException("绿洲石不足");
             }
 
-
-        }
-
-        if (record.getAuctionType().equals(AuctionType.NFT) && !record.getSellerId().equals(9859L)) {
             Asset asset = assetRepo.findById(record.getAssetId()).orElseThrow(new BusinessException("未找到该藏品"));
             if (!asset.getOwnerId().equals(SecurityUtils.getAuthenticatedUser().getId())) {
                 throw new BusinessException("非本人藏品，无法操作.");
@@ -124,9 +120,14 @@ public class AuctionActivityService {
             if (!asset.getStatus().equals(AssetStatus.NORMAL)) {
                 throw new BusinessException("藏品状态异常，无法操作.");
             }
-            if (asset.isConsignment()) {
-                throw new BusinessException("藏品已寄售，取消寄售后再申请拍卖。");
+            if (asset.isPublicShow() || asset.isConsignment()) {
+//                throw new BusinessException("藏品已寄售，取消寄售后再申请拍卖。");
+                throw new BusinessException("请先下架藏品");
             }
+
+            //是否二次拍卖
+
+
             asset.setStatus(AssetStatus.AUCTIONING);
             assetRepo.save(asset);
         }
@@ -200,7 +201,7 @@ public class AuctionActivityService {
                     AuctionActivity nowRecord = auctionActivityRepo.findById(record.getId())
                             .orElseThrow(new BusinessException("无数据"));
                     if (nowRecord.getPurchasePrice() != null) {
-                        auctionActivityRepo.scheduleOffShelf(nowRecord.getId(), AuctionStatus.PURCHASED);
+                        auctionActivityRepo.scheduleOffShelf(recordNew1.getId(), AuctionStatus.PURCHASED);
                     } else {
                         auctionActivityRepo.scheduleOffShelf(nowRecord.getId(), AuctionStatus.PASS);
                         if (record.getAuctionType().equals(AuctionType.NFT)) {