From 1802e2127d73392fcbf9a5e801877784e31d584b Mon Sep 17 00:00:00 2001
From: liangtongchuan <liangtongchuan@bantus.cn>
Date: Thu, 25 Mar 2021 11:24:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=8D=E5=8D=96=E8=A1=8C=EF=BC=9A=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E5=8F=AF=E4=BB=A5=E7=AB=9E=E4=BB=B7=E5=90=8E=E5=87=BA?=
 =?UTF-8?q?=E4=B8=80=E5=8F=A3=E4=BB=B7=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=86=9B?=
 =?UTF-8?q?=E5=9B=A2=E6=8B=8D=E5=8D=96=E8=AE=B0=E5=BD=95=E7=9A=84=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/servers/battle/handler/auctionHandler.ts  | 15 ++++++++-------
 game-server/app/services/auctionService.ts        |  9 +++++++--
 shared/domain/dbGeneral.ts                        |  2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/game-server/app/servers/battle/handler/auctionHandler.ts b/game-server/app/servers/battle/handler/auctionHandler.ts
index 567126634..4afc7d8eb 100644
--- a/game-server/app/servers/battle/handler/auctionHandler.ts
+++ b/game-server/app/servers/battle/handler/auctionHandler.ts
@@ -1,10 +1,10 @@
 import { DividendModel } from './../../../db/Dividend';
 import { Application, BackendSession, ChannelService } from "pinus";
-import { AUCTION_STAGE, DEBUG_MAGIC_WORD, STATUS, OFFER_RATIO, CURRENCY_BY_TYPE, CURRENCY_TYPE, DATA_NAME, LOT_STATUS } from "../../../consts";
+import { AUCTION_STAGE, DEBUG_MAGIC_WORD, STATUS, OFFER_RATIO, CURRENCY_BY_TYPE, CURRENCY_TYPE, DATA_NAME, LOT_STATUS, DIVIDEND_STATUS } from "../../../consts";
 import { LotModel } from "../../../db/Lot";
 import { ItemReward, LotRec } from "../../../domain/dbGeneral";
 import { resResult } from "../../../pubUtils/util";
-import { auctionStage, calculateDividend, genAuction, sendUngotDividend, startGuildAuction, startWorldAuction, stopAuction, todayGuildBegin, getBasePrice, debugAuctionLots, officialAuctionLots, auctionBidStatus } from "../../../services/auctionService";
+import { auctionStage, calculateDividend, genAuction, sendUngotDividend, startGuildAuction, startWorldAuction, stopAuction, todayGuildBegin, getBasePrice, debugAuctionLots, officialAuctionLots, auctionBidStatus, getMaxPrice, guildBidStatus } from "../../../services/auctionService";
 import { addItems, handleCost } from '../../../services/rewardService';
 import { getSimpleRoleInfo } from '../../../services/roleService';
 import { getRoleOnlineInfo } from '../../../services/redisService';
@@ -58,7 +58,7 @@ export class AuctionHandler {
             }
 
             const { curBuyer, curPrice, maxPrice, gid, count, bidRoles, watchingRoles } = lot;
-            if (curBuyer === roleId) {
+            if (curBuyer === roleId && !max) {
                 res.releaseCallback();
                 return resResult(STATUS.LOT_OFFER_SERIAL);
             }
@@ -165,16 +165,17 @@ export class AuctionHandler {
     async guildLotRecs(msg: { count: number }, session: BackendSession) {
         const guildCode = session.get('guildCode');
         const dividends = await DividendModel.findDividendsByGuild(guildCode, msg.count);
-        let lotsData: LotRec[] = [];
+        let lotsData = [];
         dividends.forEach(dividend => {
             const lots = dividend.lots.map(lot => {
-                return { ...lot, sourceType: dividend.sourceType };
+                return { ...lot, sourceType: dividend.sourceType, dividendStatus: dividend.status };
             })
             lotsData = [...lotsData, ...lots];
         });
         const lotRecs = lotsData.map(lot => {
-            const price = lot.price === 0 ? getBasePrice(lot.gid, lot.count) : lot.price;
-            const sold = lot.price !== 0;
+            const { gid, count, price: lotPrice } = lot;
+            const price = lotPrice === 0 ? getBasePrice(gid, count) : lotPrice;
+            const sold = guildBidStatus(lot);
             return { ...lot, price, sold };
         });
 
diff --git a/game-server/app/services/auctionService.ts b/game-server/app/services/auctionService.ts
index 960d3c4cf..5aebfd667 100644
--- a/game-server/app/services/auctionService.ts
+++ b/game-server/app/services/auctionService.ts
@@ -20,7 +20,7 @@ export function getBasePrice(gid: number, count: number) {
 }
 
 // ! 获取一口价，假数据
-function getMaxPrice(gid: number, count: number) {
+export function getMaxPrice(gid: number, count: number) {
     const good = getGoodById(gid);
     return (good ? good.quality * 200 : 200) * count;
 }
@@ -238,10 +238,15 @@ export async function sendUngotDividendJob() {
 }
 
 export function auctionBidStatus(roleId: string, lot: LotParam) {
-    const { curBuyer, gid, status } = lot;
+    const { curBuyer, status } = lot;
     return curBuyer !== roleId ? AUCTION_BID_STATUS.RETURN : status === LOT_STATUS.SOLD || status === LOT_STATUS.MAX ? AUCTION_BID_STATUS.SUC : AUCTION_BID_STATUS.LEAD;
 }
 
+export function guildBidStatus(lot: { max: boolean, gid: number, count: number, price: number, dividendStatus: number }) {
+    const { max, gid, count, price: lotPrice, dividendStatus } = lot;
+    return max || lotPrice === getMaxPrice(gid, count) || ((dividendStatus == DIVIDEND_STATUS.END || dividendStatus == DIVIDEND_STATUS.SENT) && lotPrice !== 0)
+}
+
 export async function sendUngotDividend(debug = false) {
     try {
         console.log('schedule sendUngotDividend called:', new Date());
diff --git a/shared/domain/dbGeneral.ts b/shared/domain/dbGeneral.ts
index 00b1c7e9b..27fdb0d36 100644
--- a/shared/domain/dbGeneral.ts
+++ b/shared/domain/dbGeneral.ts
@@ -260,7 +260,7 @@ export class LotRec {
     @prop({ required: true, default: null })
     time: Date; // 出价时间
     @prop({ required: true, default: 0 })
-    max: boolean; // 出价时间
+    max: boolean; // 一口价
 }
 
 /**