后台：修改更新活动

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

@@ -44,6 +44,7 @@ import { sendMessageToGuildWithSuc, sendMessageToUserWithSuc } from '../pushServ
 import { UserOrderModelType } from '../../db/UserOrder';
 import { isArray } from 'underscore';
 import { getGuideGachaData } from './gachaService';
+import { getPopNoticeData } from './popNoticeService';
 
 /**
    * 获取活动数据
@@ -222,6 +223,11 @@ export async function getActivity(serverId: number, roleId: string, guildCode: s
             }
         case ACTIVITY_TYPE.SHOP:
             break
+        case ACTIVITY_TYPE.POP_NOTICE:
+            {
+                activityData = await getPopNoticeData(serverId, activityId, roleId);
+                break
+            }
         default: {
             console.log('未知活动类型.........', activityType)
             break;
@@ -358,35 +364,6 @@ export async function checkActivityEditable(activities: ActivityModelType[]) {
     return true;
 }
 
-
-export async function checkActivityGroupTypeWithId(groupId: number, activities: ActivityModelType[]) {
-
-    let activityGroup = await ActivityGroupModel.findGroupData(groupId);
-    if(!activityGroup) return false;
-    if(activityGroup.type != 0) {
-        return await checkActivityGroupType(activityGroup.type, activities);
-    }
-
-    return true
-}
-
-
-export async function checkActivityGroupType(groupType: number, activities: ActivityModelType[]) {
-    if(groupType != 0) {
-        let activityGroupType = await ActivityGroupTypeModel.findByGroupType(groupType);
-        if(!activityGroupType) return false;
-        let dic = activityGroupType.activityTypes;
-        for(let { type } of activities) {
-            let index = dic.findIndex(cur => cur.activityType == type);
-            if(index == -1) {
-                return false;
-            }
-        }
-    }
-
-    return true
-}
-
 /**
  * 达成任务可活动活动积分
  * @param type 任务类型，主线、每日、成就
@@ -401,7 +378,6 @@ export async function addActvityTaskPoint(type: number, id: number, session: Bac
     let activityTaskPoint = await ActivityTaskPointModel.findData(type, id);
     let result: pushActivityInter[] = [];
     for (let { activityId, activityType, point } of activityTaskPoint) {
-        console.log('##### activityTaskPoint:', activityId, activityType, point)
         if(activityType == ACTIVITY_TYPE.NEW_HERO_GIFTS) { // 新武将活动
             let totalPoint = await newHeroGiftPoint(serverId, activityId, roleId, point);
             result.push({ activityId, activityType, param: { totalPoint } });