diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java index f53198f9b..a9bd6bb82 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java @@ -65,7 +65,11 @@ public class WxActivityJoinController extends BaseController { if (wxActivityJoin.getStatus() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "status不能为空"); } - return wxActivityJoinService.modifyStatus(wxActivityJoin); + try { + return wxActivityJoinService.modifyStatus(wxActivityJoin); + } catch (MallinkException e) { + return new ResultData(e.getErrorCode(), e.getMessage()); + } } @ApiOperation("导出报名表") 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 e86ec7529..a055c4f7d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -84,7 +84,7 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { return new ResultData(ErrorCode.ACTIVITY_JOIN_NOT_FOND); } if (wxActivityJoin.getStatus().equals(EnumActivityJoinStatus.CONFIRMED.getCode())) { - testIn(); + activityJoinRedisLock(wxActivityJoin.getActivityId()); }else{ if(wxActivityJoin1.getSignIn().equals(EnumActivityJoinSignStatus.YES.getCode())){ @@ -205,7 +205,7 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { if(wxActivity.getSignupExamine().equals(EnumDelFlag.YES.getCode())){ wxActivityJoin.setStatus(EnumActivityJoinStatus.NOT_CONFIRMED.getCode()); }else{ - testIn(); + activityJoinRedisLock(wxActivityJoin.getActivityId()); wxActivityJoin.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode()); } @@ -335,22 +335,4 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { } - private void testIn(){ - final IdWorker idWorker = IdWorker.get(); - WxActivityJoin join = new WxActivityJoin(); - join.setId(idWorker.nextId()); - join.setTenantId("789"); - join.setUserId(1111111111l); - join.setActivityId(1111111111l); - join.setName("工具人"); - join.setNickName("工具人"); - join.setBirthday(new Date()); - join.setPhone("1111111111"); - join.setSex(1); - join.setCreateTime(new Date()); - join.setUpdateTime(new Date()); - wxActivityJoinMapper.insert(join); - } - - }