活动报名接口调整

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

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<GroupDetailForMobileEndResultDTO> 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());
+        Result<UserDTO> userResult = userFeignClient.getUserInfoById(userDetail.getUserId());
-        formDto.setFaceImg(userDetail.getFaceImg());
+        if (!userResult.success() || null == userResult.getData()) {
-        formDto.setRealName(userDetail.getRealName());
+            return new Result().error("获取用户报名信息失败");
-        formDto.setSex(userDetail.getSex());
+        }
-        formDto.setMobile(userDetail.getMobile());
+        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);
     }