From 0fc04b51e2f92abbac605c9bfd062f3d66985c5d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 21 一月 2022 16:31:17 +0800
Subject: [PATCH] 测试服bug修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java | 66 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
index 91bf48c..6f2ff35 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
@@ -1,9 +1,14 @@
package com.panzhihua.common.model.vos.community;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -23,6 +28,7 @@
private Long id;
@ApiModelProperty("活动名称")
+ @NotBlank(groups = AddGroup.class, message = "活动名称不可为空")
private String activityName;
@ApiModelProperty("负责人userID")
@@ -32,12 +38,15 @@
private String sponsorName;
@ApiModelProperty("活动地址")
+ @NotBlank(groups = AddGroup.class, message = "活动地址不可为空")
private String activityAddr;
@ApiModelProperty("纬度")
+ @NotBlank(groups = AddGroup.class, message = "纬度不可为空")
private String lat;
@ApiModelProperty("经度")
+ @NotBlank(groups = AddGroup.class, message = "经度不可为空")
private String lng;
@ApiModelProperty("活动状态 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消")
@@ -46,20 +55,25 @@
@ApiModelProperty("发布时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date publishAt;
+
@ApiModelProperty("活动结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @NotNull(groups = AddGroup.class, message = "活动结束时间不可为空")
private Date endAt;
@ApiModelProperty("活动开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @NotNull(groups = AddGroup.class, message = "活动开始时间不可为空")
private Date beginAt;
@ApiModelProperty("报名开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @NotNull(groups = AddGroup.class, message = "报名开始时间不可为空")
private Date signUpBegin;
@ApiModelProperty("报名结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @NotNull(groups = AddGroup.class, message = "报名结束时间不可为空")
private Date signUpEnd;
@ApiModelProperty("参加人群（多个以逗号隔开）")
@@ -84,6 +98,7 @@
private Integer participantNow;
@ApiModelProperty("活动封面")
+ @NotBlank(groups = AddGroup.class, message = "活动封面不可为空")
private String cover;
@ApiModelProperty("是否有奖品 1 有 0 无")
@@ -92,9 +107,8 @@
@ApiModelProperty("是否二维码签到 1 是 0否")
private Integer isQrCode;
- @ApiModelProperty("用户最近签到时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date activitySignInDate;
+ @ApiModelProperty("用户签到记录列表")
+ private List<ComActActRegistVO> activitySignInList;
@ApiModelProperty("联系人姓名")
private String contactName;
@@ -115,6 +129,7 @@
private String rewardDesc;
@ApiModelProperty("活动内容")
+ @NotBlank(groups = AddGroup.class, message = "活动内容不可为空")
private String content;
@ApiModelProperty("活动奖品集合")
@@ -124,10 +139,10 @@
private List<ComActActEvaluateVO> comActActEvaluateVOList;
@ApiModelProperty("活动评价总数")
- private Integer evaluateAmount;
+ private Long evaluateAmount;
@ApiModelProperty("活动评分星级平均数")
- private Double evaluateLevel;
+ private BigDecimal evaluateLevel;
@ApiModelProperty("当前用户对活动的评分")
private Integer myRating;
@@ -157,7 +172,7 @@
private Integer isVolunteer = 0;
@ApiModelProperty(value = "当前登录者id", hidden = true)
- private Integer userId;
+ private Long userId;
@ApiModelProperty("活动参加普通人员集合")
private List<ActivitySignVO> activitySignVOList;
@@ -191,4 +206,43 @@
@ApiModelProperty(value = "查询筛选：0-本小区 1-全部")
private Integer choice;
+ @ApiModelProperty("签到范围，默认0无限制")
+ @NotNull(groups = AddGroup.class, message = "签到范围不可为空")
+ private Integer range;
+
+ @ApiModelProperty("是否有积分奖励（1.是 2.否）")
+ @NotNull(groups = AddGroup.class, message = "是否有积分奖励不可为空")
+ private Integer haveIntegralReward;
+
+ @ApiModelProperty("积分奖励方式（1.按次奖励 2.记时奖励）")
+ private Integer rewardWay;
+
+ @ApiModelProperty("参与签到/打卡奖励积分")
+ private Integer rewardIntegral;
+
+ @ApiModelProperty("参与次数上限，按次奖励需传入，无次数限制-1")
+ private Integer limit;
+
+ @ApiModelProperty("是否允许取消（1.允许 2.不允许）")
+ @NotNull(groups = AddGroup.class, message = "是否允许取消不可为空")
+ private Integer canCancel;
+
+ @ApiModelProperty("取消活动扣除积分数目")
+ @NotNull(groups = AddGroup.class, message = "取消活动扣除积分数目不可为空")
+ private Integer cancelDeduct;
+
+ @ApiModelProperty("用户已参与次数")
+ private Integer times;
+
+ @ApiModelProperty("已获取积分")
+ private Integer award;
+
+ @ApiModelProperty("二维码类型 1居民，志愿者 2党员")
+ private Integer codeType;
+
+ @ApiModelProperty("活动类型")
+ @NotBlank(groups = AddGroup.class, message = "活动类型不能为空")
+ private String activityType;
+
+ private String areaCode;
}
--
Gitblit v1.7.1