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 72abb90e..c7452be0 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 @@ -62,12 +62,10 @@ public class FamilyBaseInfoExe { .setCurrentExp( familyLevelExpService.getExp(baseInfo.getId(), baseInfo.getFamilyLevelId()).longValue()) .setCurrentMember(getFamilyMemberCount(baseInfo.getId())) - .setLevelKey(familyLevel.getLevelKey()) + .setFamilyLevel(Optional.ofNullable(familyLevel.getLevelKey()) + .map(key -> Integer.parseInt(key.substring(6))) + .orElse(0)) .setLevelExp(familyLevel.getLevelExp()) - .setAvatarFrameCover(familyLevel.getAvatarFrameCover()) - .setAvatarFrameSvg(familyLevel.getAvatarFrameSvg()) - .setBadgeCover(familyLevel.getBadgeCover()) - .setBadgeSvg(familyLevel.getBadgeSvg()) .setMaxMember(familyLevel.getMaxMember()) .setLevelBackgroundPicture(familyLevel.getLevelBackgroundPicture()); } diff --git a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyBaseInfoCO.java b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyBaseInfoCO.java index 4f8a4a7e..3e09cdf9 100644 --- a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyBaseInfoCO.java +++ b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyBaseInfoCO.java @@ -69,9 +69,9 @@ public class FamilyBaseInfoCO extends ClientObject { private Integer currentMember; /** - * 家族等级key. + * 家族等级. */ - private String levelKey; + private Integer familyLevel; /** * 等级经验值