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