From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java |   63 +++++++++++++++++++++++++++++--
 1 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java
index 8564a4c..57cd462 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
 import com.ruoyi.common.core.enums.AuthenticationEnum;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,96 +10,150 @@
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
+
 @Data
 public class AuctionGoodsinfoVO {
 
     @ApiModelProperty(value = "商品id")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private Long goodsSkuId;
 
     @ApiModelProperty(value = "商品名称")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String goodsSkuName;
 
     @ApiModelProperty(value = "起拍价格")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private BigDecimal startingPrice;
 
     @ApiModelProperty(value = "拍品数量")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private Integer salesroomStock;
 
     @ApiModelProperty(value = "开始状态 0=预展中 1=拍卖中 2=已结束")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private AuctionStartStatusEnum startStatus;
 
     @ApiModelProperty(value = "开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private LocalDateTime startTime;
 
     @ApiModelProperty(value = "结束时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private LocalDateTime endTime;
 
     @ApiModelProperty(value = "单位")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String unit;
 
+    @ApiModelProperty(value = "最高出价")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    private BigDecimal zgBid;
+
+
     @ApiModelProperty(value = "商品描述")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String description;
 
     @ApiModelProperty(value = "商品说明")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    private String explain;
+
+    @ApiModelProperty(value = "商品介绍")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String detail;
 
     @ApiModelProperty(value = "商品年份")
-    private String years;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    private LocalDateTime years;
 
     @ApiModelProperty(value = "商品分类")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String category;
 
     @ApiModelProperty(value = "商品系列")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String series;
 
     @ApiModelProperty(value = "商品品牌")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String brand;
 
     @ApiModelProperty(value = "商品香型")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String flavorType;
 
     @ApiModelProperty(value = "封面图")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String coverPic;
 
     @ApiModelProperty(value = "详情图，不超过五张图片")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String album;
 
     @ApiModelProperty(value = "是否出价 1未出价，2出价")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private Integer isBond;
 
     @ApiModelProperty(value = "是中标 1未中标，2中标")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private Integer isStatus;
 
     @ApiModelProperty(value = "是收藏 1未收藏，2收藏")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private Integer isCollection;
 
     @ApiModelProperty(value = "实名认证 0=不需实名 1=需要实名")
-    private AuthenticationEnum authentication;
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    private Integer authentication;
 
     @ApiModelProperty("是否报名 1未报名，2 已报名")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private Integer isApply;
 
     @ApiModelProperty(value = "当前出价")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private BigDecimal presentBid;
 
     @ApiModelProperty(value = "最低加价金额")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private BigDecimal minimumMarkupAmount;
 
 
     @ApiModelProperty(value = "规格")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String spec;
 
     @ApiModelProperty(value = "规格单位")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String specUnit;
 
 
     @ApiModelProperty(value = "分享标题")
-    @TableField("share_title")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String shareTitle;
 
     @ApiModelProperty(value = "分享图片")
-    @TableField("share_pic")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String sharePic;
+
+    @ApiModelProperty(value = "订单id")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    private Long orderId;
+
+    @ApiModelProperty(value = "订单编号")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    private String orderNo;
+
+    @ApiModelProperty(value = "保证金")
+    private BigDecimal bond;
+
+    @ApiModelProperty(value = "商品信息")
+    List<getHomeGoodsSkuXxiVO> xxiVOS;
+
+
 }

--
Gitblit v1.7.1