Revert "✨ feat(db): 修改role表数据库操作方式"

This reverts commit e39af3649288cc5802739cfe862c818fe56e194e.

game-server/app/services/battleService.ts

@@ -3,7 +3,7 @@ import { HangUpRecordModel } from './../db/HangUpRecord';
 import { HANG_UP_CONSTS, REDIS_KEY, TASK_TYPE, TOWER_FORBIDDEN_CHARA_TYPE, TOWER_TASK_STATUS, MAIL_TYPE, MSG_SOURCE, POP_UP_SHOP_CONDITION_TYPE } from './../consts';
 import { BattleRecordModel } from './../db/BattleRecord';
 import { TowerRecordModel, WarStatus } from './../db/TowerRecord';
-import Role, { RoleType } from './../db/Role';
+import { RoleModel, RoleType } from './../db/Role';
 import { shouldRefresh, resResult, cal, getRandEelmWithWeight, genCode, } from '../pubUtils/util';
 import { STATUS } from '../consts/statusCode';
 import { HangUpSpdUpRecModel } from '../db/HangUpSpdUpRec';
@@ -28,7 +28,7 @@ import { checkPopUpCondition } from './activity/popUpShopService';
 export async function getTowerStatus(role: RoleType) {
     let { towerLv, roleId, serverId, towerReceived } = role;
     if (!towerLv) {
-        let role = await Role.towerLvUp(roleId);
+        let role = await RoleModel.towerLvUp(roleId);
         towerLv = role.towerLv;
     }
     let towerRec = await getTowerRecByLv(roleId, towerLv);
@@ -88,7 +88,7 @@ export function getTowerHeroCe(warId: number, heroes: HeroType[], recHeroes: num
  * @param roleId 
  */
 export async function getHungupRewards(roleId: string, role?: RoleType) {
-    if(!role) role = await Role.findByRoleId(roleId);
+    if(!role) role = await RoleModel.findByRoleId(roleId);
     const result = await calcuHangUpReward(role);
     if(!result) return false;
     
@@ -108,7 +108,7 @@ export async function getHungupRewards(roleId: string, role?: RoleType) {
  * @param role 
  */
 export async function getTasks(roleId: string) {
-    let role = await Role.findByRoleId(roleId, 'roleName towerLv towerTaskRefTime towerTaskReCnt');
+    let role = await RoleModel.findByRoleId(roleId, 'roleName towerLv towerTaskRefTime towerTaskReCnt');
     let { roleName, towerLv, towerTaskRefTime, towerTaskReCnt = 0 } = role;
 
     // towerLv：从1开始，下次打得层数，dicParam内的：从0开始，打过的层数
@@ -120,7 +120,7 @@ export async function getTasks(roleId: string) {
     const needRefresh = shouldRefresh(towerTaskRefTime, curTime);
     let curTasks: TowerTaskRecType[] = []
     if(needRefresh) {
-        role = await Role.resetTowerCnt(roleId, curTime); 
+        role = await RoleModel.resetTowerCnt(roleId, curTime); 
         const batchCode = genCode(8);
         let tasksData = await TowerTaskRecModel.getPreTasks(roleId);
         let preTasksMap = treatPreTasks(tasksData);
@@ -183,7 +183,7 @@ export function checkTaskRewards(batchCode: string, tasks: TowerTaskRecType[]) {
 }
 
 export async function checkTowerWar(roleId: string, battleId: number, seqIds: number[], heroes: HeroType[]) {
-    let { towerLv } = await Role.findByRoleId(roleId);
+    let { towerLv } = await RoleModel.findByRoleId(roleId);
     const towerInfo = gameData.tower.get(towerLv);
     if (!towerInfo) {
         console.error(`天梯层数异常，lv ${towerLv} by ${roleId}`);
@@ -252,7 +252,7 @@ export async function towerBattleEnd(sid: string, roleId: string, serverId: numb
             return { status: -1, resResult: resResult(STATUS.BATTLE_ID_NOT_MATCH) };
         }
 
-        let { towerLv, roleName } = await Role.findByRoleId(roleId);
+        let { towerLv, roleName } = await RoleModel.findByRoleId(roleId);
         let { warStatus, heroes: recHeroes } = await TowerRecordModel.getRecordByLv(roleId, towerLv);
         // console.log('*******', towerLv, heroes.join(), recHeroes.join())
         for (let hid of heroes) {
@@ -275,7 +275,7 @@ export async function towerBattleEnd(sid: string, roleId: string, serverId: numb
         let newRec = await TowerRecordModel.updateRecord(roleId, towerLv, battleCode, battleId, heroes, inc);
         let towerReward: RewardInter[] = [];
         if (inc === 1) {
-            let role = await Role.towerLvUp(roleId);
+            let role = await RoleModel.towerLvUp(roleId);
             // 更新redis
             let r = new Rank(REDIS_KEY.TOWER_RANK, { serverId });
             await r.setRankWithRoleInfo(roleId, role.towerLv - 1, role.towerUpTime.getTime(), role);