From e423d56d730db1baed24f3f7dbbc4141038776b6 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 18 Jun 2021 22:12:03 +0800
Subject: [PATCH] 修复每日业绩bug和优化赠送业绩计算方式
---
zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java b/zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java
index dfc5c00..7b7d959 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java
@@ -1,9 +1,10 @@
package com.matrix.system.activity.vo;
-import java.util.Date;
-
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.Date;
@Data
public class SignReceiveListVo {
@@ -11,20 +12,33 @@
* 主键
*/
private Long id;
-
+ //活动类型
+ private int actType;
+
@ApiModelProperty(value = "用户")
private String nickName;
@ApiModelProperty(value = "签到时间")
+ @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8")
private Date reciveTime;
@ApiModelProperty(value = "连续签到天数")
private Integer cumulativeDay;
+
+ @ApiModelProperty(value = "数量")
+ private Integer scoreCnt;
@ApiModelProperty(value = "奖励类型")
private String awardType;
@ApiModelProperty(value = "获得奖励")
private String awardName;
+ @ApiModelProperty(value = "优惠券名")
+ private String couponName;
+
+ @ApiModelProperty(value ="奖项规则（1：每日奖励（默认）2：累计签到天数）")
+ private int awardRule;
+ @ApiModelProperty(value ="是否已领取（1：待领取2:已领取）")
+ private int state;
}
--
Gitblit v1.9.1