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/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleVO.java |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleVO.java
index 7e782ae..a744423 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleVO.java
@@ -1,6 +1,8 @@
 package com.panzhihua.common.model.vos.community.raffle;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -26,7 +28,7 @@
 public class ComActRaffleVO implements Serializable {
 
     private static final long serialVersionUID = -19557136291047637L;
-
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
@@ -39,35 +41,35 @@
      * 开始时间
      */
     @ApiModelProperty(value = "开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date startTime;
 
     /**
      * 结束时间
      */
     @ApiModelProperty(value = "结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date stopTime;
 
     /**
      * 开奖时间
      */
     @ApiModelProperty(value = "开奖时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date lotteryTime;
 
     /**
      * 兑奖开始时间
      */
     @ApiModelProperty(value = "兑奖开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date raffleStartTime;
 
     /**
      * 兑奖结束时间
      */
     @ApiModelProperty(value = "兑奖结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date raffleStopTime;
 
     /**
@@ -131,6 +133,9 @@
     @ApiModelProperty(value = "社区id")
     private Long communityId;
 
+    @ApiModelProperty(value = "奖品数量")
+    private Integer prizeCount;
+
     @ApiModelProperty(value = "参与人数")
     private Integer joinCount;
 
@@ -141,11 +146,17 @@
     private Integer waitRaffleCount;
 
     @ApiModelProperty(value = "创建人名称")
-    private Integer createName;
+    private String createName;
 
     @ApiModelProperty(value = "奖品集合")
     private List<ComActRafflePrizeVO> comActRafflePrizeVOList;
 
     @ApiModelProperty(value = "中奖情况")
     private ComActRaffleRecordVO comActRaffleRecordVO;
+
+    @ApiModelProperty(value = "参与状态 0 不可参与 1 可参与")
+    private Integer joinStatus;
+
+    @ApiModelProperty("是否参与  0参与 1没参与")
+    private Integer isJoin;
 }

--
Gitblit v1.7.1