From 44999bf6b0165ecdbd276ddfc2bb29b4b6636395 Mon Sep 17 00:00:00 2001 From: yujintao Date: Fri, 21 Feb 2020 15:15:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BE=AE=E4=BF=A1=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E7=BD=AE=E4=B8=BA?= =?UTF-8?q?=E8=BF=87=E6=97=B6=E7=8A=B6=E6=80=81=EF=BC=9B=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E6=97=B6=EF=BC=8C=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=94=A8=E6=88=B7=E5=A4=B4=E5=83=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml | 4 ++-- .../elink/esua/epdc/controller/ApiAppUserController.java | 2 ++ .../java/com/elink/esua/epdc/feign/UserFeignClient.java | 8 +++++--- .../java/com/elink/esua/epdc/service/AppUserService.java | 2 ++ .../elink/esua/epdc/service/impl/AppUserServiceImpl.java | 1 + .../elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java | 5 +++++ 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml index 72bd0392a..f277da2f6 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml @@ -215,10 +215,10 @@ 948aa2f21dbaa3943288ea5b119ac6f2 111 111 - + - + wx5d3e97461d248397 bfed51b731e53db9affb9e6131e7ae12 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java index 8f70114a0..9bfe36ff5 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java @@ -203,12 +203,14 @@ public class ApiAppUserController { /** * 更新用户微信信息 + *

接口过时，统一在完善个人信息接口更新微信信息

* * @return com.elink.esua.epdc.commons.tools.utils.Result * @params [tokenDto, formDto] * @author liuchuang * @since 2019/10/28 9:58 */ + @Deprecated @PostMapping("user/ma/updateWxInfo") public Result updateWxInfo(@LoginUser TokenDto tokenDto, @RequestBody EpdcAppUserMaInfoFormDTO formDto) { ValidatorUtils.validateEntity(formDto); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index 963b22a2b..c1669d1fa 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -186,7 +186,7 @@ public interface UserFeignClient { * 获取网格长管理的网格列表 * * @param userId - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author work@yujt.net.cn * @date 2019/10/23 13:34 */ @@ -218,12 +218,14 @@ public interface UserFeignClient { /** * 更新用户微信信息 + *

在完善个人信息时进行更新微信信息，不再单独更新。

* * @return com.elink.esua.epdc.commons.tools.utils.Result * @params [userDTO] * @author liuchuang * @since 2019/10/25 17:07 */ + @Deprecated @PostMapping("app-user/epdc-app/user/updateWxInfo") Result updateWxInfo(UserDTO userDTO); @@ -288,7 +290,7 @@ public interface UserFeignClient { /** * @param formDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @Author yinzuomei * @Description 用户认证审核历史 * @Date 2019/11/22 13:17 @@ -309,7 +311,7 @@ public interface UserFeignClient { /** * 获取邀请记录 * - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author work@yujt.net.cn * @date 2019/10/23 13:34 */ diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java index 9684a4b13..e994e88a0 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java @@ -170,12 +170,14 @@ public interface AppUserService { /** * 更新用户微信信息 + *

方法过时，统一在完善个人信息接口更新微信信息

* * @return com.elink.esua.epdc.commons.tools.utils.Result * @params [userDetail, formDto] * @author liuchuang * @since 2019/10/25 16:26 */ + @Deprecated Result updateWxInfo(TokenDto userDetail, EpdcAppUserMaInfoFormDTO formDto); /** diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index cbff0bce7..fb0c439aa 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -789,6 +789,7 @@ public class AppUserServiceImpl implements AppUserService { return new Result().error("解析微信开放平台ID失败"); } userDto.setWxUnionId(wxMaUserInfo.getUnionId()); + userDto.setFaceImg(wxMaUserInfo.getAvatarUrl()); } // 党员提交，验证身份证号 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java index fc6f1734d..c421c3094 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java @@ -103,4 +103,9 @@ public class EpdcCompleteAppUserDTO implements Serializable { * 居住网格id */ private Long deptId; + + /** + * 用户头像 + */ + private String faceImg; }