Przeglądaj źródła

铸造空投t+0

licailing 4 lat temu
rodzic
commit
01e917fffe

+ 1 - 1
src/main/java/com/izouma/nineth/repo/AssetRepo.java

@@ -81,5 +81,5 @@ public interface AssetRepo extends JpaRepository<Asset, Long>, JpaSpecificationE
     @Modifying
     @Transactional
     @Query(value = "update Asset a set a.holdDays = ?2 where a.id = ?1")
-    void updateHoldDays(Long id, Integer holdDays);
+    Asset updateHoldDays(Long id, Integer holdDays);
 }

+ 4 - 5
src/main/java/com/izouma/nineth/service/AirDropService.java

@@ -99,8 +99,8 @@ public class AirDropService {
                                         collection.getHoldDays());
                                 //铸造空投的t+0
                                 if (record.isAuto()) {
-                                    assetRepo.updateHoldDays(asset.getId(), 0);
-                                    log.info("合成{},T+0", asset.getId());
+                                    asset = assetRepo.updateHoldDays(asset.getId(), 0);
+                                    log.info("合成{},寄售天数{},T+0", asset.getId(), asset.getHoldDays());
                                 }
                             }
                         } else {
@@ -128,11 +128,10 @@ public class AirDropService {
                                 }
                                 //铸造空投的t+0
                                 if (record.isAuto()) {
-                                    assetRepo.updateHoldDays(asset.getId(), 0);
-                                    log.info("合成{},T+0", asset.getId());
+                                    asset = assetRepo.updateHoldDays(asset.getId(), 0);
+                                    log.info("合成{},寄售天数{},T+0", asset.getId(), asset.getHoldDays());
                                 }
                             }
-//                        Asset asset = assetService.createAsset(collection, user, null, null, "空投", collectionService.getNextNumber(collection.getId()));
 
                         }
                         collectionService.decreaseStock(collection.getId(), 1);

+ 18 - 1
src/test/java/com/izouma/nineth/service/AirDropServiceTest.java

@@ -7,6 +7,7 @@ import com.izouma.nineth.domain.AirDrop;
 import com.izouma.nineth.domain.Asset;
 import com.izouma.nineth.domain.DropTarget;
 import com.izouma.nineth.dto.AirDropExcelDTO;
+import com.izouma.nineth.enums.AirDropType;
 import com.izouma.nineth.enums.AssetStatus;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.AirDropRepo;
@@ -19,7 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import java.io.File;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Comparator;
+import java.util.Collections;
 import java.util.List;
 
 public class AirDropServiceTest extends ApplicationTests {
@@ -86,4 +87,20 @@ public class AirDropServiceTest extends ApplicationTests {
 //        collectionService.increaseStock(airDrop.getCollectionId(), total);
 //        collectionService.decreaseSale(airDrop.getCollectionId(), total);
     }
+
+    @Test
+    public void create() {
+        DropTarget target = new DropTarget(9972L, "18205083565", "Fairy Li", 1);
+        AirDrop drop = AirDrop.builder()
+                .auto(true)
+                .collectionId(8024802L)
+                .name("测试自动空投")
+                .userIds(Collections.singletonList(9972L))
+                .targets(Collections.singletonList(target))
+                .type(AirDropType.asset)
+                .build();
+
+        airDropService.create(drop);
+    }
+
 }