叠加添加创建时间字段

src/main/java/com/izouma/nineth/domain/UserAssetSummary.java

@@ -2,7 +2,6 @@ package com.izouma.nineth.domain;
 
 import com.izouma.nineth.annotations.Searchable;
 import com.izouma.nineth.converter.FileObjectListConverter;
-import com.izouma.nineth.enums.AssetShowStatus;
 import com.izouma.nineth.enums.AssetStatus;
 import com.izouma.nineth.enums.CollectionType;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,6 +11,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
@@ -70,10 +70,6 @@ public class UserAssetSummary {
     @ApiModelProperty("铸造者")
     private String minter;
 
-    @ApiModelProperty("状态")
-    @Enumerated(EnumType.STRING)
-    private AssetShowStatus assetStatus;
-
     private Long assetId;
 
     @Column(columnDefinition = "tinyint unsigned default 1")
@@ -100,6 +96,9 @@ public class UserAssetSummary {
     @ApiModelProperty("是否寄售")
     private boolean consignment;
 
+    @ApiModelProperty("最新创建时间")
+    private LocalDateTime createdAt;
+
     public UserAssetSummary(Asset asset) {
         this.assetId = asset.getId();
         this.userId = asset.getUserId();
@@ -113,8 +112,8 @@ public class UserAssetSummary {
         this.status = asset.getStatus();
         this.type = asset.getType();
         this.opened = asset.isOpened();
+        this.createdAt = asset.getCreatedAt();
         if (CollectionType.BLIND_BOX.equals(asset.getType()) && !asset.isOpened()) {
-            this.setAssetStatus(AssetShowStatus.BLIND_BOX);
             this.num = 1;
             if (AssetStatus.AUCTIONING.equals(asset.getStatus())) {
                 this.auctioningNum = 1;

src/main/java/com/izouma/nineth/enums/AssetShowStatus.java

@@ -1,21 +0,0 @@
-package com.izouma.nineth.enums;
-
-
-public enum AssetShowStatus {
-
-    NORMAL("默认"),
-    BLIND_BOX("未开启盲盒"),
-    OPEN_SHOW("公开展示"),
-    CONSIGNMENT("寄售中"),
-    AUCTIONING("拍卖中");
-
-    private final String description;
-
-    AssetShowStatus(String description) {
-        this.description = description;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-}

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

@@ -17,9 +17,9 @@ public interface UserAssetSummaryRepo extends JpaRepository<UserAssetSummary, Lo
     @Modifying
     void deleteByUserId(Long userId);
     @Query(value = "SELECT " +
+            "  a.created_at created_at, " +
             "  a.id id, " +
             "  a.id asset_id, " +
-            "  'NORMAL' asset_status, " +
             "  a.user_id, " +
             "  a.prefix_name, " +
             "  a.pic, " +
@@ -51,7 +51,8 @@ public interface UserAssetSummaryRepo extends JpaRepository<UserAssetSummary, Lo
             "    name, " +
             "    public_show, " +
             "    consignment, " +
-            "    count(*) num  " +
+            "    count(*) num,  " +
+            "    max(created_at) created_at  " +
             "  FROM " +
             "    asset  " +
             "  WHERE " +

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

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.izouma.nineth.domain.Asset;
 import com.izouma.nineth.domain.UserAssetSummary;
 import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.enums.AssetShowStatus;
 import com.izouma.nineth.enums.CollectionType;
 import com.izouma.nineth.repo.AssetRepo;
 import com.izouma.nineth.repo.UserAssetSummaryRepo;
@@ -17,10 +16,8 @@ import org.springframework.data.domain.Page;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-import javax.transaction.Transactional;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 @Service
 @AllArgsConstructor
@@ -35,33 +32,6 @@ public class UserAssetSummaryService {
         return userAssetSummaryRepo.findAll(JpaUtils.toSpecification(pageQuery, UserAssetSummary.class), JpaUtils.toPageRequest(pageQuery));
     }
 
-    /**
-     * 当该分类下的资产数量为1的时候，添加相关状态
-     *
-     * @param userAssetSummary
-     */
-    private void setAssetStatus(UserAssetSummary userAssetSummary) {
-        if (userAssetSummary.getNum() != 1) {
-            return;
-        }
-        if (Objects.isNull(userAssetSummary.getAssetStatus())) {
-            return;
-        }
-        if (userAssetSummary.getAuctioningNum() == 1) {
-            userAssetSummary.setAssetStatus(AssetShowStatus.AUCTIONING);
-            return;
-        }
-        if (userAssetSummary.getConsignmentNum() == 1) {
-            userAssetSummary.setAssetStatus(AssetShowStatus.CONSIGNMENT);
-            return;
-        }
-        if (userAssetSummary.getOpenShowNum() == 1) {
-            userAssetSummary.setAssetStatus(AssetShowStatus.OPEN_SHOW);
-            return;
-        }
-        userAssetSummary.setAssetStatus(AssetShowStatus.NORMAL);
-    }
-
     @Async
     public void calculateNum(Long userId) {
         log.info("开始重新计算用户：{}的资产数量", userId);
@@ -83,7 +53,6 @@ public class UserAssetSummaryService {
         if (CollectionUtils.isNotEmpty(isExist)) {
             userAssetSummaryRepo.deleteByUserId(userId);
         }
-        userAssetSummaries.forEach(this::setAssetStatus);
         log.info(JSONObject.toJSONString(userAssetSummaries), true);
         userAssetSummaryRepo.saveAll(userAssetSummaries);
     }

src/main/java/com/izouma/nineth/web/AssetController.java

@@ -12,7 +12,6 @@ import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.AssetRepo;
 import com.izouma.nineth.repo.OrderRepo;
 import com.izouma.nineth.service.AssetService;
-import com.izouma.nineth.service.UserAssetSummaryService;
 import com.izouma.nineth.service.CacheService;
 import com.izouma.nineth.service.GiftOrderService;
 import com.izouma.nineth.utils.SecurityUtils;

src/main/java/com/izouma/nineth/web/OrderController.java

@@ -13,7 +13,6 @@ import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.AssetRepo;
 import com.izouma.nineth.repo.OrderRepo;
 import com.izouma.nineth.repo.UserRepo;
-import com.izouma.nineth.service.UserAssetSummaryService;
 import com.izouma.nineth.service.OrderService;
 import com.izouma.nineth.utils.DateTimeUtils;
 import com.izouma.nineth.utils.SecurityUtils;