体验版更新：同意进群接口修改，服务升级到0.3.34

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -13,7 +13,7 @@ public enum EpmetErrorCode {
 	ERR401(401, "未授权"),
 	VALIDATE_ERROR(7000, "数据校验异常"),
 	SERVER_ERROR(8000, "服务器开小差了..."),
-	CANNOT_JOIN_GROUP(8001, "只有认证党员和居民才可以加入小组，请选择您的身份"),
+	CANNOT_JOIN_GROUP(8001, "只有注册居民才可以加入小组"),
 	CANNOT_CREATE_GROUP(8002, "只有党员和热心居民才能创建小组，请选择您的身份"),
 	GROUP_ALREADY_EXISTED(8003,"组名已存在"),
 	GOV_STAFF_NOT_EXISTS(8004,"手机号未注册，请联系贵单位管理员，确认其录入手机与您所持手机号相同"),

epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.33
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.34
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络

epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.33
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.34
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络

epmet-module/resi-group/resi-group-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.33</version>
+    <version>0.3.34</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java

@@ -33,6 +33,7 @@ import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
+import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.feign.MessageFeignClient;
 import com.epmet.modules.constant.UserMessageConstant;
 import com.epmet.modules.feign.EpmetUserFeignClient;
@@ -315,15 +316,21 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		userEnterGridFormDTO.setCustomerId(resiGroupDTO.getCustomerId());
 		userEnterGridFormDTO.setGridId(resiGroupDTO.getGridId());
 		Result<UserInfoOnEnterGridResultDTO> result=resiGuideFeignClient.enterGrid(userEnterGridFormDTO);
-		if(!result.success()){
+		if (!result.success() || null == result.getData()) {
 			logger.error(String.format("用户同意邀请进组,进入网格失败。入参：userId【%s】、invitationId【%s】、groupId【%s】、customerId【%s】、gridId【%s】",
-					formDTO.getUserId(),formDTO.getInvitationId(),
+					formDTO.getUserId(), formDTO.getInvitationId(),
 					groupInvitationDTO.getResiGroupId()),
-					resiGroupDTO.getCustomerId(),resiGroupDTO.getGridId());
+					resiGroupDTO.getCustomerId(), resiGroupDTO.getGridId());
-			logger.error(String.format("用户同意邀请进组,进入网格失败。调用enterGrid接口返回",result.toString()));
+			logger.error(String.format("用户同意邀请进组,进入网格失败。当前接口返回8000,调用enterGrid接口返回", result.toString()));
+			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
 		}
 		//3、校验是否已经注册居民
-		UserRoleDTO userRoleDTO=new UserRoleDTO();
+		if(null==result.getData().getUserRoleList()||result.getData().getUserRoleList().size()==0){
+			logger.error(String.format("用户同意邀请进组失败,返回角色列表为空错误编码%s,错误提示%s",EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg()));
+			throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
+		}
+		UserRoleDTO userRoleDTO=this.getUserRoleDTO(result.getData().getUserRoleList());
+		/*UserRoleDTO userRoleDTO=new UserRoleDTO();
 		if (null != resiGroupDTO) {
 			//获取当前用户所有角色
 			 userRoleDTO = resiGroupService.checkPartyMemberOrWarmHeated(formDTO.getApp(),
@@ -334,7 +341,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 				logger.error(String.format("居民端用户【%s】同意邀请进组失败,错误码:%s,错误提示:%s",formDTO.getUserId(),EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg()));
 				throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
 			}
-		}
+		}*/
 		//3、新增一条邀请入群、直接审核通过的入群记录
 		GroupMemeberOperationDTO groupMemeberOperation = new GroupMemeberOperationDTO();
 		groupMemeberOperation.setGroupId(resiGroupDTO.getId());
@@ -363,6 +370,22 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		this.sendMessageToLeader(formDTO, resiGroupDTO,groupInvitationDTO);
 	}
 
+	private UserRoleDTO getUserRoleDTO(List<String> userRoleList) {
+		UserRoleDTO userRoleDTO=new UserRoleDTO();
+		for (String roleKey : userRoleList) {
+			if (EpmetRoleKeyConstant.PARTYMEMBER.equals(roleKey)) {
+				userRoleDTO.setPartymemberFlag(NumConstant.ONE_STR);
+			}
+			if (EpmetRoleKeyConstant.WARMHEARTED.equals(roleKey)) {
+				userRoleDTO.setWarmHeartedFlag(NumConstant.ONE_STR);
+			}
+			if (EpmetRoleKeyConstant.REGISTERED_RESI.equals(roleKey)) {
+				userRoleDTO.setRegisteredResiFlag(NumConstant.ONE_STR);
+			}
+		}
+		return userRoleDTO;
+	}
+
 	/**
 	 * @param formDTO            当前用户信息
 	 * @param resiGroupDTO       群组信息