From 2b5be18ea5dc23d344c70f87317c7d095a3ca34d Mon Sep 17 00:00:00 2001
From: xichaoyin <xcy871622040@dingtalk.com>
Date: Wed, 3 Jan 2024 09:42:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=9B=E6=9E=97=E7=8C=8E=E6=89=8B?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api_cross/clsl/ApiRank.ts                  | 4 +++-
 src/api_s2c/conglinshoulie/ApiOpen.ts          | 5 +++--
 src/shared/protocols/conglinshoulie/PtlOpen.ts | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/api_cross/clsl/ApiRank.ts b/src/api_cross/clsl/ApiRank.ts
index ada7663..b63114e 100644
--- a/src/api_cross/clsl/ApiRank.ts
+++ b/src/api_cross/clsl/ApiRank.ts
@@ -10,14 +10,16 @@ export default async function (call: ApiCall<ReqRank, ResRank>) {
 
     if (G.time < week_zero_time + group_time) {
         call.succ({ rankList: [], myRank: { rank: -1, player: {}, valArr: [] } })
+        return
     }
 
     let a = await G.mongodb.collection('clslCrossUser').findOne({
         uid: call.req.uid
     });
     
-    if (!a){
+    if (!a || !a.group){
         call.succ({ rankList: [], myRank: { rank: -1, player: {}, valArr: [] } })
+        return
     }
 
     let rank: Rank;
diff --git a/src/api_s2c/conglinshoulie/ApiOpen.ts b/src/api_s2c/conglinshoulie/ApiOpen.ts
index d844979..e274418 100644
--- a/src/api_s2c/conglinshoulie/ApiOpen.ts
+++ b/src/api_s2c/conglinshoulie/ApiOpen.ts
@@ -18,9 +18,9 @@ export default async function (call: ApiCall<ReqOpen, ResOpen>) {
             fightWinNum: 0,
             buyFightNum: 0
         };
-        
+
         // 隔周刷新星级
-        if(ops?.refreshTime < PublicShared.getToWeekMondayZeroTime()){
+        if (ops?.refreshTime < PublicShared.getToWeekMondayZeroTime()) {
             change.allStar = 0;
             change.curMaxStar = 0;
         }
@@ -35,6 +35,7 @@ export default async function (call: ApiCall<ReqOpen, ResOpen>) {
     }
 
     call.succ({
+        week: parseInt(PublicShared.getToWeek()) || 7,
         allStar: ops?.allStar || 0,
         danPrize: ops?.danPrize || [],
         curMaxStar: ops?.curMaxStar || 0,
diff --git a/src/shared/protocols/conglinshoulie/PtlOpen.ts b/src/shared/protocols/conglinshoulie/PtlOpen.ts
index d506509..2213dfe 100644
--- a/src/shared/protocols/conglinshoulie/PtlOpen.ts
+++ b/src/shared/protocols/conglinshoulie/PtlOpen.ts
@@ -21,4 +21,6 @@ export type ResOpen = {
     curMaxStar: number;
     /**段位奖励发放记录*/
     danPrize: number[];
+
+    week?:number;  // 返回给客户端用
 };
\ No newline at end of file