From 9221264bb3efa76782735e6a64bc9121c6808e54 Mon Sep 17 00:00:00 2001 From: wangchao Date: Sat, 11 Apr 2020 17:23:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E5=B0=8F=E7=BB=84=E6=97=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=84-=E5=AE=A2=E6=88=B7=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E5=88=97=E8=A1=A8=EF=BC=8C=E4=BF=9D=E8=AF=81=E5=94=AF?= =?UTF-8?q?=E4=B8=80=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/dto/group/ResiGroupInfoRedisDTO.java | 2 +- .../impl/RegisterRelationServiceImpl.java | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupInfoRedisDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupInfoRedisDTO.java index e777be4ed3..89cbcaeeea 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupInfoRedisDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupInfoRedisDTO.java @@ -56,7 +56,7 @@ public class ResiGroupInfoRedisDTO implements Serializable{ private String latestTopicPublishDate; /** - * 组统计嘻嘻你系 + * 组统计信息 * */ private ResiGroupStatisticalInfoRedisDTO groupStatisticalInfo; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java index 790793dd10..4566a99710 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java @@ -168,12 +168,16 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl registerRecords = baseDao.getListByUserId(enterGridFormDTO.getUserId()); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(UserCustomerConstant.CUSTOMER_ID,enterGridFormDTO.getCustomerId()); + wrapper.eq(UserCustomerConstant.USER_ID,enterGridFormDTO.getUserId()); + + //1.查找用户注册关系表，如果没有表示当前用户为陌生人(拉取用户微信表信息)，如果有表示当前用户已经进行居民认证 if(null == registerRecords || registerRecords.size() <= 0){ //当前用户尚未注册过居民信息 - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(UserCustomerConstant.CUSTOMER_ID,enterGridFormDTO.getCustomerId()); - wrapper.eq(UserCustomerConstant.USER_ID,enterGridFormDTO.getUserId()); + List userCustomerList = userCustomerDao.selectList(wrapper); if(null == userCustomerList || userCustomerList.size() <= 0){ userCustomerDao.insert(userCustomer); @@ -192,7 +196,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl registerRecordWithSameCustAndGrid = registerRecords.stream().filter(obj -> customerId.equals(obj.getCustomerId()) && gridId.equals(obj.getGridId())).findFirst(); - //是否存在相同客户相同网格的注册记录 + //不存在相同客户相同网格的注册记录 if(!registerRecordWithSameCustAndGrid.isPresent()){ Optional registerRecordWithSameCustAndDiffGrid = registerRecords.stream().filter(obj -> customerId.equals(obj.getCustomerId()) && !gridId.equals(obj.getGridId())).findAny(); @@ -217,7 +221,10 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl userCustomerList = userCustomerDao.selectList(wrapper); + if(null == userCustomerList || userCustomerList.size() <= 0){ + userCustomerDao.insert(userCustomer); + } }else{ //如果不存在不同客户不同网格数据，说明在居民注册时没有成功记录register_relation信息