licailing 4 lat temu
rodzic
commit
af4626c63d

+ 3 - 1
src/main/java/com/izouma/nineth/domain/CompanyCollection.java

@@ -5,6 +5,7 @@ import com.izouma.nineth.converter.FileObjectConverter;
 import com.izouma.nineth.converter.FileObjectListConverter;
 import com.izouma.nineth.converter.FileObjectListConverter;
 import com.izouma.nineth.converter.PrivilegeListConverter;
 import com.izouma.nineth.converter.PrivilegeListConverter;
 import com.izouma.nineth.converter.PropertyListConverter;
 import com.izouma.nineth.converter.PropertyListConverter;
+import com.izouma.nineth.enums.AuthStatus;
 import com.izouma.nineth.enums.CollectionStatus;
 import com.izouma.nineth.enums.CollectionStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
@@ -79,8 +80,9 @@ public class CompanyCollection extends BaseEntity {
     @ApiModelProperty("是否可转售")
     @ApiModelProperty("是否可转售")
     private boolean canResale;
     private boolean canResale;
 
 
+    @ApiModelProperty("状态")
     @Enumerated(EnumType.STRING)
     @Enumerated(EnumType.STRING)
-    private CollectionStatus status;
+    private AuthStatus status;
 
 
     @ApiModelProperty("拒绝理由")
     @ApiModelProperty("拒绝理由")
     private String reason;
     private String reason;

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

@@ -1,5 +1,6 @@
 package com.izouma.nineth.domain;
 package com.izouma.nineth.domain;
 
 
+import com.izouma.nineth.enums.CollectionStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
@@ -8,10 +9,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Where;
 import org.hibernate.annotations.Where;
 
 
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.util.List;
 import java.util.List;
 
 
 @Data
 @Data
@@ -54,19 +52,18 @@ public class Showroom extends BaseEntity {
     @ApiModelProperty("展厅背景")
     @ApiModelProperty("展厅背景")
     private String showroomBg;
     private String showroomBg;
 
 
+    private String type;
+
+    @Enumerated(EnumType.STRING)
+    private CollectionStatus status;
+
+    @ApiModelProperty("拒绝理由")
+    private String reason;
+
     @Transient
     @Transient
     private List<ShowCollection> collections;
     private List<ShowCollection> collections;
 
 
     @Transient
     @Transient
     private boolean liked;
     private boolean liked;
 
 
-    private String type;
-
-//    @ApiModelProperty("版税比例")
-//    private int royalties;
-//
-//    @ApiModelProperty("手续费比例")
-//    private int serviceCharge;
-
-
 }
 }