From 0e001002a2d3d092089e5bfe79ae395078bffece Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sat, 23 May 2020 01:00:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=84=8F=E8=BF=9B=E7=BE=A4=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiGroupServiceImpl.java    |  5 +++-
 .../impl/GroupInvitationServiceImpl.java      | 25 +++++++++++++------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index 11351e6ce2..d55917080d 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -17,6 +17,7 @@
 
 package com.epmet.modules.group.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -621,9 +622,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		userRoleFormDTO.setCustomerId(customerId);
 		userRoleFormDTO.setUserId(userId);
 		userRoleFormDTO.setGridId(gridId);
+		logger.info(String.format("用户同意邀请进组,获取当前用户所有角色入参：%s", JSON.toJSONString(userRoleFormDTO)));
 		Result<List<UserRoleResultDTO>> userRoleListResult = epmetUserFeignClient.getUserRoleInfo(userRoleFormDTO);
 		if (!userRoleListResult.success()) {
-			logger.info("获取用户角色feign调用失败" + userRoleListResult.getMsg());
+			logger.error("获取用户角色feign调用失败" + userRoleListResult.getMsg());
 			return userRoleDTO;
 		}
 		List<UserRoleResultDTO> userRoleList = userRoleListResult.getData();
@@ -641,6 +643,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 				userRoleDTO.setRegisteredResiFlag(NumConstant.ONE_STR);
 			}
 		}
+		logger.info(String.format("用户同意邀请进组,获取当前用户所有角色返参：%s",JSON.toJSONString(userRoleDTO)));
 		return userRoleDTO;
 	}
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
index 82fc088a2a..c4fedb0531 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
@@ -217,13 +217,6 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		linkGroupInfoResultDTO.setGroupInfo(groupInfo);
 		//4、记录用户邀请关系
 		this.saveUserInvitation(groupInvitationDTO,formDTO);
-		UserEnterGridFormDTO userEnterGridFormDTO=new UserEnterGridFormDTO();
-		userEnterGridFormDTO.setCustomerId(groupInfo.getCustomerId());
-		userEnterGridFormDTO.setGridId(groupInfo.getGridId());
-		Result<UserInfoOnEnterGridResultDTO> result=resiGuideFeignClient.enterGrid(userEnterGridFormDTO);
-		if(!result.success()){
-			logger.error("进入网格失败"+result.getMsg());
-		}
 		return linkGroupInfoResultDTO;
 	}
 
@@ -312,8 +305,24 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 	public void accetInvitation(AccetInvitationFormDTO formDTO) {
 		//1、申请是否有效
 		GroupInvitationDTO groupInvitationDTO=this.checkLinkValid(formDTO.getInvitationId());
-		//2、校验是否已经注册居民
+		//2、进入小组所在的网格
 		ResiGroupDTO resiGroupDTO = resiGroupService.get(groupInvitationDTO.getResiGroupId());
+		if(null==resiGroupDTO){
+			logger.error(String.format("用户同意邀请进组，查询组信息失败。入参：userId【%s】、invitationId【%s】、groupId【%s】。",formDTO.getUserId(),formDTO.getInvitationId(),groupInvitationDTO.getResiGroupId()));
+			throw new RenException(EpmetErrorCode.LOSE_EFFICACY.getCode());
+		}
+		UserEnterGridFormDTO userEnterGridFormDTO=new UserEnterGridFormDTO();
+		userEnterGridFormDTO.setCustomerId(resiGroupDTO.getCustomerId());
+		userEnterGridFormDTO.setGridId(resiGroupDTO.getGridId());
+		Result<UserInfoOnEnterGridResultDTO> result=resiGuideFeignClient.enterGrid(userEnterGridFormDTO);
+		if(!result.success()){
+			logger.error(String.format("用户同意邀请进组,进入网格失败。入参：userId【%s】、invitationId【%s】、groupId【%s】、customerId【%s】、gridId【%s】",
+					formDTO.getUserId(),formDTO.getInvitationId(),
+					groupInvitationDTO.getResiGroupId()),
+					resiGroupDTO.getCustomerId(),resiGroupDTO.getGridId());
+			logger.error(String.format("用户同意邀请进组,进入网格失败。调用enterGrid接口返回",result.toString()));
+		}
+		//3、校验是否已经注册居民
 		UserRoleDTO userRoleDTO=new UserRoleDTO();
 		if (null != resiGroupDTO) {
 			//获取当前用户所有角色