活动:时间
This commit is contained in:
@@ -6,7 +6,8 @@ import { RoleModel } from '../../db/Role';
|
||||
import { ServerlistModel } from '../../db/Serverlist';
|
||||
import { RefreshShopData } from '../../domain/activityField/refreshShopField';
|
||||
import { deltaDays } from '../../pubUtils/util';
|
||||
import { getActivityById } from './activityService';
|
||||
import { getRoleCreateTime, getServerCreateTime } from '../redisService';
|
||||
import { getActivitiesByType, getActivityById } from './activityService';
|
||||
import { addReward, stringToRewardParam } from './giftPackageService';
|
||||
|
||||
/**
|
||||
@@ -19,14 +20,14 @@ import { addReward, stringToRewardParam } from './giftPackageService';
|
||||
*/
|
||||
|
||||
export async function getRefreshShopActivity(serverId: number, roleId: string) {
|
||||
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
|
||||
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.REFRESH_SHOP, new Date)
|
||||
let activityArray = await getActivitiesByType(serverId, ACTIVITY_TYPE.REFRESH_SHOP);
|
||||
if (activityArray.length == 0) {
|
||||
return null;
|
||||
}
|
||||
let activityData = activityArray[0];
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let playerData = new RefreshShopData(activityData, createTime);
|
||||
let createTime = await getRoleCreateTime(roleId);
|
||||
let serverTime = await getServerCreateTime(serverId);
|
||||
let playerData = new RefreshShopData(activityData, createTime, serverTime);
|
||||
|
||||
let playerRecord: ActivityRefreshShopModelType = await ActivityRefreshShopModel.findData(activityData.activityId, roleId, playerData.roundIndex);
|
||||
if (!playerRecord) {//生成商店可购买商品的数据
|
||||
@@ -48,13 +49,14 @@ export async function getRefreshShopActivity(serverId: number, roleId: string) {
|
||||
*/
|
||||
export async function getPlayerRefreshShopData(activityId: number, serverId: number, roleId: string) {
|
||||
let activityData = await getActivityById(activityId);
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let playerData = new RefreshShopData(activityData, createTime);
|
||||
let role = await RoleModel.findByRoleId(roleId, 'lv createTime');
|
||||
let createTime = await getRoleCreateTime(roleId, role);
|
||||
let serverTime = await getServerCreateTime(serverId);
|
||||
let playerData = new RefreshShopData(activityData, createTime, serverTime);
|
||||
|
||||
let playerRecord: ActivityRefreshShopModelType = await ActivityRefreshShopModel.findData(activityId, roleId, playerData.roundIndex);
|
||||
if (!playerRecord) {//生成商店可购买商品的数据
|
||||
let { lv } = await RoleModel.findByRoleId(roleId);
|
||||
let randomGoods = playerData.randomGoodsItems(lv);
|
||||
let randomGoods = playerData.randomGoodsItems(role.lv);
|
||||
playerRecord = await ActivityRefreshShopModel.createShop(activityData.activityId, roleId, playerData.roundIndex, randomGoods);
|
||||
}
|
||||
playerData.setPlayerRecords(playerRecord);
|
||||
@@ -71,13 +73,14 @@ export async function getPlayerRefreshShopData(activityId: number, serverId: num
|
||||
*/
|
||||
export async function getPlayerRefreshShopDataByRoundIndex(activityId: number, serverId: number, roleId: string, roundIndex: number) {
|
||||
let activityData: ActivityModelType = await getActivityById(activityId);
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let playerData = new RefreshShopData(activityData, createTime);
|
||||
let role = await RoleModel.findByRoleId(roleId, 'lv createTime');
|
||||
let createTime = await getRoleCreateTime(roleId, role);
|
||||
let serverTime = await getServerCreateTime(serverId);
|
||||
let playerData = new RefreshShopData(activityData, createTime, serverTime);
|
||||
playerData.roundIndex = roundIndex;
|
||||
let playerRecord: ActivityRefreshShopModelType = await ActivityRefreshShopModel.findData(activityId, roleId, playerData.roundIndex);
|
||||
if (!playerRecord) {//生成商店可购买商品的数据
|
||||
let { lv } = await RoleModel.findByRoleId(roleId);
|
||||
let randomGoods = playerData.randomGoodsItems(lv);
|
||||
let randomGoods = playerData.randomGoodsItems(role.lv);
|
||||
playerRecord = await ActivityRefreshShopModel.createShop(activityData.activityId, roleId, playerData.roundIndex, randomGoods);
|
||||
}
|
||||
playerData.setPlayerRecords(playerRecord);
|
||||
@@ -121,8 +124,9 @@ export async function makeRefreshShopReward(roleId: string, roleName: string, si
|
||||
if (activityData.type !== ACTIVITY_TYPE.REFRESH_SHOP) {
|
||||
return STATUS.ACTIVITY_TYPE_ERROR;
|
||||
}
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let playerData = new RefreshShopData(activityData, createTime);
|
||||
let createTime = await getRoleCreateTime(roleId);
|
||||
let serverTime = await getServerCreateTime(serverId);
|
||||
let playerData = new RefreshShopData(activityData, createTime, serverTime);
|
||||
if (roundIndex) {
|
||||
playerData.roundIndex = roundIndex;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user