Merge branch 'staging' into pai_mai

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

@@ -210,7 +210,7 @@ public class AuctionActivityService {
         }
     }
 
-    private void offShelfTask(AuctionActivity record) {
+    public void offShelfTask(AuctionActivity record) {
         ScheduledFuture<?> task = tasks.get(record.getId());
         if (task != null) {
             if (!task.cancel(true)) {
@@ -228,6 +228,7 @@ public class AuctionActivityService {
                         auctionActivityRepo.scheduleOffShelf(recordNew1.getId(), AuctionStatus.PURCHASED);
                     } else {
                         //没有成交价，无人出价过
+                        log.info("拍卖流拍Task-else{}", recordNew1.getId());
                         auctionActivityRepo.scheduleOffShelf(recordNew1.getId(), AuctionStatus.PASS);
 
                         if (record.getAuctionType().equals(AuctionType.NFT)) {
@@ -247,6 +248,7 @@ public class AuctionActivityService {
                     log.info("拍卖成交{}", recordNew1.getId());
                     auctionActivityRepo.scheduleOffShelf(recordNew1.getId(), AuctionStatus.PURCHASED);
                 } else {
+                    log.info("拍卖流拍Task-else{}", recordNew1.getId());
                     auctionActivityRepo.scheduleOffShelf(recordNew1.getId(), AuctionStatus.PASS);
 
                     if (record.getAuctionType().equals(AuctionType.NFT)) {

src/test/java/com/izouma/nineth/service/AuctionActivityServiceTest.java

@@ -1,6 +1,8 @@
 package com.izouma.nineth.service;
 
 import com.izouma.nineth.ApplicationTests;
+import com.izouma.nineth.domain.AuctionActivity;
+import com.izouma.nineth.repo.AuctionActivityRepo;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -9,9 +11,18 @@ public class AuctionActivityServiceTest extends ApplicationTests {
 
     @Autowired
     private AuctionActivityService auctionActivityService;
+    @Autowired
+    private AuctionActivityRepo    auctionActivityRepo;
 
     @Test
     public void test() {
         auctionActivityService.init();
     }
+
+    @Test
+    public void test1() {
+        AuctionActivity activity = auctionActivityRepo.findById(2652491L).orElse(null);
+
+        auctionActivityService.offShelfTask(activity);
+    }
 }