From c253b555c7905c5136d47cd615ef545fa50cc6ad Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 20 Feb 2022 21:24:16 +0800
Subject: [PATCH] Merge branch 'api_score_meger'

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 46 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java
new file mode 100644
index 0000000..fd0e48d
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java
@@ -0,0 +1,46 @@
+package com.matrix.system.shopXcx.api.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+
+@ApiModel(value = "SignBasicInfoVo", description = "签到活动")
+public class SignBasicInfoVo {
+	
+	/**
+	 * 主键
+	 */
+	private Long  id;
+	@ApiModelProperty(value ="活动今日是否已参与 1:未参与 2:已参与")
+    private int joinState;
+
+	public static final int JOINSTATE_NOTSIGN = 1;
+	public static final int JOINSTATE_SIGN = 2;
+
+	@ApiModelProperty(value ="当前累计签到天数")
+	private int actAumulativeDay;
+
+	@ApiModelProperty(value ="活动名称")
+    private String actName;
+	@ApiModelProperty(value ="活动编码")
+	private String actCode;
+	@ApiModelProperty(value ="活动开始时间")
+	@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8")
+	private Date beginTime;
+	@ApiModelProperty(value ="活动结束时间")
+	@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8")
+	private Date endTime;
+	@ApiModelProperty(value ="活动基本参数")
+	private SignBasicInfoJsonVo signBasicInfoJsonVo;
+	@ApiModelProperty(value ="奖品信息")
+	private List<ActivitySignAwardSetVo> activitySignAwardSetVos;
+	@ApiModelProperty(value ="签到天数")
+	private List<ActivitySignRecordVo> activitySignRecords;
+
+}

--
Gitblit v1.9.1