From d733210c3a085ceac041c0a6d1d1e763cf3e8031 Mon Sep 17 00:00:00 2001
From: liangtongchuan <liangtongchuan@bantus.cn>
Date: Mon, 22 Mar 2021 20:37:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=8D=E5=8D=96=E8=A1=8C=EF=BC=9A=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E8=8E=B7=E5=8F=96=E5=86=9B=E5=9B=A2=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E7=9A=84=E6=B5=8B=E8=AF=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/auctionService.ts | 27 ++++------------------
 shared/domain/battleField/guild.ts         |  5 ----
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/game-server/app/services/auctionService.ts b/game-server/app/services/auctionService.ts
index b284dee92..c227b4ce4 100644
--- a/game-server/app/services/auctionService.ts
+++ b/game-server/app/services/auctionService.ts
@@ -7,10 +7,11 @@ import { LotModel, LotParam } from '../db/Lot';
 import { getNextTime, getTodayZeroDate, getZeroDateByDeltaDay } from '../pubUtils/timeUtil';
 import { gameData, getGoodById } from '../pubUtils/data';
 import { DividendParam, DividendType } from '../db/Dividend';
-import { RolePosition } from '../domain/battleField/guild';
 import { pushMail } from '../pubUtils/interface';
 import { getMailContent } from './mailService';
 import { pinus } from 'pinus';
+import { participants } from './guildActivityService';
+import { Member } from '../domain/battleField/guildActivity';
 
 // ! 获取底价，假数据
 export function getBasePrice(gid: number, count: number) {
@@ -94,24 +95,6 @@ export async function genAuction(guildCode: string, sourceType: number, sourceCo
     return { lots, dividend };
 }
 
-/**
- * ! 目前返回假数据
- * @description 获取活动参加者
- * @export
- * @param {string} guildCode
- * @param {number} sourceType
- * @param {string} sourceCode
- */
-export async function participants(guildCode: string, sourceType: number, sourceCode: string) {
-    return [{
-        roleId: 'rM8NZtlfzD',
-        position: 1,
-    }, {
-        roleId: 'EjX79SEddK',
-        position: 2,
-    }];
-}
-
 function posDividend(totalPrice: number, roleRatio: number, totalRatio: number) {
     const dividend = Math.floor(totalPrice * roleRatio / totalRatio);
     const maxDividend = Math.floor(totalPrice * DIVIDENDMAXRATIO);
@@ -123,11 +106,11 @@ function weekendDividend(posNum: number, date: Date) {
     return (day === 0 || day === 6) ? Math.floor(posNum * DIVIDENDWEEKENDRATE) : 0;
 }
 
-function dividendRate(data: RolePosition) {
-    return gameData.guildPosition.get(data.position).sellRatio;
+function dividendRate(data: Member) {
+    return gameData.guildPosition.get(data.job).sellRatio;
 }
 
-function totalDividendRatio(participantsData: RolePosition[]) {
+function totalDividendRatio(participantsData: Member[]) {
     const result = participantsData.reduce((sum, data) => {
         return sum + dividendRate(data);
     }, 0);
diff --git a/shared/domain/battleField/guild.ts b/shared/domain/battleField/guild.ts
index 34a75ad92..dcb7d8d35 100644
--- a/shared/domain/battleField/guild.ts
+++ b/shared/domain/battleField/guild.ts
@@ -119,8 +119,3 @@ export class GuildListInfo extends GuildMainInfo {
         this.hasApply = hasApply;
     }
 }
-
-export interface RolePosition {
-    roleId: string;
-    position: number; // 职位
-}
\ No newline at end of file