修改寻宝助战次数获取方法

This commit is contained in:
liangtongchuan
2020-11-26 16:08:01 +08:00
parent 9d5a87aebf
commit 2907ef8ff0
2 changed files with 6 additions and 3 deletions
@@ -124,7 +124,7 @@ export class ComBattleHandler {
return resResult(STATUS.COM_BATTLE_CE_LIMIT); return resResult(STATUS.COM_BATTLE_CE_LIMIT);
} }
let teams = await ComBattleTeamModel.getTeamByRoleAndTime(roleId, teamStatus.quality, new Date(new Date().setHours(0, 0, 0, 0))); let teams = await ComBattleTeamModel.getTeamByRoleAndTime(roleId, teamStatus.quality, new Date(new Date().setHours(0, 0, 0, 0)), true);
if (teams.length >= assistanceTime) resResult(STATUS.COM_BATTLE_ASSIST_NOT_ENOUGH); if (teams.length >= assistanceTime) resResult(STATUS.COM_BATTLE_ASSIST_NOT_ENOUGH);
let roleStatus = new RoleStatus(); let roleStatus = new RoleStatus();
@@ -170,7 +170,7 @@ export class ComBattleHandler {
async getAssistCnt(msg: {}, session: BackendSession) { async getAssistCnt(msg: {}, session: BackendSession) {
let roleId = session.get('roleId'); let roleId = session.get('roleId');
let teams = await ComBattleTeamModel.getTeamByRoleAndTime(roleId, null, new Date(new Date().setHours(0, 0, 0, 0))); let teams = await ComBattleTeamModel.getTeamByRoleAndTime(roleId, null, new Date(new Date().setHours(0, 0, 0, 0)), true);
let cnt = [0, 0, 0, 0, 0]; let cnt = [0, 0, 0, 0, 0];
teams.forEach(team => { teams.forEach(team => {
if (team && team.quality) { if (team && team.quality) {
+4 -1
View File
@@ -143,7 +143,7 @@ export default class ComBattleTeam extends BaseModel {
return teams; return teams;
} }
public static async getTeamByRoleAndTime(roleId: string, quality?: number, time?: Date, limitCnt = 50, lean = true) { public static async getTeamByRoleAndTime(roleId: string, quality?: number, time?: Date, isAssist?: boolean, limitCnt = 50, lean = true) {
let query = {roleIds: roleId}; let query = {roleIds: roleId};
if (quality) { if (quality) {
query = Object.assign(query, {quality}); query = Object.assign(query, {quality});
@@ -151,6 +151,9 @@ export default class ComBattleTeam extends BaseModel {
if (time) { if (time) {
query = Object.assign(query, {createdAt: {$gte: time}}); query = Object.assign(query, {createdAt: {$gte: time}});
} }
if (isAssist) {
query = Object.assign(query, {capId: {$ne: roleId}});
}
const teams = await ComBattleTeamModel.find(query).limit(limitCnt).lean(lean); const teams = await ComBattleTeamModel.find(query).limit(limitCnt).lean(lean);
return teams; return teams;
} }