feat(活动): 添加关注豪礼

This commit is contained in:
luying
2023-04-03 17:59:06 +08:00
parent 07b75c1510
commit 94b6dca4cc
15 changed files with 382 additions and 27 deletions
@@ -2,6 +2,7 @@ import { ACTIVITY_TYPE } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityBindPhoneRewardModel } from '../../db/ActivityBindPhoneReward';
import { ActivityDailyChallengesModel, ActivityDailyChallengesModelType } from '../../db/ActivityDailyChallenges';
import { LinkModel } from '../../db/Link';
import { RoleModel } from '../../db/Role';
import { ServerlistModel } from '../../db/Serverlist';
import { UserModel } from '../../db/User';
@@ -28,9 +29,14 @@ export async function getBindPhoneData(activityId: number, roleId: string, serve
let serverTime = await getServerCreateTime(serverId);
let playerData = new BindPhoneData(activityData, createTime, serverTime);
let user = await UserModel.findUserByUid(uid);
let receiveRec = await ActivityBindPhoneRewardModel.findByUid(activityId, uid);
playerData.setRecord(user, receiveRec);
let links = await LinkModel.findByServerId(serverId);
playerData.setLinks(links);
if(playerData.bindPhone) {
let user = await UserModel.findUserByUid(uid);
let receiveRec = await ActivityBindPhoneRewardModel.findByUid(activityId, uid);
playerData.setBindPhoneStatus(user, receiveRec);
}
return playerData;
}
+4
View File
@@ -123,6 +123,10 @@ export function checkRouteParam(route: string, msg: any) {
case 'activity.miniGameHandler.getMiniGameActivity':
case 'activity.weeklyFundHandler.getData':
case 'activity.monthlyFundHandler.getData':
case 'activity.bindPhoneHandler.bind':
case 'activity.bindPhoneHandler.receiveReward':
case 'activity.bindPhoneHandler.receiveGiftCode':
case 'activity.bindPhoneHandler.skipOutSide':
{
if(!checkNaturalNumbers(msg.activityId)) return false;
break;
+5 -1
View File
@@ -8,7 +8,7 @@ import { getCurTask, getPvpTask } from './task/taskService';
import { RoleType } from '../db/Role';
import { Application, FrontendOrBackendSession, pinus, RpcClient } from 'pinus';
import { getRandEelmWithWeight, resResult } from '../pubUtils/util';
import { STATUS, PUSH_BATCH, PUSH_INTERVAL, CONSUME_TYPE, HERO_SELECT, ENTERY_ROLE_PICK, JEWEL_SELECT, ITEM_SELECT, SKIN_SELECT, PUSH_ROUTE, ARTIFACT_SELECT, ACTIVITYITEM_SELECT } from '../consts';
import { STATUS, PUSH_BATCH, PUSH_INTERVAL, CONSUME_TYPE, HERO_SELECT, ENTERY_ROLE_PICK, JEWEL_SELECT, ITEM_SELECT, SKIN_SELECT, PUSH_ROUTE, ARTIFACT_SELECT, ACTIVITYITEM_SELECT, SNS_LINK_TYPE } from '../consts';
import { getAllShopList } from './shopService';
import { getGeneralRank, getRankFirstReward } from './rankService';
import { getFriendList, getApplyList } from './friendService';
@@ -52,6 +52,7 @@ import { PvpDataReturn } from '../domain/battleField/pvp';
import { getHiddenData } from './dataService';
import { ArtifactModel } from '../db/Artifact';
import { ActivityItemModel } from '../db/ActivityItem';
import { LinkModel } from '../db/Link';
/**
* init: 初始的时候是否推送 true-推 false-不推
@@ -87,6 +88,7 @@ const modules = [
{ id: 26, type: 'survey', init: false, refresh: true, guild: false },
{ id: 27, type: 'ladder', init: false, refresh: true, guild: false },
{ id: 28, type: 'hiddenData', init: true, refresh: true, guild: false },
{ id: 29, type: 'customerLink', init: true, refresh: true, guild: false },
]
export async function pushData(hasInit: boolean, role: RoleType, session: FrontendOrBackendSession, pushType: 'entry' | 'refresh' = 'entry') {
@@ -127,6 +129,7 @@ export async function getModuleData(type: string, data: { role: RoleType, sessio
let skins = await SkinModel.findbyRole(role.roleId, SKIN_SELECT.ENTRY);
let artifacts = await ArtifactModel.findbyRole(role.roleId, ARTIFACT_SELECT.ENTRY);
let activityItems = await ActivityItemModel.findbyRole(role.roleId, ACTIVITYITEM_SELECT.ENTRY);
let link = await LinkModel.findByType(SNS_LINK_TYPE.CUSTOMER);
role['heros'] = heros.map(hero => new HeroParam(hero));
role['jewels'] = jewels;
@@ -142,6 +145,7 @@ export async function getModuleData(type: string, data: { role: RoleType, sessio
role.heads = role.heads.filter(cur => cur.status);
role.frames = role.frames.filter(cur => cur.status);
role.spines = role.spines.filter(cur => cur.status);
role['customerLink'] = link?.link||'';
return pick(role, ENTERY_ROLE_PICK);
case 'shop': // 商店
return await getAllShopList(roleId, serverId);