diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/WeekStarGiftRankingQueryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/WeekStarGiftRankingQueryExe.java index acc294ec..a27c4cf2 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/WeekStarGiftRankingQueryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/WeekStarGiftRankingQueryExe.java @@ -127,16 +127,28 @@ public class WeekStarGiftRankingQueryExe { public UserRankCO myRank(WeekStarRankingQueryCmd cmd) { if (Objects.equals(cmd.getType(), WeekLeaderboardEnum.THIS_WEEK)) { - return convertToUserRankCO(weekStarGiftCountService.getMyThisWeekRank( - cmd.getReqSysOrigin().getOrigin(), - cmd.getReqUserId() - )); + WeekStarGiftCount myThisWeekRank = weekStarGiftCountService.getMyThisWeekRank(cmd.getReqSysOrigin().getOrigin(), cmd.getReqUserId()); + if (Objects.isNull(myThisWeekRank)) { + myThisWeekRank = new WeekStarGiftCount(); + myThisWeekRank.setRank(0); + myThisWeekRank.setUserId(cmd.getReqUserId()); + myThisWeekRank.setQuantity(0L); + } + return convertToUserRankCO(myThisWeekRank); } if (Objects.equals(cmd.getType(), WeekLeaderboardEnum.LAST_WEEK)) { - return convertToUserRankCO(weekStarGiftCountService.getMyLastWeekRank( + WeekStarGiftCount myLastWeekRank = weekStarGiftCountService.getMyLastWeekRank( cmd.getReqSysOrigin().getOrigin(), cmd.getReqUserId() - )); + ); + if (Objects.isNull(myLastWeekRank)) { + myLastWeekRank = new WeekStarGiftCount(); + myLastWeekRank.setRank(0); + myLastWeekRank.setUserId(cmd.getReqUserId()); + myLastWeekRank.setQuantity(0L); + } + + return convertToUserRankCO(myLastWeekRank); } return null; }