diff --git a/src/main/java/com/cdzy/activity/controller/UserController.java b/src/main/java/com/cdzy/activity/controller/UserController.java index 4b58427..f877630 100644 --- a/src/main/java/com/cdzy/activity/controller/UserController.java +++ b/src/main/java/com/cdzy/activity/controller/UserController.java @@ -115,12 +115,11 @@ public class UserController { * 用户查询活动详细信息。 * * @param activityId 活动ID - * @param wxOpenId OpenID * @return 登陆结果 */ @GetMapping("activity/info") - public JsonResult activityInfo(@NotNull(message = "活动ID不能为空") Long activityId,@NotNull(message = "OpenID不能为空") String wxOpenId) { - ActivityInfo activityInfo = userService.activityInfo(activityId,wxOpenId); + public JsonResult activityInfo(@NotNull(message = "活动ID不能为空") Long activityId) { + ActivityInfo activityInfo = userService.activityInfo(activityId); return JsonResult.success(activityInfo); } diff --git a/src/main/java/com/cdzy/activity/service/UserService.java b/src/main/java/com/cdzy/activity/service/UserService.java index 5b1fffe..5f25880 100644 --- a/src/main/java/com/cdzy/activity/service/UserService.java +++ b/src/main/java/com/cdzy/activity/service/UserService.java @@ -18,5 +18,5 @@ public interface UserService extends IService { void registration(RegistrationVo registrationVo); - ActivityInfo activityInfo(Long activityId, String wxOpenId); + ActivityInfo activityInfo(Long activityId); } diff --git a/src/main/java/com/cdzy/activity/service/impl/UserServiceImpl.java b/src/main/java/com/cdzy/activity/service/impl/UserServiceImpl.java index 2ee274d..9679da8 100644 --- a/src/main/java/com/cdzy/activity/service/impl/UserServiceImpl.java +++ b/src/main/java/com/cdzy/activity/service/impl/UserServiceImpl.java @@ -112,7 +112,7 @@ public class UserServiceImpl extends ServiceImpl implements Us } @Override - public ActivityInfo activityInfo(Long activityId, String wxOpenId) { + public ActivityInfo activityInfo(Long activityId) { QueryWrapper queryWrapper = QueryWrapper.create() .where(ACTIVITY.ACTIVITY_ID.eq(activityId)); ActivityInfo activityInfo = activityMapper.selectObjectByQueryAs(queryWrapper, ActivityInfo.class); @@ -128,17 +128,6 @@ public class UserServiceImpl extends ServiceImpl implements Us if (activityInfo.getRegistrationEndTime().isBefore(LocalDateTime.now())) { activityInfo.setPossibleRegister(Boolean.FALSE); } - - if (activityInfo.getLimitRegister() == 1) { - queryWrapper.clear(); - queryWrapper.where(ACTIVITY_USER.ACTIVITY_ID.eq(activityId)) - .where(USER.WX_OPEN_ID.eq(wxOpenId)) - .leftJoin(USER).on(USER.USER_ID.eq(ACTIVITY_USER.USER_ID)); - ActivityUser selected = activityUserMapper.selectOneByQuery(queryWrapper); - if (selected == null) { - activityInfo.setPossibleRegister(Boolean.FALSE); - } - } return activityInfo; } }