diff --git a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/asserts/FamilyErrorCode.java b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/asserts/FamilyErrorCode.java index 551f8486..8b19fd3e 100644 --- a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/asserts/FamilyErrorCode.java +++ b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/asserts/FamilyErrorCode.java @@ -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_NOT_FOUND(2514, "There are no member of this family"), + ; diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyRemoveUserExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyRemoveUserExe.java index 4c3e5682..3e7ad4b8 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyRemoveUserExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyRemoveUserExe.java @@ -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.service.family.FamilyMemberInfoService; import java.util.Objects; + +import com.red.circle.other.inner.asserts.FamilyErrorCode; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -30,28 +32,16 @@ public class FamilyRemoveUserExe { public void execute(FamilyRemoveUserCmd cmd) { FamilyMemberInfo member = getRemovedPersonMember(cmd); - if (Objects.isNull(member)) { - return; - } + ResponseAssert.notNull(FamilyErrorCode.USER_NOT_FOUND, member); Boolean isExistFamily = getExistFamilyByUserId(cmd); - if (Boolean.FALSE.equals(isExistFamily)) { - log.error("DELETE_FAILURE: 操作人:{} 被移除成员ID:{}", cmd.getReqUserId(), - cmd.getRemoveMemberId()); - ResponseAssert.failure(CommonErrorCode.DELETE_FAILURE); - return; - } + ResponseAssert.isTrue(FamilyErrorCode.USER_NOT_FOUND, isExistFamily); FamilyMemberInfo manageMember = getOperatorMember(cmd); - if (Objects.isNull(manageMember)) { - log.error("DELETE_FAILURE: 操作人不存在: 操作人:{} 被移除成员ID:{}", - cmd.getReqUserId(), cmd.getRemoveMemberId()); - ResponseAssert.failure(CommonErrorCode.DELETE_FAILURE); - return; - } + ResponseAssert.notNull(FamilyErrorCode.USER_NOT_FOUND, manageMember); ResponseAssert.isFalse(CommonErrorCode.INSUFFICIENT_PERMISSION, - Objects.equals(member.getMemberUserId(), manageMember.getMemberUserId())); + Objects.equals(member.getMemberUserId(), manageMember.getMemberUserId())); if (isAdmin(manageMember)) { familyCommon.removeFamilyUser(member);