|
|
|
@@ -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)) { |
|
|
|
|