wangqifan 4 jaren geleden
bovenliggende
commit
e720f9bf02

+ 2 - 0
src/main/java/com/izouma/nineth/dto/auction/AuctionRecordDTO.java

@@ -2,6 +2,7 @@ package com.izouma.nineth.dto.auction;
 
 
 import com.izouma.nineth.domain.FileObject;
 import com.izouma.nineth.domain.FileObject;
 import com.izouma.nineth.enums.AuctionRecordType;
 import com.izouma.nineth.enums.AuctionRecordType;
+import com.izouma.nineth.enums.AuctionStatus;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Data;
@@ -34,5 +35,6 @@ public class AuctionRecordDTO {
     private boolean           purchased;
     private boolean           purchased;
     @ApiModelProperty("出价")
     @ApiModelProperty("出价")
     private BigDecimal        bidderPrice;
     private BigDecimal        bidderPrice;
+    private AuctionStatus     auctionStatus;
     private Long              orderId;
     private Long              orderId;
 }
 }

+ 1 - 0
src/main/java/com/izouma/nineth/service/AuctionRecordService.java

@@ -57,6 +57,7 @@ public class AuctionRecordService {
             auctionRecordDTO.setUserId(record.getUserId());
             auctionRecordDTO.setUserId(record.getUserId());
             auctionRecordDTO.setType(record.getType());
             auctionRecordDTO.setType(record.getType());
             auctionRecordDTO.setPurchased(record.isPurchased());
             auctionRecordDTO.setPurchased(record.isPurchased());
+            auctionRecordDTO.setAuctionStatus(auctionActivity.getStatus());
 //            if (auctionActivity.getStatus().equals(AuctionStatus.PURCHASED) || auctionActivity.getStatus()
 //            if (auctionActivity.getStatus().equals(AuctionStatus.PURCHASED) || auctionActivity.getStatus()
 //                    .equals(AuctionStatus.FINISH)) {
 //                    .equals(AuctionStatus.FINISH)) {
 //                if (auctionActivity.getRecordId() != null) {
 //                if (auctionActivity.getRecordId() != null) {