Browse Source

志愿者认证,去掉参数党员标识

feature/dangjian
wanggongfeng 6 years ago
parent
commit
4c503822ca
  1. 8
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
  2. 4
      esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java

8
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@ -1107,21 +1107,21 @@ public class AppUserServiceImpl implements AppUserService {
formDto.setSex(sex); // 性别
formDto.setBirthday(birthday); // 生日
formDto.setUserId(tokenDto.getUserId()); // 用户ID
//验证是否为志愿者
// 验证是否为志愿者
Result<Integer> volunteerCountResult = userFeignClient.getVolunteerCountById(tokenDto.getUserId());
if (!volunteerCountResult.success() || null == volunteerCountResult.getData()) {
return new Result().error("志愿者认证失败");
} else if (volunteerCountResult.getData() == 0) {
//添加志愿者
// 添加志愿者
Result<Integer> insertCountResult = userFeignClient.insertVolunteerInfo(formDto);
}
//调用用户完善个人信息-保存
// 调用用户完善个人信息-保存
EpdcCompleteUserInfoFormDTO epdcCompleteUserInfoFormDTO = ConvertUtils.sourceToTarget(formDto, EpdcCompleteUserInfoFormDTO.class);
if (UserTagUtils.containIdentity(tokenDto.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) {
epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.YES.value());// 党员标志
} else {
epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.NO.value());// 党员标志
epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.NO.value()); // 党员标志
}
Result<EpdcAppAuthorizationDTO> result = completeUserInfoNoVerifyCode(tokenDto, epdcCompleteUserInfoFormDTO);

4
esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java

@ -34,8 +34,8 @@ public class EpdcCompleteVolunteerInfoFormDTO implements Serializable {
@NotBlank(message = "手机号不能为空")
private String mobile;
@NotBlank(message = "党员标识不能为空")
private String partyFlag;
//@NotBlank(message = "党员标识不能为空")
//private String partyFlag;
/**
* 身份证号码

Loading…
Cancel
Save