活动：修改获取活动逻辑，从serverlist上剥离

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

@@ -6,7 +6,7 @@ import { UserOrderModel, UserOrderModelType } from '../../db/UserOrder';
 import { RewardParam } from '../../domain/activityField/rewardField';
 import { YuanBaoShopData } from '../../domain/activityField/yuanBaoShopField';
 import { getRoleCreateTime, getServerCreateTime } from '../redisService';
-import { getActivityById } from './activityService';
+import { getActivitiesByType, getActivityById } from './activityService';
 import { addReward, stringToRewardParam } from './giftPackageService';
 
 /**
@@ -19,8 +19,7 @@ import { addReward, stringToRewardParam } from './giftPackageService';
    */
 
 export async function yuanbaoActivity(serverId: number, roleId: string) {
-    let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(activityGroupId, ACTIVITY_TYPE.YUAN_BAO_SHOP, -1)
+    let activityArray = await getActivitiesByType(serverId, ACTIVITY_TYPE.YUAN_BAO_SHOP);
     if (activityArray.length == 0) {
         return null;
     }