Merge pull request #62 from cheng521521/main

fix: 增加member 姓名
Dapp-Learning-DAO · Dec 2, 2023 · 4382661 · 4382661
2 parents 9ea34d8 + 1f53392
commit 4382661
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git 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
@@ -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);
             //发送邮件
@@ -115,11 +119,12 @@ 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()+"加入申请";
+                    String content = "点击此链接去处理" + "https://dapplearning.org/team/admin";
                     List<String> 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());
@@ -142,11 +147,12 @@ 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()+"加入申请";
+                    String content = "点击此链接去处理" + "https://dapplearning.org/team/admin";
                     List<String> 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());
@@ -240,4 +246,4 @@ public TeamsMembersVo getTeamById(Long teamId) {
                 CodeEnums.TEAM_NOT_EXIST.getMsg());
         }
     }
-}
+}