Browse Source

完善党员信息通过后 加积分操作

feature/syp_points
songyunpeng 5 years ago
parent
commit
770e1bb37e
  1. 1
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiAppUserV2Controller.java
  2. 10
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
  3. 5
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
  4. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
  5. 8
      esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java
  6. 12
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java

1
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<EpdcAppAuthorizationDTO> completePartyInfo(@LoginUser TokenDto tokenDto, @RequestBody EpdcCompleteUserInfoFormV2DTO formDto) {
ValidatorUtils.validateEntity(formDto);
return appUserService.completeUserInfo(tokenDto, formDto);

10
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<EpdcAppUserRankingResultDTO> 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);
}

5
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<EpdcAppUserRankingResultDTO> 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);
}
}

4
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);
}

8
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;
}

12
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();
}
}

Loading…
Cancel
Save