From 5de951b31cb9a37a075557622a90a1554374ea4c Mon Sep 17 00:00:00 2001
From: liangtongchuan <liangtongchuan@bantus.cn>
Date: Thu, 18 Mar 2021 08:11:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=8D=E5=8D=96=E8=A1=8C=EF=BC=9A=E5=87=BA?=
 =?UTF-8?q?=E4=BB=B7=E5=90=8E=E6=9B=B4=E6=96=B0=E5=88=86=E7=BA=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/servers/battle/handler/auctionHandler.ts | 5 +++--
 shared/db/Dividend.ts                                    | 8 +++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/game-server/app/servers/battle/handler/auctionHandler.ts b/game-server/app/servers/battle/handler/auctionHandler.ts
index 3dd2b50e3..432b4ad2f 100644
--- a/game-server/app/servers/battle/handler/auctionHandler.ts
+++ b/game-server/app/servers/battle/handler/auctionHandler.ts
@@ -63,8 +63,9 @@ export class AuctionHandler {
         bidRoles.push({roleId, price: newPrice, time: new Date()});
         const newLot = await LotModel.updateLot({ code, curBuyer: roleId, curPrice: newPrice, bidRoles});
 
-        // TODO 更新分红
-        return resResult(STATUS.SUCCESS, { lot: newLot });
+        const incPrice = newPrice - (curBuyer ? curPrice : 0);
+        const dividend = await DividendModel.updateLot(code, gid, newPrice, incPrice);
+        return resResult(STATUS.SUCCESS, { lot: newLot, dividend });
     }
 
     async watchLot(msg: { code: string }, session: BackendSession) {
diff --git a/shared/db/Dividend.ts b/shared/db/Dividend.ts
index dd8ccc229..8c9bc9c7a 100644
--- a/shared/db/Dividend.ts
+++ b/shared/db/Dividend.ts
@@ -9,7 +9,8 @@ import { genCode } from '../pubUtils/util';
 @modelOptions({ schemaOptions: { id: false } })
 @index({ code: 1 })
 @index({ begin: -1, guildCode: 1 })
-@index({ begin: -1, serverId: 1})
+@index({ begin: -1, serverId: 1 })
+@index({ 'lots.code': 1 })
 export default class Dividend extends BaseModel {
     @prop({ required: true, default: 0 })
     serverId: number; // 区服编号
@@ -58,6 +59,11 @@ export default class Dividend extends BaseModel {
         const result = await DividendModel.findOneAndUpdate({ code }, { ...update }, { new: true }).select('-_id -__v').lean();
         return result;
     }
+
+    public static async updateLot(lotCode: string, gid: number, price: number, incPrice: number) {
+        const result = await DividendModel.findOneAndUpdate({ 'lots.code': lotCode }, { 'lots.$.gid': gid, 'lots.$.price': price, $inc: { totalPrice: incPrice} }, { new: true }).select('-_id -__v').lean();
+        return result;
+    }
 }
 
 export const DividendModel = getModelForClass(Dividend);