From 0c79556c355add103b051e2ec70786ce1d26813f Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 14 Jun 2019 18:54:54 +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=9F=A5=E8=AF=A2=E7=8A=B6=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxActivityServiceImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 b6cf7cc53..a7435db79 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -181,20 +181,23 @@ public class WxActivityServiceImpl implements WxActivityService { activityJoin.setUserId(userId); activityJoin.setActivityId(id); activityJoin.setTenantId(wxActivity.getTenantId()); + //查询是否已参加报名 int count = wxActivityJoinMapper.selectCount(activityJoin); if (count > 0) { return EnumActivityEnrollStatus.JOINED.getCode(); } - if (wxActivity.getStartTime().equals(EnumActivityStatus.STATUS_THROW_IN.getCode())) { + //未投放 就是 未开始 + if (wxActivity.getStatus().equals(EnumActivityStatus.STATUS_THROW_IN.getCode())) { return EnumActivityEnrollStatus.NOT_START.getCode(); } - if (wxActivity.getStartTime().equals(EnumActivityStatus.STATUS_TAKE_OFFF.getCode())) { + //下线 就是 结束 + if (wxActivity.getStatus().equals(EnumActivityStatus.STATUS_TAKE_OFFF.getCode())) { return EnumActivityEnrollStatus.END.getCode(); } Date date = new Date(); - if (wxActivity.getStartTime().equals(EnumActivityStatus.INJECT_CAMPAIGN.getCode())) { + if (wxActivity.getStatus().equals(EnumActivityStatus.INJECT_CAMPAIGN.getCode())) { //报名未开始 - if (wxActivity.getStartTime().before(date)) { + if (wxActivity.getStartTime().after(date)) { return EnumActivityEnrollStatus.NOT_START.getCode(); } if (wxActivity.getEndTime().before(date)) {