From fe7084e2886bdd24687cacfe6243cc0d588f5637 Mon Sep 17 00:00:00 2001 From: chengpengxiang <15503679582@163.com> Date: Mon, 13 Nov 2023 18:02:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0member=20=E5=A7=93?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/dl/officialsite/team/TeamService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/dl/officialsite/team/TeamService.java b/src/main/java/com/dl/officialsite/team/TeamService.java index bd752559..a29babd6 100644 --- a/src/main/java/com/dl/officialsite/team/TeamService.java +++ b/src/main/java/com/dl/officialsite/team/TeamService.java @@ -115,7 +115,7 @@ public void join(TeamMemberJoinVO teamMember) { if (admin.isPresent()) { Member member1 = admin.get(); String email = member1.getEmail(); - String subject = team.getTeamName() + "团队新成员加入申请"; + String subject = team.getTeamName() + "团队新成员"+ member1.getNickName()+"加入申请"; List mailAddress = new ArrayList<>(); mailAddress.add(email); log.info("发送邮件给管理员:{},接收地址{}", email, mailAddress); @@ -142,7 +142,7 @@ public void join(TeamMemberJoinVO teamMember) { if (admin.isPresent()) { Member member1 = admin.get(); String email = member1.getEmail(); - String subject = team.getTeamName() + "团队新成员加入申请"; + String subject = team.getTeamName() + "团队新成员"+ member1.getNickName()+"加入申请"; List mailAddress = new ArrayList<>(); mailAddress.add(email); log.info("发送邮件给管理员:{},接收地址{}", email, mailAddress); @@ -240,4 +240,4 @@ public TeamsMembersVo getTeamById(Long teamId) { CodeEnums.TEAM_NOT_EXIST.getMsg()); } } -} +} \ No newline at end of file From 8043db9db793c2b388ddd0cea7baa8a4407c5049 Mon Sep 17 00:00:00 2001 From: chengpengxiang <15503679582@163.com> Date: Mon, 13 Nov 2023 18:10:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E5=90=8E=E7=AB=AF=E6=8B=A6=E6=88=AA?= =?UTF-8?q?=E9=87=8D=E5=A4=8Djoin=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/dl/officialsite/common/enums/CodeEnums.java | 3 ++- src/main/java/com/dl/officialsite/team/TeamService.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/dl/officialsite/common/enums/CodeEnums.java b/src/main/java/com/dl/officialsite/common/enums/CodeEnums.java index 3910325d..f3affe0c 100644 --- a/src/main/java/com/dl/officialsite/common/enums/CodeEnums.java +++ b/src/main/java/com/dl/officialsite/common/enums/CodeEnums.java @@ -18,7 +18,8 @@ public enum CodeEnums { TEAM_NOT_EXIST("1005", "team not exist"), LOGIN_IN("2001", "please login"), - TEAM_ADMIN_NOT_EXIST("1006", "team admin not exist"); + TEAM_ADMIN_NOT_EXIST("1006", "team admin not exist"), + MEMBER_ALREADY_REQUEST_TEAM("1007", "member already request team"); private String code; diff --git a/src/main/java/com/dl/officialsite/team/TeamService.java b/src/main/java/com/dl/officialsite/team/TeamService.java index a29babd6..28d86c34 100644 --- a/src/main/java/com/dl/officialsite/team/TeamService.java +++ b/src/main/java/com/dl/officialsite/team/TeamService.java @@ -105,6 +105,10 @@ public void join(TeamMemberJoinVO teamMember) { , teamMember.getMemberId()); if (optional.isPresent()) { TeamMember teamMember2 = optional.get(); + if (teamMember2.getStatus() == Constants.REQUEST_TEAM) { + throw new BizException(CodeEnums.MEMBER_ALREADY_REQUEST_TEAM.getCode(), + CodeEnums.MEMBER_ALREADY_REQUEST_TEAM.getMsg()); + } teamMember2.setStatus(Constants.REQUEST_TEAM); teamMemberRepository.save(teamMember2); //发送邮件 From 1f53392cadde16a8f6cd69c80a4f528a48be01c1 Mon Sep 17 00:00:00 2001 From: chengpengxiang <15503679582@163.com> Date: Mon, 13 Nov 2023 18:23:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=A4=84=E7=90=86=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/dl/officialsite/team/TeamService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/dl/officialsite/team/TeamService.java b/src/main/java/com/dl/officialsite/team/TeamService.java index 28d86c34..dc5b78e3 100644 --- a/src/main/java/com/dl/officialsite/team/TeamService.java +++ b/src/main/java/com/dl/officialsite/team/TeamService.java @@ -120,10 +120,11 @@ public void join(TeamMemberJoinVO teamMember) { Member member1 = admin.get(); String email = member1.getEmail(); String subject = team.getTeamName() + "团队新成员"+ member1.getNickName()+"加入申请"; + String content = "点击此链接去处理" + "https://dapplearning.org/team/admin"; List mailAddress = new ArrayList<>(); mailAddress.add(email); log.info("发送邮件给管理员:{},接收地址{}", email, mailAddress); - emailService.memberJoinTeam(mailAddress, subject, subject); + emailService.memberJoinTeam(mailAddress, subject, content); } else { throw new BizException(CodeEnums.TEAM_ADMIN_NOT_EXIST.getCode(), CodeEnums.TEAM_ADMIN_NOT_EXIST.getMsg()); @@ -147,10 +148,11 @@ public void join(TeamMemberJoinVO teamMember) { Member member1 = admin.get(); String email = member1.getEmail(); String subject = team.getTeamName() + "团队新成员"+ member1.getNickName()+"加入申请"; + String content = "点击此链接去处理" + "https://dapplearning.org/team/admin"; List mailAddress = new ArrayList<>(); mailAddress.add(email); log.info("发送邮件给管理员:{},接收地址{}", email, mailAddress); - emailService.memberJoinTeam(mailAddress, subject, subject); + emailService.memberJoinTeam(mailAddress, subject, content); } else { throw new BizException(CodeEnums.TEAM_ADMIN_NOT_EXIST.getCode(), CodeEnums.TEAM_ADMIN_NOT_EXIST.getMsg());