公会-h5邀请-放开公会申请需要参数的用户态校验
This commit is contained in:
@@ -57,8 +57,8 @@ public class GuildH5InviteService {
|
||||
throw new ServiceException(BusiStatus.NOAUTHORITY);
|
||||
}
|
||||
else if (inviteTypeEnum.equals(GuildH5InviteRecord.InviteTypeEnum.APPLY_GUILD)
|
||||
&& (!guildAuthService.hasAuthByRoleType(guildMember.getRoleType(), GuildConstant.AuthCode.INVITE_APPLY_GUILD_H5)
|
||||
|| null == bdInfoService.getValidByUid(inviterUid))) {
|
||||
&& !guildAuthService.hasAuthByRoleType(guildMember.getRoleType(), GuildConstant.AuthCode.INVITE_APPLY_GUILD_H5)
|
||||
&& null == bdInfoService.getValidByUid(inviterUid)) {
|
||||
throw new ServiceException(BusiStatus.NOAUTHORITY);
|
||||
}
|
||||
}
|
||||
@@ -165,13 +165,11 @@ public class GuildH5InviteService {
|
||||
return;
|
||||
}
|
||||
|
||||
Users inviterUser = usersService.getNotNullUsersByUid(record.getInviterUid());
|
||||
|
||||
GuildMember inviterMember = guildMemberService.getVaildGuildMemberByUid(record.getInviterUid());
|
||||
if (null != inviterMember){
|
||||
GuildApplyParam param = new GuildApplyParam();
|
||||
BeanUtils.copyProperties(record, param);
|
||||
param.setApplyUid(inviterUser.getUid());
|
||||
param.setApplyUid(user.getUid());
|
||||
GuildApply applyRecord = guildApplyService.createGuildApply(param, record.getPartitionId());
|
||||
log.info("[guildH5Invite] 受邀用户 {} 邀请用户 {} 成功创建申请公会记录 {},等待审批", user.getUid(), record.getInviterUid(), applyRecord.getId());
|
||||
return;
|
||||
@@ -185,7 +183,7 @@ public class GuildH5InviteService {
|
||||
|
||||
GuildApplyParam param = new GuildApplyParam();
|
||||
BeanUtils.copyProperties(record, param);
|
||||
param.setApplyUid(inviterUser.getUid());
|
||||
param.setApplyUid(user.getUid());
|
||||
GuildApply applyRecord = guildApplyService.createGuildApply(param, record.getPartitionId());
|
||||
log.info("[guildH5Invite] 受邀用户 {} 邀请用户 {} 成功创建申请公会记录 {},等待审批", user.getUid(), record.getInviterUid(), applyRecord.getId());
|
||||
}
|
||||
|
@@ -25,7 +25,6 @@ public class GuildApplyController {
|
||||
private GuildApplyService guildApplyService;
|
||||
|
||||
@ApiOperation(value = "公会申请需要参数",httpMethod = "GET")
|
||||
@Authorization
|
||||
@GetMapping("/paramOptions")
|
||||
public BusiResult<GuildApplyParamOption> paramOptions() {
|
||||
GuildApplyParamOption guildApplyParamOption = guildApplyService.getParamOptions();
|
||||
|
@@ -93,7 +93,6 @@ public class GuildH5InviteController {
|
||||
}
|
||||
|
||||
@ApiOperation(value = "公会申请(传json格式)")
|
||||
@Authorization
|
||||
@PostMapping("/applyGuild")
|
||||
public BusiResult<Void> apply(@RequestBody GuildH5ApplyParam guildApplyParam) {
|
||||
if (!StringUtils.hasText(guildApplyParam.getEmail())
|
||||
|
Reference in New Issue
Block a user