From 5ade76cf2103ec99027df3def6fc7da0149d73e5 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Wed, 29 Sep 2021 10:29:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=87=AA=E5=8A=A8=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86=E5=91=98=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/feign/AppVolunteerRankFeignClient.java   | 10 ----------
 .../fallback/AppVolunteerRankFeignClientFallback.java  |  6 ------
 .../esua/epdc/service/impl/AppUserServiceImpl.java     |  5 -----
 3 files changed, 21 deletions(-)

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 1fc07aa..ccecf1e 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,7 +2,6 @@ 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;
@@ -155,13 +154,4 @@ 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 76d2e4c..8314afa 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,7 +3,6 @@ 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;
@@ -67,11 +66,6 @@ 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/impl/AppUserServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
index febff88..c676967 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
@@ -921,7 +921,6 @@ 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,13 +930,9 @@ 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) {