diff --git a/game-server/app/servers/battle/handler/auctionHandler.ts b/game-server/app/servers/battle/handler/auctionHandler.ts index 25080b75c..dddc6d824 100644 --- a/game-server/app/servers/battle/handler/auctionHandler.ts +++ b/game-server/app/servers/battle/handler/auctionHandler.ts @@ -152,8 +152,8 @@ export class AuctionHandler { const lotsData = await LotModel.recentBidLots(serverId, roleId, msg.count); const bidRecs = lotsData.map(lot => { const bidRec = lot.bidRoles.find(role => { return role.roleId === roleId }); - const { curBuyer } = lot; - return { ...bidRec, status: curBuyer === roleId ? AUCTION_BID_STATUS.SUC : AUCTION_BID_STATUS.RETURN }; + const { curBuyer, gid } = lot; + return { ...bidRec, gid, status: curBuyer === roleId ? AUCTION_BID_STATUS.SUC : AUCTION_BID_STATUS.RETURN }; }); return resResult(STATUS.SUCCESS, { bidRecs }); } diff --git a/game-server/test/auction.test.ts b/game-server/test/auction.test.ts index 291aa09e5..60e7f9d78 100644 --- a/game-server/test/auction.test.ts +++ b/game-server/test/auction.test.ts @@ -253,6 +253,7 @@ describe('拍卖行测试', function() { expect(bidRec.price).to.be.a('number'); expect(Date.parse(bidRec.time)).to.be.a('number'); expect(bidRec.status).to.be.a('number'); + expect(bidRec.gid).to.be.a('number'); } done(); }); diff --git a/shared/db/Lot.ts b/shared/db/Lot.ts index b2c3a9a82..fc88aec4f 100644 --- a/shared/db/Lot.ts +++ b/shared/db/Lot.ts @@ -35,9 +35,9 @@ export default class Lot extends BaseModel { @prop({ required: true, default: 0 }) maxPrice: number; // 一口价,最高价格 @prop({ required: true, type: BidRec, default: [] }) - bidRoles: BidRec[]; + bidRoles: BidRec[]; // 出价历史 @prop({ required: true, type: String, default: [] }) - watchingRoles: string[]; + watchingRoles: string[]; // 正在关注的玩家 @prop({ required: true }) begin: Date; // 竞拍开始时间 @prop({ required: true })