diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 19ad4739e..e7cc69584 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -489,6 +489,8 @@ public enum ErrorCode{ ACTIVITY_SEND_ERROR(30004, "活动投放到宣传页失败,宣传页显示已达七条上限!"), ACTIVITY_TIME_ERROR(30005, "活动报名结束时间不能大于活动结束时间"), ACTIVITY_WAIT_CONFIRMED(30006, "您报名的活动还在审核中"), + ACTIVITY_EXPIRED(30007, "您报名的活动已过期"), + /** * 文件上传 */ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index f771563b9..177711dc7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -204,16 +204,17 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { if (activityJoin == null) { return new ResultData(ErrorCode.ACTIVITY_JOIN_NOT_FOUND); } - wxActivityJoin.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode()); - activityJoin = wxActivityJoinMapper.selectOne(wxActivityJoin); - if (activityJoin == null) { + if (activityJoin.getStatus().equals(EnumActivityJoinStatus.NOT_CONFIRMED.getCode())) { return new ResultData(ErrorCode.ACTIVITY_WAIT_CONFIRMED); } - activityJoin.setSignIn(EnumActivityJoinSignStatus.YES.getCode()); - wxActivityJoinMapper.updateByPrimaryKeySelective(activityJoin); - //查询活动名称 - WxActivity activity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); - return new ResultData(Result.SUCCESS, "签到成功", activity.getTitle()); + if (activityJoin.getStatus().equals(EnumActivityJoinStatus.CONFIRMED.getCode())) { + activityJoin.setSignIn(EnumActivityJoinSignStatus.YES.getCode()); + wxActivityJoinMapper.updateByPrimaryKeySelective(activityJoin); + //查询活动名称 + WxActivity activity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); + return new ResultData(Result.SUCCESS, "签到成功", activity.getTitle()); + } + return new ResultData(ErrorCode.ACTIVITY_EXPIRED); } private void sendMessage(WxActivityJoin join, WxActivity activity) {