diff --git a/src/main/java/com/cdzy/activity/controller/UserController.java b/src/main/java/com/cdzy/activity/controller/UserController.java index 95fcd20..48ed0a3 100644 --- a/src/main/java/com/cdzy/activity/controller/UserController.java +++ b/src/main/java/com/cdzy/activity/controller/UserController.java @@ -1,11 +1,15 @@ package com.cdzy.activity.controller; import com.alibaba.fastjson2.JSONObject; +import com.cdzy.activity.model.Activity; import com.cdzy.activity.model.JsonResult; +import com.cdzy.activity.model.PageParam; import com.cdzy.activity.model.User; import com.cdzy.activity.model.vo.UserVo; +import com.cdzy.activity.service.ActivityService; import com.cdzy.activity.service.UserService; import com.cdzy.activity.uitls.VerifyUtil; +import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.util.StringUtil; import jakarta.annotation.Resource; @@ -32,6 +36,9 @@ public class UserController { @Resource private UserService userService; + @Resource + private ActivityService activityService; + /** * 用户微信无感登录。 * @@ -60,7 +67,7 @@ public class UserController { } /** - * 用户详情。 + * 用户详情填写。 * * @param user 用户信息 * @return 登陆结果 @@ -93,11 +100,11 @@ public class UserController { * @return 登陆结果 */ @GetMapping("activity/page") - public JsonResult activityPage(String activityName,Integer activityType) { + public JsonResult activityPage(PageParam pageParam, String activityName, Integer activityType) { QueryWrapper queryWrapper = QueryWrapper.create() .where(ACTIVITY.ACTIVITY_NAME.like(activityName, StringUtil.hasText(activityName))) .where(ACTIVITY.ACTIVITY_TYPE.eq(activityType, Objects.nonNull(activityType))); - User user = userService.getOne(queryWrapper); - return JsonResult.success(user); + Page activityPage = activityService.page(pageParam.getPage(), queryWrapper); + return JsonResult.success(activityPage); } } 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 0e2cf8b..4c06e9a 100644 --- a/src/main/java/com/cdzy/activity/service/impl/UserServiceImpl.java +++ b/src/main/java/com/cdzy/activity/service/impl/UserServiceImpl.java @@ -1,23 +1,44 @@ package com.cdzy.activity.service.impl; import com.cdzy.activity.model.vo.UserVo; +import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; import com.cdzy.activity.model.User; import com.cdzy.activity.mapper.UserMapper; import com.cdzy.activity.service.UserService; +import jakarta.annotation.Resource; import org.springframework.stereotype.Service; /** - * 服务层实现。 + * 服务层实现。 * * @author attiya * @since 2025-09-19 */ @Service -public class UserServiceImpl extends ServiceImpl implements UserService{ +public class UserServiceImpl extends ServiceImpl implements UserService { + + @Resource + private UserMapper userMapper; @Override public void saveUser(UserVo user) { - + QueryWrapper queryWrapper = QueryWrapper + .create() + .eq(User::getWxOpenId, user.getWxOpenId()); + User entity = userMapper.selectOneByQuery(queryWrapper); + if (entity == null) { + throw new RuntimeException("用户登陆信息错误"); + } + entity.setName(user.getName()); + entity.setPhone(user.getPhone()); + entity.setGender(user.getGender()); + entity.setAddress(user.getAddress()); + entity.setAge(user.getAge()); + entity.setChronicDiseasesHistory(user.getChronicDiseasesHistory()); + entity.setChronicDisease(user.getChronicDisease()); + entity.setHeath(user.getHeath()); + entity.setIsFilled(2); + userMapper.insert(entity); } }