diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
index fb5b3a41f..42944f865 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
@@ -5,7 +5,7 @@ import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.dto.epdc.form.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcLeaderGridResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
import com.elink.esua.epdc.dto.form.*;
import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
@@ -46,13 +46,15 @@ public class ApiAppUserController {
}
/**
- * 用户注册
+ * 小程序端，用户注册。已废弃，新的注册接口使用：
+ * {@link com.elink.esua.epdc.controller.v2.ApiAppUserV2Controller#getMaV2Token(EpdcAppUserRegisterFormDTO)}
*
* @param formDto
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @author yujintao
* @date 2019/9/9 10:41
*/
+ @Deprecated
@PostMapping("user/mp/regist")
public Result mpUserRegister(@RequestBody EpdcUserRegistFormDTO formDto) {
ValidatorUtils.validateEntity(formDto);
@@ -60,14 +62,15 @@ public class ApiAppUserController {
}
/**
- * 小程序端，用户注册
- * {@link com.elink.esua.epdc.controller.v2.ApiAppUserV2Controller#getMaV2Token(EpdcAppUserRegisterFormDTO)}
+ * 小程序端，用户注册。已废弃，新的注册接口使用：
+ * {@link com.elink.esua.epdc.controller.v2.ApiAppUserV2Controller#getMaV2Token(EpdcAppUserRegisterFormDTO)}
*
* @param formDto
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @author yujintao
* @date 2019/9/9 10:41
*/
+ @Deprecated
@PostMapping("user/ma/regist")
public Result maUserRegister(@RequestBody EpdcUserRegistFormDTO formDto) {
ValidatorUtils.validateEntity(formDto);
@@ -96,6 +99,7 @@ public class ApiAppUserController {
* @author work@yujt.net.cn
* @date 2019/9/26 09:14
*/
+ @Deprecated
@GetMapping("user/checkRegister")
public Result checkRegister(EpdcCheckRegisterFormDTO formDto) {
ValidatorUtils.validateEntity(formDto);
@@ -175,12 +179,12 @@ public class ApiAppUserController {
* 获取用户的所有网格列表
*
* @param userDetail
- * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
* @author work@yujt.net.cn
* @date 2019/10/23 15:58
*/
@GetMapping("user/listGrid")
- public Result> listUserGrid(@LoginUser TokenDto userDetail) {
+ public Result> listUserGrid(@LoginUser TokenDto userDetail) {
return appUserService.listUserGrid(userDetail.getUserId());
}
@@ -208,7 +212,7 @@ public class ApiAppUserController {
* @date 2019/10/26 13:41
*/
@PostMapping("user/completeInfo")
- public Result completeUserInfo(@LoginUser TokenDto tokenDto, EpdcCompleteUserInfoFormDTO formDto) {
+ public Result completeUserInfo(@LoginUser TokenDto tokenDto, @RequestBody EpdcCompleteUserInfoFormDTO formDto) {
ValidatorUtils.validateEntity(formDto);
return appUserService.completeUserInfo(tokenDto, formDto);
}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
index 2d22adb53..8e7271ff6 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
@@ -210,12 +210,12 @@ public interface UserFeignClient {
* 获取网格长管理的网格列表
*
* @param userId
- * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
* @author work@yujt.net.cn
* @date 2019/10/23 13:34
*/
@GetMapping("app-user/epdc-app/usergrid/listUserGrid/{userId}")
- Result> listUserGrid(@PathVariable("userId") String userId);
+ Result> listUserGrid(@PathVariable("userId") String userId);
/**
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
index 6a3d652fd..35e8d7dba 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
@@ -102,7 +102,7 @@ public class UserFeignClientFallback implements UserFeignClient {
}
@Override
- public Result> listUserGrid(String userId) {
+ public Result> listUserGrid(String userId) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "listUserGrid", userId);
}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java
index f7b51d51a..c31c1214b 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java
@@ -3,7 +3,7 @@ package com.elink.esua.epdc.service;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.epdc.form.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcLeaderGridResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
import com.elink.esua.epdc.dto.form.*;
import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
@@ -27,6 +27,7 @@ public interface AppUserService {
* @author yujintao
* @date 2019/9/7 09:54
*/
+ @Deprecated
Result mpUserRegister(EpdcUserRegistFormDTO formDto);
/**
@@ -91,6 +92,7 @@ public interface AppUserService {
* @author yujintao
* @date 2019/9/10 20:48
*/
+ @Deprecated
Result maUserRegister(EpdcUserRegistFormDTO formDto);
/**
@@ -138,11 +140,11 @@ public interface AppUserService {
* 获取用户的所有网格列表
*
* @param userId
- * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
* @author work@yujt.net.cn
* @date 2019/10/23 15:58
*/
- Result> listUserGrid(String userId);
+ Result> listUserGrid(String userId);
/**
* 用户注册、获取Token
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
index 2f3ade91b..6f5de0e5c 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
@@ -15,8 +15,8 @@ import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcGridLeaderRegisterFormDTO;
import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
import com.elink.esua.epdc.dto.epdc.form.*;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcLeaderGridResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
import com.elink.esua.epdc.dto.form.*;
import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
@@ -108,23 +108,6 @@ public class AppUserServiceImpl implements AppUserService {
return this.userFeignClient.saveWxFormId(saveFormId);
}
- /**
- * 根据unionId登录
- *
- * @param unionId
- * @return com.elink.esua.epdc.commons.tools.utils.Result
- * @author work@yujt.net.cn
- * @date 2019/9/19 19:16
- */
- private Result getTokenByUnionId(String unionId) {
- // 查询当前微信是否已注册用户
- Result userInfoResult = userFeignClient.getUserForLoginByOpenId(unionId);
- if (!userInfoResult.success()) {
- return new Result().error(userInfoResult.getMsg());
- }
- return this.getTokenByUserDto(userInfoResult.getData());
- }
-
/**
* 根据openId登录
*
@@ -297,6 +280,7 @@ public class AppUserServiceImpl implements AppUserService {
* @author work@yujt.net.cn
* @date 2019/9/25 17:26
*/
+ @Deprecated
private Result getRegisterResult(UserDTO userDto) {
Result result = userFeignClient.userRegist(userDto);
EpdcAppRegisterCallbackDTO dto = new EpdcAppRegisterCallbackDTO();
@@ -313,6 +297,7 @@ public class AppUserServiceImpl implements AppUserService {
* @author work@yujt.net.cn
* @date 2019/9/20 14:40
*/
+ @Deprecated
private void verifyUserRegisterData(EpdcUserRegistFormDTO formDto) {
// 校验身份证号码格式
String verification = IdentityNoUtils.IdentityNoVerification(formDto.getIdentityNo());
@@ -354,6 +339,7 @@ public class AppUserServiceImpl implements AppUserService {
* @author yujintao
* @date 2019/9/10 21:09
*/
+ @Deprecated
private UserDTO packageUserDto(EpdcUserRegistFormDTO formDto, WxMpUser wxMpUser, WxMaJscode2SessionResult wxMaUser) {
String unionId = null;
String openId = null;
@@ -542,7 +528,7 @@ public class AppUserServiceImpl implements AppUserService {
}
@Override
- public Result> listUserGrid(String userId) {
+ public Result> listUserGrid(String userId) {
return userFeignClient.listUserGrid(userId);
}
@@ -698,10 +684,11 @@ public class AppUserServiceImpl implements AppUserService {
if (!verifyResult.success()) {
return new Result().error(verifyResult.getMsg());
}
+ String userState = verifyResult.getData().toString();
UserGridRelationDTO userGrid = this.packageUserGridRelationInfo(tokenDto.getGridId());
EpdcCompleteAppUserDTO completeAppUserDto = ConvertUtils.sourceToTarget(userDto, EpdcCompleteAppUserDTO.class);
- completeAppUserDto = this.packageUserCompleteInfo(completeAppUserDto);
+ completeAppUserDto = this.packageUserCompleteInfo(completeAppUserDto, userState);
// 组装对象，准备保存用户信息
EpdcAppUserCompleteInfoFormDTO dto = new EpdcAppUserCompleteInfoFormDTO();
dto.setCompleteAppUser(completeAppUserDto);
@@ -733,7 +720,16 @@ public class AppUserServiceImpl implements AppUserService {
return new Result().error("获取用户信息失败");
}
- private EpdcCompleteAppUserDTO packageUserCompleteInfo(EpdcCompleteAppUserDTO dto) {
+ /**
+ * 组装个人完善信息对象
+ *
+ * @param dto 已知数据
+ * @param userState 用户当前状态，用户状态不为0时，表明用户操作为二次修改
+ * @return com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO
+ * @author work@yujt.net.cn
+ * @date 2019/10/29 17:54
+ */
+ private EpdcCompleteAppUserDTO packageUserCompleteInfo(EpdcCompleteAppUserDTO dto, String userState) {
String road = dto.getRoad();
String villageName = dto.getVillageName();
@@ -750,6 +746,10 @@ public class AppUserServiceImpl implements AppUserService {
} else {
dto.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value());
}
+ // 用户不是第一次完善信息，保持现在的用户状态不变
+ if (!AppUserStatesEnum.STATE_REGISTERED.value().equals(userState)) {
+ dto.setState(userState);
+ }
String address = road
.concat(StringUtils.isNotBlank(villageName) ? villageName : "")
@@ -781,19 +781,11 @@ public class AppUserServiceImpl implements AppUserService {
throw new RenException("查询网格信息失败");
}
CompleteDeptDTO completeDept = adminDeptResult.getData();
- UserGridRelationDTO gridRelationDTO = new UserGridRelationDTO();
- gridRelationDTO.setDistrictId(completeDept.getDistrictId());
- gridRelationDTO.setDistrict(completeDept.getDistrict());
- gridRelationDTO.setStreet(completeDept.getStreet());
- gridRelationDTO.setStreetId(completeDept.getStreetId());
- gridRelationDTO.setCommunity(completeDept.getCommunity());
- gridRelationDTO.setCommunityId(completeDept.getCommunityId());
- gridRelationDTO.setGrid(completeDept.getGrid());
- gridRelationDTO.setGridId(completeDept.getGridId());
- gridRelationDTO.setSwitchedTime(new Date());
- gridRelationDTO.setLeaderFlag(NumConstant.ZERO_STR);
-
- return gridRelationDTO;
+ UserGridRelationDTO gridRelation = ConvertUtils.sourceToTarget(completeDept, UserGridRelationDTO.class);
+ gridRelation.setSwitchedTime(new Date());
+ gridRelation.setLeaderFlag(YesOrNoEnum.NO.value());
+
+ return gridRelation;
}
@Override
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java
index 3a599ee6a..00d6c2a51 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java
@@ -211,7 +211,7 @@ public class UserDTO implements Serializable {
private String inviteUserId;
/**
- * 状态(0-未审核，1-审核通过，2-审核未通过)
+ * 状态，参考枚举类：{@link com.elink.esua.epdc.enums.AppUserStatesEnum}
*/
private String state;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcLeaderGridResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserGridResultDTO.java
similarity index 76%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcLeaderGridResultDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserGridResultDTO.java
index 23f579749..46d8497de 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcLeaderGridResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserGridResultDTO.java
@@ -5,13 +5,13 @@ import lombok.Data;
import java.io.Serializable;
/**
- * 网格长管理的网格
+ * 用户扫码关联的网格
*
* @author work@yujt.net.cn
* @date 2019/10/23 11:19
*/
@Data
-public class EpdcLeaderGridResultDTO implements Serializable {
+public class EpdcUserGridResultDTO implements Serializable {
private static final long serialVersionUID = -2330556079892327467L;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcUserGridRelationController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcUserGridRelationController.java
index e43747731..371f48718 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcUserGridRelationController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcUserGridRelationController.java
@@ -21,7 +21,7 @@ import com.elink.esua.epdc.commons.tools.constant.Constant;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.UserGridRelationDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcLeaderSwitchGridFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcLeaderGridResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
import com.elink.esua.epdc.service.UserGridRelationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -59,12 +59,12 @@ public class EpdcUserGridRelationController {
* 获取网格长管理的网格列表
*
* @param userId
- * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
* @author work@yujt.net.cn
* @date 2019/10/23 13:26
*/
@GetMapping("listUserGrid/{userId}")
- public Result> listGridForLeader(@PathVariable("userId") String userId) {
+ public Result> listGridForLeader(@PathVariable("userId") String userId) {
return userGridRelationService.listUserGridForApi(userId);
}
}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java
index 5442ea565..8285d9abe 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java
@@ -22,7 +22,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.UserGridRelationDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcLeaderSwitchGridFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcLeaderGridResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
import com.elink.esua.epdc.entity.UserGridRelationEntity;
import java.util.List;
@@ -110,11 +110,11 @@ public interface UserGridRelationService extends BaseService>
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
* @author work@yujt.net.cn
* @date 2019/10/23 13:28
*/
- Result> listUserGridForApi(String userId);
+ Result> listUserGridForApi(String userId);
/**
* 获取用户绑定网格信息
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java
index dc3a16724..63a695e86 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java
@@ -29,7 +29,7 @@ import com.elink.esua.epdc.constant.UserFieldConsant;
import com.elink.esua.epdc.dao.UserGridRelationDao;
import com.elink.esua.epdc.dto.UserGridRelationDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcLeaderSwitchGridFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcLeaderGridResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
import com.elink.esua.epdc.entity.UserGridRelationEntity;
import com.elink.esua.epdc.service.UserGridRelationService;
import org.apache.commons.lang3.StringUtils;
@@ -127,13 +127,13 @@ public class UserGridRelationServiceImpl extends BaseServiceImpl> listUserGridForApi(String userId) {
+ public Result> listUserGridForApi(String userId) {
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq(UserFieldConsant.USER_ID, userId)
.orderByDesc(UserFieldConsant.SWITCHED_TIME);
List entityList = this.baseDao.selectList(queryWrapper);
- List dtoList = ConvertUtils.sourceToTarget(entityList, EpdcLeaderGridResultDTO.class);
- return new Result>().ok(dtoList);
+ List dtoList = ConvertUtils.sourceToTarget(entityList, EpdcUserGridResultDTO.class);
+ return new Result>().ok(dtoList);
}
@Override
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
index 41df07ced..41a083856 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
@@ -366,36 +366,38 @@ public class UserServiceImpl extends BaseServiceImpl implem
@Override
public Result verifyUserCompleteData(UserDTO userDto) {
- UserEntity userEntity = this.selectById(userDto.getId());
-
- if (!userEntity.getMobile().equals(userDto.getMobile())) {
- return new Result().error("手机号与注册手机号不匹配");
- }
-
- if (AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value().equals(userEntity.getState())
- || AppUserStatesEnum.STATE_INFORMATION_PASSED.value().equals(userEntity.getState())) {
- return new Result().error("用户信息已审核通过或正在审核中");
+ String userId = userDto.getId();
+ String mobile = userDto.getMobile();
+
+ QueryWrapper userWrapper = new QueryWrapper<>();
+ userWrapper.eq(FieldConstant.MOBILE, mobile)
+ .ne(FieldConstant.ID, userId);
+ Integer selectCount = this.baseDao.selectCount(userWrapper);
+ if (selectCount > NumConstant.ZERO) {
+ return new Result().error("手机号已被注册");
}
if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) {
QueryWrapper partyWrapper = new QueryWrapper<>();
partyWrapper.eq(UserFieldConsant.IDENTITY_NO, userDto.getIdentityNo())
.eq(UserFieldConsant.REAL_NAME, userDto.getRealName());
- Integer selectCount = this.partyMembersDao.selectCount(partyWrapper);
+ selectCount = this.partyMembersDao.selectCount(partyWrapper);
if (selectCount != NumConstant.ONE) {
return new Result().error("无法匹配党员信息");
}
- QueryWrapper userWrapper = new QueryWrapper<>();
+ userWrapper = new QueryWrapper<>();
userWrapper.eq(UserFieldConsant.IDENTITY_NO, userDto.getIdentityNo())
- .ne(FieldConstant.ID, userDto.getId());
+ .ne(FieldConstant.ID, userId);
selectCount = this.baseDao.selectCount(userWrapper);
if (selectCount > NumConstant.ZERO) {
return new Result().error("身份证号已被注册");
}
}
- return new Result();
+ UserEntity userEntity = this.selectById(userId);
+
+ return new Result().ok(userEntity.getState());
}
@Override