| @@ -380,6 +380,10 @@ public class WxActivityServiceImpl implements WxActivityService { | |||||
| } | } | ||||
| Date date = new Date(); | Date date = new Date(); | ||||
| if(wxActivity.getActivityEndTime().before(date)){ | |||||
| return EnumActivityEnrollStatus.ACTIVITY_END.getCode(); | |||||
| } | |||||
| if (wxActivity.getStatus().equals(EnumActivityStatus.INJECT_CAMPAIGN.getCode()) | if (wxActivity.getStatus().equals(EnumActivityStatus.INJECT_CAMPAIGN.getCode()) | ||||
| || wxActivity.getStatus().equals(EnumActivityStatus.INJECT_ONLINE.getCode())) { | || wxActivity.getStatus().equals(EnumActivityStatus.INJECT_ONLINE.getCode())) { | ||||
| //报名未开始 | //报名未开始 | ||||
| @@ -391,9 +395,7 @@ public class WxActivityServiceImpl implements WxActivityService { | |||||
| return EnumActivityEnrollStatus.END.getCode(); | return EnumActivityEnrollStatus.END.getCode(); | ||||
| } | } | ||||
| } | } | ||||
| if(wxActivity.getActivityEndTime().before(date)){ | |||||
| return EnumActivityEnrollStatus.ACTIVITY_END.getCode(); | |||||
| } | |||||
| }else{ | }else{ | ||||
| return EnumActivityEnrollStatus.NOT_JOIN.getCode(); | return EnumActivityEnrollStatus.NOT_JOIN.getCode(); | ||||
| } | } | ||||