邀请入组的接口添加返参，标识是否存在审核中申请

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

@@ -128,8 +128,7 @@ public enum EpmetErrorCode {
 	GROUP_EDIT_ERROR(9000,"组信息编辑失败"),
 	GROUP_NOT_EXISTS(9001,"该组不存在"),
 	GROUP_IN_AUDITING(9002,"该组已提交编辑，处于待审核状态，完成审核前不可再次提交"),
-	GROUP_EDIT_NUM_LIMITED(9003,"已达编辑次数上限"),
-	EXISTING_APPLICATION(9004,"已存在待审核入组申请，不能重复申请");
+	GROUP_EDIT_NUM_LIMITED(9003,"已达编辑次数上限");
 
 
 	private int code;

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/AcceptInvitationResultDTO.java

@@ -0,0 +1,19 @@
+package com.epmet.resi.group.dto.invitation.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 同意邀请进组
+ * @Author sun
+ */
+@Data
+public class AcceptInvitationResultDTO implements Serializable {
+	private static final long serialVersionUID = 8860336693592035343L;
+
+	/**
+	 * true 已经入组过需要审核 false没有入组过
+	 */
+	private Boolean awaitAudit = false;
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoResultDTO.java

@@ -14,6 +14,10 @@ import java.io.Serializable;
 public class LinkGroupInfoResultDTO implements Serializable {
 	private static final long serialVersionUID = 8860336693592035343L;
 
+	/**
+	 * true 已经入组过需要审核 false没有入组过
+	 */
+	private Boolean awaitAudit;
 	/**
 	 * 是否在群内标志，已经在群内yes 不在群内no
 	 */

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/GroupInvitationController.java

@@ -25,6 +25,7 @@ import com.epmet.modules.invitation.service.GroupInvitationService;
 import com.epmet.resi.group.dto.invitation.form.AccetInvitationFormDTO;
 import com.epmet.resi.group.dto.invitation.form.CreateGroupInvitationFormDTO;
 import com.epmet.resi.group.dto.invitation.form.LinkGroupInfoFormDTO;
+import com.epmet.resi.group.dto.invitation.result.AcceptInvitationResultDTO;
 import com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO;
 import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -89,12 +90,10 @@ public class GroupInvitationController {
      * @Date 2020/3/31 23:47
      **/
     @PostMapping("acceptinvitation")
-    public Result accetInvitation(@LoginUser TokenDto tokenDto,
-                                  @RequestBody AccetInvitationFormDTO formDTO) {
+    public Result<AcceptInvitationResultDTO> accetInvitation(@LoginUser TokenDto tokenDto, @RequestBody AccetInvitationFormDTO formDTO) {
         formDTO.setUserId(tokenDto.getUserId());
         formDTO.setApp(tokenDto.getApp());
         ValidatorUtils.validateEntity(formDTO);
-		groupInvitationService.accetInvitation(formDTO);
-        return new Result();
+        return new Result<AcceptInvitationResultDTO>().ok(groupInvitationService.accetInvitation(formDTO));
     }
 }

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

@@ -25,6 +25,7 @@ import com.epmet.resi.group.dto.invitation.GroupInvitationDTO;
 import com.epmet.resi.group.dto.invitation.form.AccetInvitationFormDTO;
 import com.epmet.resi.group.dto.invitation.form.CreateGroupInvitationFormDTO;
 import com.epmet.resi.group.dto.invitation.form.LinkGroupInfoFormDTO;
+import com.epmet.resi.group.dto.invitation.result.AcceptInvitationResultDTO;
 import com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO;
 import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO;
 
@@ -133,5 +134,5 @@ public interface GroupInvitationService extends BaseService<GroupInvitationEntit
      * @Description 同意邀请进组
      * @Date 2020/3/31 23:47
      **/
-	void accetInvitation(AccetInvitationFormDTO formDTO);
+    AcceptInvitationResultDTO accetInvitation(AccetInvitationFormDTO formDTO);
 }

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

@@ -46,7 +46,6 @@ import com.epmet.modules.member.dao.ResiGroupMemberDao;
 import com.epmet.modules.member.service.GroupMemeberOperationService;
 import com.epmet.modules.member.service.ResiGroupMemberService;
 import com.epmet.modules.member.service.impl.ResiGroupMemberServiceImpl;
-import com.epmet.resi.group.constant.EnterGroupTypeConstant;
 import com.epmet.resi.group.constant.GroupStateConstant;
 import com.epmet.resi.group.constant.LeaderFlagConstant;
 import com.epmet.resi.group.constant.MemberStateConstant;
@@ -57,6 +56,7 @@ import com.epmet.resi.group.dto.invitation.GroupInvitationDTO;
 import com.epmet.resi.group.dto.invitation.form.AccetInvitationFormDTO;
 import com.epmet.resi.group.dto.invitation.form.CreateGroupInvitationFormDTO;
 import com.epmet.resi.group.dto.invitation.form.LinkGroupInfoFormDTO;
+import com.epmet.resi.group.dto.invitation.result.AcceptInvitationResultDTO;
 import com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO;
 import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoDTO;
 import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO;
@@ -244,6 +244,13 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		} else {
 			linkGroupInfoResultDTO.setInGroup(Constant.NO);
 		}
+		//2020.11.27 sun 添加查询是否已存在待审核申请  start
+		linkGroupInfoResultDTO.setAwaitAudit(false);
+		GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.selectLatestRecord(groupInvitationDTO.getResiGroupId(), formDTO.getUserId());
+		if (null != groupMemeberOperationDTO && MemberStateConstant.UNDER_AUDITTING.equals(groupMemeberOperationDTO.getOperateStatus())) {
+			linkGroupInfoResultDTO.setAwaitAudit(true);
+		}
+		//end
 		//2、查询组信息
 		LinkGroupInfoDTO groupInfo = baseDao.selectLinkGroupInfo(groupInvitationDTO.getResiGroupId());
 		if(null!=groupInfo){
@@ -349,21 +356,23 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 	 * @Date 2020/3/31 23:47
 	 **/
 	@Override
-	public void accetInvitation(AccetInvitationFormDTO formDTO) {
+	public AcceptInvitationResultDTO accetInvitation(AccetInvitationFormDTO formDTO) {
+		AcceptInvitationResultDTO resultDTO = new AcceptInvitationResultDTO();
 		//1、申请是否有效
 		GroupInvitationDTO groupInvitationDTO=this.checkLinkValid(formDTO.getInvitationId());
 		//2、查询是否在群内
 		ResiGroupMemberDTO groupMember = resiGroupMemberDao.selectGroupMemberInfo(groupInvitationDTO.getResiGroupId(), formDTO.getUserId());
 		if (null != groupMember && !MemberStateConstant.REMOVED.equals(groupMember.getStatus())) {
 			logger.info("已经在群内,直接返回成功");
-			return;
+			return resultDTO;
 		}
 		//2020.11.26 sun start
 		//先判断用户是否有在审核的入组申请，有的话直接给提示
 		GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.selectLatestRecord(groupInvitationDTO.getResiGroupId(), formDTO.getUserId());
 		if (null != groupMemeberOperationDTO && MemberStateConstant.UNDER_AUDITTING.equals(groupMemeberOperationDTO.getOperateStatus())) {
 			logger.info("已存在待审核入组申请，不能重复审核");
-			throw new RenException(EpmetErrorCode.EXISTING_APPLICATION.getCode());
+			resultDTO.setAwaitAudit(true);
+			return  resultDTO;
 		}
 		//end
 		//3、进入小组所在的网格
@@ -414,7 +423,8 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 			groupMemeberOperationService.accetInvitation(groupMemeberOperation);
 			//给小组长推送站内信
 			resiGroupMemberServiceImpl.sendMessageToGroupLeader(resiGroupDTO, formDTO.getUserId());
-			return;
+			resultDTO.setAwaitAudit(true);
+			return  resultDTO;
 		}
 		UserRoleDTO userRoleDTO = this.getUserRoleDTO(result.getData().getUserRoleList());
 		//5、新增一条邀请入群、直接审核通过的入群记录
@@ -456,6 +466,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		}
 		//8、发送消息
 		this.sendMessageToLeader(formDTO, resiGroupDTO,groupInvitationDTO);
+		return resultDTO;
 	}
 
 	private UserRoleDTO getUserRoleDTO(List<String> userRoleList) {