From f21faaa75a16fd1cf5293de600af0bd4c86ce58f Mon Sep 17 00:00:00 2001 From: yujt Date: Fri, 10 Jul 2020 10:17:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiPropertyController.java | 2 +- .../service/impl/PropertyServiceImpl.java | 31 +++++++++++++++---- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java index 20d799a..bc9cc93 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java @@ -490,7 +490,7 @@ public class ApiPropertyController { * @date: 2020/6/23 10:04 */ @PostMapping("activity/signUp/{activityId}") - public Result singUp(@PathVariable("activityId") String activityId, @LoginUser TokenDto userDetail, ActivityParticipantFormDTO formDto) { + public Result signUp(@PathVariable("activityId") String activityId, @LoginUser TokenDto userDetail, ActivityParticipantFormDTO formDto) { formDto.setActId(activityId); ValidatorUtils.validateEntity(formDto); return propertyService.singUp(userDetail, formDto); diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java index a689900..ebfa2b2 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java @@ -4,8 +4,10 @@ import com.elink.esua.epdc.async.WxMaSecCheckTask; import com.elink.esua.epdc.common.token.dto.TokenDto; 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.utils.IdentityNoUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; +import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.comment.TopicCommentFormDTO; import com.elink.esua.epdc.dto.comment.TopicCommentStatementFormDTO; import com.elink.esua.epdc.dto.comment.TopicCommentsFormDTO; @@ -28,6 +30,7 @@ import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO; import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO; import com.elink.esua.epdc.enums.ArticleSectionEnum; import com.elink.esua.epdc.feign.AdminFeignClient; +import com.elink.esua.epdc.feign.UserFeignClient; import com.elink.esua.epdc.modules.news.feign.NewsFeignClient; import com.elink.esua.epdc.feign.PropertyFeignClient; import com.elink.esua.epdc.service.PropertyService; @@ -53,6 +56,7 @@ import com.elink.esua.epdc.smile.dto.psychology.result.PsychologistResultDTO; import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyAnswerListResultDTO; import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyAnswerListUserResultDTO; import com.elink.esua.epdc.utils.UserTagUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -80,6 +84,9 @@ public class PropertyServiceImpl implements PropertyService { @Autowired private NewsFeignClient newsFeignClient; + @Autowired + private UserFeignClient userFeignClient; + @Override public Result getGroupDetail(TokenDto userDetail, String id) { if (null == userDetail) { @@ -406,13 +413,25 @@ public class PropertyServiceImpl implements PropertyService { @Override public Result singUp(TokenDto userDetail, ActivityParticipantFormDTO formDto) { - formDto.setUserId(userDetail.getUserId()); - formDto.setNickname(userDetail.getNickname()); - formDto.setFaceImg(userDetail.getFaceImg()); - formDto.setRealName(userDetail.getRealName()); - formDto.setSex(userDetail.getSex()); - formDto.setMobile(userDetail.getMobile()); + + Result userResult = userFeignClient.getUserInfoById(userDetail.getUserId()); + if (!userResult.success() || null == userResult.getData()) { + return new Result().error("获取用户报名信息失败"); + } + UserDTO user = userResult.getData(); + String identityNo = user.getIdentityNo(); + + formDto.setSex(user.getSex()); + formDto.setUserId(user.getId()); + formDto.setIdentityNo(identityNo); formDto.setSignUpTime(new Date()); + formDto.setMobile(user.getMobile()); + formDto.setFaceImg(user.getFaceImg()); + formDto.setNickname(user.getNickname()); + formDto.setRealName(user.getRealName()); + formDto.setPartyFlag(user.getPartyFlag()); + formDto.setAge(StringUtils.isNotBlank(identityNo) ? IdentityNoUtils.getAge(identityNo) : null); + return propertyFeignClient.singUp(formDto); }