Merge remote-tracking branch 'origin/feature/phaseOne' into feature/appletsModify

4 years ago · bc5b0bb3db
6 changed files with 329 additions and 70 deletions
--- 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
@ -51,6 +51,44 @@ public class ApiVolunteerRankController {
        return appVolunteerRankService.getAppVolunteerOrgList();
    }

+    /**
+    * @describe: 志愿活动-申请（新增修改）
+    * @author wangtong
+    * @date 2021/9/3 9:48
+    * @params [userDetail, formDto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("applyActivity")
+    public Result applyActivity(@LoginUser TokenDto userDetail, @RequestBody AppVactApplyDTO formDto) {
+        return appVolunteerRankService.applyActivity(userDetail, formDto);
+    }
+
+    /**
+    * @describe: 志愿活动-活动列表
+    * @author wangtong
+    * @date 2021/9/3 9:56
+    * @params [userDetail, dto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("getActivityList")
+    public Result getActivityList(@LoginUser TokenDto userDetail, AppPageParamsDTO dto) {
+        return appVolunteerRankService.getActivityList(userDetail , dto);
+    }
+
+    /**
+    * @describe: 志愿活动-详情
+    * @author wangtong
+    * @date 2021/9/3 9:57
+    * @params [userDetail, vactId]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("getActivityDetail")
+    public Result getActivityDetail(AppVactApplyDTO dto) {
+        return appVolunteerRankService.getActivityDetail( dto);
+    }
+
+    //-------------------------社会组织相关
+
    /**
     * @describe: 小程序-志愿者申请
     * @author wangtong
@ -71,45 +109,80 @@ 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);
    }

+    /**
+     * @describe: 小程序-社会组织-审核认证
+     * @author wangtong
+     * @date 2021/8/29 11:22
+     * @params [dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    @PostMapping("handleApply")
+    public Result handleApply(@RequestBody VolunteerDTO dto){
+        return appVolunteerRankService.handleApply(dto);
+    }

    /**
-    * @describe: 志愿活动-申请（新增修改）
+     * @describe: 小程序-社会组织-组织分类列表
     * @author wangtong
-    * @date 2021/9/3 9:48
-    * @params [userDetail, formDto]
+     * @date 2021/9/26 15:24
+     * @params [formDto]
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
-    @PostMapping("applyActivity")
-    public Result applyActivity(@LoginUser TokenDto userDetail, @RequestBody AppVactApplyDTO formDto) {
-        return appVolunteerRankService.applyActivity(userDetail, formDto);
+    @GetMapping("getOrgTypeList")
+    public Result getOrgTypeList() {
+        return appVolunteerRankService.getOrgTypeList();
    }

    /**
-    * @describe: 志愿活动-活动列表
+     * @describe: 小程序-社会组织-组织列表
     * @author wangtong
-    * @date 2021/9/3 9:56
-    * @params [userDetail, dto]
+     * @date 2021/9/26 15:24
+     * @params [formDto]
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
-    @GetMapping("getActivityList")
-    public Result getActivityList(@LoginUser TokenDto userDetail, AppPageParamsDTO dto) {
-        return appVolunteerRankService.getActivityList(userDetail , dto);
+    @GetMapping("getOrgListByType")
+    public Result getOrgListByType( AppVorgFormDTO formDto) {
+        return appVolunteerRankService.getOrgListByType(formDto);
    }

    /**
-    * @describe: 志愿活动-详情
+     * @describe: 小程序-社会组织-组织详情
     * @author wangtong
-    * @date 2021/9/3 9:57
-    * @params [userDetail, vactId]
+     * @date 2021/9/26 15:24
+     * @params [formDto]
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
-    @GetMapping("getActivityDetail")
-    public Result getActivityDetail(AppVactApplyDTO dto) {
-        return appVolunteerRankService.getActivityDetail( dto);
+    @GetMapping("getOrgDetail")
+    public Result getOrgDetail(@LoginUser TokenDto userDetail, AppVorgFormDTO formDto) {
+        return appVolunteerRankService.getOrgDetail(userDetail ,formDto);
+    }
+
+    /**
+     * @describe: 小程序-社会组织-组织详情列表
+     * @author wangtong
+     * @date 2021/9/26 15:24
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    @GetMapping("getOrgDetailList")
+    public Result getOrgDetailList( AppVorgFormDTO formDto) {
+        return appVolunteerRankService.getOrgDetailList(formDto);
+    }
+
+    /**
+     * @describe: 小程序-社会组织-成员管理列表
+     * @author wangtong
+     * @date 2021/9/26 15:24
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    @GetMapping("getVolunteerList")
+    public Result getVolunteerList( AppVorgFormDTO formDto) {
+        return appVolunteerRankService.getVolunteerList(formDto);
    }

 }
--- 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
@ -41,7 +41,41 @@ public interface AppVolunteerRankFeignClient {
    Result<List<VolunteerOrgDTO>> getAppVolunteerOrgList();

    /**
-     * @describe: 小程序-志愿者申请
+     * @describe: 志愿活动-申请（新增修改）
+     * @author wangtong
+     * @date 2021/9/3 9:48
+     * @params [userDetail, formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    @PostMapping(value = "heart/vactinfo/applyActivity", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result applyActivity(AppVactApplyDTO formDto);
+
+
+    /**
+     * @describe: 志愿活动-活动列表
+     * @author wangtong
+     * @date 2021/9/3 9:56
+     * @params [userDetail, dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    @GetMapping(value = "heart/vactinfo/getActivityList", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result getActivityList(AppPageParamsDTO dto);
+
+
+    /**
+     * @describe: 志愿活动-详情
+     * @author wangtong
+     * @date 2021/9/3 9:57
+     * @params [userDetail, vactId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    @GetMapping(value = "heart/vactinfo/getActivityDetail", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result getActivityDetail(AppVactApplyDTO dto);
+
+    //------------------------社会组织相关
+
+    /**
+     * @describe: 小程序-社会组织-志愿者申请
     * @author wangtong
     * @date 2021/8/30 10:43
     * @params [userDetail, formDto]
@ -51,7 +85,7 @@ public interface AppVolunteerRankFeignClient {
    Result applyVolunteer(AppVolunteerApplyDTO formDto);

    /**
-    * @describe: 小程序-志愿者详情
+     * @describe: 小程序-社会组织-志愿者详情
     * @author wangtong
     * @date 2021/8/30 11:07
     * @params [formDto]
@ -60,36 +94,64 @@ public interface AppVolunteerRankFeignClient {
    @GetMapping(value = "heart/volunteer/getVolunteerDetail", consumes = MediaType.APPLICATION_JSON_VALUE)
    Result getVolunteerDetail(AppVolunteerApplyDTO formDto);

+    /**
+     * @describe: 小程序-社会组织-审核认证
+     * @author wangtong
+     * @date 2021/8/29 11:22
+     * @params [dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    @PostMapping(value = "heart/volunteer/handleApply", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result handleApply(VolunteerDTO formDto);

    /**
-     * @describe: 志愿活动-申请（新增修改）
+     * @describe: 小程序-社会组织-组织分类列表
     * @author wangtong
-     * @date 2021/9/3 9:48
-     * @params [userDetail, formDto]
+     * @date 2021/9/26 15:24
+     * @params [formDto]
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
-    @PostMapping(value = "heart/vactinfo/applyActivity", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result applyActivity(AppVactApplyDTO formDto);
+    @GetMapping(value = "heart/volunteer/getOrgTypeList", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result getOrgTypeList();

+    /**
+     * @describe: 小程序-社会组织-组织列表
+     * @author wangtong
+     * @date 2021/9/26 15:24
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    @GetMapping(value = "heart/volunteer/getOrgListByType", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result getOrgListByType(AppVorgFormDTO formDto);

    /**
-     * @describe: 志愿活动-活动列表
+     * @describe: 小程序-社会组织-组织详情
     * @author wangtong
-     * @date 2021/9/3 9:56
-     * @params [userDetail, dto]
+     * @date 2021/9/26 15:24
+     * @params [formDto]
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
-    @GetMapping(value = "heart/vactinfo/getActivityList", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result getActivityList(AppPageParamsDTO dto);
+    @GetMapping(value = "heart/volunteer/getOrgDetail", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result getOrgDetail(AppVorgFormDTO formDto);

+    /**
+     * @describe: 小程序-社会组织-组织详情列表
+     * @author wangtong
+     * @date 2021/9/26 15:24
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    @GetMapping(value = "heart/volunteer/getOrgDetailList", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result getOrgDetailList(AppVorgFormDTO formDto);

    /**
-     * @describe: 志愿活动-详情
+     * @describe: 小程序-社会组织-成员管理列表
     * @author wangtong
-     * @date 2021/9/3 9:57
-     * @params [userDetail, vactId]
+     * @date 2021/9/26 15:24
+     * @params [formDto]
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
-    @GetMapping(value = "heart/vactinfo/getActivityDetail", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result getActivityDetail(AppVactApplyDTO dto);
+    @GetMapping(value = "heart/volunteer/getVolunteerList", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result getVolunteerList(AppVorgFormDTO formDto);
+
 }
--- 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
@ -36,6 +36,36 @@ public class AppVolunteerRankFeignClientFallback implements AppVolunteerRankFeig
        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getVolunteerDetail",formDto);
    }

+    @Override
+    public Result handleApply(VolunteerDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "handleApply",formDto);
+    }
+
+    @Override
+    public Result getOrgTypeList() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getOrgTypeList");
+    }
+
+    @Override
+    public Result getOrgListByType(AppVorgFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getOrgListByType",formDto);
+    }
+
+    @Override
+    public Result getOrgDetail(AppVorgFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getOrgDetail",formDto);
+    }
+
+    @Override
+    public Result getOrgDetailList(AppVorgFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getOrgDetailList",formDto);
+    }
+
+    @Override
+    public Result getVolunteerList(AppVorgFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getVolunteerList",formDto);
+    }
+
    @Override
    public Result applyActivity(AppVactApplyDTO formDto) {
        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "applyActivity",formDto);
--- 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: 志愿活动-申请（新增修改）
@ -72,4 +72,58 @@ public interface AppVolunteerRankService {
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
    Result getActivityDetail(AppVactApplyDTO dto);
+
+    /**
+     * @describe: 小程序-社会组织-审核认证
+     * @author wangtong
+     * @date 2021/8/29 11:22
+     * @params [dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result handleApply(VolunteerDTO dto);
+
+    /**
+     * @describe: 小程序-社会组织-组织分类列表
+     * @author wangtong
+     * @date 2021/9/26 15:24
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result getOrgTypeList();
+
+    /**
+     * @describe: 小程序-社会组织-组织列表
+     * @author wangtong
+     * @date 2021/9/26 15:24
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result getOrgListByType(AppVorgFormDTO formDto);
+
+    /**
+     * @describe: 小程序-社会组织-组织详情
+     * @author wangtong
+     * @date 2021/9/26 15:24
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result getOrgDetail(TokenDto userDetail, AppVorgFormDTO formDto);
+
+    /**
+     * @describe: 小程序-社会组织-组织详情列表
+     * @author wangtong
+     * @date 2021/9/26 15:24
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result getOrgDetailList(AppVorgFormDTO formDto);
+
+    /**
+     * @describe: 小程序-社会组织-成员管理列表
+     * @author wangtong
+     * @date 2021/9/26 15:24
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result getVolunteerList(AppVorgFormDTO formDto);
 }
--- 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";

@ -935,6 +934,7 @@ public class AppUserServiceImpl implements AppUserService {
    }


+
    private EpdcAppAuthorizationDTO cachingUserInfoForAuthorization(CachingUserInfoDTO cachingUserInfo, String userGrid, String userState) {
        TokenDto newTokenDto = ConvertUtils.sourceToTarget(cachingUserInfo, TokenDto.class);
        return this.packageEpdcAppAuthorization(newTokenDto, userGrid, userState);
--- 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
@ -47,8 +47,10 @@ public class AppVolunteerRankServiceImpl implements AppVolunteerRankService {
        return appVolunteerRankFeignClient.getAppVolunteerOrgList();
    }

+
    @Override
-    public Result applyVolunteer(TokenDto userDetail, AppVolunteerApplyDTO formDto) {
+    public Result applyActivity(TokenDto userDetail, AppVactApplyDTO formDto) {
+        log.info("dto:"+formDto);
        if (null == userDetail) {
            return new Result().error("获取用户信息失败");
        }
@ -80,22 +82,24 @@ public class AppVolunteerRankServiceImpl implements AppVolunteerRankService {
        } else {
            formDto.setPartyFlag("0");
        }
-        return appVolunteerRankFeignClient.applyVolunteer(formDto);
+        log.info("dto:"+formDto);
+        return appVolunteerRankFeignClient.applyActivity(formDto);
    }

    @Override
-    public Result getVolunteerDetail(TokenDto userDetail) {
-        if (null == userDetail) {
-            return new Result().error("获取用户信息失败");
+    public Result getActivityList(TokenDto userDetail, AppPageParamsDTO dto) {
+        dto.setUserId(userDetail.getUserId());
+        return appVolunteerRankFeignClient.getActivityList(dto);
    }
-        AppVolunteerApplyDTO formDto = new AppVolunteerApplyDTO();
-        formDto.setUserId(userDetail.getUserId());
-        return appVolunteerRankFeignClient.getVolunteerDetail(formDto);
+
+    @Override
+    public Result getActivityDetail(AppVactApplyDTO dto) {
+        return appVolunteerRankFeignClient.getActivityDetail(dto);
    }

    @Override
-    public Result applyActivity(TokenDto userDetail, AppVactApplyDTO formDto) {
-        log.info("dto:"+formDto);
+    public Result applyVolunteer(TokenDto userDetail, AppVolunteerApplyDTO formDto) {
+        log.info("applyVolunteer:"+formDto);
        if (null == userDetail) {
            return new Result().error("获取用户信息失败");
        }
@ -127,19 +131,55 @@ public class AppVolunteerRankServiceImpl implements AppVolunteerRankService {
        } else {
            formDto.setPartyFlag("0");
        }
-        log.info("dto:"+formDto);
-        return appVolunteerRankFeignClient.applyActivity(formDto);
+        return appVolunteerRankFeignClient.applyVolunteer(formDto);
    }

    @Override
-    public Result getActivityList(TokenDto userDetail, AppPageParamsDTO dto) {
-        dto.setUserId(userDetail.getUserId());
-        return appVolunteerRankFeignClient.getActivityList(dto);
+    public Result getVolunteerDetail(TokenDto userDetail,AppVolunteerApplyDTO formDto) {
+        if (null == userDetail) {
+            return new Result().error("获取用户信息失败");
+        }
+        formDto.setUserId(userDetail.getUserId());
+        return appVolunteerRankFeignClient.getVolunteerDetail(formDto);
    }

    @Override
-    public Result getActivityDetail(AppVactApplyDTO dto) {
-        return appVolunteerRankFeignClient.getActivityDetail(dto);
+    public Result handleApply(VolunteerDTO formDto) {
+        log.info("handleApply:"+formDto);
+        return appVolunteerRankFeignClient.handleApply(formDto);
+    }
+
+    @Override
+    public Result getOrgTypeList() {
+        return appVolunteerRankFeignClient.getOrgTypeList();
+    }
+
+    @Override
+    public Result getOrgListByType(AppVorgFormDTO formDto) {
+        log.info("getOrgListByType:"+formDto);
+        return appVolunteerRankFeignClient.getOrgListByType(formDto);
+    }
+
+    @Override
+    public Result getOrgDetail(TokenDto userDetail, AppVorgFormDTO formDto) {
+        log.info("getOrgDetail:"+formDto);
+        if (null == userDetail) {
+            return new Result().error("获取用户信息失败");
+        }
+        formDto.setUserId(userDetail.getUserId());
+        return appVolunteerRankFeignClient.getOrgDetail(formDto);
+    }
+
+    @Override
+    public Result getOrgDetailList(AppVorgFormDTO formDto) {
+        log.info("getOrgDetailList:"+formDto);
+        return appVolunteerRankFeignClient.getOrgDetailList(formDto);
+    }
+
+    @Override
+    public Result getVolunteerList(AppVorgFormDTO formDto) {
+        log.info("getVolunteerList:"+formDto);
+        return appVolunteerRankFeignClient.getVolunteerList(formDto);
    }

 }