From 288db69696a8a492a75f19626f882499d0bb5d9d Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 29 Sep 2021 09:54:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiVolunteerRankController.java | 4 ++-- .../epdc/feign/AppVolunteerRankFeignClient.java | 11 +++++++++++ .../AppVolunteerRankFeignClientFallback.java | 6 ++++++ .../epdc/service/AppVolunteerRankService.java | 2 +- .../epdc/service/impl/AppUserServiceImpl.java | 15 ++++++++++----- .../service/impl/AppVolunteerRankServiceImpl.java | 3 +-- 6 files changed, 31 insertions(+), 10 deletions(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiVolunteerRankController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiVolunteerRankController.java index 0d5e64e..dd4fddf 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiVolunteerRankController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiVolunteerRankController.java @@ -109,8 +109,8 @@ public class ApiVolunteerRankController { * @return com.elink.esua.epdc.commons.tools.utils.Result */ @GetMapping("getVolunteerDetail") - public Result getVolunteerDetail(@LoginUser TokenDto userDetail) { - return appVolunteerRankService.getVolunteerDetail(userDetail); + public Result getVolunteerDetail(@LoginUser TokenDto userDetail,AppVolunteerApplyDTO formDto) { + return appVolunteerRankService.getVolunteerDetail(userDetail ,formDto); } /** diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AppVolunteerRankFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AppVolunteerRankFeignClient.java index b389d40..1fc07aa 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AppVolunteerRankFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AppVolunteerRankFeignClient.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.feign.fallback.AppVolunteerRankFeignClientFallback; import com.elink.esua.epdc.volunteer.*; import org.springframework.cloud.openfeign.FeignClient; @@ -153,4 +154,14 @@ public interface AppVolunteerRankFeignClient { */ @GetMapping(value = "heart/volunteer/getVolunteerList", consumes = MediaType.APPLICATION_JSON_VALUE) Result getVolunteerList(AppVorgFormDTO formDto); + + /** + * @describe: 小程序完善居民信息-检查是否为志愿组织管理员 + * @author wangtong + * @date 2021/9/29 9:04 + * @params [user] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping(value = "heart/volunteer/setAppOrgAdminUser", consumes = MediaType.APPLICATION_JSON_VALUE) + Result setAppOrgAdminUser(UserDTO user); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AppVolunteerRankFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AppVolunteerRankFeignClientFallback.java index 8314afa..76d2e4c 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AppVolunteerRankFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AppVolunteerRankFeignClientFallback.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.feign.AppVolunteerRankFeignClient; import com.elink.esua.epdc.volunteer.*; import org.springframework.stereotype.Component; @@ -66,6 +67,11 @@ public class AppVolunteerRankFeignClientFallback implements AppVolunteerRankFeig return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getVolunteerList",formDto); } + @Override + public Result setAppOrgAdminUser(UserDTO user) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "setAppOrgAdminUser",user); + } + @Override public Result applyActivity(AppVactApplyDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "applyActivity",formDto); diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppVolunteerRankService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppVolunteerRankService.java index 06a6c92..68f569c 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppVolunteerRankService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppVolunteerRankService.java @@ -44,7 +44,7 @@ public interface AppVolunteerRankService { * @params [userDetail] * @return com.elink.esua.epdc.commons.tools.utils.Result */ - Result getVolunteerDetail(TokenDto userDetail); + Result getVolunteerDetail(TokenDto userDetail,AppVolunteerApplyDTO formDto); /** * @describe: 志愿活动-申请（新增修改） diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 36491a2..febff88 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -16,7 +16,6 @@ import com.elink.esua.epdc.commons.tools.enums.UserTagEnum; import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.*; import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.enums.GroupUserStateEnum; @@ -36,10 +35,7 @@ import com.elink.esua.epdc.enums.AppUserAuditStateEnum; import com.elink.esua.epdc.enums.AppUserRegisterSourceEnum; import com.elink.esua.epdc.enums.AppUserRegisterWayEnum; import com.elink.esua.epdc.enums.AppUserStatesEnum; -import com.elink.esua.epdc.feign.AdminFeignClient; -import com.elink.esua.epdc.feign.GroupFeignClient; -import com.elink.esua.epdc.feign.OssFeignClient; -import com.elink.esua.epdc.feign.UserFeignClient; +import com.elink.esua.epdc.feign.*; import com.elink.esua.epdc.jwt.JwtTokenProperties; import com.elink.esua.epdc.jwt.JwtTokenUtils; import com.elink.esua.epdc.redis.AppUserRedis; @@ -110,6 +106,9 @@ public class AppUserServiceImpl implements AppUserService { @Autowired private GroupFeignClient groupFeignClient; + @Autowired + private AppVolunteerRankFeignClient appVolunteerRankFeignClient; + //private static String USER_FACE = "https://epdc.elinkchina.com.cn/esua-epdc/static/default/default_user_face.png"; private static String USER_FACE = "https://epdc-shibei.elinkservice.cn/epdcFile/M00/00/00/CgUipV3wgl6Afm4cAAAa8QfEb00266_big.png"; @@ -922,6 +921,7 @@ public class AppUserServiceImpl implements AppUserService { // 党员认证失败 if (100006001 == completeResult.getCode()) { + setAppOrgAdminUser(user); authorizationDto.setResultCode(YesOrNoEnum.YES.value()); authorizationDto.setResultMsg(completeResult.getMsg()); return new Result().ok(authorizationDto); @@ -931,9 +931,14 @@ public class AppUserServiceImpl implements AppUserService { if (partyFlag) { initPartyGroupInfo(cachingUserInfoDTO); } + setAppOrgAdminUser(user); return new Result().ok(authorizationDto); } + private void setAppOrgAdminUser(UserDTO user){ + appVolunteerRankFeignClient.setAppOrgAdminUser(user); + } + private EpdcAppAuthorizationDTO cachingUserInfoForAuthorization(CachingUserInfoDTO cachingUserInfo, String userGrid, String userState) { TokenDto newTokenDto = ConvertUtils.sourceToTarget(cachingUserInfo, TokenDto.class); diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppVolunteerRankServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppVolunteerRankServiceImpl.java index b67f803..93392ff 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppVolunteerRankServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppVolunteerRankServiceImpl.java @@ -135,11 +135,10 @@ public class AppVolunteerRankServiceImpl implements AppVolunteerRankService { } @Override - public Result getVolunteerDetail(TokenDto userDetail) { + public Result getVolunteerDetail(TokenDto userDetail,AppVolunteerApplyDTO formDto) { if (null == userDetail) { return new Result().error("获取用户信息失败"); } - AppVolunteerApplyDTO formDto = new AppVolunteerApplyDTO(); formDto.setUserId(userDetail.getUserId()); return appVolunteerRankFeignClient.getVolunteerDetail(formDto); }