From 308683cf90fcfd638c97d004d867a0d85fc545c0 Mon Sep 17 00:00:00 2001
From: CounterFire2023 <136581895+CounterFire2023@users.noreply.github.com>
Date: Tue, 26 Mar 2024 16:27:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=B2=A1=E6=9C=89=E7=AD=BE?=
 =?UTF-8?q?=E5=88=B0=E8=AE=B0=E5=BD=95=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B?=
 =?UTF-8?q?,=E8=8E=B7=E5=8F=96=E6=B8=B8=E6=88=8F=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/game.controller.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/controllers/game.controller.ts b/src/controllers/game.controller.ts
index 6a46eac..3efabf7 100644
--- a/src/controllers/game.controller.ts
+++ b/src/controllers/game.controller.ts
@@ -151,7 +151,7 @@ class GameController extends BaseController {
       // 检查是否已领取
       todayStat = 2
     }
-    const scoreBonus = seqSignScore(checkRecord.count)
+    const scoreBonus = seqSignScore(checkRecord?.count || 0)
     const ticketRecords = await TicketRecord.find({ user: user.id, activity: user.activity, type: SIGN_TOTAL })
     const claimedSet = new Set()
     ticketRecords.forEach(record => {
@@ -161,7 +161,7 @@ class GameController extends BaseController {
     const totalStat = []
     for (let cfg of totalSignCfg) {
       let state = 0
-      if (cfg.days <= checkRecord.total) {
+      if (cfg.days <= checkRecord?.total || 0) {
         state = 1
       }
       if (claimedSet.has(cfg.days)) {
@@ -173,13 +173,14 @@ class GameController extends BaseController {
         state,
       })
     }
+    totalStat.sort((a, b) => a.days - b.days)
     return {
       ticket: record.tickets,
       signCfg,
       todayStat,
       todayTickets: 1 + scoreBonus,
-      daysTotal: checkRecord.total,
-      daysSeq: checkRecord.count,
+      daysTotal: checkRecord?.total || 0,
+      daysSeq: checkRecord?.count || 0,
       totalStat,
     }
   }