From 78e7a8bbaeabcd8fd75d4675fe6f4752e3b0f7eb Mon Sep 17 00:00:00 2001 From: liangtongchuan Date: Tue, 23 Mar 2021 18:56:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=8D=E5=8D=96=E8=A1=8C=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=A2=86=E5=8F=96=E5=88=86=E7=BA=A2=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/servers/battle/handler/auctionHandler.ts | 7 +++---- shared/db/Dividend.ts | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/game-server/app/servers/battle/handler/auctionHandler.ts b/game-server/app/servers/battle/handler/auctionHandler.ts index 6c647cf2e..f62e79bee 100644 --- a/game-server/app/servers/battle/handler/auctionHandler.ts +++ b/game-server/app/servers/battle/handler/auctionHandler.ts @@ -127,13 +127,12 @@ export class AuctionHandler { return resResult(STATUS.SUCCESS, { dividends }); } - async getDividend(msg: { sourceType: number }, session: BackendSession) { + async getDividend(msg: { code: string }, session: BackendSession) { const roleId = session.get('roleId'); const sid = session.get('sid'); const roleName = session.get('roleName'); - const guildCode = session.get('guildCode'); - const { sourceType } = msg; - const dividendData = await DividendModel.findReadyDividend(guildCode, sourceType); + const { code } = msg; + const dividendData = await DividendModel.findReadyDividend(code); if (!dividendData) return resResult(STATUS.DIVIDEND_NOT_READY); const { dividends } = dividendData; const dividend = dividends.find(item => { return item.roleId === roleId }); diff --git a/shared/db/Dividend.ts b/shared/db/Dividend.ts index b2f7bb872..0e176fcaf 100644 --- a/shared/db/Dividend.ts +++ b/shared/db/Dividend.ts @@ -76,8 +76,8 @@ export default class Dividend extends BaseModel { return result; } - public static async findReadyDividend(guildCode: string, sourceType: number) { - const result: DividendType = await DividendModel.findOne({ guildCode, sourceType, status: DIVIDEND_STATUS.END }).sort({ _id: -1 }).select('-_id -__v').lean(); + public static async findReadyDividend(code: string) { + const result: DividendType = await DividendModel.findOne({ code, status: DIVIDEND_STATUS.END }).sort({ _id: -1 }).select('-_id -__v').lean(); return result; }