From 336c49eed55e1c67ee463239f3f6dd35bf08c773 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 17 Jun 2019 16:08:41 +0800 Subject: [PATCH] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8A=A5=E5=90=8D=E7=8A=B6=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxActivityServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 e3113ac3c..109cfefe6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -202,18 +202,14 @@ public class WxActivityServiceImpl implements WxActivityService { activityJoin.setActivityId(id); activityJoin.setTenantId(wxActivity.getTenantId()); //查询是否已参加报名 - int count = wxActivityJoinMapper.selectCount(activityJoin); - if (count > 0) { - return EnumActivityEnrollStatus.JOINED.getCode(); + //下线 就是 结束 + if (wxActivity.getStatus().equals(EnumActivityStatus.STATUS_TAKE_OFFF.getCode())) { + return EnumActivityEnrollStatus.END.getCode(); } //未投放 就是 未开始 if (wxActivity.getStatus().equals(EnumActivityStatus.STATUS_THROW_IN.getCode())) { return EnumActivityEnrollStatus.NOT_START.getCode(); } - //下线 就是 结束 - if (wxActivity.getStatus().equals(EnumActivityStatus.STATUS_TAKE_OFFF.getCode())) { - return EnumActivityEnrollStatus.END.getCode(); - } Date date = new Date(); if (wxActivity.getStatus().equals(EnumActivityStatus.INJECT_CAMPAIGN.getCode())) { //报名未开始 @@ -225,6 +221,10 @@ public class WxActivityServiceImpl implements WxActivityService { return EnumActivityEnrollStatus.END.getCode(); } } + int count = wxActivityJoinMapper.selectCount(activityJoin); + if (count > 0) { + return EnumActivityEnrollStatus.JOINED.getCode(); + } return EnumActivityEnrollStatus.NORMAL.getCode(); }