diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppMemberController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppMemberController.java index a449adc8..283e275c 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppMemberController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppMemberController.java @@ -1,6 +1,7 @@ package com.ycwl.basic.controller.mobile; import com.ycwl.basic.annotation.IgnoreToken; +import com.ycwl.basic.constant.BaseContextHandler; import com.ycwl.basic.model.mobile.weChat.DTO.WeChatUserInfoDTO; import com.ycwl.basic.model.mobile.weChat.DTO.WeChatUserInfoUpdateDTO; import com.ycwl.basic.model.pc.member.resp.MemberRespVO; @@ -67,7 +68,8 @@ public class AppMemberController { // 修改用户信息 @PostMapping("/update") public ApiResponse update(@RequestBody WeChatUserInfoUpdateDTO userInfoUpdateDTO) { - return memberService.update(userInfoUpdateDTO); + Long userId = Long.parseLong(BaseContextHandler.getUserId()); + return memberService.update(userId, userInfoUpdateDTO); } // 新增或修改景区服务通知状态 diff --git a/src/main/java/com/ycwl/basic/service/mobile/AppMemberService.java b/src/main/java/com/ycwl/basic/service/mobile/AppMemberService.java index 5aa8bd25..5d0c7357 100644 --- a/src/main/java/com/ycwl/basic/service/mobile/AppMemberService.java +++ b/src/main/java/com/ycwl/basic/service/mobile/AppMemberService.java @@ -42,7 +42,7 @@ public interface AppMemberService { * @param userInfoUpdateDTO * @return */ - ApiResponse update(WeChatUserInfoUpdateDTO userInfoUpdateDTO); + ApiResponse update(Long memberId, WeChatUserInfoUpdateDTO userInfoUpdateDTO); /** * 同意用户协议 diff --git a/src/main/java/com/ycwl/basic/service/mobile/impl/AppMemberServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/AppMemberServiceImpl.java index 8c714f3c..f766495b 100644 --- a/src/main/java/com/ycwl/basic/service/mobile/impl/AppMemberServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/mobile/impl/AppMemberServiceImpl.java @@ -139,9 +139,8 @@ public class AppMemberServiceImpl implements AppMemberService { } @Override - public ApiResponse update(WeChatUserInfoUpdateDTO userInfoUpdateDTO) { + public ApiResponse update(Long userId, WeChatUserInfoUpdateDTO userInfoUpdateDTO) { if (StringUtils.isNotBlank(userInfoUpdateDTO.getNickname())) { - Long userId = Long.parseLong(BaseContextHandler.getUserId()); MemberRespVO member = memberMapper.getById(userId); if (member != null && member.getScenicId() != null) { MpConfigEntity scenicMpConfig = scenicRepository.getScenicMpConfig(member.getScenicId()); @@ -154,7 +153,7 @@ public class AppMemberServiceImpl implements AppMemberService { } } MemberEntity memberEntity = new MemberEntity(); - memberEntity.setId(Long.parseLong(BaseContextHandler.getUserId())); + memberEntity.setId(userId); memberEntity.setNickname(userInfoUpdateDTO.getNickname()); memberEntity.setAvatarUrl(userInfoUpdateDTO.getAvatarUrl()); memberEntity.setAgreement(userInfoUpdateDTO.getAgreement());