Browse Source

调整叠加逻辑

sunkean 3 years ago
parent
commit
a089edf696

+ 12 - 14
src/main/java/com/izouma/nineth/domain/AssetSuperimposition.java

@@ -25,31 +25,31 @@ public class AssetSuperimposition extends BaseEntity {
 
     @ApiModelProperty("资产总数")
     @Column(columnDefinition = "int default 0")
-    private Integer num;
+    private int num;
 
     @ApiModelProperty("拍卖中数量")
     @Column(columnDefinition = "int default 0")
-    private Integer auctioningNum;
+    private int auctioningNum;
 
     @ApiModelProperty("寄售数量")
     @Column(columnDefinition = "int default 0")
-    private Integer consignmentNum;
+    private int consignmentNum;
 
     @ApiModelProperty("仅展示数量")
     @Column(columnDefinition = "int default 0")
-    private Integer openShowNum;
+    private int openShowNum;
 
     @ApiModelProperty("未展示数量")
     @Column(columnDefinition = "int default 0")
-    private Integer closeShowNum;
+    private int closeShowNum;
 
     @ApiModelProperty("市场交易完成数量")
     @Column(columnDefinition = "int default 0")
-    private Integer transferredNum;
+    private int transferredNum;
 
     @ApiModelProperty("拍卖完成数量")
     @Column(columnDefinition = "int default 0")
-    private Integer auctionedNum;
+    private int auctionedNum;
 
     @ApiModelProperty("资产分类")
     private String prefixName;
@@ -64,12 +64,10 @@ public class AssetSuperimposition extends BaseEntity {
 
     private String assetStatus;
 
-    public static AssetSuperimposition create(Asset asset, Long userId) {
-        return AssetSuperimposition.builder()
-                .userId(userId)
-                .minter(asset.getMinter())
-                .pic(asset.getPic())
-                .prefixName(asset.getPrefixName())
-                .build();
+    public AssetSuperimposition(Asset asset, Long userId) {
+        this.userId = userId;
+        this.minter = asset.getMinter();
+        this.pic = asset.getPic();
+        this.prefixName = asset.getPrefixName();
     }
 }

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

@@ -50,7 +50,7 @@ public class AssetSuperimpositionService {
         }
         AssetSuperimposition assetSuperimposition = assetSuperimpositionRepo.findByUserIdAndPrefixName(asset.getUserId(), asset.getPrefixName()).orElse(null);
         if (Objects.isNull(assetSuperimposition)) {
-            assetSuperimposition = AssetSuperimposition.create(asset, asset.getUserId());
+            assetSuperimposition = new AssetSuperimposition(asset, asset.getUserId());
         }
         switch (type) {
             case OPEN:
@@ -161,7 +161,7 @@ public class AssetSuperimpositionService {
         }
         AssetSuperimposition assetSuperimposition = assetSuperimpositionRepo.findByUserIdAndPrefixName(toUserId, prefixName).orElse(null);
         if (Objects.isNull(assetSuperimposition)) {
-            assetSuperimposition = AssetSuperimposition.create(asset, toUserId);
+            assetSuperimposition = new AssetSuperimposition(asset, toUserId);
         }
         assetSuperimposition.setNum(assetSuperimposition.getNum() + NUM);
         assetSuperimposition.setCloseShowNum(assetSuperimposition.getCloseShowNum() + NUM);