From bfbfe7d5fd6c90d5f7359762223ce4bd1cc7cfa1 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 15 八月 2022 09:56:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into diandongche
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityActivityVo.java | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 166 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityActivityVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityActivityVo.java
new file mode 100644
index 0000000..f954386
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityActivityVo.java
@@ -0,0 +1,166 @@
+package com.panzhihua.common.model.vos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 电动车商城-商家活动表返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-商家活动表返回参数
+ *
+ * @author lyq
+ * @date 2022-03-29 13:17:41
+ */
+@Data
+@ApiModel("电动车商城-商家活动表返回参数")
+public class ComBatteryCommodityActivityVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 活动名称
+ */
+ @ApiModelProperty(value = "活动名称")
+ private String name;
+ /**
+ * 活动类型（1.拼团活动 2.砍价活动 3.限时秒杀）
+ */
+ @ApiModelProperty(value = "活动类型（1.拼团活动 2.砍价活动 3.限时秒杀）")
+ private Integer type;
+ /**
+ * 商品id
+ */
+ @ApiModelProperty(value = "商品id")
+ private Long commodityId;
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+ /**
+ * 状态（1.进行中 2.已下架 3.已结束）
+ */
+ @ApiModelProperty(value = "状态（1.进行中 2.已下架 3.已结束）")
+ private Integer status;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 活动价格
+ */
+ @ApiModelProperty(value = "活动价格")
+ private BigDecimal price;
+ /**
+ * 活动截止时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "活动截止时间")
+ private Date endTime;
+ /**
+ * 拼团总团数
+ */
+ @ApiModelProperty(value = "拼团总团数")
+ private Integer collageNum;
+ /**
+ * 拼团人数
+ */
+ @ApiModelProperty(value = "拼团人数")
+ private Integer collagePeopleNum;
+ /**
+ * 活动图片
+ */
+ @ApiModelProperty(value = "活动图片")
+ private String images;
+ /**
+ * 活动商品总数
+ */
+ @ApiModelProperty(value = "活动商品总数")
+ private Integer commodityNum;
+ /**
+ * 活动规则
+ */
+ @ApiModelProperty(value = "活动规则")
+ private String rule;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+ /**
+ * 更新人id
+ */
+ @ApiModelProperty(value = "更新人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "活动商品信息")
+ private ComBatteryCommodityVo commodityVo;
+
+ @ApiModelProperty(value = "商品名称")
+ private String commodityName;
+
+ @ApiModelProperty(value = "商品编号")
+ private String commodityCode;
+
+ @ApiModelProperty(value = "商户名称")
+ private String storeName;
+
+ @ApiModelProperty(value = "商户规格id")
+ private Long specsId;
+
+ @ApiModelProperty(value = "商户规格名称")
+ private String specsName;
+
+ @ApiModelProperty(value = "活动已卖出数量")
+ private Integer commoditySaleNum;
+
+ @ApiModelProperty(value = "是否可以开团（1.是 2.否）")
+ private Integer isOpen = 1;
+
+ @ApiModelProperty(value = "团队id")
+ private Long teamId;
+
+ @ApiModelProperty(value = "拼团结束时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date teamEndTime;
+
+ @ApiModelProperty(value = "是否可以砍价（1.是 2.否）")
+ private Integer isBargain = 1;
+
+ @ApiModelProperty(value = "砍价记录id")
+ private Long bargainId;
+
+ @ApiModelProperty(value = "砍价结束时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date bargainEndTime;
+}
--
Gitblit v1.7.1