From d056c0cb1021685f4e5ecb45da2c3930fdccc480 Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Mon, 22 Sep 2025 15:12:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E6=98=9F=E6=88=91=E7=9A=84=E6=8E=92?=
 =?UTF-8?q?=E5=90=8D=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../query/WeekStarGiftRankingQueryExe.java    | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

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;
   }