From 4872b664c2bef8a293117079d25bf2d3b99e7ede Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Sat, 7 Dec 2019 16:41:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0=EF=BC=9A?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/entity/ScanSwitchEntity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java index d89db1824..5bb86d5cc 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java @@ -59,12 +59,12 @@ public class ScanSwitchEntity extends BaseEpdcEntity { /** * 扫码开关名称 */ - private String scanFlagName; + //private String scanFlagName; /** * 维护状态名称 */ - private String maintainFlagName; + //private String maintainFlagName; } \ No newline at end of file From daf1920a5ebcccd6c854d3bf280bd88353f7b377 Mon Sep 17 00:00:00 2001 From: yujintao Date: Sat, 7 Dec 2019 16:55:35 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=97=B6=E7=9A=84=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/service/impl/UserServiceImpl.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) 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 ad804ce80..38112fe25 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 @@ -92,6 +92,7 @@ public class UserServiceImpl extends BaseServiceImpl implem private AdminFeignClient adminFeignClient; @Autowired private PartyAuthenticationFailedDao partyAuthenticationFailedDao; + @Override public PageData page(Map params) { this.verifyParams(params); @@ -425,8 +426,8 @@ public class UserServiceImpl extends BaseServiceImpl implem // userGridRel.setAllDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId() + "," + formUserDto.getGridId()); // userGridRel.setParentDeptNames(formUserDto.getStreet() + "-" + formUserDto.getCommunity()); // userGridRel.setParentDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId()); - Result parentAndAllDeptDTOResult=adminFeignClient.getParentAndAllDept(userGridRel.getGrid()); - if(!parentAndAllDeptDTOResult.success()){ + Result parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(userGridRel.getGrid()); + if (!parentAndAllDeptDTOResult.success()) { return new Result().error(parentAndAllDeptDTOResult.getMsg()); } userGridRel.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames()); @@ -742,14 +743,14 @@ public class UserServiceImpl extends BaseServiceImpl implem } if (null == userEntity) { wrapper.eq(UserFieldConsant.WX_UNION_ID, formDTO.getUnionId()) - .eq(StringUtils.isNotBlank(formDTO.getOpenId()), UserFieldConsant.WX_OPEN_ID, formDTO.getOpenId()) - .orderByDesc(FieldConstant.CREATED_TIME); + .eq(StringUtils.isNotBlank(formDTO.getOpenId()), UserFieldConsant.WX_OPEN_ID, formDTO.getOpenId()) + .orderByDesc(FieldConstant.CREATED_TIME); userEntity = this.baseDao.selectOne(wrapper); } if (null != userEntity) { QueryWrapper ugWrapper = new QueryWrapper<>(); ugWrapper.eq(UserFieldConsant.USER_ID, userEntity.getId()) - .orderByDesc(UserFieldConsant.SWITCHED_TIME); + .orderByDesc(UserFieldConsant.SWITCHED_TIME); List gridRelations = userGridRelationService.listUserGrid(userEntity.getId()); if (CollUtil.isNotEmpty(gridRelations)) { UserDTO dto = ConvertUtils.sourceToTarget(userEntity, UserDTO.class); @@ -757,10 +758,8 @@ public class UserServiceImpl extends BaseServiceImpl implem dto.setGrid(gridRelations.get(NumConstant.ZERO).getGrid()); return new Result().ok(dto); } - } else { - return new Result().error("没有找到用户信息"); } - return new Result<>(); + return new Result(); } } From 7441dd99f006285396ff07487c8a042a2c2acd50 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Sat, 7 Dec 2019 17:00:23 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=20=E6=94=B9=E6=88=90?= =?UTF-8?q?=E5=9B=9B=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/service/impl/UserServiceImpl.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) 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 38112fe25..ba86bec7f 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 @@ -506,11 +506,21 @@ public class UserServiceImpl extends BaseServiceImpl implem String identityNo = userDto.getIdentityNo(); if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) { PartyMembersEntity partyMembersEntity = new PartyMembersEntity(); - //修改数据库结构 - partyMembersEntity.setAllDeptNames(userGridRelation.getStreet() + "-" + userGridRelation.getCommunity() + "-" + userGridRelation.getGrid()); - partyMembersEntity.setAllDeptIds(userGridRelation.getStreetId() + "," + userGridRelation.getCommunityId() + "," + userGridRelation.getGridId()); - partyMembersEntity.setParentDeptNames(userGridRelation.getStreet() + "-" + userGridRelation.getCommunity()); - partyMembersEntity.setParentDeptIds(userGridRelation.getStreetId() + "," + userGridRelation.getCommunityId()); + + Result parentAndAllDeptDTOResult=adminFeignClient.getParentAndAllDept(userGridRelation.getGrid()); + if(!parentAndAllDeptDTOResult.success()){ + return new Result().error(parentAndAllDeptDTOResult.getMsg()); + } + partyMembersEntity.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames()); + partyMembersEntity.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds()); + partyMembersEntity.setParentDeptNames(parentAndAllDeptDTOResult.getData().getParentDeptNames()); + partyMembersEntity.setParentDeptIds(parentAndAllDeptDTOResult.getData().getParentDeptIds()); + +// //修改数据库结构 +// partyMembersEntity.setAllDeptNames(userGridRelation.getStreet() + "-" + userGridRelation.getCommunity() + "-" + userGridRelation.getGrid()); +// partyMembersEntity.setAllDeptIds(userGridRelation.getStreetId() + "," + userGridRelation.getCommunityId() + "," + userGridRelation.getGridId()); +// partyMembersEntity.setParentDeptNames(userGridRelation.getStreet() + "-" + userGridRelation.getCommunity()); +// partyMembersEntity.setParentDeptIds(userGridRelation.getStreetId() + "," + userGridRelation.getCommunityId()); partyMembersEntity.setGridId(userGridRelation.getGridId()); partyMembersEntity.setGridName(userGridRelation.getGrid()); From 737576379efdb7210768f164a669e3a2c795aedf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Sat, 7 Dec 2019 17:18:14 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/item/ItemDao.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 9337d3586..7cc56a2d6 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -37,6 +37,9 @@ item.USER_FACE, item.IS_PARTY_MEMBER, item.CREATED_TIME, + eve.APPROVE_NUM, + eve.OPPOSE_NUM, + eve.COMMENT_NUM, ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS statementNum, cate.CATEGORY_NAME, img.IMG_URL, From b08eed8b4282ff56e8e018d3799043b2e9321b00 Mon Sep 17 00:00:00 2001 From: yujintao Date: Sat, 7 Dec 2019 17:20:22 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=97=B6=EF=BC=8C=E4=B8=BB=E8=A6=81=E7=94=A8?= =?UTF-8?q?unionid=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/EpdcCompleteUserInfoFormDTO.java | 15 +++ .../epdc/service/impl/AppUserServiceImpl.java | 13 ++- .../src/main/resources/registry.conf | 2 +- .../epdc/dto/epdc/EpdcCompleteAppUserDTO.java | 5 + .../form/EpdcCheckUserRegisterFromDTO.java | 5 + .../epdc/service/impl/UserServiceImpl.java | 102 ++++++++++-------- 6 files changed, 97 insertions(+), 45 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java index dfbc61f96..8d89fe03a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java @@ -57,4 +57,19 @@ public class EpdcCompleteUserInfoFormDTO implements Serializable { */ @NotBlank(message = "性别不能为空") private String sex; + + /** + * 微信code + */ + private String wxCode; + + /** + * 用户信息 + */ + private String encryptedData; + + /** + * 加密算法的初始向量 + */ + private String iv; } 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 763583bee..ac58194a5 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 @@ -110,7 +110,7 @@ public class AppUserServiceImpl implements AppUserService { @Override public Result checkRegister(EpdcCheckRegisterFormDTO formDto) { - WxMaJscode2SessionResult wxMaJscode2SessionResult=new WxMaJscode2SessionResult(); + WxMaJscode2SessionResult wxMaJscode2SessionResult = new WxMaJscode2SessionResult(); wxMaJscode2SessionResult.setOpenid(formDto.getOpenId()); return this.getTokenByOpenId(wxMaJscode2SessionResult); } @@ -669,6 +669,7 @@ public class AppUserServiceImpl implements AppUserService { // 查询当前微信注册状态 EpdcCheckUserRegisterFromDTO checkFromDto = new EpdcCheckUserRegisterFromDTO(); checkFromDto.setOpenId(openId); + checkFromDto.setWxUnionId(unionId); checkFromDto.setGridId(formDto.getGridId()); Result userResult = userFeignClient.getUserRegisterState(checkFromDto); if (!userResult.success()) { @@ -764,8 +765,18 @@ public class AppUserServiceImpl implements AppUserService { @Override public Result completeUserInfo(TokenDto tokenDto, EpdcCompleteUserInfoFormDTO infoDto) { + WxMaUserInfo wxMaUserInfo = null; + if (StringUtils.isNotBlank(infoDto.getWxCode())) { + String sessionKey = this.getUserSessionKey(infoDto.getWxCode()); + wxMaUserInfo = wxMaServiceUtils.normalWxMaService().getUserService().getUserInfo(sessionKey, infoDto.getEncryptedData(), infoDto.getIv()); + if (StringUtils.isBlank(wxMaUserInfo.getUnionId())) { + return new Result().error("解析微信开放平台ID失败"); + } + } + UserDTO userDto = ConvertUtils.sourceToTarget(infoDto, UserDTO.class); userDto.setId(tokenDto.getUserId()); + userDto.setWxUnionId(wxMaUserInfo.getUnionId()); // 党员提交，验证身份证号 if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) { diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf index bccc306f5..fb64abd71 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf @@ -14,7 +14,7 @@ config { type = "nacos" nacos { - serverAddr = "nacos.server-addr" + serverAddr = "@nacos.server-addr@" namespace = "public" cluster = "default" } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java index fa7b52f85..f9a2e0cdf 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java @@ -94,4 +94,9 @@ public class EpdcCompleteAppUserDTO implements Serializable { */ private String state; + /** + * 微信unionId + */ + private String wxUnionId; + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCheckUserRegisterFromDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCheckUserRegisterFromDTO.java index 41efa78fe..87c8f9269 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCheckUserRegisterFromDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCheckUserRegisterFromDTO.java @@ -17,6 +17,11 @@ public class EpdcCheckUserRegisterFromDTO implements Serializable { */ private String openId; + /** + * 微信unionId + */ + private String wxUnionId; + /** * 网格ID */ 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 ba86bec7f..0871b5228 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 @@ -364,22 +364,24 @@ public class UserServiceImpl extends BaseServiceImpl implem @Override public Result checkUserRegisterState(EpdcCheckUserRegisterFromDTO fromDto) { - QueryWrapper 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 userEntityList = this.baseDao.selectList(wrapper); + + UserDTO userDto = this.selectUserByWxInfo(fromDto.getOpenId(), fromDto.getWxUnionId()); + +// QueryWrapper 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 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); @@ -507,8 +509,8 @@ public class UserServiceImpl extends BaseServiceImpl implem if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) { PartyMembersEntity partyMembersEntity = new PartyMembersEntity(); - Result parentAndAllDeptDTOResult=adminFeignClient.getParentAndAllDept(userGridRelation.getGrid()); - if(!parentAndAllDeptDTOResult.success()){ + Result parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(userGridRelation.getGrid()); + if (!parentAndAllDeptDTOResult.success()) { return new Result().error(parentAndAllDeptDTOResult.getMsg()); } partyMembersEntity.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames()); @@ -622,25 +624,25 @@ public class UserServiceImpl extends BaseServiceImpl 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,48 @@ public class UserServiceImpl extends BaseServiceImpl implem **/ @Override public Result queryUserDto(EpdcAppQueryUserInfoFormDTO formDTO) { - if (!StringUtils.isNotBlank(formDTO.getUnionId()) && !StringUtils.isNotBlank(formDTO.getOpenId())) { - return new Result().error("openId、unionId不能同时为空"); + UserDTO userDto = this.selectUserByWxInfo(formDTO.getOpenId(), formDTO.getUnionId()); + if (null != userDto) { + QueryWrapper ugWrapper = new QueryWrapper<>(); + ugWrapper.eq(UserFieldConsant.USER_ID, userDto.getId()) + .orderByDesc(UserFieldConsant.SWITCHED_TIME); + List 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().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.isNotBlank(openId) && !StringUtils.isNotBlank(unionId)) { + throw new RenException("openId、unionId不能同时为空"); } QueryWrapper 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_UNION_ID, unionId) + .or() + .eq(StringUtils.isNotBlank(openId), UserFieldConsant.WX_OPEN_ID, openId) .orderByDesc(FieldConstant.CREATED_TIME); userEntity = this.baseDao.selectOne(wrapper); } - if (null != userEntity) { - QueryWrapper ugWrapper = new QueryWrapper<>(); - ugWrapper.eq(UserFieldConsant.USER_ID, userEntity.getId()) - .orderByDesc(UserFieldConsant.SWITCHED_TIME); - List 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().ok(dto); - } - } - return new Result(); + return ConvertUtils.sourceToTarget(userEntity, UserDTO.class); } }