|
|
|
@ -364,22 +364,24 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
|
|
|
|
|
@Override |
|
|
|
public Result<EpdcUserRegisterInfoResultDTO> checkUserRegisterState(EpdcCheckUserRegisterFromDTO fromDto) { |
|
|
|
QueryWrapper<UserEntity> wrapper = new QueryWrapper<>(); |
|
|
|
wrapper.eq(UserFieldConsant.WX_OPEN_ID, fromDto.getOpenId()) |
|
|
|
.select(FieldConstant.ID, UserFieldConsant.NICKNAME, UserFieldConsant.FACE_IMG, |
|
|
|
FieldConstant.MOBILE, UserFieldConsant.REAL_NAME, |
|
|
|
FieldConstant.STATE, UserFieldConsant.PARTY_FLAG, UserFieldConsant.REMARK) |
|
|
|
.orderByDesc(FieldConstant.CREATED_TIME); |
|
|
|
List<UserEntity> userEntityList = this.baseDao.selectList(wrapper); |
|
|
|
|
|
|
|
UserDTO userDto = this.selectUserByWxInfo(fromDto.getOpenId(), fromDto.getWxUnionId()); |
|
|
|
|
|
|
|
// QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
|
|
|
|
// wrapper.eq(UserFieldConsant.WX_OPEN_ID, fromDto.getOpenId())
|
|
|
|
// .select(FieldConstant.ID, UserFieldConsant.NICKNAME, UserFieldConsant.FACE_IMG,
|
|
|
|
// FieldConstant.MOBILE, UserFieldConsant.REAL_NAME,
|
|
|
|
// FieldConstant.STATE, UserFieldConsant.PARTY_FLAG, UserFieldConsant.REMARK)
|
|
|
|
// .orderByDesc(FieldConstant.CREATED_TIME);
|
|
|
|
// List<UserEntity> userEntityList = this.baseDao.selectList(wrapper);
|
|
|
|
|
|
|
|
EpdcUserRegisterInfoResultDTO resultDto = new EpdcUserRegisterInfoResultDTO(); |
|
|
|
resultDto.setGridId(fromDto.getGridId()); |
|
|
|
// 已注册
|
|
|
|
if (CollUtil.isNotEmpty(userEntityList) && null != userEntityList.get(NumConstant.ZERO)) { |
|
|
|
UserEntity userEntity = userEntityList.get(NumConstant.ZERO); |
|
|
|
resultDto.setUserDTO(ConvertUtils.sourceToTarget(userEntity, UserDTO.class)); |
|
|
|
if (null != userDto) { |
|
|
|
resultDto.setUserDTO(userDto); |
|
|
|
// 获取用户关联当前网格信息
|
|
|
|
UserGridRelationDTO relationInfo = userGridRelationService.getUserRelationInfo(userEntity.getId(), fromDto.getGridId()); |
|
|
|
UserGridRelationDTO relationInfo = userGridRelationService.getUserRelationInfo(userDto.getId(), fromDto.getGridId()); |
|
|
|
// 未绑定当前网格
|
|
|
|
if (null == relationInfo) { |
|
|
|
resultDto.setRegisterState(NumConstant.ONE); |
|
|
|
@ -426,7 +428,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
|
// userGridRel.setAllDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId() + "," + formUserDto.getGridId());
|
|
|
|
// userGridRel.setParentDeptNames(formUserDto.getStreet() + "-" + formUserDto.getCommunity());
|
|
|
|
// userGridRel.setParentDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId());
|
|
|
|
Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(userGridRel.getGrid()); |
|
|
|
Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(userGridRel.getGridId().toString()); |
|
|
|
if (!parentAndAllDeptDTOResult.success()) { |
|
|
|
return new Result<EpdcUserRegisterInfoResultDTO>().error(parentAndAllDeptDTOResult.getMsg()); |
|
|
|
} |
|
|
|
@ -507,8 +509,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
|
if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) { |
|
|
|
PartyMembersEntity partyMembersEntity = new PartyMembersEntity(); |
|
|
|
|
|
|
|
Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult=adminFeignClient.getParentAndAllDept(userGridRelation.getGrid()); |
|
|
|
if(!parentAndAllDeptDTOResult.success()){ |
|
|
|
Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(userGridRelation.getGrid()); |
|
|
|
if (!parentAndAllDeptDTOResult.success()) { |
|
|
|
return new Result<UserDTO>().error(parentAndAllDeptDTOResult.getMsg()); |
|
|
|
} |
|
|
|
partyMembersEntity.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames()); |
|
|
|
@ -622,25 +624,25 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
|
if (StringUtils.isBlank(formDTO.getAuthenticatedFlag())) { |
|
|
|
formDTO.setAuthenticatedFlag(YesOrNoEnum.NO.value()); |
|
|
|
} |
|
|
|
UserDTO userDTO = this.get(formDTO.getUserId()); |
|
|
|
if (null != userDTO) { |
|
|
|
userDTO.setRemark(formDTO.getRemark());//审核不通过的原因 - 2019.12.05.zy
|
|
|
|
UserDTO userDto = this.get(formDTO.getUserId()); |
|
|
|
if (null != userDto) { |
|
|
|
userDto.setRemark(formDTO.getRemark());//审核不通过的原因 - 2019.12.05.zy
|
|
|
|
if (YesOrNoEnum.NO.value().equals(formDTO.getAuthenticatedFlag())) {//不通过
|
|
|
|
userDTO.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value()); |
|
|
|
userDto.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value()); |
|
|
|
} else if (YesOrNoEnum.YES.value().equals(formDTO.getAuthenticatedFlag())) {//通过
|
|
|
|
userDTO.setState(AppUserStatesEnum.STATE_INFORMATION_PASSED.value()); |
|
|
|
userDto.setState(AppUserStatesEnum.STATE_INFORMATION_PASSED.value()); |
|
|
|
} else { |
|
|
|
throw new RenException("是否认证通过数据不匹配"); |
|
|
|
} |
|
|
|
this.update(userDTO); |
|
|
|
this.update(userDto); |
|
|
|
//插入认证历史表
|
|
|
|
UserAuthenticateHistoryEntity authenticateHistoryEntity = new UserAuthenticateHistoryEntity(); |
|
|
|
authenticateHistoryEntity.setUserId(userDTO.getId()); |
|
|
|
authenticateHistoryEntity.setMobile(userDTO.getMobile()); |
|
|
|
authenticateHistoryEntity.setRealName(userDTO.getRealName()); |
|
|
|
authenticateHistoryEntity.setAddress(userDTO.getAddress()); |
|
|
|
authenticateHistoryEntity.setUserId(userDto.getId()); |
|
|
|
authenticateHistoryEntity.setMobile(userDto.getMobile()); |
|
|
|
authenticateHistoryEntity.setRealName(userDto.getRealName()); |
|
|
|
authenticateHistoryEntity.setAddress(userDto.getAddress()); |
|
|
|
authenticateHistoryEntity.setAuthenticatedFlag(formDTO.getAuthenticatedFlag());//是否认证通过 0未通过1通过
|
|
|
|
//authenticateHistoryEntity.setRemark(userDTO.getRemark());
|
|
|
|
//authenticateHistoryEntity.setRemark(userDto.getRemark());
|
|
|
|
authenticateHistoryEntity.setRemark(formDTO.getRemark()); //审核不通过的原因 - 2019.12.05.zy
|
|
|
|
userAuthenticateHistoryDao.insert(authenticateHistoryEntity); |
|
|
|
} |
|
|
|
@ -742,34 +744,46 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
|
**/ |
|
|
|
@Override |
|
|
|
public Result<UserDTO> queryUserDto(EpdcAppQueryUserInfoFormDTO formDTO) { |
|
|
|
if (!StringUtils.isNotBlank(formDTO.getUnionId()) && !StringUtils.isNotBlank(formDTO.getOpenId())) { |
|
|
|
return new Result<UserDTO>().error("openId、unionId不能同时为空"); |
|
|
|
UserDTO userDto = this.selectUserByWxInfo(formDTO.getOpenId(), formDTO.getUnionId()); |
|
|
|
if (null != userDto) { |
|
|
|
QueryWrapper<UserGridRelationEntity> ugWrapper = new QueryWrapper<>(); |
|
|
|
ugWrapper.eq(UserFieldConsant.USER_ID, userDto.getId()) |
|
|
|
.orderByDesc(UserFieldConsant.SWITCHED_TIME); |
|
|
|
List<UserGridRelationDTO> gridRelations = userGridRelationService.listUserGrid(userDto.getId()); |
|
|
|
if (CollUtil.isNotEmpty(gridRelations)) { |
|
|
|
userDto.setGridId(gridRelations.get(NumConstant.ZERO).getGridId()); |
|
|
|
userDto.setGrid(gridRelations.get(NumConstant.ZERO).getGrid()); |
|
|
|
return new Result<UserDTO>().ok(userDto); |
|
|
|
} |
|
|
|
} |
|
|
|
return new Result(); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 根据微信信息查询用户 |
|
|
|
* |
|
|
|
* @param openId |
|
|
|
* @param unionId |
|
|
|
* @return com.elink.esua.epdc.dto.UserDTO |
|
|
|
* @author work@yujt.net.cn |
|
|
|
* @date 2019/12/7 17:19 |
|
|
|
*/ |
|
|
|
private UserDTO selectUserByWxInfo(String openId, String unionId) { |
|
|
|
if (StringUtils.isBlank(openId)) { |
|
|
|
throw new RenException("openId不能为空"); |
|
|
|
} |
|
|
|
QueryWrapper<UserEntity> wrapper = new QueryWrapper<>(); |
|
|
|
UserEntity userEntity = null; |
|
|
|
if (StringUtils.isNotBlank(formDTO.getUnionId())) { |
|
|
|
wrapper.eq(UserFieldConsant.WX_UNION_ID, formDTO.getUnionId()); |
|
|
|
if (StringUtils.isNotBlank(unionId)) { |
|
|
|
wrapper.eq(UserFieldConsant.WX_UNION_ID, unionId); |
|
|
|
userEntity = this.baseDao.selectOne(wrapper); |
|
|
|
} |
|
|
|
if (null == userEntity) { |
|
|
|
wrapper.eq(UserFieldConsant.WX_UNION_ID, formDTO.getUnionId()) |
|
|
|
.eq(StringUtils.isNotBlank(formDTO.getOpenId()), UserFieldConsant.WX_OPEN_ID, formDTO.getOpenId()) |
|
|
|
wrapper.eq(UserFieldConsant.WX_OPEN_ID, openId) |
|
|
|
.orderByDesc(FieldConstant.CREATED_TIME); |
|
|
|
userEntity = this.baseDao.selectOne(wrapper); |
|
|
|
} |
|
|
|
if (null != userEntity) { |
|
|
|
QueryWrapper<UserGridRelationEntity> ugWrapper = new QueryWrapper<>(); |
|
|
|
ugWrapper.eq(UserFieldConsant.USER_ID, userEntity.getId()) |
|
|
|
.orderByDesc(UserFieldConsant.SWITCHED_TIME); |
|
|
|
List<UserGridRelationDTO> gridRelations = userGridRelationService.listUserGrid(userEntity.getId()); |
|
|
|
if (CollUtil.isNotEmpty(gridRelations)) { |
|
|
|
UserDTO dto = ConvertUtils.sourceToTarget(userEntity, UserDTO.class); |
|
|
|
dto.setGridId(gridRelations.get(NumConstant.ZERO).getGridId()); |
|
|
|
dto.setGrid(gridRelations.get(NumConstant.ZERO).getGrid()); |
|
|
|
return new Result<UserDTO>().ok(dto); |
|
|
|
} |
|
|
|
} |
|
|
|
return new Result(); |
|
|
|
return ConvertUtils.sourceToTarget(userEntity, UserDTO.class); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
李鹏飞
6 years ago