From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期一, 09 六月 2025 11:54:00 +0800 Subject: [PATCH] 6.9新增登录失败冻结逻辑 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java | 181 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 171 insertions(+), 10 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java index e15c551..2a8845b 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java @@ -1,14 +1,17 @@ package com.panzhihua.service_community.model.dos; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.Date; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -24,7 +27,7 @@ /** * 自增id */ - @TableId(type = IdType.AUTO) + @TableId(type = IdType.ASSIGN_ID) private Long id; /** @@ -43,6 +46,16 @@ private String activityAddr; /** + * 纬度 + */ + private String lat; + + /** + * 经度 + */ + private String lng; + + /** * 活动状态 */ private Integer status; @@ -53,7 +66,7 @@ private Date publishAt; /** - * 互动结束时间 + * 活动结束时间 */ private Date endAt; @@ -73,6 +86,12 @@ private Date signUpEnd; /** + * 参加人群 + */ + private String aattendPeople; + + + /** * 志愿者人数下线 */ private Integer volunteerMin; @@ -80,6 +99,7 @@ /** * 志愿者人数上限 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private Integer volunteerMax; /** @@ -90,6 +110,7 @@ /** * 参与者人数上限 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private Integer participantMax; /** @@ -98,9 +119,34 @@ private String cover; /** - * 是否有奖品 1 有 0 无 + * 是否有奖品 1 有 0 无 */ private Integer hasPrize; + + /** + * 是否二维码签到 1 是 0否 + */ + private Integer isQrCode; + + /** + * 联系人姓名 + */ + private String contactName; + + /** + * 联系人电话 + */ + private String contactPhone; + + /** + * 是否签到 1 是 0否 + */ + private Integer isRegist; + + /** + * 是否顶部 1 是 0否 + */ + private Integer isTop; /** * 奖品备注 @@ -117,6 +163,7 @@ /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private Date createAt; /** * 取消原因 @@ -126,4 +173,118 @@ * 社区id */ private Long communityId; + /** + * 活动是否已默认好评 + */ + private Integer isDefaultPraise; + /** + * 签到范围,默认0无限制 + */ + @TableField("`range`") + private Integer range; + /** + * 是否有积分奖励(1.是 2.否) + */ + private Integer haveIntegralReward; + /** + * 居民积分奖励方式(1.按次奖励 2.记时奖励) + */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Integer participantRewardWay; + + /** + * 居民参与签到/打卡奖励积分 + */ + private Integer participantRewardIntegral; + + /** + * 志愿者积分奖励方式(1.按次奖励 2.记时奖励) + */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Integer volunteerRewardWay; + + /** + * 志愿者参与签到/打卡奖励积分 + */ + private Integer volunteerRewardIntegral; + + /** + * 党员积分奖励方式(1.按次奖励 2.记时奖励) + */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Integer pbRewardWay; + + /** + * 党员参与签到/打卡奖励积分 + */ + private Integer pbRewardIntegral; + + /** + * 参与次数上限 + */ + @TableField("`limit`") + private Integer limit; + /** + * 是否允许取消(1.允许 2.不允许) + */ + private Integer canCancel; + /** + * 取消扣除积分 + */ + private Integer cancelDeduct; + /** + * 活动类型 + */ + private String activityType; + + /** + * 是否项目 + */ + private Integer isProject; + + /** + * 项目id + */ + private Long projectId; + + /** + * 活动类型 1 社区活动 4项目活动 5服务活动 + */ + private Integer type; + + /** + * 党员参与者人数下线 + */ + private Integer partyMemberMin; + + /** + * 党员参与者人数上限 + */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Integer partyMemberMax; + /** + * 签退范围,默认0无限制 + */ + private Integer signOutRange; + + /** + * 单次活动时长(小时) + */ + private Integer duration; + + private Integer isArticle; + + private String jumpArticleUrl; + + private Long relationId; + + private String phone; + + private Long checkUnitId; + + private Long topicId; + + private String jinhuiCoinAward; + + private String jinhuiCoinPunishment; } -- Gitblit v1.7.1