活动：首冲活动添加查询是否结束相关逻辑

game-server/app/services/firstGiftService.ts

@@ -1,7 +1,7 @@
 import { ACTIVITY_TYPE, TASK_TYPE } from '../consts';
 import { ActivityModel, ActivityModelType } from '../db/Activity';
 import { ActivityFirstGiftModel, ActivityFirstGiftModelType } from '../db/ActivityFirstGift';
-import { FirstGiftData, FirstGiftItem } from '../domain/activityField/firstGiftField';
+import { FirstGiftData } from '../domain/activityField/firstGiftField';
 
 /**
    * 获取活动数据
@@ -13,16 +13,20 @@ import { FirstGiftData, FirstGiftItem } from '../domain/activityField/firstGiftF
    */
 
 export async function firstGiftActivity(serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.FIRST_GIFT, true)
-    activityArray = activityArray.sort((a, b) => {
-        return a.activityId - b.activityId
-    });
+    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.FIRST_GIFT, 1)
+
     if (activityArray.length == 0) {
         return null;
     }
     let activityData = activityArray[0];
-    let playerData = await getPlayerFirstGiftData(activityData.activityId, serverId, roleId);
-    return playerData
+    let playerRecord: ActivityFirstGiftModelType = await ActivityFirstGiftModel.findData(activityData.activityId, roleId);
+    if (playerRecord.isOver) {
+        return true;
+    }
+
+    let playerData = new FirstGiftData(activityData);
+    playerData.setPlayerRecords(playerRecord);
+    return playerData;
 }
 
 /**