交易历史头像

src/main/java/com/izouma/nineth/TokenHistory.java

@@ -28,7 +28,11 @@ public class TokenHistory extends BaseEntity {
 
     private Long   fromUserId;
 
+    private String fromAvatar;
+
     private String toUser;
 
     private Long   toUserId;
+
+    private String toAvatar;
 }

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

@@ -19,4 +19,6 @@ public interface AssetRepo extends JpaRepository<Asset, Long>, JpaSpecificationE
     long countByIpfsUrlAndStatusNot(String ipfsUrl, AssetStatus status);
 
     List<Asset> findByCollectionId(Long collectionId);
+
+    List<Asset> findByCollectionIdAndStatusIn(Long collectionId, Iterable<AssetStatus> statuses);
 }

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

@@ -58,8 +58,10 @@ public class AssetService {
                 .tokenId(asset.getTokenId())
                 .fromUser(collection.getMinter())
                 .fromUserId(collection.getMinterId())
+                .fromAvatar(collection.getMinterAvatar())
                 .toUser(user.getNickname())
                 .toUserId(user.getId())
+                .toAvatar(user.getAvatar())
                 .operation(type)
                 .price(price)
                 .build());
@@ -79,8 +81,10 @@ public class AssetService {
                 .tokenId(asset.getTokenId())
                 .fromUser(winItem.getMinter())
                 .fromUserId(winItem.getMinterId())
+                .fromAvatar(winItem.getMinterAvatar())
                 .toUser(user.getNickname())
                 .toUserId(user.getId())
+                .toAvatar(user.getAvatar())
                 .operation(type)
                 .price(price)
                 .build());
@@ -257,8 +261,10 @@ public class AssetService {
                 .tokenId(asset.getTokenId())
                 .fromUser(asset.getOwner())
                 .fromUserId(asset.getOwnerId())
+                .fromAvatar(asset.getOwnerAvatar())
                 .toUser(toUser.getNickname())
                 .toUserId(toUser.getId())
+                .toAvatar(toUser.getAvatar())
                 .operation(reason)
                 .build());
 

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

@@ -358,7 +358,10 @@ public class OrderService {
     public void setNumber() {
         for (Collection collection : collectionRepo.findAll()) {
             if (collection.getSource() != CollectionSource.OFFICIAL) continue;
-            for (Asset asset : assetRepo.findByCollectionId(collection.getId())) {
+            collection.setCurrentNumber(0);
+            collectionRepo.save(collection);
+            for (Asset asset : assetRepo.findByCollectionIdAndStatusIn(collection.getId(),
+                    Arrays.asList(AssetStatus.NORMAL, AssetStatus.GIFTING, AssetStatus.TRADING))) {
                 asset.setNumber(collectionService.getNextNumber(collection.getId()));
                 assetRepo.save(asset);
             }