| @@ -202,18 +202,14 @@ public class WxActivityServiceImpl implements WxActivityService { | |||||
| activityJoin.setActivityId(id); | activityJoin.setActivityId(id); | ||||
| activityJoin.setTenantId(wxActivity.getTenantId()); | 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())) { | if (wxActivity.getStatus().equals(EnumActivityStatus.STATUS_THROW_IN.getCode())) { | ||||
| return EnumActivityEnrollStatus.NOT_START.getCode(); | return EnumActivityEnrollStatus.NOT_START.getCode(); | ||||
| } | } | ||||
| //下线 就是 结束 | |||||
| if (wxActivity.getStatus().equals(EnumActivityStatus.STATUS_TAKE_OFFF.getCode())) { | |||||
| return EnumActivityEnrollStatus.END.getCode(); | |||||
| } | |||||
| Date date = new Date(); | Date date = new Date(); | ||||
| if (wxActivity.getStatus().equals(EnumActivityStatus.INJECT_CAMPAIGN.getCode())) { | if (wxActivity.getStatus().equals(EnumActivityStatus.INJECT_CAMPAIGN.getCode())) { | ||||
| //报名未开始 | //报名未开始 | ||||
| @@ -225,6 +221,10 @@ public class WxActivityServiceImpl implements WxActivityService { | |||||
| return EnumActivityEnrollStatus.END.getCode(); | return EnumActivityEnrollStatus.END.getCode(); | ||||
| } | } | ||||
| } | } | ||||
| int count = wxActivityJoinMapper.selectCount(activityJoin); | |||||
| if (count > 0) { | |||||
| return EnumActivityEnrollStatus.JOINED.getCode(); | |||||
| } | |||||
| return EnumActivityEnrollStatus.NORMAL.getCode(); | return EnumActivityEnrollStatus.NORMAL.getCode(); | ||||
| } | } | ||||