From 703583a4183d2153742b64663193fd003ff7a9e5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 19 Mar 2021 17:43:02 +0800
Subject: [PATCH] 20210318 活动信息注册时，初始化
---
src/main/java/com/xcong/excoin/modules/activity/controller/ActivityController.java | 6 +++---
src/main/java/com/xcong/excoin/modules/activity/service/impl/ActivityServiceImpl.java | 8 +++++---
src/main/java/com/xcong/excoin/modules/activity/vo/ActivityMainDetailVo.java | 4 ++--
src/main/java/com/xcong/excoin/modules/activity/vo/ActivityReceiveRecordVo.java | 2 +-
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/activity/controller/ActivityController.java b/src/main/java/com/xcong/excoin/modules/activity/controller/ActivityController.java
index 71f4138..0c94613 100644
--- a/src/main/java/com/xcong/excoin/modules/activity/controller/ActivityController.java
+++ b/src/main/java/com/xcong/excoin/modules/activity/controller/ActivityController.java
@@ -44,8 +44,8 @@
@ApiOperation(value="活动详情", notes="活动详情")
@ApiResponses({@ApiResponse( code = 200, message = "success", response = ActivityMainDetailVo.class)})
@GetMapping(value = "/getActivityMainDetail")
- public Result getActivityMainDetail(@ApiParam(name = "活动ID", value = "ID", example = "1")
- @RequestParam(value = "Id") long Id) {
+ public Result getActivityMainDetail(@ApiParam(name = "id", value = "id", required = true,example = "1")
+ @RequestParam(value = "id") long Id) {
return activityService.getActivityMainDetail(Id);
}
@@ -54,7 +54,7 @@
*/
@ApiOperation(value="点击领取", notes="点击领取")
@GetMapping(value = "/clinkReceive")
- public Result clinkReceive(@ApiParam(name = "活动规则ID", value = "subId", example = "1")
+ public Result clinkReceive(@ApiParam(name = "subId", value = "活动规则ID", example = "1")
@RequestParam(value = "subId") long subId) {
return activityService.clinkReceive(subId);
}
diff --git a/src/main/java/com/xcong/excoin/modules/activity/service/impl/ActivityServiceImpl.java b/src/main/java/com/xcong/excoin/modules/activity/service/impl/ActivityServiceImpl.java
index 95daa04..e6ee64f 100644
--- a/src/main/java/com/xcong/excoin/modules/activity/service/impl/ActivityServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/activity/service/impl/ActivityServiceImpl.java
@@ -143,10 +143,12 @@
queryWrapperActivityReceiveRecord.eq("member_id",memberId);
queryWrapperActivityReceiveRecord.eq("sub_id",subId);
ActivityReceiveRecord activityReceiveRecord = activityReceiveRecordDao.selectOne(queryWrapperActivityReceiveRecord);
- Date receiveTime = activityReceiveRecord.getReceiveTime();
+ Date invalidTime = activityReceiveRecord.getInvalidTime();
Date date = new Date();
- if(receiveTime.getTime() - date.getTime() < 0) {
- return Result.fail(MessageSourceUtils.getString("activity_service_0002"));
+ if(ObjectUtil.isNotEmpty(invalidTime.getTime())) {
+ if(invalidTime.getTime() - date.getTime() < 0) {
+ return Result.fail(MessageSourceUtils.getString("activity_service_0002"));
+ }
}
//验证当前活动是否结束
ActivityMain activityMain = activityMainDao.selectById(activityReceiveRecord.getMainId());
diff --git a/src/main/java/com/xcong/excoin/modules/activity/vo/ActivityMainDetailVo.java b/src/main/java/com/xcong/excoin/modules/activity/vo/ActivityMainDetailVo.java
index d495ab8..da384ac 100644
--- a/src/main/java/com/xcong/excoin/modules/activity/vo/ActivityMainDetailVo.java
+++ b/src/main/java/com/xcong/excoin/modules/activity/vo/ActivityMainDetailVo.java
@@ -32,10 +32,10 @@
private String content;
@ApiModelProperty("活动状态1:开始2结束")
private Integer state;
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd hh:mm", timezone = "GMT+8")
@ApiModelProperty("开始时间")
private Date startTime;
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd hh:mm", timezone = "GMT+8")
@ApiModelProperty("结束时间")
private Date endTime;
/**
diff --git a/src/main/java/com/xcong/excoin/modules/activity/vo/ActivityReceiveRecordVo.java b/src/main/java/com/xcong/excoin/modules/activity/vo/ActivityReceiveRecordVo.java
index 6688af3..fc8f1f7 100644
--- a/src/main/java/com/xcong/excoin/modules/activity/vo/ActivityReceiveRecordVo.java
+++ b/src/main/java/com/xcong/excoin/modules/activity/vo/ActivityReceiveRecordVo.java
@@ -25,7 +25,7 @@
private String subConditions;
@ApiModelProperty("激活状态1已激活2未激活3已领取")
private Integer receiveState;
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd hh:mm", timezone = "GMT+8")
@ApiModelProperty("失效时间")
private Date invalidTime;
--
Gitblit v1.9.1