hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移除家族用户接口修改

Browse Source
This commit is contained in:
tianfeng 2025-12-23 18:40:04 +08:00
parent 203cd537c3
commit 24e8781f97
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/asserts/FamilyErrorCode.java
View File

@ -78,6 +78,11 @@ public enum FamilyErrorCode implements IResponseErrorCode {
*/ */
USER_RECENT_LEAVE(2513, "Your recently left a family. Please tryagain 1 day after leaving"), USER_RECENT_LEAVE(2513, "Your recently left a family. Please tryagain 1 day after leaving"),
/**
* 家族承运不存在
*/
USER_NOT_FOUND(2514, "There are no member of this family"),
; ;

22
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyRemoveUserExe.java
View File

@ -7,6 +7,8 @@ import com.red.circle.other.infra.common.family.FamilyCommon;
import com.red.circle.other.infra.database.rds.entity.family.FamilyMemberInfo; import com.red.circle.other.infra.database.rds.entity.family.FamilyMemberInfo;
import com.red.circle.other.infra.database.rds.service.family.FamilyMemberInfoService; import com.red.circle.other.infra.database.rds.service.family.FamilyMemberInfoService;
import java.util.Objects; import java.util.Objects;
import com.red.circle.other.inner.asserts.FamilyErrorCode;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -30,28 +32,16 @@ public class FamilyRemoveUserExe {
public void execute(FamilyRemoveUserCmd cmd) { public void execute(FamilyRemoveUserCmd cmd) {
FamilyMemberInfo member = getRemovedPersonMember(cmd); FamilyMemberInfo member = getRemovedPersonMember(cmd);
if (Objects.isNull(member)) { ResponseAssert.notNull(FamilyErrorCode.USER_NOT_FOUND, member);
return;
}
Boolean isExistFamily = getExistFamilyByUserId(cmd); Boolean isExistFamily = getExistFamilyByUserId(cmd);
if (Boolean.FALSE.equals(isExistFamily)) { ResponseAssert.isTrue(FamilyErrorCode.USER_NOT_FOUND, isExistFamily);
log.error("DELETE_FAILURE: 操作人:{} 被移除成员ID:{}", cmd.getReqUserId(),
cmd.getRemoveMemberId());
ResponseAssert.failure(CommonErrorCode.DELETE_FAILURE);
return;
}
FamilyMemberInfo manageMember = getOperatorMember(cmd); FamilyMemberInfo manageMember = getOperatorMember(cmd);
if (Objects.isNull(manageMember)) { ResponseAssert.notNull(FamilyErrorCode.USER_NOT_FOUND, manageMember);
log.error("DELETE_FAILURE: 操作人不存在: 操作人:{} 被移除成员ID:{}",
cmd.getReqUserId(), cmd.getRemoveMemberId());
ResponseAssert.failure(CommonErrorCode.DELETE_FAILURE);
return;
}
ResponseAssert.isFalse(CommonErrorCode.INSUFFICIENT_PERMISSION, ResponseAssert.isFalse(CommonErrorCode.INSUFFICIENT_PERMISSION,
Objects.equals(member.getMemberUserId(), manageMember.getMemberUserId())); Objects.equals(member.getMemberUserId(), manageMember.getMemberUserId()));
if (isAdmin(manageMember)) { if (isAdmin(manageMember)) {
familyCommon.removeFamilyUser(member); familyCommon.removeFamilyUser(member);