diff --git a/game-server/app/servers/battle/handler/ladderHandler.ts b/game-server/app/servers/battle/handler/ladderHandler.ts
index ba92d9077..b813be6ee 100644
--- a/game-server/app/servers/battle/handler/ladderHandler.ts
+++ b/game-server/app/servers/battle/handler/ladderHandler.ts
@@ -5,7 +5,7 @@ import { gameData } from '../../../pubUtils/data';
 import { STATUS } from '../../../consts/statusCode';
 import { resResult } from '../../../pubUtils/util';
 import { LadderMatchModel, LadderUpdateInter } from '../../../db/LadderMatch';
-import { battleEndWhenChange, checkRank, generateInitRecInfo, getBuyCntCost, getLadderData, getLadderOppStatus, ladderBattleEndReward, refreshLadderDaily, refreshLadderEnemies, sendLadderDailyReward } from '../../../services/ladderService';
+import { battleEndWhenChange, checkRank, generateInitRecInfo, getBuyCntCost, getLadderData, getLadderOppDetailData, getLadderOppStatus, ladderBattleEndReward, refreshLadderDaily, refreshLadderEnemies, sendLadderDailyReward } from '../../../services/ladderService';
 import { LadderDataReturn, LadderDefense, LadderDefenseHero, LadderOppDetailReturn, LadderOppLineupReturn, LadderOppPlayerHeroInfo, LadderOppPlayerReturn } from '../../../domain/battleField/ladder';
 import { LadderMatchRecModel } from '../../../db/LadderMatchRec';
 import { HeroModel } from '../../../db/Hero';
@@ -96,11 +96,11 @@ export class LadderHandler {
         // 倒计时，倒计时结束没有check设为失败并发失败通知
         pinus.app.rpc.systimer.systimerRemote.setLadderCountDown.broadcast(rec.battleCode, rec.checkTime, LADDER_STATUS.CHECK);
 
+        let result = await getLadderOppDetailData(rec);
         return resResult(STATUS.SUCCESS, {
             status,
             challengeCnt: ladderData.challengeCnt,
-            time: rec.checkTime + LADDER.LADDER_BATTLE_PREPARE_COUNTDOWN,
-            battleCode: rec.battleCode
+            ...result
         });
     }
 
@@ -126,22 +126,7 @@ export class LadderHandler {
         if(!rec || rec.roleId1 != roleId) return resResult(STATUS.LADDER_REC_NOT_FOUND);
         if(rec.status == LADDER_STATUS.COMPLETE || rec.status == LADDER_STATUS.NO) return resResult(STATUS.LADDER_REC_STATUS_IS_COMPLETE);
 
-        // 判断是机器人还是真人
-        let isRobot = rec.defenseInfo.isRobot;
-        let dicLadderDifficultRatio = gameData.ladderDifficultRatio.get(rec.defenseInfo.oldRank);
-        let result = new LadderOppDetailReturn(rec);
-        if(isRobot) {
-            result.setByRobot(dicLadderDifficultRatio);
-        } else {
-            let hisLadderData = await LadderMatchModel.findByRoleIdAndInclude(rec.roleId2);
-            let dicWarJson = gameData.warJson.get(dicLadderDifficultRatio.gkId)
-            result.setByPlayer(hisLadderData, dicWarJson);
-            let attrByHid = await getHeroesAttributes(rec.roleId2);
-            for(let [hid, attribute] of attrByHid) {
-                result.setAttribute(hid, attribute.getAttributesToString());
-            }
-        }
-
+        let result = await getLadderOppDetailData(rec);
         return resResult(STATUS.SUCCESS, result);
     }