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 7c235b62f..42aa8963f 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 @@ -252,21 +252,23 @@ public interface UserFeignClient { @PostMapping("app-user/epdc-app/user/updateWxInfo") Result updateWxInfo(UserDTO userDTO); - /** - * 获取居民详情(已认证或待认证(提交信息待审核)的居民用户) - * @param userId 用户Id - * @return - */ - @GetMapping("app-user/epdc-app/user/residentDetail/{userId}") - Result residentDetail(@PathVariable("userId") String userId); + /** + * 获取居民详情(已认证或待认证(提交信息待审核)的居民用户) + * + * @param userId 用户Id + * @return + */ + @GetMapping("app-user/epdc-app/user/residentDetail/{userId}") + Result residentDetail(@PathVariable("userId") String userId); /** * 认证用户(用户信息审核) + * * @param formDTO * @return */ @PostMapping("app-user/epdc-app/user/authenticateResident") - Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO); + Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO); /** * 获取党员详情(已认证或未认证的党员用户) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java index 473f2d29f..90fa685be 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java @@ -258,7 +258,7 @@ public class EpdcAppUserController { * @return */ @GetMapping("residentDetail/{userId}") - public Result residentDetail(@PathVariable("userId") String userId){ + public Result residentDetail(@PathVariable("userId") String userId) { return userService.residentDetail(userId); } @@ -277,10 +277,10 @@ public class EpdcAppUserController { * @param formDTO * @return */ - @PostMapping("authenticateResident") - public Result authenticateResident(@RequestBody EpdcAppAuthenticateResidentFormDTO formDTO){ - return userService.authenticateResident(formDTO); - } + @PostMapping("authenticateResident") + public Result authenticateResident(@RequestBody EpdcAppAuthenticateResidentFormDTO formDTO) { + return userService.authenticateResident(formDTO); + } /*** * 用户列表 * @param workUserFromDto diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index c0d993017..88b9325fb 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -508,7 +508,7 @@ public class UserServiceImpl extends BaseServiceImpl implem */ @Override public Result residentDetail(String userId) { - if(StringUtils.isBlank(userId)){ + if (StringUtils.isBlank(userId)) { return new Result().error("用户Id不能为空"); } EpdcResidentDetailResultDTO dto = this.baseDao.residentDetailByUserId(userId); @@ -522,19 +522,21 @@ public class UserServiceImpl extends BaseServiceImpl implem */ @Override public Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO) { - if(StringUtils.isBlank(formDTO.getAuthenticatedFlag())){ - formDTO.setAuthenticatedFlag("0"); - } - UserDTO userDTO=this.get(formDTO.getUserId()); - if(null!=userDTO){ - if("0".equals(formDTO.getAuthenticatedFlag())){//不通过 - userDTO.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value()); - }else if("1".equals(formDTO.getAuthenticatedFlag())){//通过 - userDTO.setState(AppUserStatesEnum.STATE_INFORMATION_PASSED.value()); - } - this.update(userDTO); - } - return new Result(); + if (StringUtils.isBlank(formDTO.getAuthenticatedFlag())) { + formDTO.setAuthenticatedFlag(YesOrNoEnum.NO.value()); + } + UserDTO userDTO = this.get(formDTO.getUserId()); + if (null != userDTO) { + if (YesOrNoEnum.NO.value().equals(formDTO.getAuthenticatedFlag())) {//不通过 + userDTO.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value()); + } else if (YesOrNoEnum.YES.value().equals(formDTO.getAuthenticatedFlag())) {//通过 + userDTO.setState(AppUserStatesEnum.STATE_INFORMATION_PASSED.value()); + } else { + throw new RenException("是否认证通过数据不匹配"); + } + this.update(userDTO); + } + return new Result(); } /**