From eac517c57b9117597b5b9e5bd9d31f6d1aeaaf45 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Fri, 15 Jan 2021 18:24:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=88=98=E6=8A=A5=E6=9C=AA=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=AF=B9=E6=89=8BroleId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/pvpService.ts   | 2 +-
 game-server/app/services/redisService.ts | 1 -
 game-server/config/redis.ts              | 2 +-
 shared/db/PvpHistoryOpp.ts               | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/game-server/app/services/pvpService.ts b/game-server/app/services/pvpService.ts
index d05b89c24..d4adedece 100644
--- a/game-server/app/services/pvpService.ts
+++ b/game-server/app/services/pvpService.ts
@@ -584,7 +584,7 @@ export async function generPVPOppRecInfo(isSuccess: boolean, curOpp: OppPlayers,
         }
     }
     return {
-        roleId: oppRole.roleId,
+        roleId: robotIdComBack(oppRole.oppRoleId),
         roleName: oppRole.roleName,
         lv: oppRole.lv,
         sHid: oppRole.sHid,
diff --git a/game-server/app/services/redisService.ts b/game-server/app/services/redisService.ts
index b5c742133..0e37a8003 100644
--- a/game-server/app/services/redisService.ts
+++ b/game-server/app/services/redisService.ts
@@ -120,7 +120,6 @@ export async function getMyRank(key: string, serverId: number, roleId: string) {
 export async function getFieldByRank(key: string, serverId: number, rank: number) {
     const client: Redis.RedisClient = pinus.app.get('redis');
     let myRank = await client.zrevrangeAsync(getKeyName(key, serverId), rank - 1, rank - 1);
-    console.log('****', JSON.stringify(myRank))
     return myRank;
 }
 
diff --git a/game-server/config/redis.ts b/game-server/config/redis.ts
index e2e936c19..ed673cc6f 100644
--- a/game-server/config/redis.ts
+++ b/game-server/config/redis.ts
@@ -47,7 +47,7 @@ declare module 'redis' {
         // 返回有序集中指定成员的排名，从大到小
         zrevrankAsync(key: string, field: string): Promise<number>;
         // 命令返回有序集中，指定区间内的成员，从大到小
-        zrevrangeAsync(key: string, start: number, end: number): Promise<any>;
+        zrevrangeAsync(key: string, start: number, end: number): Promise<string[]>;
     }
     export interface Multi extends Commands<Multi> {
         execAsync(...args: any[]): Promise<any>;
diff --git a/shared/db/PvpHistoryOpp.ts b/shared/db/PvpHistoryOpp.ts
index e3afb4712..c57cf1e9c 100644
--- a/shared/db/PvpHistoryOpp.ts
+++ b/shared/db/PvpHistoryOpp.ts
@@ -47,7 +47,7 @@ export default class PvpHistoryOpp extends BaseModel {
         const doc = new PvpHistoryOppModel();
         const update = Object.assign(doc.toJSON(), params);
         delete update._id;
-        const defense: PvpHistoryOppType = await PvpHistoryOppModel.findOneAndUpdate({ roleId: params.roleId, pos: params.pos }, update, { upsert: true, new: true }).lean(lean);
+        const defense: PvpHistoryOppType = await PvpHistoryOppModel.findOneAndUpdate({ roleId: params.roleId, pos: params.pos, status: 0 }, update, { upsert: true, new: true }).lean(lean);
         return defense;
     }