修改代码

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/IdentityNoUtils.java

@@ -46,11 +46,12 @@ public class IdentityNoUtils implements Serializable {
     private final static int[] VERIFY_CODE_WEIGHT = {7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2};
 
     /**
-     * 根据身份证号获取性别
-     * 0女；1男
+     * 根据身份证号获取性别 0女；1男
      *
-     * @param IDCard
-     * @return
+     * @param IDCard 完整身份证号码
+     * @return java.lang.String
+     * @author work@yujt.net.cn
+     * @date 2019/9/20 14:26
      */
     public static String getSex(String IDCard) {
         if (StringUtils.isNotBlank(IDCard)) {
@@ -74,8 +75,10 @@ public class IdentityNoUtils implements Serializable {
     /**
      * 根据身份证号获取年龄
      *
-     * @param IDCard
-     * @return
+     * @param IDCard 完整身份证号码
+     * @return java.lang.Integer
+     * @author work@yujt.net.cn
+     * @date 2019/9/20 14:26
      */
     public static Integer getAge(String IDCard) {
         int age;
@@ -112,10 +115,12 @@ public class IdentityNoUtils implements Serializable {
     }
 
     /**
-     * 获取出生日期  yyyy-MM-dd
+     * 根据身份证号获取出生日期
      *
-     * @param IDCard
-     * @return
+     * @param IDCard 完整身份证号码
+     * @return java.lang.String
+     * @author work@yujt.net.cn
+     * @date 2019/9/20 14:26
      */
     public static String getBirthday(String IDCard) {
         String year = "";
@@ -188,7 +193,7 @@ public class IdentityNoUtils implements Serializable {
     /**
      * 验证身份证号码，验证通过返回null
      *
-     * @param idStr
+     * @param idStr 完整身份证号码
      * @return java.lang.String
      * @author work@yujt.net.cn
      * @date 2019/9/20 14:26

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java

@@ -220,12 +220,12 @@ public class ApiAppUserController {
     /**
      * 用于用户完善个人信息页面，获取个人信息
      *
-     * @param tokenDto
+     * @param tokenDto 令牌
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO>
      * @author work@yujt.net.cn
      * @date 2019/10/26 15:07
      */
-    @GetMapping("prepareComplete")
+    @GetMapping("user/prepareComplete")
     public Result<EpdcCompleteUserInfoDTO> prepareCompleteUserInfo(@LoginUser TokenDto tokenDto) {
         return appUserService.prepareCompleteUserInfo(tokenDto);
     }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -94,7 +94,7 @@ public interface UserFeignClient {
     Result verifyUserRegisterData(EpdcUserRegistFormDTO formDto);
 
     /**
-     * 验证用户完善个人信息时提交的数据
+     * 验证用户完善个人信息时提交的数据，返回用户当前状态
      *
      * @param userDto
      * @return com.elink.esua.epdc.commons.tools.utils.Result
@@ -102,7 +102,7 @@ public interface UserFeignClient {
      * @date 2019/10/26 11:31
      */
     @GetMapping(value = "app-user/epdc-app/user/verifyComplete", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    Result verifyUserCompleteData(UserDTO userDto);
+    Result<String> verifyUserCompleteData(UserDTO userDto);
 
     /**
      * 用户完善个人信息-保存

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@@ -52,7 +52,7 @@ public class UserFeignClientFallback implements UserFeignClient {
     }
 
     @Override
-    public Result verifyUserCompleteData(UserDTO userDto) {
+    public Result<String> verifyUserCompleteData(UserDTO userDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "verifyUserCompleteData", userDto);
     }
 

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

@@ -680,11 +680,11 @@ public class AppUserServiceImpl implements AppUserService {
         // 验证手机号
         this.checkSmsCode(userDto.getMobile(), infoDto.getSmsCode());
         // 验证用户提交的信息
-        Result verifyResult = userFeignClient.verifyUserCompleteData(userDto);
+        Result<String> verifyResult = userFeignClient.verifyUserCompleteData(userDto);
         if (!verifyResult.success()) {
             return new Result().error(verifyResult.getMsg());
         }
-        String userState = verifyResult.getData().toString();
+        String userState = verifyResult.getData();
 
         UserGridRelationDTO userGrid = this.packageUserGridRelationInfo(tokenDto.getGridId());
         EpdcCompleteAppUserDTO completeAppUserDto = ConvertUtils.sourceToTarget(userDto, EpdcCompleteAppUserDTO.class);

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java

@@ -186,11 +186,10 @@ public class EpdcAppUserController {
     }
 
     /**
-     *
      * 更新用户微信信息
      *
-     * @params [userDTO]
      * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @params [userDTO]
      * @author liuchuang
      * @since 2019/10/25 17:10
      */
@@ -206,7 +205,7 @@ public class EpdcAppUserController {
     }
 
     /**
-     * 验证用户完善个人信息时提交的数据
+     * 验证用户完善个人信息时提交的数据，校验成功，返回用户当前状态
      *
      * @param userDto
      * @return com.elink.esua.epdc.commons.tools.utils.Result
@@ -214,7 +213,7 @@ public class EpdcAppUserController {
      * @date 2019/9/21 11:03
      */
     @GetMapping("verifyComplete")
-    public Result verifyUserCompleteData(@RequestBody UserDTO userDto) {
+    public Result<String> verifyUserCompleteData(@RequestBody UserDTO userDto) {
         return userService.verifyUserCompleteData(userDto);
     }
 

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java

@@ -173,7 +173,7 @@ public interface UserService extends BaseService<UserEntity> {
      * @author work@yujt.net.cn
      * @date 2019/10/26 11:18
      */
-    Result verifyUserCompleteData(UserDTO userDto);
+    Result<String> verifyUserCompleteData(UserDTO userDto);
 
     /**
      * 用户完善个人信息

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -364,11 +364,16 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     }
 
     @Override
-    public Result verifyUserCompleteData(UserDTO userDto) {
+    public Result<String> verifyUserCompleteData(UserDTO userDto) {
 
         String userId = userDto.getId();
         String mobile = userDto.getMobile();
 
+        UserEntity userEntity = this.selectById(userId);
+        if (null == userEntity) {
+            return new Result().error("匹配用户失败");
+        }
+
         QueryWrapper<UserEntity> userWrapper = new QueryWrapper<>();
         userWrapper.eq(FieldConstant.MOBILE, mobile)
                 .ne(FieldConstant.ID, userId);
@@ -395,9 +400,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             }
         }
 
-        UserEntity userEntity = this.selectById(userId);
-
-        return new Result().ok(userEntity.getState());
+        return new Result<String>().ok(userEntity.getState());
     }
 
     @Override
@@ -405,7 +408,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     public Result<UserDTO> completeUserInfo(EpdcAppUserCompleteInfoFormDTO formDto) {
         EpdcCompleteAppUserDTO completeAppUser = formDto.getCompleteAppUser();
 
-        UserDTO userDto = ConvertUtils.sourceToTarget(completeAppUser,UserDTO.class);
+        UserDTO userDto = ConvertUtils.sourceToTarget(completeAppUser, UserDTO.class);
         UserGridRelationDTO userGridRelation = formDto.getUserGridRelation();
 
         if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) {