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-26 16:54:37 +08:00
parent 77a0068eb3
commit 74ca0d15bd
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,12 +13,7 @@ import com.red.circle.other.infra.database.rds.entity.family.FamilyBaseInfo;
import com.red.circle.other.infra.database.rds.entity.family.FamilyBoxDaily; import com.red.circle.other.infra.database.rds.entity.family.FamilyBoxDaily;
import com.red.circle.other.infra.database.rds.entity.family.FamilyBoxUserReward; import com.red.circle.other.infra.database.rds.entity.family.FamilyBoxUserReward;
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.FamilyBaseInfoService; import com.red.circle.other.infra.database.rds.service.family.*;
import com.red.circle.other.infra.database.rds.service.family.FamilyBoxDailyService;
import com.red.circle.other.infra.database.rds.service.family.FamilyBoxUserContributeService;
import com.red.circle.other.infra.database.rds.service.family.FamilyBoxUserRewardService;
import com.red.circle.other.infra.database.rds.service.family.FamilyLevelExpService;
import com.red.circle.other.infra.database.rds.service.family.FamilyMemberInfoService;
import com.red.circle.other.infra.database.mongo.entity.team.team.TeamMember; import com.red.circle.other.infra.database.mongo.entity.team.team.TeamMember;
import com.red.circle.other.infra.database.mongo.service.team.team.TeamMemberService; import com.red.circle.other.infra.database.mongo.service.team.team.TeamMemberService;
import com.red.circle.other.infra.enums.family.FamilyRoleEnum; import com.red.circle.other.infra.enums.family.FamilyRoleEnum;
@ -60,6 +55,7 @@ public class FamilyBaseInfoExe {
private final FamilyBoxUserRewardService familyBoxUserRewardService; private final FamilyBoxUserRewardService familyBoxUserRewardService;
private final TeamMemberService teamMemberService; private final TeamMemberService teamMemberService;
private final UserProfileGateway userProfileGateway; private final UserProfileGateway userProfileGateway;
private final FamilyMessageService familyMessageService;
public FamilyBaseInfoCO execute(FamilyBaseInfoQueryCmd cmd) { public FamilyBaseInfoCO execute(FamilyBaseInfoQueryCmd cmd) {
@ -77,7 +73,12 @@ public class FamilyBaseInfoExe {
//支持者和主播列表 //支持者和主播列表
FamilyBaseInfoCO.FamilyMemberList memberList = buildMemberList(cmd.getFamilyId()); FamilyBaseInfoCO.FamilyMemberList memberList = buildMemberList(cmd.getFamilyId());
return getFamilyInfoCO(baseInfo, familyLevel, adminInfo, myFamilyInfo, boxInfo, memberList); Boolean joinWaiting = null;
if (myFamilyInfo == null) {
joinWaiting = familyMessageService.isExistApplyingMsg(cmd.getFamilyId(), cmd.getReqUserId());
}
return getFamilyInfoCO(baseInfo, familyLevel, adminInfo, myFamilyInfo, boxInfo, memberList, joinWaiting);
} }
private FamilyBaseInfoCO.FamilyAdminInfo getFamilyAdminInfo(FamilyMemberInfo familyMemberInfo) { private FamilyBaseInfoCO.FamilyAdminInfo getFamilyAdminInfo(FamilyMemberInfo familyMemberInfo) {
@ -101,7 +102,8 @@ public class FamilyBaseInfoExe {
FamilyBaseInfoCO.FamilyAdminInfo adminInfo, FamilyBaseInfoCO.FamilyAdminInfo adminInfo,
FamilyMemberInfo myFamilyInfo, FamilyMemberInfo myFamilyInfo,
FamilyBaseInfoCO.FamilyBoxInfo boxInfo, FamilyBaseInfoCO.FamilyBoxInfo boxInfo,
FamilyBaseInfoCO.FamilyMemberList memberList) { FamilyBaseInfoCO.FamilyMemberList memberList,
Boolean joinWaiting) {
return new FamilyBaseInfoCO() return new FamilyBaseInfoCO()
.setFamilyId(baseInfo.getId()) .setFamilyId(baseInfo.getId())
@ -122,6 +124,7 @@ public class FamilyBaseInfoExe {
.setBoxInfo(boxInfo) .setBoxInfo(boxInfo)
.setMemberList(memberList) .setMemberList(memberList)
.setMyFamilyRole(Optional.ofNullable(myFamilyInfo).map(FamilyMemberInfo::getMemberRole).orElse(null)) .setMyFamilyRole(Optional.ofNullable(myFamilyInfo).map(FamilyMemberInfo::getMemberRole).orElse(null))
.setJoinWaiting(joinWaiting)
; ;
} }

5
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyBaseInfoCO.java
View File

@ -131,6 +131,11 @@ public class FamilyBaseInfoCO extends ClientObject {
*/ */
private String myFamilyRole; private String myFamilyRole;
/**
* 待加入
*/
private Boolean joinWaiting;
/** /**
* 家族群聊付费解锁金额. * 家族群聊付费解锁金额.
*/ */