From c0c1de00dadc0d77b252f745429f1205ab8f3a60 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 21 Jul 2020 14:59:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E7=AB=AF=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E7=99=BB=E9=99=86=E6=8E=A5=E5=8F=A3=E9=80=BB=E8=BE=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ThirdLoginServiceImpl.java | 2 ++ .../epmet/service/impl/UserServiceImpl.java | 20 +++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index a809f04a94..4985f4d9e8 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -74,6 +74,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { resiLoginFormDTO.setWxCode(formDTO.getWxCode()); Result result = epmetThirdFeignClient.resiAndWorkLogin(resiLoginFormDTO); if (!result.success()) { + logger.error("居民端小程序登陆，调用epmet_third服务获取数据失败"); throw new RenException(result.getCode()); } UserWechatDTO userWechatDTO = result.getData(); @@ -149,6 +150,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { resiLoginFormDTO.setWxCode(formDTO.getWxCode()); Result result = epmetThirdFeignClient.resiAndWorkLogin(resiLoginFormDTO); if (!result.success()) { + logger.error("工作端小程序登陆，调用epmet_third服务获取数据失败"); throw new RenException(result.getCode()); } UserWechatDTO userWechatDTO = result.getData(); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java index 4d855c7078..b6d3a63965 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java @@ -199,24 +199,32 @@ public class UserServiceImpl extends BaseServiceImpl implem UserDTO userDTO = userWechatDao.selectUserDTOByOpenId(dto); UserWechatEntity userWechatEntity = ConvertUtils.sourceToTarget(wechatDTO, UserWechatEntity.class); + if ("".equals(userWechatEntity.getUnionId())) { + userWechatEntity.setUnionId(null); + } //2.不存在则新增，存在则更新 - if(null==userDTO||null==userDTO.getId()){ + if (null == userDTO || null == userDTO.getId()) { //user表新增 UserEntity userEntity = new UserEntity(); userEntity.setFromApp(UserConstant.APP_RESI); userEntity.setFromClient(UserConstant.CLIENT_WX); - if(baseDao.insert(userEntity)< NumConstant.ONE){ + if (baseDao.insert(userEntity) < NumConstant.ONE) { + log.error("小程序登陆，居民端user表新增数据失败"); throw new RenException(UserConstant.SAVE_USER); } //user_wechat表新增 userWechatEntity.setUserId(userEntity.getId()); - if(userWechatDao.insert(userWechatEntity)< NumConstant.ONE){ + if (userWechatDao.insert(userWechatEntity) < NumConstant.ONE) { + log.error("小程序登陆，居民端user_wechat表新增数据失败"); throw new RenException(UserConstant.SAVE_USER_WECHAT); } resultDTO.setId(userEntity.getId()); - }else { - wechatDTO.setId(userDTO.getId()); - if(userWechatDao.updateByUserId(wechatDTO)< NumConstant.ONE){ + } else { + wechatDTO.setUserId(userDTO.getId()); + wechatDTO.setUpdatedBy(userDTO.getId()); + wechatDTO.setUpdatedTime(new Date()); + if (userWechatDao.updateByUserId(wechatDTO) < NumConstant.ONE) { + log.error("小程序登陆，居民端user_wechat表更新数据失败"); throw new RenException(UserConstant.UPDATE_USER_WECHAT); } resultDTO.setId(userDTO.getId());