xiongzhu vor 4 Jahren
Ursprung
Commit
0c45b823e1

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

@@ -34,6 +34,11 @@ public class Asset extends BaseEntity {
     @Searchable
     private String name;
 
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = Collection.PropertyListConverter.class)
+    @ApiModelProperty("特性")
+    private List<Collection.CollectionProperty> properties;
+
     @ApiModelProperty("铸造者")
     @Searchable
     private String minter;

+ 5 - 0
src/main/java/com/izouma/nineth/domain/Order.java

@@ -46,6 +46,11 @@ public class Order extends BaseEntity {
     @Column(columnDefinition = "TEXT")
     private List<String> pic;
 
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = Collection.PropertyListConverter.class)
+    @ApiModelProperty("特性")
+    private List<Collection.CollectionProperty> properties;
+
     @ApiModelProperty("铸造者")
     @Searchable
     private String minter;

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

@@ -1,6 +1,7 @@
 package com.izouma.nineth.service;
 
 import com.izouma.nineth.domain.Asset;
+import com.izouma.nineth.domain.Collection;
 import com.izouma.nineth.domain.Order;
 import com.izouma.nineth.domain.User;
 import com.izouma.nineth.dto.NFT;
@@ -9,6 +10,7 @@ import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.enums.AssetStatus;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.AssetRepo;
+import com.izouma.nineth.repo.CollectionRepo;
 import com.izouma.nineth.repo.UserRepo;
 import com.izouma.nineth.utils.JpaUtils;
 import lombok.AllArgsConstructor;
@@ -23,9 +25,9 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class AssetService {
 
-    private AssetRepo  assetRepo;
-    private UserRepo   userRepo;
-    private NFTService nftService;
+    private AssetRepo      assetRepo;
+    private UserRepo       userRepo;
+    private NFTService     nftService;
 
     public Page<Asset> all(PageQuery pageQuery) {
         return assetRepo.findAll(JpaUtils.toSpecification(pageQuery, Asset.class), JpaUtils.toPageRequest(pageQuery));
@@ -50,7 +52,9 @@ public class AssetService {
                     .minter(order.getMinter())
                     .minterId(order.getMinterId())
                     .minterAvatar(order.getMinterAvatar())
+                    .name(order.getName())
                     .pic(order.getPic())
+                    .properties(order.getProperties())
                     .tokenId(nft.getTokenId())
                     .blockNumber(nft.getBlockNumber())
                     .txHash(nft.getTxHash())

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

@@ -81,6 +81,7 @@ public class OrderService {
                 .collectionId(collectionId)
                 .name(collection.getName())
                 .pic(collection.getPics())
+                .properties(collection.getProperties())
                 .minter(minter.getNickname())
                 .minterAvatar(minter.getAvatar())
                 .qty(qty)