This commit is contained in:
mamengke01
2021-01-29 16:35:15 +08:00
parent 75d07b0550
commit afddeba1c9
12 changed files with 205 additions and 41 deletions

View File

@@ -2,7 +2,7 @@ import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType, Ref } from '@typegoose/typegoose';
import Role, { RoleType } from './Role';
import { GUILD_AUTH, USER_GUILD_STATUS, GUILD_JOB } from '../consts';
import { nowSeconds } from '../pubUtils/timeUtil';
import { getTodayZeroDate, nowSeconds } from '../pubUtils/timeUtil';
import { ARMY } from '../pubUtils/dicParam';
class ActiveRecord {
@prop({ required: true })
@@ -12,8 +12,6 @@ class ActiveRecord {
}
class WishGood {
@prop({ required: true })
id: number;
@prop({ required: true })
type: number;
@prop({ required: true })
@@ -77,7 +75,7 @@ export default class UserGuild extends BaseModel {
@prop({ required: true, default: [] })
trainRewards: Array<number>;//领取过的进阶等级
@prop({ required: true, default: [], type: WishGood })
@prop({ required: true, default: [], type: WishGood, _id: false })
wishGoods:Array<WishGood>;
@prop({ required: true, default: [], type: Number })
@@ -143,7 +141,7 @@ export default class UserGuild extends BaseModel {
}
public static async dismiss(guildCode: string) {
const result = await UserGuildModel.updateMany({guildCode}, {status: USER_GUILD_STATUS.DISMISSED});
const result = await UserGuildModel.updateMany({ guildCode }, { status: USER_GUILD_STATUS.DISMISSED });
return result;
}
@@ -161,13 +159,13 @@ export default class UserGuild extends BaseModel {
public static async receiveTrainRewards(roleId: string, trainId: number, lean = true) {
const result = await UserGuildModel.findOneAndUpdate({ roleId, status: USER_GUILD_STATUS.ON},
{$push:{trainRewards: trainId} },{new: true}).lean(lean);
{ $push:{trainRewards: trainId} },{new: true}).lean(lean);
return result;
}
public static async addTrainCount(roleId: string, trainCount: number, lean = true) {
const result = await UserGuildModel.findOneAndUpdate({ roleId, status: USER_GUILD_STATUS.ON},
{$inc: {trainCount, buyTrainCount: trainCount}}, {new: true}).lean(lean);
{ $inc: { trainCount, buyTrainCount: trainCount } }, {new: true}).lean(lean);
return result;
}
@@ -178,11 +176,15 @@ export default class UserGuild extends BaseModel {
public static async donateFund(roleId: string, donateCnt: number, lean = true) {
const result = await UserGuildModel.findOneAndUpdate({ roleId, status: USER_GUILD_STATUS.ON},
{$inc: {donateCnt :-1*donateCnt}}, {new: true}).lean(lean);
{$inc: { donateCnt }}, {new: true}).lean(lean);
return result;
}
public static async getWishPoolGoods(guildCode: string, select?: string, lean = true) {
const userGuilds: UserGuildType[] = await UserGuildModel.find({ guildCode, status: USER_GUILD_STATUS.ON, refTimeDaily: { $gte: getTodayZeroDate() } })
.select(select).lean(lean);
return userGuilds;
}
}