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

familyId 优化

Browse Source
This commit is contained in:
tianfeng 2025-12-29 19:18:24 +08:00
parent 4d69b94417
commit b5c026a411
6 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/query/UserProfileUseQryExe.java
View File

@ -105,9 +105,6 @@ public class UserProfileUseQryExe {
e.getMeUserId().equals(userProfile.getId()) && e.getCpUserId().equals(cmd.requiredReqUserId()));
userProfileDTO.setIsCpRelation(match);
}
userProfileDTO.setFamilyId(Optional.ofNullable(familyMemberInfoService.getFamilyMemberByUserId(userProfileDTO.getId())).map(FamilyMemberInfo::getFamilyId).orElse(null));
return userProfileDTO;
}

6
rc-service/rc-service-other/other-domain/src/main/java/com/red/circle/other/domain/model/user/UserProfile.java
View File

@ -157,6 +157,12 @@ public class UserProfile implements Serializable {
*/
private List<CpSimpleUserProfileCO> cpList;
/**
* 家族ID
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long familyId;
/**
* 拥有的靓号.

6
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/entity/user/profile/UserRunProfile.java
View File

@ -193,6 +193,12 @@ public class UserRunProfile implements Serializable {
*/
private List<CpSimpleUserProfileCO> cpList;
/**
* 家族ID
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long familyId;
/**
* 添加使用道具.
*/

3
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/user/profile/impl/UserRunProfileServiceImpl.java
View File

@ -260,6 +260,9 @@ public class UserRunProfileServiceImpl implements UserRunProfileService {
if (Objects.nonNull(userRunProfile.getFirstRechargeEndTime())) {
update.set("firstRechargeEndTime", userRunProfile.getFirstRechargeEndTime());
}
if (Objects.nonNull(userRunProfile.getFamilyId())) {
update.set("familyId", userRunProfile.getFamilyId());
}
return update;
}

6
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/gateway/user/UserRunProfileTransportGatewayImpl.java
View File

@ -17,12 +17,14 @@ import com.red.circle.other.infra.database.mongo.entity.user.profile.UserRunProf
import com.red.circle.other.infra.database.mongo.entity.user.profile.UserSpecialId;
import com.red.circle.other.infra.database.mongo.service.user.profile.UserRunProfileService;
import com.red.circle.other.infra.database.mongo.service.user.profile.UserSpecialIdService;
import com.red.circle.other.infra.database.rds.entity.family.FamilyMemberInfo;
import com.red.circle.other.infra.database.rds.entity.props.PropsBackpack;
import com.red.circle.other.infra.database.rds.entity.user.user.BaseInfo;
import com.red.circle.other.infra.database.rds.entity.user.user.OneTimeTask;
import com.red.circle.other.infra.database.rds.entity.user.user.CpRelationship;
import com.red.circle.other.infra.database.rds.service.badge.BadgeConfigService;
import com.red.circle.other.infra.database.rds.service.badge.BadgePictureConfigService;
import com.red.circle.other.infra.database.rds.service.family.FamilyMemberInfoService;
import com.red.circle.other.infra.database.rds.service.props.PropsBackpackService;
import com.red.circle.other.infra.database.rds.service.props.PropsSourceRecordService;
import com.red.circle.other.infra.database.rds.service.props.RoomThemeUserBackpackService;
@ -92,8 +94,7 @@ public class UserRunProfileTransportGatewayImpl implements UserRunProfileTranspo
private final PropsResourcesInfraConvertor propsResourcesInfraConvertor;
private final RoomThemeUserCustomizeService roomThemeUserCustomizeService;
private final OneTimeTaskService oneTimeTaskService;
private final CpRelationshipService cpRelationshipService;
private final CpValueService cpValueService;
private final FamilyMemberInfoService familyMemberInfoService;
@Override
public UserProfile getByUserId(Long userId) {
@ -288,6 +289,7 @@ public class UserRunProfileTransportGatewayImpl implements UserRunProfileTranspo
newUserRunProfile.setOwnSpecialId(userSpecialIdMap.get(userBaseInfo.getId()));
newUserRunProfile.setBackgroundPhotos(JSON.parseArray(userBaseInfo.getBackgroundPhoto(), PhotoItem.class));
newUserRunProfile.setPersonalPhotos(JSON.parseArray(userBaseInfo.getPersonalPhoto(), PhotoItem.class));
newUserRunProfile.setFamilyId(Optional.ofNullable(familyMemberInfoService.getFamilyMemberByUserId(userBaseInfo.getId())).map(FamilyMemberInfo::getFamilyId).orElse(null));
return newUserRunProfile;
}
).collect(Collectors.toList());

6
rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/user/user/impl/UserAccountClientServiceImpl.java
View File

@ -383,7 +383,6 @@ public class UserAccountClientServiceImpl implements UserAccountClientService {
public UserAccountDTO createUserAccountDTO(Long userId, String imei, VoidConsumer voidConsumer) {
UserProfile userProfile = userProfileGateway.getByUserId(userId);
ResponseAssert.notNull(CommonErrorCode.DATA_ERROR, userProfile);
List<String> imeiList = List.of("7DD73EF2FC33128DEB6D68ED1E931379C2C613B5","2674AA85CF8EF827660DDABBFC231D615AD6E529","FE94F2B2CEEDEEADA31C790991B05CC06238EB68");
// 注册黑名单
if (Objects.equals(userProfile.getDel(), Boolean.TRUE)) {
@ -405,11 +404,6 @@ public class UserAccountClientServiceImpl implements UserAccountClientService {
"Device required.",
StringUtils.isNotBlank(imei));
//运营临时封禁设备
ResponseAssert.isTrue(CommonErrorCode.DEVICE_UNAVAILABLE,
"Device required.",
!imeiList.contains(imei));
ResponseAssert.isFalse(CommonErrorCode.DEVICE_UNAVAILABLE,
getTipsUserAccount(CommonErrorCode.DEVICE_UNAVAILABLE, userProfile),
archiveDeviceService.existsDevice(imei, userProfile.getOriginSys()));