diff --git a/game-server/app.ts b/game-server/app.ts index b5bb09d39..c3817ec61 100644 --- a/game-server/app.ts +++ b/game-server/app.ts @@ -132,7 +132,7 @@ function errorHandler(err: Error, msg: any, resp: any, errlogger.error(`${pinus.app.serverId} error handler \n msg[${JSON.stringify(msg)}] \n resp[${JSON.stringify(resp)}] \n sessionId:${JSON.stringify(session.export())} \n error 【${errCode}】 stack: ${err.stack}`); if (!resp) { - resp = resResult(STATUS.GLOBAL_ERR, { errCode }); + resp = resResult(STATUS.GLOBAL_ERR, { errCode, stack: err.stack }); } cb(err, resp); } diff --git a/game-server/app/servers/activity/handler/gachaHandler.ts b/game-server/app/servers/activity/handler/gachaHandler.ts index 078cf8570..f94698a24 100644 --- a/game-server/app/servers/activity/handler/gachaHandler.ts +++ b/game-server/app/servers/activity/handler/gachaHandler.ts @@ -30,15 +30,11 @@ export class GachaHandler { * @memberof GachaHandler */ async getGachaList(msg: {}, session: BackendSession) { - try { - const { } = msg; - const roleId: string = session.get('roleId'); - const list = await getGachaList(roleId); - - return resResult(STATUS.SUCCESS, { list }); - }catch(e) { - return resResult(STATUS.WRONG_PARMS, {err:e.stack}) - } + const { } = msg; + const roleId: string = session.get('roleId'); + const list = await getGachaList(roleId); + + return resResult(STATUS.SUCCESS, { list }); } /** diff --git a/shared/db/Guild.ts b/shared/db/Guild.ts index 61244e695..011e0078e 100644 --- a/shared/db/Guild.ts +++ b/shared/db/Guild.ts @@ -217,8 +217,12 @@ export default class Guild extends BaseModel { return result; } - public static async updateCe(roleId: string, inc: number ) { - const result = await GuildModel.findOneAndUpdate({ members: { $elemMatch: { $eq: roleId } }, status: GUILD_STATUS.RUNNING}, {$inc: {guildCe: inc}}, {new: true}).lean({getters: true}); + public static async updateCe(roleId: string, inc: number, populate: boolean = false ) { + let result = await GuildModel.findOneAndUpdate({ members: { $elemMatch: { $eq: roleId } }, status: GUILD_STATUS.RUNNING}, {$inc: {guildCe: inc}}, {new: true}).lean({getters: true}); + if(populate) { + result = await GuildModel.findOneAndUpdate({ members: { $elemMatch: { $eq: roleId } }, status: GUILD_STATUS.RUNNING}, {$inc: {guildCe: inc}}, {new: true}) + .populate('leader', { roleId: 1, roleName: 1, head: 1, frame: 1, spine: 1, lv: 1, quitTime: 1, ce: 1, title: 1, _id: 0 }, 'Role').lean({getters: true}); + } return result; } /**