xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

活动：修改显示排行榜定时器

Browse Source
This commit is contained in:
luying
2022-05-11 21:55:36 +08:00
parent 2e23263e56
commit 6284fa02f7
4 changed files with 31 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
shared/domain/activityField/activityField.ts
View File

@@ -119,25 +119,25 @@ export abstract class ActivityBase {
export class ActivityInRemote {
groupId: number; // 组Id
activityId: number; // 活动Id
beginTime: number; // 开启时间 timeType=3
endTime: number; // 结束时间 timeType=3
beginTime: number = 0; // 开启时间 timeType=3
endTime: number = 0; // 结束时间 timeType=3
type: number; // 活动类型
data: string; // 活动表中的数据
timeType: number; // 活动时间类型 ACTIVITY_TIME_TYPE 1.服务器开启时间 2.角色创建时间 3.指定开启时间(beginTime,endTime)
days: number; // 活动持续天数 timeType=1、2
delayDay: number; // 迟几天开启活动，0表示按照规定时间开启
effectDay: number; // 生效天数
interval: number; // 周期性活动时间间隔,秒
hideDayByServer: number;
days: number = 0; // 活动持续天数 timeType=1、2
delayDay: number = 0; // 迟几天开启活动，0表示按照规定时间开启
effectDay: number = 0; // 生效天数
interval: number = 0; // 周期性活动时间间隔,天
hideDayByServer: number = 0;
isEnable: boolean;
name: string;
constructor(activity?: ActivityModelType) {
this.groupId = activity.groupId;
this.activityId = activity.activityId;
this.beginTime = activity.beginTime.getTime();
this.endTime = activity.endTime.getTime();
if(activity.beginTime) this.beginTime = activity.beginTime.getTime();
if(activity.endTime) this.endTime = activity.endTime.getTime();
this.type = activity.type;
this.data = activity.data;
this.timeType = activity.timeType;

10
shared/domain/activityField/timeLimitRankField.ts
View File

@@ -1,3 +1,4 @@
import moment = require('moment');
import { RANK_TYPE } from '../../consts';
import { ActivityModelType } from '../../db/Activity';
import { ActivityBase } from './activityField';
@@ -11,8 +12,9 @@ interface TimeLimitRewardInDb {
interface TimeLimitInDb {
rankType: number; // 排行榜类型
hid: number; // 如果有单个武将排行，这里写武将id
rankEndTime: number; // 排行榜统计结束时间。13位时间戳，之后会在后台加时间筛选，在此之前先找wo
sendMailTime: number; // 发送奖励时间。13位时间戳
rankEndDay: number; // 开始时间之后几天停止计入活动
rankEndTime: string; // hh:mm:ss，几点几分几秒正式计入活动
sendMailTime: number; // rankEndTime 后几秒发送邮件奖励
rankRewards: TimeLimitRewardInDb[]; // 不同排名的奖励
tabName: string; // 排行榜标签名
}
@@ -66,8 +68,8 @@ export class TimeLimitRankData extends ActivityBase {
let dataObj: TimeLimitInDb = JSON.parse(data);
this.rankType = dataObj.rankType;
this.hid = dataObj.hid;
this.rankEndTime = dataObj.rankEndTime;
this.sendMailTime = dataObj.sendMailTime;
this.rankEndTime = moment(moment(this.beginTime).add(dataObj.rankEndDay, 'd').format(`YYYY-MM-DD ${this.rankEndTime}`)).valueOf() ;
this.sendMailTime = this.rankEndTime + this.sendMailTime * 1000;
for(let rank of dataObj.rankRewards) {
this.rankRewards.push(new TimeLimitRankReward(rank));
}