区分不同进组方式

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

@@ -382,27 +382,31 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 			throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
 		}
 		//2020.11.17 sun 新增扫描或邀请进组是否需要审核的逻辑  start
-		GroupMemeberOperationDTO operation = new GroupMemeberOperationDTO();
+		GroupMemeberOperationDTO groupMemeberOperation = new GroupMemeberOperationDTO();
-		operation.setGroupId(resiGroupDTO.getId());
+		groupMemeberOperation.setGroupId(resiGroupDTO.getId());
-		operation.setCustomerUserId(formDTO.getUserId());
+		groupMemeberOperation.setCustomerUserId(formDTO.getUserId());
-		operation.setEnterGroupType(groupInvitationDTO.getInvitationType());
+		groupMemeberOperation.setEnterGroupType(groupInvitationDTO.getInvitationType());
-		operation.setGroupInvitationId(formDTO.getInvitationId());
+		groupMemeberOperation.setGroupInvitationId(formDTO.getInvitationId());
-		operation.setOperateUserId(formDTO.getUserId());
+		groupMemeberOperation.setOperateUserId(formDTO.getUserId());
-		operation.setOperateStatus(MemberStateConstant.UNDER_AUDITTING);
+		//邀请入组
-		operation.setOperateDes(UserMessageConstant.SCANCODE_OPERATE);
+		if(groupInvitationDTO.getInvitationType().equals(GroupStateConstant.GROUP_INVITED)){
+			groupMemeberOperation.setOperateDes(UserMessageConstant.INVITED_OPERATE);
+			//扫码入组
+		}else if(groupInvitationDTO.getInvitationType().equals(GroupStateConstant.GROUP_SCANCODE)){
+			groupMemeberOperation.setOperateDes(UserMessageConstant.SCANCODE_OPERATE);
+		}
 		//入组审核开关是开启状态则需要组长审核
 		if(GroupStateConstant.AUDIT_SWITCH_OPEN.equals(resiGroupDTO.getAuditSwitch())){
+			groupMemeberOperation.setOperateStatus(MemberStateConstant.UNDER_AUDITTING);
 			//新增一条入组申请
-			groupMemeberOperationService.accetInvitation(operation);
+			groupMemeberOperationService.accetInvitation(groupMemeberOperation);
 			//给小组长推送站内信
 			resiGroupMemberServiceImpl.sendMessageToGroupLeader(resiGroupDTO, formDTO.getUserId());
 			return;
 		}
 		UserRoleDTO userRoleDTO=this.getUserRoleDTO(result.getData().getUserRoleList());
 		//5、新增一条邀请入群、直接审核通过的入群记录
-		GroupMemeberOperationDTO groupMemeberOperation = operation;
 		groupMemeberOperation.setOperateStatus(MemberStateConstant.APPROVED);
-		groupMemeberOperation.setOperateDes(UserMessageConstant.INVITED_OPERATE);
 		//2020.11.17  end
 		groupMemeberOperationService.accetInvitation(groupMemeberOperation);
 		//6、直接加入群成员关系表