用户完善信息，志愿者认证相关代码调试修改

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

@@ -931,18 +931,29 @@ public class AppUserServiceImpl implements AppUserService {
         return this.packageUserCompleteInfo(completeAppUserDto, userState);
     }
 
+    @Override
+    public Result<EpdcAppAuthorizationDTO> completeUserInfo(TokenDto tokenDto, EpdcCompleteUserInfoFormDTO infoDto) {
+        // 验证手机号、验证码
+        this.checkSmsCode(infoDto.getMobile(), infoDto.getSmsCode());
+        return this.completeUserInfo(tokenDto, ConvertUtils.sourceToTarget(infoDto, EpdcCompleteUserInfoFormV2DTO.class));
+    }
 
     @Override
     public Result<EpdcAppAuthorizationDTO> completeUserInfo(TokenDto tokenDto, EpdcCompleteUserInfoFormV2DTO infoDto) {
-        String userId = tokenDto.getUserId();
         // 验证身份证号格式，身份证号码字符串校正
         String identityNo = fixAndCheckIdentityNo(infoDto.getIdentityNo(), infoDto.getPartyFlag());
+        infoDto.setIdentityNo(identityNo);
+        return completeUserInfoNormally(tokenDto, infoDto);
+    }
+
+    private Result<EpdcAppAuthorizationDTO> completeUserInfoNormally(TokenDto tokenDto, EpdcCompleteUserInfoFormV2DTO infoDto) {
+        String userId = tokenDto.getUserId();
         // 验证手机号身份证号是否已被注册，若未被注册，返回当前用户的状态
-        String userState = checkMobileAndIdentityNo(userId, infoDto.getMobile(), infoDto.getPartyFlag(), identityNo);
+        String userState = checkMobileAndIdentityNo(userId, infoDto.getMobile(), infoDto.getPartyFlag(), infoDto.getIdentityNo());
 
         Long gridId = getGridId(infoDto.getGridId(), tokenDto.getGridId(), userId);
         infoDto.setGridId(gridId);
-        infoDto.setIdentityNo(identityNo);
+        infoDto.setIdentityNo(infoDto.getIdentityNo());
 
         // 组装对象，准备保存用户信息与网格信息
         EpdcAppUserCompleteInfoFormDTO dto = new EpdcAppUserCompleteInfoFormDTO();
@@ -987,13 +998,6 @@ public class AppUserServiceImpl implements AppUserService {
         return new Result().ok(authorizationDto);
     }
 
-    @Override
-    public Result<EpdcAppAuthorizationDTO> completeUserInfo(TokenDto tokenDto, EpdcCompleteUserInfoFormDTO infoDto) {
-        // 验证手机号、验证码
-        this.checkSmsCode(infoDto.getMobile(), infoDto.getSmsCode());
-        return this.completeUserInfo(tokenDto, ConvertUtils.sourceToTarget(infoDto, EpdcCompleteUserInfoFormV2DTO.class));
-    }
-
     /**
      * 判断用户居住网格id
      *
@@ -1289,29 +1293,29 @@ public class AppUserServiceImpl implements AppUserService {
     @Override
     public Result volunteerAuthenticate(TokenDto tokenDto, EpdcCompleteVolunteerInfoFormDTO formDto) {
         logger.info("志愿者认证wxCode=" + formDto.getWxCode() + ";userId=" + tokenDto.getUserId());
-        // 处理和验证身份证号码
-        String identityNo = fixAndCheckIdentityNo(formDto.getIdentityNo());
 
-        formDto.setSex(IdentityNoUtils.getSex(identityNo));                     // 性别
-        formDto.setBirthday(DateUtils.parse(IdentityNoUtils.getBirthday(identityNo), DateUtils.DATE_PATTERN));           // 生日
-        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) {
+            // 处理和验证身份证号码
+            String identityNo = fixAndCheckIdentityNo(formDto.getIdentityNo());
+            formDto.setSex(IdentityNoUtils.getSex(identityNo));                     // 性别
+            formDto.setBirthday(DateUtils.parse(IdentityNoUtils.getBirthday(identityNo), DateUtils.DATE_PATTERN));           // 生日
+            formDto.setUserId(tokenDto.getUserId()); // 用户ID
             // 添加志愿者
             Result<Integer> insertCountResult = userFeignClient.insertVolunteerInfo(formDto);
         }
 
         // 调用用户完善个人信息-保存
-        EpdcCompleteUserInfoFormDTO epdcCompleteUserInfoFormDTO = ConvertUtils.sourceToTarget(formDto, EpdcCompleteUserInfoFormDTO.class);
+        EpdcCompleteUserInfoFormV2DTO epdcCompleteUserInfoFormDTO = ConvertUtils.sourceToTarget(formDto, EpdcCompleteUserInfoFormV2DTO.class);
         if (UserTagUtils.containIdentity(tokenDto.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) {
             epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.YES.value());// 党员标志
         } else {
             epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.NO.value()); // 党员标志
         }
-        Result<EpdcAppAuthorizationDTO> result = completeUserInfoNoVerifyCode(tokenDto, epdcCompleteUserInfoFormDTO);
+        Result<EpdcAppAuthorizationDTO> result = completeUserInfoNormally(tokenDto, epdcCompleteUserInfoFormDTO);
 
         return result;
     }
@@ -1338,7 +1342,7 @@ public class AppUserServiceImpl implements AppUserService {
         return result;
     }
 
-    public Result<EpdcAppAuthorizationDTO> completeUserInfoNoVerifyCode(TokenDto tokenDto, EpdcCompleteUserInfoFormDTO infoDto) {
+    /*private Result<EpdcAppAuthorizationDTO> completeUserInfoNoVerifyCode(TokenDto tokenDto, EpdcCompleteUserInfoFormDTO infoDto) {
 
         UserDTO userDto = ConvertUtils.sourceToTarget(infoDto, UserDTO.class);
         userDto.setDeptId(Long.valueOf(infoDto.getGridId()));
@@ -1408,7 +1412,7 @@ public class AppUserServiceImpl implements AppUserService {
         }
 
         return new Result().ok(authorizationDto);
-    }
+    }*/
 
 
     @Override

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

@@ -67,7 +67,6 @@ public class EpdcCompleteVolunteerInfoFormDTO implements Serializable {
     /**
      * 微信code
      */
-    @NotBlank(message = "微信code不能为空")
     private String wxCode;
 
     /**
@@ -106,10 +105,4 @@ public class EpdcCompleteVolunteerInfoFormDTO implements Serializable {
     private String sex;
 
 
-
-
-
-
-
-
 }