wangqifan 3 lat temu
rodzic
commit
9944a7f445

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

@@ -347,8 +347,7 @@ public class Asset extends CollectionBaseEntity {
                 .minterId(user.getId())
                 .minterAvatar(user.getAvatar())
                 .name("元域名:" + domainOrder.getDomainName())
-                .detail(null)
-                .pic(Collections.singletonList(null))
+                .pic(domainOrder.getPic())
                 .model3d(null)
                 .category("元域名")
                 .canResale(false)
@@ -359,7 +358,7 @@ public class Asset extends CollectionBaseEntity {
                 .owner(user.getNickname())
                 .ownerId(user.getId())
                 .ownerAvatar(user.getAvatar())
-                .type(CollectionType.DEFAULT)
+                .type(CollectionType.DOMAIN)
                 .holdDays(null)
                 .oldHoldDays(null)
                 .source(AssetSource.OFFICIAL)

+ 6 - 0
src/main/java/com/izouma/nineth/domain/DomainOrder.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.izouma.nineth.annotations.Searchable;
 import com.izouma.nineth.converter.FileObjectConverter;
+import com.izouma.nineth.converter.FileObjectListConverter;
 import com.izouma.nineth.enums.CollectionStatus;
 import com.izouma.nineth.enums.OrderStatus;
 import com.izouma.nineth.enums.PayMethod;
@@ -14,6 +15,7 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 @Entity
@@ -29,6 +31,10 @@ public class DomainOrder extends BaseEntity {
     private String           userName;
     @ApiModelProperty("用户头像")
     private String           userAvatar;
+    @ApiModelProperty("图片")
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = FileObjectListConverter.class)
+    private List<FileObject> pic;
     @ApiModelProperty("图片名称")
     @ExcelProperty("图片名称")
     private String           picName;

+ 2 - 1
src/main/java/com/izouma/nineth/enums/CollectionType.java

@@ -5,7 +5,8 @@ public enum CollectionType {
     BLIND_BOX("盲盒"),
     AUCTION("拍卖"),
     SHOWROOM("展厅"),
-    PICTURE("星图");
+    PICTURE("星图"),
+    DOMAIN("元域名");
 
     private final String description;
 

+ 7 - 4
src/main/java/com/izouma/nineth/service/DomainOrderService.java

@@ -1,6 +1,7 @@
 package com.izouma.nineth.service;
 
 import com.izouma.nineth.domain.DomainOrder;
+import com.izouma.nineth.domain.FileObject;
 import com.izouma.nineth.domain.PhotoAsset;
 import com.izouma.nineth.domain.User;
 import com.izouma.nineth.dto.PageQuery;
@@ -18,10 +19,7 @@ import org.springframework.stereotype.Service;
 
 import javax.print.DocFlavor;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 @AllArgsConstructor
@@ -57,7 +55,12 @@ public class DomainOrderService {
             int dotIndex = domain.indexOf(".");
             domain = domain.substring(0, dotIndex);
         }
+        FileObject fileObject = new FileObject();
+        fileObject.setName("默认图片");
+        fileObject.setType("image/jpeg");
+        fileObject.setUrl("https://raex-meta.oss-cn-shenzhen.aliyuncs.com/image/2021-12-17-19-03-38BNAlEhlJ.png");
         DomainOrder domainOrder = new DomainOrder();
+        domainOrder.setPic(Collections.singletonList(fileObject));
         domainOrder.setPicName(domain);
         domainOrder.setPrice(price);
         domainOrder.setDomainName(domain + ".uni");