moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

绑定了邀请码的公会默认绑定的邀请人

Browse Source
This commit is contained in:
hokli
2025-05-29 12:53:51 +08:00
parent 218b540d4a
commit aee544318c
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/vo/UserVo.java
View File

@@ -236,4 +236,7 @@ public class UserVo {
private String guildNameplateIcon;
private Integer regionId;
private Long inviteUid;
private Long inviteErbanNo;
}

5
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildApplyServiceImpl.java
View File

@@ -91,11 +91,6 @@ public class GuildApplyServiceImpl extends ServiceImpl<GuildApplyMapper, GuildAp
} else {
guildApply.setInviteUid(inviteUser.getUid());
}
} else {
UserInviteFissionRecord recordServiceByUid = userInviteFissionRecordService.getByUid(guildApplyParam.getApplyUid());
Long inviteUid = Optional.ofNullable(recordServiceByUid).map(x -> x.getInviterUid()).orElse(null);
guildApply.setInviteUid(inviteUid);
guildApply.setRemark("通过邀请码绑定的邀请人");
}
BeanUtils.copyProperties(guildApplyParam, guildApply);
guildApply.setApplyTime(new Date());

1
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UsersService.java
View File

@@ -425,6 +425,7 @@ public class UsersService extends BaseService {
userVo.setGender(user.getGender());
userVo.setRegion(user.getRegion());
userVo.setSignture(user.getSignture());
userVo.setInviteUid(user.getInviteUid());
//userVo.setStar(user.getStar());
userVo.setFollowNum(user.getFollowNum());
userVo.setFansNum(user.getFansNum());

14
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/H5UserController.java
View File

@@ -4,6 +4,7 @@ import com.accompany.business.service.user.UsersService;
import com.accompany.common.annotation.Authorization;
import com.accompany.common.result.BusiResult;
import com.accompany.core.model.Users;
import com.accompany.core.vo.UserVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,9 +26,18 @@ public class H5UserController {
@ApiOperation(value = "h5用户基础信息",httpMethod = "GET")
@Authorization
@GetMapping("")
public BusiResult<Users> applyExist(@RequestHeader(value = PUB_UID) Long uid) {
public BusiResult<UserVo> applyExist(@RequestHeader(value = PUB_UID) Long uid) {
Users users = usersService.getUsersByUid(uid);
return BusiResult.success(users);
UserVo userVo = null;
if (users == null) {
return BusiResult.success(userVo);
}
userVo = usersService.converToUserVo(users, null, null, null, null, null);
if (userVo.getInviteUid() != null) {
Users users1 = usersService.getUsersByUid(userVo.getUid());
userVo.setInviteErbanNo(users1.getErbanNo());
}
return BusiResult.success(userVo);
}
}