diff --git a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/enums/material/ConsolePropsTypeEnum.java b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/enums/material/ConsolePropsTypeEnum.java index 7be66071..a3d539bd 100644 --- a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/enums/material/ConsolePropsTypeEnum.java +++ b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/enums/material/ConsolePropsTypeEnum.java @@ -19,6 +19,11 @@ public enum ConsolePropsTypeEnum { */ RIDE("RIDE", "座驾"), + /** + * 徽章. + */ + BADGE("BADGE", "徽章"), + /** * 贵族. */ diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/common/room/RoomVoiceProfileCommon.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/common/room/RoomVoiceProfileCommon.java index 0dd7940b..108b34c1 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/common/room/RoomVoiceProfileCommon.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/common/room/RoomVoiceProfileCommon.java @@ -4,9 +4,10 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.red.circle.common.business.core.enums.SysOriginPlatformEnum; import com.red.circle.common.business.enums.SVIPLevelEnum; -import com.red.circle.other.app.convertor.live.RoomProfileAppConvertor; -import com.red.circle.other.app.convertor.user.UserProfileAppConvertor; -import com.red.circle.other.app.dto.clientobject.room.RoomVoiceProfileCO; +import com.red.circle.other.app.convertor.live.RoomProfileAppConvertor; +import com.red.circle.other.app.convertor.user.UserProfileAppConvertor; +import com.red.circle.other.app.dto.clientobject.family.RoomSettingCO; +import com.red.circle.other.app.dto.clientobject.room.RoomVoiceProfileCO; import com.red.circle.other.domain.gateway.user.UserProfileGateway; import com.red.circle.other.infra.database.mongo.entity.live.ActiveVoiceRoom; import com.red.circle.other.infra.database.mongo.entity.live.RoomProfileManager; @@ -166,12 +167,16 @@ public class RoomVoiceProfileCommon { return null; } - RoomVoiceProfileCO roomVoiceProfile = roomProfileAppConvertor.toRoomVoiceProfileCO(manager); - roomVoiceProfile.setUserProfile(userProfile); - roomVoiceProfile - .putExistsPassword(StringUtils.isNotBlank(manager.getSetting().getPassword())) - .putRoomDefaultSetting(roomProfileAppConvertor.toRoomSettingCO(manager.getSetting())) - .putRoomMemberQuantity(manager.getCounter().getMemberCount()); + RoomVoiceProfileCO roomVoiceProfile = roomProfileAppConvertor.toRoomVoiceProfileCO(manager); + roomVoiceProfile.setUserProfile(userProfile); + RoomSettingCO roomSetting = roomProfileAppConvertor.toRoomSettingCO(manager.getSetting()); + if (Objects.nonNull(roomSetting)) { + roomSetting.setPassword(""); + } + roomVoiceProfile + .putExistsPassword(StringUtils.isNotBlank(manager.getSetting().getPassword())) + .putRoomDefaultSetting(roomSetting) + .putRoomMemberQuantity(manager.getCounter().getMemberCount()); roomVoiceProfile.setRoomBadgeIcons(Optional.ofNullable(manager.getUseBadges()).map( badges -> badges.stream().map(UseBadgeDTO::getSelectUrl) .toList()).orElse(Lists.newArrayList())