活动：军团付费

game-server/app/servers/activity/handler/activityHandler.ts

@@ -28,6 +28,7 @@ export class ActivityHandler {
         const { } = msg;
         const roleId = session.get('roleId');
         const serverId = session.get('serverId');
+        const guildCode = session.get('guildCode');
         const sid: string = session.get('sid');
         
 
@@ -41,7 +42,7 @@ export class ActivityHandler {
             for (let activityId of groupData.activities) {
                 let activityData = await getActivityById(activityId);
                 if (activityData) {
-                    let playerActivityData = await getActivity(serverId, roleId, activityId, activityData.type);
+                    let playerActivityData = await getActivity(serverId, roleId, guildCode, activityId, activityData.type);
                     if(playerActivityData) {
                         playerGroupActivityArray.push(playerActivityData);
                     }

game-server/app/servers/activity/handler/guildPayHandler.ts

@@ -0,0 +1,71 @@
+import { Application, BackendSession, HandlerService, pinus, } from 'pinus';
+import { isNumber } from 'underscore';
+import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
+import { ActivityGuildPayRecordModel } from '../../../db/ActivityGuildPayRecord';
+import { RewardParam } from '../../../domain/activityField/rewardField';
+import { resResult } from '../../../pubUtils/util';
+import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
+import { getGuildPayDataShow, getGuildPayData } from '../../../services/activity/guildPayService';
+
+
+export default function (app: Application) {
+    return new GuildPayHandler(app);
+}
+
+export class GuildPayHandler {
+    constructor(private app: Application) {
+    }
+
+
+    /**
+    * @description 获取活动数据
+    * @param {{ }} msg
+    * @param {BackendSession} session
+    * @memberof GuildPayHandler
+    */
+    async getGuildPayData(msg: { activityId: number }, session: BackendSession) {
+        const { activityId } = msg;
+        const roleId = session.get('roleId');
+        const serverId = session.get('serverId');
+        const guildCode = session.get('guildCode');
+
+        let playerData = await getGuildPayDataShow(serverId, activityId, roleId, guildCode);
+        if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
+
+        return resResult(STATUS.SUCCESS, { playerData });
+    }
+
+    /**
+    * @description (一键)领取奖励
+    * @param {{ }} msg
+    * @param {BackendSession} session
+    * @memberof GuildPayHandler
+    */
+     async receiveItems(msg: { activityId: number, cellIndex: number }, session: BackendSession) {
+        const { activityId, cellIndex } = msg;
+        const roleId = session.get('roleId');
+        const roleName = session.get('roleName');
+        const sid = session.get('sid');
+        const serverId = session.get('serverId');
+        const guildCode = session.get('guildCode');
+
+        if(!isNumber(cellIndex)) return resResult(STATUS.WRONG_PARMS);
+
+        let playerData = await getGuildPayData(serverId, activityId, roleId, guildCode);
+        if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
+
+        let items = playerData.receiveItems(cellIndex);
+        if(!items) return resResult(STATUS.ACTIVITY_ITEM_CANNOT_RECEIVE);
+
+
+        let records: number[] = [], rewards: RewardParam[] = [];
+        for(let item of items) {
+            records.push(item.cellIndex);
+            rewards.push(...stringToRewardParam(item.reward));
+        }
+        await ActivityGuildPayRecordModel.receiveItems(serverId, activityId, playerData.roundIndex, roleId, records);
+        let result = await addReward(roleId, roleName, sid, serverId, rewards, ITEM_CHANGE_REASON.ACT_GUILD_PAY_REWARD);
+
+        return resResult(STATUS.SUCCESS, { items, ...result });
+    }
+}

game-server/app/servers/activity/handler/luckyTurntableHandler.ts

@@ -61,9 +61,9 @@ export class LuckyTurntableHandler {
 
         let { result, records, goodResult } = playerData.pull(roleName, count);
         await ActivityTurntableModel.updateData(serverId, activityId, roleId, pick(playerData, ['todayCount', 'count', 'records', 'greatRewardCount']));
-        let goods = await addItems(roleId, roleName, sid, goodResult, ITEM_CHANGE_REASON.ACT_TURNTABLE_PULL);
+        await addItems(roleId, roleName, sid, goodResult, ITEM_CHANGE_REASON.ACT_TURNTABLE_PULL);
 
-        return resResult(STATUS.SUCCESS, { result, records, goods: combineItems(goods) });
+        return resResult(STATUS.SUCCESS, { result, records });
     }
     
 

game-server/app/servers/activity/handler/rechargeMoneyHandler.ts

@@ -33,7 +33,7 @@ export class RechargeMoneyHandler {
         let playerData = await getPlayerRechargeMoneyDataShow(activityId, serverId, roleId);
         if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
 
-        return resResult(STATUS.SUCCESS, playerData);
+        return resResult(STATUS.SUCCESS, {playerData});
     }
 
     /**