活动：清理数据

game-server/app/services/activity/gachaService.ts

@@ -8,10 +8,10 @@ import { gameData, getDicGachaFloor } from "../../pubUtils/data";
 import { RoleModel } from "../../db/Role";
 import { RewardInter } from "../../pubUtils/interface";
 import { CreateHeroParam } from "../../domain/roleField/hero";
-import { transPiece } from "../../pubUtils/itemUtils";
 import { HeroType } from "../../db/Hero";
 import { NewHeroGachaItem } from "../../domain/activityField/newHeroGachaField";
 import { getActivityById } from "./activityService";
+import { transPiece } from "../role/util";
 
 /**
  * 获取招募列表

game-server/app/services/activity/giftPackageService.ts

@@ -1,11 +1,12 @@
 import { GIFT_PACKAGE_TYPE, ACTIVITY_RESOURCES_TYPE, ITEM_CHANGE_REASON } from '../../consts';
 import { gameData } from '../../pubUtils/data';
-import { addItems, createHeroes } from '../role/rewardService';
+import { addItems } from '../role/rewardService';
 import { RewardParam } from '../../domain/activityField/rewardField';
 import { CreateHeroParam } from '../../domain/roleField/hero';
 import { DicGiftPackage } from '../../pubUtils/dictionary/DicGiftPackage';
 import { ItemInter, RewardInter } from '../../pubUtils/interface';
 import { decodeArrayListStr } from '../../pubUtils/util';
+import { createHeroes } from '../role/createHero';
 
 
 

game-server/app/services/activity/monthlyTicketService.ts

@@ -10,10 +10,10 @@ import { sendMailByContent } from './../mailService';
 import { RoleModel, RoleType } from '../../db/Role';
 import { getActivityById } from './activityService';
 import { RewardInter } from '../../pubUtils/interface';
-import { getGoldId } from '../../pubUtils/itemUtils';
 import { DUNGEON_CONST, PVP, VIP } from '../../pubUtils/dicParam';
 import { cal } from '../../pubUtils/util';
 import { pinus } from 'pinus';
+import { getGoldId } from '../role/rewardService';
 
 /**
    * 获取活动数据

game-server/app/services/activity/popUpShopService.ts

@@ -39,7 +39,7 @@ export async function getPopUpShopDataShow(activityId: number, serverId: number,
     return null
 }
 
-export async function checkPopUpConditionInCreateHero(serverId, roleId, heroes: HeroType[]) {
+export async function checkPopUpConditionInCreateHero(serverId: number, roleId: string, heroes: HeroType[]) {
     let conditions = heroes.map(hero => ({ conditionType: POP_UP_SHOP_CONDITION_TYPE.GET_HERO_BY_QUALITY, param: { quality: hero.quality } }));
     return await checkPopUpConditions(serverId, roleId, conditions);
 }