diff --git a/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/family/FamilyRestController.java b/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/family/FamilyRestController.java index 52968b7b..410709ae 100644 --- a/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/family/FamilyRestController.java +++ b/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/family/FamilyRestController.java @@ -148,12 +148,7 @@ public class FamilyRestController extends BaseController { } /** - * 家族排行榜 周榜、月榜、自己家族信息. - * - * @eo.name 家族排行榜 周榜、月榜、自己家族信息. - * @eo.url /leaderboard - * @eo.method get - * @eo.request-type formdata + * 家族排行榜. */ @GetMapping("/leaderboard") public FamilyLeaderboardCO getLeaderboard(AppExtCommand cmd) { diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyLeaderboardExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyLeaderboardExe.java index e9c673b3..56aa22bc 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyLeaderboardExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyLeaderboardExe.java @@ -56,7 +56,7 @@ public class FamilyLeaderboardExe { Map baseInfoMap = getBaseInfoMap(weeks, months); resultCO.setWeekDataList(listWeekCO(cmd, weeks, baseInfoMap)); - resultCO.setMonthDataList(listMonthCO(cmd, months, baseInfoMap)); +// resultCO.setMonthDataList(listMonthCO(cmd, months, baseInfoMap)); FamilyMemberInfo member = getMemberByUserId(cmd); if (Objects.isNull(member)) { @@ -66,11 +66,8 @@ public class FamilyLeaderboardExe { if (isNormal(baseInfo)) { return resultCO; } - resultCO.setWeekData(getExpCO(cmd, baseInfo, Optional.ofNullable(getFamilyWeekExp(baseInfo)) - .map(FamilyWeekExp::getExp).orElse(0L))); - - resultCO.setMonthData(getExpCO(cmd, baseInfo, Optional.ofNullable(getFamilyMonthExp(baseInfo)) - .map(FamilyMonthExp::getExp).orElse(0L))); +// resultCO.setWeekData(getExpCO(cmd, baseInfo, Optional.ofNullable(getFamilyWeekExp(baseInfo)).map(FamilyWeekExp::getExp).orElse(0L))); +// resultCO.setMonthData(getExpCO(cmd, baseInfo, Optional.ofNullable(getFamilyMonthExp(baseInfo)).map(FamilyMonthExp::getExp).orElse(0L))); return resultCO; } diff --git a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyLeaderboardCO.java b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyLeaderboardCO.java index 15adcd52..f8b377c4 100644 --- a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyLeaderboardCO.java +++ b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyLeaderboardCO.java @@ -23,11 +23,11 @@ public class FamilyLeaderboardCO implements Serializable { /** * 周-自己家族贡献榜单. */ - private FamilyExpCO weekData; +// private FamilyExpCO weekData; /** * 月-自己家族贡献榜单. */ - private FamilyExpCO monthData; +// private FamilyExpCO monthData; /** * 周-家族贡献榜单. */ @@ -35,7 +35,7 @@ public class FamilyLeaderboardCO implements Serializable { /** * 月-家族贡献榜单. */ - private List monthDataList; +// private List monthDataList; }