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

家族排行榜

Browse Source
This commit is contained in:
tianfeng 2025-12-25 15:51:17 +08:00
parent 4c287e8713
commit 944752c1a9
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/family/FamilyRestController.java
View File

@ -148,12 +148,7 @@ public class FamilyRestController extends BaseController {
} }
/** /**
* 家族排行榜 周榜、月榜、自己家族信息. * 家族排行榜.
*
* @eo.name 家族排行榜 周榜、月榜、自己家族信息.
* @eo.url /leaderboard
* @eo.method get
* @eo.request-type formdata
*/ */
@GetMapping("/leaderboard") @GetMapping("/leaderboard")
public FamilyLeaderboardCO getLeaderboard(AppExtCommand cmd) { public FamilyLeaderboardCO getLeaderboard(AppExtCommand cmd) {

9
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyLeaderboardExe.java
View File

@ -56,7 +56,7 @@ public class FamilyLeaderboardExe {
Map<Long, FamilyBaseInfo> baseInfoMap = getBaseInfoMap(weeks, months); Map<Long, FamilyBaseInfo> baseInfoMap = getBaseInfoMap(weeks, months);
resultCO.setWeekDataList(listWeekCO(cmd, weeks, baseInfoMap)); resultCO.setWeekDataList(listWeekCO(cmd, weeks, baseInfoMap));
resultCO.setMonthDataList(listMonthCO(cmd, months, baseInfoMap)); // resultCO.setMonthDataList(listMonthCO(cmd, months, baseInfoMap));
FamilyMemberInfo member = getMemberByUserId(cmd); FamilyMemberInfo member = getMemberByUserId(cmd);
if (Objects.isNull(member)) { if (Objects.isNull(member)) {
@ -66,11 +66,8 @@ public class FamilyLeaderboardExe {
if (isNormal(baseInfo)) { if (isNormal(baseInfo)) {
return resultCO; return resultCO;
} }
resultCO.setWeekData(getExpCO(cmd, baseInfo, Optional.ofNullable(getFamilyWeekExp(baseInfo)) // resultCO.setWeekData(getExpCO(cmd, baseInfo, Optional.ofNullable(getFamilyWeekExp(baseInfo)).map(FamilyWeekExp::getExp).orElse(0L)));
.map(FamilyWeekExp::getExp).orElse(0L))); // resultCO.setMonthData(getExpCO(cmd, baseInfo, Optional.ofNullable(getFamilyMonthExp(baseInfo)).map(FamilyMonthExp::getExp).orElse(0L)));
resultCO.setMonthData(getExpCO(cmd, baseInfo, Optional.ofNullable(getFamilyMonthExp(baseInfo))
.map(FamilyMonthExp::getExp).orElse(0L)));
return resultCO; return resultCO;
} }

6
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyLeaderboardCO.java
View File

@ -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<FamilyExpCO> monthDataList; // private List<FamilyExpCO> monthDataList;
} }