Преглед изворни кода

盲盒可转让天数(回调)

licailing пре 3 година
родитељ
комит
a5fae81ee0

+ 2 - 2
src/main/java/com/izouma/nineth/domain/Asset.java

@@ -194,7 +194,7 @@ public class Asset extends BaseEntity {
                 .build();
     }
 
-    public static Asset create(BlindBoxItem item, User user) {
+    public static Asset create(BlindBoxItem item, User user,Integer holdDays) {
         return Asset.builder()
                 .userId(user.getId())
                 .collectionId(item.getCollectionId())
@@ -217,7 +217,7 @@ public class Asset extends BaseEntity {
                 .ownerId(user.getId())
                 .ownerAvatar(user.getAvatar())
                 .type(CollectionType.BLIND_BOX)
-                .holdDays(item.getHoldDays())
+                .holdDays(holdDays)
                 .build();
     }
 }

+ 2 - 2
src/main/java/com/izouma/nineth/domain/BlindBoxItem.java

@@ -96,6 +96,6 @@ public class BlindBoxItem extends BaseEntity {
     @ApiModelProperty("稀有")
     private boolean rare;
 
-    @ApiModelProperty("持有几天")
-    private Integer holdDays;
+//    @ApiModelProperty("持有几天")
+//    private Integer holdDays;
 }

+ 2 - 1
src/main/java/com/izouma/nineth/service/AirDropService.java

@@ -56,7 +56,8 @@ public class AirDropService {
                 try {
                     if (collection.getType() == CollectionType.BLIND_BOX) {
                         BlindBoxItem winItem = collectionService.draw(collection.getId());
-                        assetService.createAsset(winItem, user, null, null, "空投", collectionService.getNextNumber(winItem.getCollectionId()));
+                        assetService.createAsset(winItem, user, null, null, "空投",
+                                collectionService.getNextNumber(winItem.getCollectionId()), collection.getHoldDays());
                     } else {
                         assetService.createAsset(collection, user, null, null, "空投", collectionService.getNextNumber(collection.getId()));
                     }

+ 3 - 2
src/main/java/com/izouma/nineth/service/AssetService.java

@@ -91,8 +91,9 @@ public class AssetService {
         return asset;
     }
 
-    public Asset createAsset(BlindBoxItem winItem, User user, Long orderId, BigDecimal price, String type, Integer number) {
-        Asset asset = Asset.create(winItem, user);
+    public Asset createAsset(BlindBoxItem winItem, User user, Long orderId, BigDecimal price, String type,
+                             Integer number, Integer holdDays) {
+        Asset asset = Asset.create(winItem, user, holdDays);
         asset.setTokenId(TokenUtils.genTokenId());
         asset.setNumber(number);
         asset.setOrderId(orderId);

+ 2 - 1
src/main/java/com/izouma/nineth/service/OrderService.java

@@ -565,7 +565,8 @@ public class OrderService {
                     order.setWinCollectionId(winItem.getCollectionId());
                     orderRepo.save(order);
                     assetService.createAsset(winItem, user, order.getId(), order.getPrice(), "出售",
-                            winItem.getTotal() > 1 ? collectionService.getNextNumber(winItem.getCollectionId()) : null);
+                            winItem.getTotal() > 1 ? collectionService.getNextNumber(winItem.getCollectionId()) : null,
+                            collection.getHoldDays());
                 } else {
                     if (collection.getSource() == CollectionSource.TRANSFER) {
                         orderRepo.save(order);

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

@@ -78,7 +78,7 @@ class AssetServiceTest extends ApplicationTests {
         Collection collection = collectionRepo.findById(order.getCollectionId()).get();
         BlindBoxItem blindBoxItem = blindBoxItemRepo.findById(4250L).get();
         User user = userRepo.findById(order.getUserId()).get();
-        assetService.createAsset(blindBoxItem, user, order.getId(), order.getPrice(), "出售", 1);
+        assetService.createAsset(blindBoxItem, user, order.getId(), order.getPrice(), "出售", 1, collection.getHoldDays());
     }
 
     @Test