diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumActivityEnrollStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumActivityEnrollStatus.java index cce6c94b3..73ae50328 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumActivityEnrollStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumActivityEnrollStatus.java @@ -9,7 +9,8 @@ public enum EnumActivityEnrollStatus { NOT_START(0, "报名未开始"), NORMAL(1, "正常报名"), END(2, "报名结束"), - JOINED(3, "已报名"),; + JOINED(3, "已报名"), + NOT_JOIN(4, "不需要报名"),; public static EnumActivityEnrollStatus getEnum(Integer code) { for (EnumActivityEnrollStatus value : values()) { 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 9171f2647..6c24b0ff2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -272,27 +272,34 @@ public class WxActivityServiceImpl implements WxActivityService { activityJoin.setUserId(userId); activityJoin.setActivityId(id); activityJoin.updateTenantInfo(wxActivity); - //查询是否已参加报名 - //下线 就是 结束 - 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(); - } - Date date = new Date(); - if (wxActivity.getStatus().equals(EnumActivityStatus.INJECT_CAMPAIGN.getCode()) - || wxActivity.getStatus().equals(EnumActivityStatus.INJECT_ONLINE.getCode())) { - //报名未开始 - if (wxActivity.getStartTime().after(date)) { + + if(wxActivity.getActivityType().equals(EnumDelFlag.YES.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.getEndTime().before(date)) { - //报名结束 - return EnumActivityEnrollStatus.END.getCode(); + + Date date = new Date(); + if (wxActivity.getStatus().equals(EnumActivityStatus.INJECT_CAMPAIGN.getCode()) + || wxActivity.getStatus().equals(EnumActivityStatus.INJECT_ONLINE.getCode())) { + //报名未开始 + if (wxActivity.getStartTime().after(date)) { + return EnumActivityEnrollStatus.NOT_START.getCode(); + } + if (wxActivity.getEndTime().before(date)) { + //报名结束 + return EnumActivityEnrollStatus.END.getCode(); + } } + }else{ + return EnumActivityEnrollStatus.NOT_JOIN.getCode(); } + int count = wxActivityJoinMapper.selectCount(new QueryWrapper(activityJoin)); if (count > 0) { return EnumActivityEnrollStatus.JOINED.getCode();