diff --git a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/user/user/impl/UserAccountClientServiceImpl.java b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/user/user/impl/UserAccountClientServiceImpl.java index d8cc48bd..91578f7f 100644 --- a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/user/user/impl/UserAccountClientServiceImpl.java +++ b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/user/user/impl/UserAccountClientServiceImpl.java @@ -25,11 +25,13 @@ import com.red.circle.other.domain.model.user.UserProfile; import com.red.circle.other.infra.common.user.UserAccountCommon; import com.red.circle.other.infra.database.cache.service.user.UserAccountAuthCacheService; import com.red.circle.other.infra.database.mongo.service.user.status.OnlineUserService; +import com.red.circle.other.infra.database.rds.entity.family.FamilyMemberInfo; import com.red.circle.other.infra.database.rds.entity.user.user.AccountAuth; import com.red.circle.other.infra.database.rds.entity.user.user.ApprovalUserAccountStatusLog; import com.red.circle.other.infra.database.rds.entity.user.user.AuthType; import com.red.circle.other.infra.database.rds.entity.user.user.BaseInfo; import com.red.circle.other.infra.database.rds.entity.user.user.LogoutRecord; +import com.red.circle.other.infra.database.rds.service.family.FamilyMemberInfoService; import com.red.circle.other.infra.database.rds.service.user.device.ArchiveDeviceService; import com.red.circle.other.infra.database.rds.service.user.device.LatestMobileDeviceService; import com.red.circle.other.infra.database.rds.service.user.user.AccountAuthService; @@ -86,6 +88,7 @@ public class UserAccountClientServiceImpl implements UserAccountClientService { private final AuthInnerConvertor authInnerConvertor; private final AccountAuthService accountAuthService; private final UserProfileGateway userProfileGateway; + private final FamilyMemberInfoService familyMemberInfoService; private final LogoutRecordService logoutRecordService; private final UserMqMessageService userMqMessageService; private final ArchiveDeviceService archiveDeviceService; @@ -382,6 +385,7 @@ public class UserAccountClientServiceImpl implements UserAccountClientService { public UserAccountDTO createUserAccountDTO(Long userId, String imei, VoidConsumer voidConsumer) { UserProfile userProfile = userProfileGateway.getByUserId(userId); + userProfile.setFamilyId(Optional.ofNullable(familyMemberInfoService.getFamilyMemberByUserId(userId)).map(FamilyMemberInfo::getFamilyId).orElse(null)); ResponseAssert.notNull(CommonErrorCode.DATA_ERROR, userProfile); // 注册黑名单