活动：军团付费

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

@@ -37,6 +37,7 @@ import { getTimeLimitRankDataShow } from './timeLimitRankService';
 import { ActivityTaskPointModel } from '../../db/ActivityTaskPoint';
 import { getRoleOnlineInfo } from '../redisService';
 import { addTaskPassPoint } from './taskPassService';
+import { getGuildChannelSid } from '../chatService';
 
 /**
    * 获取活动数据
@@ -46,7 +47,7 @@ import { addTaskPassPoint } from './taskPassService';
    * @param {string} roleId 角色Id
    *
    */
-export async function getActivity(serverId: number, roleId: string, activityId: number, activityType: number) {
+export async function getActivity(serverId: number, roleId: string, guildCode: string, activityId: number, activityType: number) {
     let activityData = null;
     switch (activityType) {
         case ACTIVITY_TYPE.SIGN_IN://签到 4
@@ -200,6 +201,10 @@ export async function getActivity(serverId: number, roleId: string, activityId:
                 activityData = await getTimeLimitRankDataShow(activityId);
                 break;
             }
+        case ACTIVITY_TYPE.GUILD_PAY:
+            {
+
+            }
         default: {
             console.log('未知活动类型.........', activityType)
             break;
@@ -357,6 +362,8 @@ export async function addActvityTaskPoint(type: number, id: number, session: Bac
 interface pushActivityParamInter {
     ticketCnt?: number;     // 木签活动的签数(type21)
     totalPoint?: number;     // 新将好礼（type37）和战令（type42）更新后的积分
+    payMemberCnt?: number;    // 军团充值活动，你的军团充值的人数
+    payMember?: string;       // 军团充值活动，充值人员名字，添加到payRecord里面
 }
 
 export interface pushActivityInter {
@@ -374,9 +381,23 @@ export async function pushActivities(arr: pushActivityInter[], roleId: string, s
         let onlineUser = await getRoleOnlineInfo(roleId);
         sid = onlineUser.sid;
     }
-    pinus.app.get('channelService').pushMessageByUids('onActivityUpdate', 
-        resResult(STATUS.SUCCESS, {
-            activities: arr
-        }), 
-    [{ uid: roleId, sid }]);  
+    if(!!sid && arr.length > 0) {
+        pinus.app.get('channelService').pushMessageByUids('onActivityUpdate', 
+            resResult(STATUS.SUCCESS, {
+                activities: arr
+            }), 
+        [{ uid: roleId, sid }]);  
+    }
+}
+
+export async function pushActivitiesToGuild(arr: pushActivityInter[], guildCode: string) {
+    let chatSid = await getGuildChannelSid(guildCode);
+    console.log('####', chatSid, arr)
+    if(!!chatSid && arr.length > 0) {
+        pinus.app.rpc.chat.guildRemote.sendMailToGuild.toServer(chatSid, guildCode, 'onActivityUpdate', 
+            resResult(STATUS.SUCCESS, {
+                activities: arr
+            }), 
+        );
+    }
 }