Skip to content

Commit

Permalink
fix the code ofadd the team
Browse files Browse the repository at this point in the history
  • Loading branch information
liberhe committed Dec 18, 2023
1 parent 2f96f9c commit d239377
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 3 deletions.
5 changes: 5 additions & 0 deletions src/main/java/com/dl/officialsite/team/TeamController.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package com.dl.officialsite.team;

import com.dl.officialsite.common.base.BaseResponse;
import com.dl.officialsite.common.exception.BizException;
import com.dl.officialsite.login.Auth;
import com.dl.officialsite.member.Member;
import com.dl.officialsite.member.MemberService;
import com.dl.officialsite.team.vo.TeamMemberApproveVO;
import com.dl.officialsite.team.vo.TeamMemberBatchJoinVO;
import com.dl.officialsite.team.vo.TeamMemberJoinVO;
Expand All @@ -29,6 +31,9 @@ public class TeamController {
@Autowired
private TeamService teamService;

@Autowired
private MemberService memberService;


/**
* 新增团队
Expand Down
21 changes: 18 additions & 3 deletions src/main/java/com/dl/officialsite/team/TeamService.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package com.dl.officialsite.team;


import com.dl.officialsite.common.base.BaseResponse;
import com.dl.officialsite.common.constants.Constants;
import com.dl.officialsite.common.enums.CodeEnums;
import com.dl.officialsite.common.exception.BizException;
import com.dl.officialsite.login.enums.UserRoleEnum;
import com.dl.officialsite.mail.EmailService;
import com.dl.officialsite.member.Member;
import com.dl.officialsite.member.MemberRepository;
Expand Down Expand Up @@ -58,14 +60,27 @@ public class TeamService {
@Autowired
private EmailService emailService;

@Autowired
private MemberService memberService;

@Autowired
private MemberService memberService;


@Transactional
public Team add(Team team) {
return teamRepository.save(team);

Member member = memberService.getMemberByAddress(team.getAdministrator());
if(member==null) {
throw new BizException(CodeEnums.NOT_FOUND_MEMBER.getCode(),CodeEnums.NOT_FOUND_MEMBER.getMsg() );
}
teamRepository.save(team);
TeamMember teamMember = new TeamMember();
teamMember.setTeamId(team.getId());
teamMember.setMemberId(member.getId());
teamMember.setRole(UserRoleEnum.ADMIN);
teamMember.setStatus(0);
teamMemberRepository.save(teamMember);
return team;

}

public List<TeamsWithMembers> getTeamWithMembersByTeamNameAndStatus(String teamName , int status) {
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/DB/data-mysql.SQL
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
INSERT INTO member (address, email, nickName, role,githubId)
VALUES
("0x1F7b953113f4dFcBF56a1688529CC812865840e1", "yanyanho126@gmail.com", "Yan", 0, "yanyanho");


INSERT INTO team ( team_name, team_profile, administrator, authority)
VALUES
Expand Down

0 comments on commit d239377

Please sign in to comment.