diff --git a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/user/CpUserInfoDTO.java b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/user/CpUserInfoDTO.java index 9130e3d9..d06d726f 100644 --- a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/user/CpUserInfoDTO.java +++ b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/user/CpUserInfoDTO.java @@ -21,4 +21,8 @@ public class CpUserInfoDTO { /** CP等级. */ private Integer cpLevel; + private Integer micEffectLevel; + + private Boolean hasNonMicEffect; + } diff --git a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/user/user/impl/UserCpClientServiceImpl.java b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/user/user/impl/UserCpClientServiceImpl.java index 0bd7ed16..5299a343 100644 --- a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/user/user/impl/UserCpClientServiceImpl.java +++ b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/user/user/impl/UserCpClientServiceImpl.java @@ -114,9 +114,13 @@ public class UserCpClientServiceImpl implements UserCpClientService { CpRelationship::getUserId, Collectors.mapping(v -> { BigDecimal cpVal = cpValueMap.getOrDefault(v.getCpValId(), BigDecimal.ZERO); + CpLevelConfig levelConfig = CpLevelConfig.of(cpVal); return new CpUserInfoDTO() .setCpUserId(v.getCpUserId()) - .setCpLevel(CpLevelConfig.of(cpVal).getLevel()); + .setCpLevel(levelConfig.getLevel()) + .setMicEffectLevel(levelConfig.getMicEffectLevel()) + .setHasNonMicEffect(levelConfig.isHasNonMicEffect()); + }, Collectors.toList()) )); }