From 3d8b03444bef79a8a1f9e925510a3a7634620555 Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Thu, 8 Jan 2026 17:09:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AE=B6=E6=97=8F=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9EuserID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../other/adapter/app/family/FamilyRestController.java | 3 ++- .../circle/other/app/command/family/FamilyBaseInfoExe.java | 5 +++-- .../circle/other/app/service/family/FamilyServiceImpl.java | 4 +++- .../red/circle/other/app/service/family/FamilyService.java | 3 ++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/family/FamilyRestController.java b/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/family/FamilyRestController.java index 1c038428..e6490c8e 100644 --- a/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/family/FamilyRestController.java +++ b/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/family/FamilyRestController.java @@ -3,6 +3,7 @@ package com.red.circle.other.adapter.app.family; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.red.circle.common.business.dto.cmd.AppExtCommand; +import com.red.circle.common.business.dto.cmd.app.AppUserIdCmd; import com.red.circle.framework.web.controller.BaseController; import com.red.circle.other.app.dto.clientobject.family.*; import com.red.circle.other.app.dto.clientobject.room.RoomVoiceProfileCO; @@ -66,7 +67,7 @@ public class FamilyRestController extends BaseController { * 用户家族基本信息 */ @GetMapping("/user-base-info") - public FamilyBaseInfoCO getBaseInfo(AppExtCommand cmd) { + public FamilyBaseInfoCO getBaseInfo(AppUserIdCmd cmd) { return familyService.getUserBaseInfo(cmd); } diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyBaseInfoExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyBaseInfoExe.java index abae55b5..8b41eb7d 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyBaseInfoExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyBaseInfoExe.java @@ -2,6 +2,7 @@ package com.red.circle.other.app.command.family; import cn.hutool.core.collection.CollectionUtil; import com.red.circle.common.business.dto.cmd.AppExtCommand; +import com.red.circle.common.business.dto.cmd.app.AppUserIdCmd; import com.red.circle.framework.core.asserts.ResponseAssert; import com.red.circle.framework.core.response.CommonErrorCode; import com.red.circle.other.app.dto.clientobject.family.FamilyBaseInfoCO; @@ -85,8 +86,8 @@ public class FamilyBaseInfoExe { /** * 查询用户自己的家族 */ - public FamilyBaseInfoCO execute2(AppExtCommand cmd) { - FamilyMemberInfo myFamilyInfo = familyMemberInfoService.getFamilyMemberByUserId(cmd.getReqUserId()); + public FamilyBaseInfoCO execute2(AppUserIdCmd cmd) { + FamilyMemberInfo myFamilyInfo = familyMemberInfoService.getFamilyMemberByUserId(cmd.getUserId()); if (Objects.isNull(myFamilyInfo)) { return null; } diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/family/FamilyServiceImpl.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/family/FamilyServiceImpl.java index 211c8ba4..06c17ee3 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/family/FamilyServiceImpl.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/family/FamilyServiceImpl.java @@ -1,6 +1,8 @@ package com.red.circle.other.app.service.family; import com.red.circle.common.business.dto.cmd.AppExtCommand; +import com.red.circle.common.business.dto.cmd.UserIdCmd; +import com.red.circle.common.business.dto.cmd.app.AppUserIdCmd; import com.red.circle.other.app.command.family.ApplyJoinFamilyExe; import com.red.circle.other.app.command.family.FamilyAdminExe; import com.red.circle.other.app.command.family.FamilyBaseInfoExe; @@ -122,7 +124,7 @@ public class FamilyServiceImpl implements FamilyService { } @Override - public FamilyBaseInfoCO getUserBaseInfo(AppExtCommand cmd) { + public FamilyBaseInfoCO getUserBaseInfo(AppUserIdCmd cmd) { return familyBaseInfoExe.execute2(cmd); } diff --git a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/service/family/FamilyService.java b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/service/family/FamilyService.java index 39d54f43..c8b33467 100644 --- a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/service/family/FamilyService.java +++ b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/service/family/FamilyService.java @@ -2,6 +2,7 @@ package com.red.circle.other.app.service.family; import com.red.circle.common.business.dto.cmd.AppExtCommand; +import com.red.circle.common.business.dto.cmd.app.AppUserIdCmd; import com.red.circle.framework.dto.PageResult; import com.red.circle.other.app.dto.clientobject.family.*; import com.red.circle.other.app.dto.clientobject.room.RoomVoiceProfileCO; @@ -48,7 +49,7 @@ public interface FamilyService { /** * 用户家族基本信息. */ - FamilyBaseInfoCO getUserBaseInfo(AppExtCommand cmd); + FamilyBaseInfoCO getUserBaseInfo(AppUserIdCmd cmd); /**