From e38dbee7e43f6af65c7e9307d936a1c48e4bb539 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 11:56:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java
index 2785da2..072d806 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java
@@ -6,18 +6,40 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
@Data
public class SeckillActivityVO {
@ApiModelProperty(value = "活动id")
- private Integer id;
+ private String id;
+
+ @ApiModelProperty(value = "商品id")
+ private Integer goodsId;
@ApiModelProperty(value = "商品名称")
private String goodsName;
@ApiModelProperty(value = "商品简介")
private String introduction;
+
+ @ApiModelProperty(value = "商品类型")
+ private Integer goodsType;
+
+ @ApiModelProperty(value = "商品分类名称")
+ private String goodsCategoryName;
+
+ @ApiModelProperty(value = "运营成本")
+ private BigDecimal operatingCost;
+
+ @ApiModelProperty(value = "门店成本")
+ private BigDecimal shopCost;
+
+ @ApiModelProperty(value = "限购数量")
+ private Integer maxNum;
+
+ @ApiModelProperty(value = "销量")
+ private Integer saleNum;
@ApiModelProperty(value = "封面图")
private String homePagePicture;
@@ -28,15 +50,22 @@
@ApiModelProperty(value = "基础售价")
private BigDecimal sellingPrice;
- @ApiModelProperty(value = "已售数量")
- private Integer saleNum;
+ @ApiModelProperty(value = "基础积分")
+ private Integer integral;
+
@ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Integer startTime;
+ private LocalDateTime startTime;
@ApiModelProperty(value = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Integer endTime;
+ private LocalDateTime endTime;
+
+ @ApiModelProperty(value = "状态：1未开始 2已开始 3已结束")
+ private Integer status;
+
+ @ApiModelProperty(value = "展示状态：0下架中 1上架中")
+ private Integer showStatus;
}
--
Gitblit v1.7.1