From c63403a482904d40e1ba67297bd611474aaf97d9 Mon Sep 17 00:00:00 2001
From: CounterFire2023 <136581895+CounterFire2023@users.noreply.github.com>
Date: Wed, 24 Apr 2024 16:55:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=8E=B7=E5=8F=96ticket=20re?=
 =?UTF-8?q?cord=E6=97=B6dataTag=E7=9A=84=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/game.controller.ts | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/controllers/game.controller.ts b/src/controllers/game.controller.ts
index 586175c..c5bb100 100644
--- a/src/controllers/game.controller.ts
+++ b/src/controllers/game.controller.ts
@@ -39,7 +39,7 @@ class GameController extends BaseController {
     const existsSet = new Set()
     exists.forEach(record => {
       // @ts-ignore
-      let _dateTag = record.data?.dateTag || formatDate(record.createdAt)
+      let _dateTag = record.data?.dataTag || formatDate(record.createdAt)
       existsSet.add(_dateTag)
     })
     if (existsSet.has(dateTag)) {
@@ -88,7 +88,7 @@ class GameController extends BaseController {
     const claimedSet = new Set()
     ticketRecords.forEach(record => {
       // @ts-ignore
-      let dateTag = record.data?.dateTag || formatDate(record.createdAt)
+      let dateTag = record.data?.dataTag || formatDate(record.createdAt)
       claimedSet.add(dateTag)
     })
     for (let record of res) {
@@ -234,14 +234,12 @@ class GameController extends BaseController {
       // 有签到的链上记录, 说明已签到
       todayStat = 1
     }
-    if (record.lastSignDay === dateTag) {
-      // 检查是否已领取
-      todayStat = 9
-    }
+    const claimedDaySet = new Set()
+
     const ticketRecords = await TicketRecord.find({
       user: user.id,
       activity: user.activity,
-      type: { $in: [SIGN_TOTAL, USE_TICKET, SIGN_SEQ] },
+      type: { $in: [SIGN_TOTAL, USE_TICKET, SIGN_SEQ, DAILY_SIGN] },
     })
     const claimedSet = new Set()
     const seqSet = new Set()
@@ -253,9 +251,16 @@ class GameController extends BaseController {
         claimedSet.add(record.data.day)
       } else if (record.type === SIGN_SEQ) {
         seqSet.add(record.data.day)
+      } else if (record.type === DAILY_SIGN) {
+        //@ts-ignore
+        let dateTag = record.data?.dataTag || formatDate(record.createdAt)
+        claimedDaySet.add(dateTag)
       }
     })
-
+    if (claimedDaySet.has(dateTag)) {
+      // 检查是否已领取
+      todayStat = 9
+    }
     const totalStat = []
     const lastRecord = await CheckIn.findOne({ from: user.address.toLowerCase() }).sort({ _id: -1 })
     for (let cfg of totalSignCfg) {