From 770e1bb37e66465af5e3f672142ef9a3d3925959 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Wed, 24 Jun 2020 16:32:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=9A=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E9=80=9A=E8=BF=87=E5=90=8E=20=E5=8A=A0=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/v2/ApiAppUserV2Controller.java | 1 - .../com/elink/esua/epdc/feign/UserFeignClient.java | 10 ++++++++++ .../epdc/feign/fallback/UserFeignClientFallback.java | 5 +++++ .../esua/epdc/service/impl/AppUserServiceImpl.java | 4 +++- .../main/java/com/elink/esua/epdc/dto/UserDTO.java | 8 ++++++-- .../elink/esua/epdc/controller/UserController.java | 12 ++++++++++++ 6 files changed, 36 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiAppUserV2Controller.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiAppUserV2Controller.java index 9145382a..b86e3a5f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiAppUserV2Controller.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiAppUserV2Controller.java @@ -85,7 +85,6 @@ public class ApiAppUserV2Controller { * @date 2020/2/20 17:11 */ @PostMapping("user/" + Constant.VERSION_CONTROL + "/completePartyInfo") - @RecordUserBehavior(behavior = BehaviorEnum.PERFECT_PARTY_INFO,referenceId = "#{tokenDto.getUserId}",userId = "#{tokenDto.getUserId}") public Result completePartyInfo(@LoginUser TokenDto tokenDto, @RequestBody EpdcCompleteUserInfoFormV2DTO formDto) { ValidatorUtils.validateEntity(formDto); return appUserService.completeUserInfo(tokenDto, 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 37ec810f..a8565742 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 @@ -410,4 +410,14 @@ public interface UserFeignClient { **/ @GetMapping(value = "app-user/epdc-app/user/listUserPointsRanking/list", consumes = MediaType.APPLICATION_JSON_VALUE) Result selectListUserPointsRanking(EpdcAppUserRankingFormDTO formDto); + + /** + * @Description 完善党员信息通过后加积分操作 + * @Author songyunpeng + * @Date 2020/6/24 + * @Param [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @PostMapping(value = "app-user/user/addPerfectPoints", consumes = MediaType.APPLICATION_JSON_VALUE) + Result addPerfectPoints(UserDTO dto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java index 454d926d..980c6a58 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java @@ -199,4 +199,9 @@ public class UserFeignClientFallback implements UserFeignClient { public Result selectListUserPointsRanking(EpdcAppUserRankingFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "selectListUserPointsRanking", "formDto"); } + + @Override + public Result addPerfectPoints(UserDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "addPerfectPoints", dto); + } } 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 6727f8ba..646e3738 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 @@ -1436,7 +1436,9 @@ public class AppUserServiceImpl implements AppUserService { formDTO.setUserAvatar(cachingUserInfoDTO.getFaceImg()); // partyGroupTask.updateInfo(formDTO); partyGroupFeignClient.updateInfo(formDTO); - + //调用加积分操作 + user.setUserId(user.getId()); + userFeignClient.addPerfectPoints(user); return new Result().ok(authorizationDto); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java index b611a5b6..4349384e 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java @@ -18,11 +18,11 @@ package com.elink.esua.epdc.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; - /** * 用户信息表 @@ -357,4 +357,8 @@ public class UserDTO implements Serializable { * 所有部门名称 */ private String allDeptNames; + /** + * 加积分使用 + */ + private String userId; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java index 46d438cd..4edf9007 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java @@ -294,4 +294,16 @@ public class UserController { ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); return userService.addPartyInfo(dto); } + /** + * @Description 完善党员信息加积分 + * @Author songyunpeng + * @Date 2020/6/24 + * @Param [dto] + * @return void + **/ + @PostMapping("addPerfectPoints") + @RecordUserBehavior(behavior = BehaviorEnum.PERFECT_PARTY_INFO,referenceId = "#{dto.getUserId}",userId = "#{dto.getUserId}") + public Result addPerfectPoints(@RequestBody UserDTO dto){ + return new Result(); + } }