试炼调试数据

shared/db/Guild.ts

@@ -89,9 +89,6 @@ export default class Guild extends BaseModel {
 
     @prop({ required: true, default: 0 })
     resetTrainTime: number;//上次刷新挑战训练场次数的时间
-    
-    @prop({ required: true, default: 1 })
-    wishPoolLv: number;                         // 许愿池等级
 
     public static async createGuild(params: { name: string, icon: number, notice: string }, role: RoleType, serverId: number) {
         const doc = new GuildModel();
@@ -204,7 +201,7 @@ export default class Guild extends BaseModel {
 
     public static async resetGuildTrain(code: string, serverId: number, trainLv: number, lean = true) {
         const time = getCurWeekTime(1, 5);//每周一，5点刷新
-        const result = await GuildModel.findOneAndUpdate({ code, status: GUILD_STATUS.RUNNING, serverId, resetTrainTime:{$ne:time}},{$set: {trainId: 1, resetTrainTime: time, trainLv}}).lean(lean);
+        const result = await GuildModel.findOneAndUpdate({ code, status: GUILD_STATUS.RUNNING, serverId, resetTrainTime:{$ne:time}},{$set: {trainId: 1, resetTrainTime: time, trainLv}}, {new: true}).lean(lean);
         return result;
     }
 }

shared/db/GuildTrainReport.ts

@@ -13,7 +13,7 @@ class Report {
     @prop({ required: true })
     time: number;
     @prop({ required: true })
-    isSuccessed: boolean;
+    difficulty: number;
     @prop({ required: true })
     type: number;//1表示普通战报， 2表示系统战报即：被成功压制
 }

shared/db/UserGuild.ts

@@ -12,6 +12,8 @@ class ActiveRecord {
 }
 
 class WishGood {
+    @prop({ required: true })
+    id: string;
     @prop({ required: true })
     type: number;
     @prop({ required: true })
@@ -76,16 +78,16 @@ export default class UserGuild extends BaseModel {
     trainRewards: Array<number>;//领取过的进阶等级
 
     @prop({ required: true, default: [], type: WishGood, _id: false })
-    wishGoods:Array<WishGood>;
+    wishGoods: Array<WishGood>;
 
     @prop({ required: true, default: [], type: Number })
-    receiveBoxs:Array<number>;
+    receiveBoxs: Array<number>;
     
     @prop({ required: true })
-    wishDntCnt:number;//今天许愿池捐献次数
+    wishDntCnt: number;//今天许愿池捐献次数
 
     @prop({ required: true })
-    donateCnt:number;//今天捐献所次数
+    donateCnt: number;//今天捐献所次数
 
     public static async getMyAuth(roleId: string, guildCode?: string, userGuild?: UserGuildType) {
         let myGuild: UserGuildType;
@@ -186,6 +188,10 @@ export default class UserGuild extends BaseModel {
         return userGuilds;
     }
 
+    public static async pushAndUpdate(roleId: string, update: UserGuildUpdateParam, pushData:{wishGoods?: WishGood}, select?: string, lean = true) {
+        const result: UserGuildType = await UserGuildModel.findOneAndUpdate({ roleId, status: USER_GUILD_STATUS.ON }, { $set: update, $push: pushData }, { new: true }).select(select).lean();
+        return result;
+    }
 }
 
 export const UserGuildModel = getModelForClass(UserGuild);

shared/db/WishPoolReport.ts

@@ -38,7 +38,7 @@ export default class WishPoolReport extends BaseModel {
     //获得day天之前的许愿池战报
     public static async getReportsByTime(guildCode: string, day: number, lean = true) {
         let time = getTodayZeroPoint() - day * 24 * 60;
-        const reports = await WishPoolReportModel.find({ guildCode,  dntTime: {$gte: time}});
+        const reports = await WishPoolReportModel.find({ guildCode,  dntTime: {$gte: time}}).sort({ dntTime : -1 });
         return reports;
     }
 }