拍品详情、出价列表接口新增字段

lot/src/main/java/cn/hobbystocks/auc/domain/Bid.java

@@ -3,11 +3,12 @@ package cn.hobbystocks.auc.domain;
 import cn.hobbystocks.auc.annotation.Sensitive;
 import cn.hobbystocks.auc.annotation.View;
 import cn.hobbystocks.auc.common.core.domain.BaseEntity;
-import cn.hobbystocks.auc.common.user.UserUtils;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import java.math.BigDecimal;
-import java.util.Objects;
+import java.util.Date;
 
 @Data
 @ToString
@@ -23,42 +24,59 @@ public class Bid extends BaseEntity {
     private String bidNo;
 
     // 拍品ID
+    @ApiModelProperty("拍品ID")
     private Long lotId;
 
     // 轮次
+    @ApiModelProperty("轮次")
     private Long round;
 
     // 用户昵称
     @Sensitive(type = 4)
+    @ApiModelProperty("用户昵称")
     private String account;
 
     // 用户ID
     @View(type = 1)
+    @ApiModelProperty("用户ID")
     private String accountId;
 
     // 出价的值
+    @ApiModelProperty("出价的值")
     private BigDecimal amount;
 
+    @ApiModelProperty("出价时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bidTime;
+
     // 客户端设备类型
+    @ApiModelProperty("客户端设备类型")
     private String deviceType;
 
+    @ApiModelProperty("ip")
     private String ip;
 
     // 删除标记
+    @ApiModelProperty("删除标记")
     private Integer delFlag;
 
     //是否匿名
+    @ApiModelProperty("是否匿名")
     private Integer anonymous;
 
     // 是否是当前出价者
+    @ApiModelProperty("是否是当前出价者")
     private Integer curr;
 
     //是否拍中
+    @ApiModelProperty("status")
     private Integer status;
 
+    @ApiModelProperty("头像")
     private String avatar;
 
     @View(type = 1)
+    @ApiModelProperty("用户编码")
     private String userCode;
 
     private Boolean currentAccount = false;

lot/src/main/java/cn/hobbystocks/auc/response/LotDetailResponse.java

@@ -25,6 +25,13 @@ public class LotDetailResponse {
     private Long auctionId;
     @ApiModelProperty("拍卖会名称")
     private String auctionName;
+    @ApiModelProperty("拍卖会首图")
+    private String auctionImgs;
+    @ApiModelProperty("拍卖会描述")
+    private String auctionDesc;
+
+    @ApiModelProperty("规则")
+    private String ruleContent;
 
     @ApiModelProperty("名称")
     private String name;

lot/src/main/java/cn/hobbystocks/auc/service/impl/BidServiceImpl.java

@@ -140,7 +140,9 @@ public class BidServiceImpl implements IBidService
     private void insertCurrBid(BidVO bid, Long round) {
         bidMapper.clearCurrentBid(bid.getLotId());
         bid.setDelFlag(Constants.DEL_FLAG_NO_DELETE);
-        bid.setCreateTime(new Date());
+        Date now = new Date();
+        bid.setCreateTime(now);
+        bid.setBidTime(now);
         bid.setRound(Objects.nonNull(round) ? round + 1 : 1);
         bid.setCurr(1);
         bidMapper.insertBid(bid);
@@ -153,7 +155,9 @@ public class BidServiceImpl implements IBidService
         BeanUtils.copyProperties(bid, bidval);
         bidval.setStatus(0);
         bidval.setDelFlag(Constants.DEL_FLAG_NO_DELETE);
-        bidval.setCreateTime(new Date());
+        Date now = new Date();
+        bidval.setCreateTime(now);
+        bidval.setBidTime(now);
         bidval.setRound(Objects.nonNull(round) ? round + 1 : 1);
         bidval.setCurr(1);
         if(!Objects.isNull(bidval) && !Objects.isNull(bidval.getLotId())){

lot/src/main/java/cn/hobbystocks/auc/service/impl/LotServiceImpl.java

@@ -838,12 +838,17 @@ public class LotServiceImpl extends ServiceImpl<LotMapper,Lot> implements ILotSe
         response.setAuctionId(lot.getAuctionId());
         response.setName(lot.getName());
         response.setAuctionName(auction.getName());
+        response.setAuctionDesc(auction.getDescription());
+        response.setAuctionImgs(auction.getImgs());
         response.setImgs(lot.getImgs());
         response.setCarouselImgs(lot.getCarouselImgs());
         response.setStatus(lot.getStatus());
-        response.setStartTime(lot.getStartTime());
-        response.setEndTime(lot.getEndTime());
-        response.setRealEndTime(lot.getRealEndTime());
+        Date startTime = toBeijingTime(lot.getStartTime());
+        Date endTime = toBeijingTime(lot.getEndTime());
+        Date realEndTime = toBeijingTime(lot.getRealEndTime());
+        response.setStartTime(startTime);
+        response.setEndTime(endTime);
+        response.setRealEndTime(realEndTime);
         response.setStartPrice(startPrice);
         response.setCurrentPrice(Objects.nonNull(lot.getLastPrice()) ? lot.getLastPrice() : startPrice);
         response.setBidCount(lot.getBidCount());
@@ -857,16 +862,20 @@ public class LotServiceImpl extends ServiceImpl<LotMapper,Lot> implements ILotSe
         response.setIsFans(Boolean.FALSE);
         response.setHasDeposit(Boolean.FALSE);
         response.setPayTimeLimit(lot.getPayTimeLimit());
-        if (Objects.equals("Waiting", lot.getStatus())) {
-            response.setTimestamp(lot.getStartTime().getTime() - System.currentTimeMillis());
-        } else if (Objects.equals("Bidding", lot.getStatus())) {
-            response.setTimestamp(lot.getEndTime().getTime() - System.currentTimeMillis());
+        if (Objects.equals("Waiting", lot.getStatus()) && Objects.nonNull(startTime)) {
+            response.setTimestamp(startTime.getTime() - System.currentTimeMillis());
+        } else if (Objects.equals("Bidding", lot.getStatus()) && Objects.nonNull(endTime)) {
+            response.setTimestamp(endTime.getTime() - System.currentTimeMillis());
         }
         //TODO 成交用户暂时无
         fillUserFlags(lot, response, depositType);
         return response;
     }
 
+    private Date toBeijingTime(Date date) {
+        return Objects.isNull(date) ? null : DateUtils.addHours(date, 8);
+    }
+
     private void fillUserFlags(Lot lot, LotDetailResponse response, String depositType) {
         UserInfo userInfo = UserUtils.getSimpleUserInfo();
         if (Objects.isNull(userInfo)) {

lot/src/main/java/cn/hobbystocks/auc/vo/BidVO.java

@@ -1,17 +1,22 @@
 package cn.hobbystocks.auc.vo;
 
 import cn.hobbystocks.auc.domain.Bid;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class BidVO extends Bid implements InData {
 
+    @ApiModelProperty("ID集合，多个用逗号分隔")
     private String ids;
 
+    @ApiModelProperty("拍卖会Id")
     private Long auctionId;
 
+    @ApiModelProperty("商品类型")
     private String goodsType;
 
+    @ApiModelProperty("是否测试")
     private Boolean test = false;
 
     @Override

lot/src/main/resources/mapper/BidMapper.xml

@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
+        <result property="bidTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />