拍卖修改

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

@@ -12,9 +12,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
+import javax.persistence.*;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -31,16 +29,15 @@ public class AuctionActivity extends BaseEntity {
     @ApiModelProperty("起拍人昵称")
     private String           seller;
     @ApiModelProperty("拍卖名称")
+    @Searchable
     private String           name;
+    @Enumerated(EnumType.STRING)
     @ApiModelProperty("拍卖类型")
     private AuctionType      auctionType;
     @ApiModelProperty("铸造者")
     private String           minter;
     @ApiModelProperty("藏品ID")
     private Long             assetId;
-    @ApiModelProperty("名称")
-    @Searchable
-    private String           assetName;
     @ApiModelProperty("图片")
     @Column(columnDefinition = "TEXT")
     @Convert(converter = FileObjectListConverter.class)

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

@@ -68,9 +68,9 @@ public class AuctionOrder extends BaseEntityNoID {
     @Enumerated(EnumType.STRING)
     private CollectionType type;
 
-    @ApiModelProperty("来源")
     @Enumerated(EnumType.STRING)
-    private AuctionSource source;
+    @ApiModelProperty("拍卖类型")
+    private AuctionType auctionType;
 
     @Enumerated(EnumType.STRING)
     @ApiModelProperty("支付类型")

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

@@ -8,6 +8,7 @@ import com.izouma.nineth.domain.User;
 import com.izouma.nineth.dto.AuctionPaymentType;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.enums.AuctionSource;
+import com.izouma.nineth.enums.AuctionType;
 import com.izouma.nineth.enums.OrderStatus;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.AuctionOrderRepo;
@@ -81,7 +82,7 @@ public class AuctionOrderService {
             //退保证金
         }
 
-        if (AuctionSource.OFFICIAL.equals(order.getSource())) {
+        if (AuctionType.ENTITY.equals(order.getAuctionType())) {
         } else {
             //转让流程
 //            assetService.transfer();