活动：转盘

game-server/app/services/activity/activityService.ts

@@ -1,5 +1,5 @@
 import { ACTIVITY_TYPE, STATUS } from '../../consts';
-import { getPlayerFirstGiftData } from './firstGiftService';
+import { getPlayerFirstGiftDataShow } from './firstGiftService';
 import { getPlayerSignInData, } from './signInService';
 import { getPlayerGrowthFundData, } from './growthFundService';
 import { getPlayerLimitPackageData, } from './limitPackageService';
@@ -78,7 +78,7 @@ export async function getActivity(serverId: number, roleId: string, activityId:
             }
         case ACTIVITY_TYPE.FIRST_GIFT://首冲礼包活动 14
             {
-                activityData = await getPlayerFirstGiftData(activityId, serverId, roleId);
+                activityData = await getPlayerFirstGiftDataShow(activityId, serverId, roleId);
                 break;
             }
         case ACTIVITY_TYPE.NEW_PLAYER_LIMIT_PACKAGE://新手限定RMB购买礼包 15

game-server/app/services/activity/firstGiftService.ts

@@ -52,6 +52,21 @@ export async function getPlayerFirstGiftData(activityId: number, serverId: numbe
     return playerData;
 }
 
+/**
+ * 获取可显示的数据
+ * @param activityId 
+ * @param serverId 
+ * @param roleId 
+ * @returns 
+ */
+export async function getPlayerFirstGiftDataShow(activityId: number, serverId: number, roleId: string) {
+    let playerData = await getPlayerFirstGiftData(activityId, serverId, roleId);
+    if(playerData && playerData.canShow && playerData.canShow()) {
+        return playerData.getShowResult();
+    }
+    return null
+}
+
 /**
  * 记录玩家首充记录
  * @param {RoleType} role 玩家数据

game-server/app/services/activity/luckyTurntableService.ts

@@ -0,0 +1,34 @@
+import { ActivityTurntableModel } from "../../db/ActivityTurntableRec";
+import { RoleModel } from "../../db/Role";
+import { LuckyTurntableData } from "../../domain/activityField/luckyTurntableField";
+import { shouldRefresh } from "../../pubUtils/util";
+import { getActivityById } from "./activityService";
+
+/**
+   * 玩家活动数据
+   *
+   * @param {number} serverId 区Id
+   * @param {number} activityId 活动Id
+   * @param {string} roleId 角色Id
+   *
+   */
+ export async function getPlayerLuckyTurntableData(activityId: number, serverId: number, roleId: string) {
+    let activityData = await getActivityById(activityId);
+    let playerRecord = await ActivityTurntableModel.findByActivityId(serverId, activityId, roleId);
+    if(playerRecord && shouldRefresh(playerRecord.refTodayCount, new Date())) {
+        playerRecord = await ActivityTurntableModel.refreshTodayCount(serverId, activityId, roleId);
+    }
+
+    let { createTime } = await RoleModel.findByRoleId(roleId);
+    let playerData = new LuckyTurntableData(activityData, createTime);
+    playerData.setPlayerRecords(playerRecord);
+    return playerData;
+}
+
+export async function getPlayerLuckyTurntableDataShow(activityId: number, serverId: number, roleId: string) {
+    let playerData = await getPlayerLuckyTurntableData(activityId, serverId, roleId);
+    if(playerData && playerData.canShow && playerData.canShow()) {
+        return playerData.getShowResult();
+    }
+    return null
+}