From 05a882f8b7768752e2a66cd2e6e2f80cc9c0737c Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 17 Jun 2019 10:59:58 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=8A=A5=E5=90=8D=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=A4=A7=E4=BA=8E=E5=BD=93=E5=89=8D=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=8F=90=E7=A4=BA=E4=B8=8D=E8=83=BD=E6=8A=A5=E5=90=8D?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/common/ErrorCode.java | 3 ++- .../com/iformall/service/impl/WxActivityServiceImpl.java | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 7feaec25b..62417fb75 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -435,7 +435,8 @@ public enum ErrorCode{ */ ACTIVITY_PERSON_LIMITED(30000, "活动报名人数超过限制"), ACTIVITY_JOIN_NOT_FOUND(30001, "对不起,您未报名参加该活动"), - ACTIVITY_JOINED(30002, "您已报名该活动") + ACTIVITY_JOINED(30002, "您已报名该活动"), + ACTIVITY_JOIN_TIME_END(30003, "活动报名时间已结束") ; private int code; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java index a7435db79..65196db35 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -90,6 +90,9 @@ public class WxActivityServiceImpl implements WxActivityService { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } wxActivity.setStatus(EnumActivityStatus.STATUS_THROW_IN.getCode()); + if (wxActivity.getEndTime().before(new Date())) { + return new ResultData(ErrorCode.ACTIVITY_JOIN_NOT_FOUND); + } Date date = new Date(); wxActivity.setCreateTime(date); wxActivity.setUpdateTime(date); @@ -147,6 +150,9 @@ public class WxActivityServiceImpl implements WxActivityService { public ResultData sendToCampaign(Long id) { //修改投放状态 WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(id); + if (wxActivity.getEndTime().before(new Date())) { + return new ResultData(ErrorCode.ACTIVITY_JOIN_TIME_END); + } wxActivity.setStatus(EnumActivityStatus.INJECT_CAMPAIGN.getCode()); wxActivity.setUpdateTime(new Date()); wxActivityMapper.updateByPrimaryKeySelective(wxActivity);