修复代码冲突

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

@@ -892,7 +892,7 @@ public class AppUserServiceImpl implements AppUserService {
      * @author work@yujt.net.cn
      * @date 2020/3/12 19:20
      */
-    private EpdcCompleteAppUserDTO packageUserCompleteInfo(String userId, String userState, EpdcCompleteUserInfoFormDTO infoDto) {
+    private EpdcCompleteAppUserDTO packageUserCompleteInfo(String userId, String userState, EpdcCompleteUserInfoFormV2DTO infoDto) {
         UserDTO userDto = ConvertUtils.sourceToTarget(infoDto, UserDTO.class);
         userDto.setDeptId(infoDto.getGridId());
         userDto.setId(userId);
@@ -927,12 +927,8 @@ public class AppUserServiceImpl implements AppUserService {
 
 
     @Override
-    public Result<EpdcAppAuthorizationDTO> completeUserInfo(TokenDto tokenDto, EpdcCompleteUserInfoFormDTO infoDto) {
-
+    public Result<EpdcAppAuthorizationDTO> completeUserInfo(TokenDto tokenDto, EpdcCompleteUserInfoFormV2DTO infoDto) {
         String userId = tokenDto.getUserId();
-
-        // 验证手机号、验证码
-        this.checkSmsCode(infoDto.getMobile(), infoDto.getSmsCode());
         // 验证身份证号格式，身份证号码字符串校正
         String identityNo = fixAndCheckIdentityNo(infoDto.getIdentityNo(), infoDto.getPartyFlag());
         // 验证手机号身份证号是否已被注册，若未被注册，返回当前用户的状态
@@ -982,6 +978,13 @@ 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
      *
@@ -1026,23 +1029,6 @@ public class AppUserServiceImpl implements AppUserService {
         return null;
     }
 
-    @Override
-    public Result<EpdcAppAuthorizationDTO> completeUserInfo(TokenDto tokenDto, EpdcCompleteUserInfoFormDTO infoDto) {
-        UserDTO userDto = ConvertUtils.sourceToTarget(infoDto, UserDTO.class);
-        userDto.setDeptId(infoDto.getGridId());
-        userDto.setId(tokenDto.getUserId());
-        return this.completeUserInfo(tokenDto, userDto, infoDto.getWxCode(), infoDto.getEncryptedData(), infoDto.getIv(), infoDto.getSmsCode());
-    }
-
-
-    @Override
-    public Result<EpdcAppAuthorizationDTO> completeUserInfo(TokenDto tokenDto, EpdcCompleteUserInfoFormV2DTO infoDto) {
-        UserDTO userDto = ConvertUtils.sourceToTarget(infoDto, UserDTO.class);
-        userDto.setDeptId(infoDto.getGridId());
-        userDto.setId(tokenDto.getUserId());
-        return this.completeUserInfo(tokenDto, userDto, infoDto.getWxCode(), infoDto.getEncryptedData(), infoDto.getIv(), null);
-    }
-
     @Override
     public Result<EpdcCompleteUserInfoDTO> prepareCompleteUserInfo(TokenDto tokenDto) {