From 674e46e705425f45be7c509db21680cd09cdba97 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 15 Aug 2019 14:31:07 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=AD=BE=E5=88=B0=E6=8F=90=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/common/ErrorCode.java | 2 +- .../iformall/service/impl/WxActivityJoinServiceImpl.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 05cdd3fe7..f7f3c87d6 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -480,7 +480,7 @@ public enum ErrorCode{ ACTIVITY_JOIN_TIME_END(30003, "活动报名时间已结束"), ACTIVITY_SEND_ERROR(30004, "活动投放到宣传页失败,宣传页显示已达七条上限!"), ACTIVITY_TIME_ERROR(30005, "活动报名结束时间不能大于活动结束时间"), - + ACTIVITY_WAIT_CONFIRMED(30006, "您报名的活动还在审核中"), /** * 文件上传 */ 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 81f94f39a..f771563b9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -200,11 +200,15 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { @Override public ResultData sign(WxActivityJoin wxActivityJoin) { //是否报名记录 - wxActivityJoin.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode()); WxActivityJoin activityJoin = wxActivityJoinMapper.selectOne(wxActivityJoin); if (activityJoin == null) { return new ResultData(ErrorCode.ACTIVITY_JOIN_NOT_FOUND); } + wxActivityJoin.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode()); + activityJoin = wxActivityJoinMapper.selectOne(wxActivityJoin); + if (activityJoin == null) { + return new ResultData(ErrorCode.ACTIVITY_WAIT_CONFIRMED); + } activityJoin.setSignIn(EnumActivityJoinSignStatus.YES.getCode()); wxActivityJoinMapper.updateByPrimaryKeySelective(activityJoin); //查询活动名称