licailing 4 سال پیش
والد
کامیت
af0646aee9

+ 24 - 0
src/main/java/com/izouma/nineth/domain/CompanyCollection.java

@@ -4,6 +4,8 @@ import com.izouma.nineth.annotations.Searchable;
 import com.izouma.nineth.annotations.SearchableOne;
 import com.izouma.nineth.converter.FileObjectConverter;
 import com.izouma.nineth.converter.FileObjectListConverter;
+import com.izouma.nineth.converter.PrivilegeListConverter;
+import com.izouma.nineth.converter.PropertyListConverter;
 import com.izouma.nineth.enums.CollectionStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -40,6 +42,13 @@ public class CompanyCollection extends BaseEntity {
     @Convert(converter = FileObjectConverter.class)
     private FileObject model3d;
 
+    @ApiModelProperty("铸造者")
+    @SearchableOne
+    private String minter;
+
+    @ApiModelProperty("铸造者ID")
+    private Long minterId;
+
     @ApiModelProperty("铸造者头像")
     private String minterAvatar;
 
@@ -68,4 +77,19 @@ public class CompanyCollection extends BaseEntity {
 
     @Enumerated(EnumType.STRING)
     private CollectionStatus status;
+
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = PropertyListConverter.class)
+    @ApiModelProperty("特性")
+    private List<CollectionProperty> properties;
+
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = PrivilegeListConverter.class)
+    @ApiModelProperty("特权")
+    private List<Privilege> privileges;
+
+    @ApiModelProperty("编号")
+    private Integer number;
+
+    private Integer currentNumber;
 }

+ 10 - 0
src/main/java/com/izouma/nineth/domain/Showroom.java

@@ -59,4 +59,14 @@ public class Showroom extends BaseEntity {
 
     @Transient
     private boolean liked;
+
+    /**
+     * 企业用
+     */
+    @ApiModelProperty("版税比例")
+    private int royalties;
+
+    @ApiModelProperty("手续费比例")
+    private int serviceCharge;
+
 }