红点：修改推送方式

game-server/app/servers/battle/handler/dailyBattleHandler.ts

@@ -4,7 +4,7 @@ import { GOLD_COST_RATIO } from '../../../consts';
 import { STATUS } from '../../../consts/statusCode';
 import { resResult, calculateNum } from '../../../pubUtils/util';
 import { RoleModel } from '../../../db/Role';
-import { getDailyNum } from '../../../services/dailyBattleService';
+import { getDailyNum, getDailyBattleList } from '../../../services/dailyBattleService';
 import { handleCost } from '../../../services/rewardService';
 import { getGoldObject } from '../../../pubUtils/itemUtils';
 import { gameData } from '../../../pubUtils/data';
@@ -21,42 +21,8 @@ export class DailyBattleHandler {
     async getData(msg: { }, session: BackendSession) {
         let roleId = session.get('roleId');
 
-        let {warStar} = await RoleModel.findByRoleId(roleId); 
-        let dicDaily = gameData.daily;
-
-        let result = new Array();
-        for(let {dailyType: type, name, timesPerDay, timesCanBuy } of dicDaily) {
-            let refreshResult = await DailyRecordModel.refreshRecord(roleId, type);
-            let wars: {battleId: number, cost: number, star: number, status: number, name: string}[] = new Array();
-            let dicDailyWar = gameData.dailyWarByType.get(type);
-            for(let {war_id, cost, gk_name, previousGk } of dicDailyWar) {
-                let status = 0, star = 0;
-                let curBattle = warStar.find(cur => cur.id == war_id);
-                if(curBattle) {
-                    status = 2;
-                    star = curBattle.star;
-                } else {
-                    if (previousGk) {
-                        let preBattleRecord = warStar.find(cur => cur.id == previousGk);
-                        if(preBattleRecord) {
-                            status = 1;
-                        } else {
-                            status = 0;
-                        }
-                    } else {
-                        status = 1;
-                    }
-                }
-                wars.push({
-                    battleId: war_id, cost, star, status, name: gk_name
-                });
-            }
-            let checkDailyResult = await getDailyNum(refreshResult, timesPerDay, timesCanBuy);
-            result.push({
-                type, name, ...checkDailyResult,
-                wars
-            });
-        }
+        let role = await RoleModel.findByRoleId(roleId); 
+        let result = await getDailyBattleList(role);
 
         return resResult(STATUS.SUCCESS, { list: result });
     }