xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

活动：首充增加页签

Browse Source
This commit is contained in:
luying
2022-03-04 09:47:24 +08:00
parent 9e6a43a90a
commit c8c64f7e48
8 changed files with 163 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/activity/handler/firstGiftHandler.ts
+13 -10
View File
@@ -5,6 +5,7 @@ import { getPlayerFirstGiftData } from '../../../services/activity/firstGiftServ
import { RoleModel } from '../../../db/Role';
import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
import { ActivityFirstGiftModel } from '../../../db/ActivityFirstGift';
import { RewardParam } from '../../../domain/activityField/rewardField';
export default function (app: Application) {
new HandlerService(app, {});
@@ -48,8 +49,8 @@ export class FirstGiftHandler {
* @param {BackendSession} session
* @memberof FirstGiftHandler
*/
async getFirstGiftReward(msg: { activityId: number, index: number }, session: BackendSession) {
const { activityId, index } = msg;
async getFirstGiftReward(msg: { activityId: number, pageIndex: number }, session: BackendSession) {
const { activityId, pageIndex } = msg;
const roleId = session.get('roleId');
const serverId = session.get('serverId');
const sid = session.get('sid');
@@ -60,28 +61,30 @@ export class FirstGiftHandler {
if (!playerData) {
return resResult(STATUS.ACTIVITY_MISSING);
}
if (playerData.state === FIRST_GIFT_STATE.CLOSED) {
let playerPageData = playerData.findPageByIndex(pageIndex);
if (playerPageData.state === FIRST_GIFT_STATE.NOT_PAY) {
return resResult(STATUS.ACTIVITY_FIRST_GIFT_NOT_OPEN);
}
let items = playerData.canReceiveItems();
let items = playerPageData.getCanReceiveItems();
if (items.length === 0) {
return resResult(STATUS.ACTIVITY_REWARDED);
}
let rewardArray = [];
let indexArray = [];
let rewardArray: RewardParam[] = [];
let indexArray: number[] = [];
for (let item of items) {
rewardArray = rewardArray.concat(stringToRewardParam(item.reward))
rewardArray.push(...stringToRewardParam(item.reward));
indexArray.push(item.index)
item.isReceive = true;
}
let result = await addReward(roleId, roleName, sid, serverId, rewardArray, ITEM_CHANGE_REASON.FIRST_GIFT);
let isOver = playerData.isComplete();
let isOver = playerPageData.isComplete();
await ActivityFirstGiftModel.addRecord(activityId, roleId, indexArray, isOver);
await ActivityFirstGiftModel.addRecord(activityId, roleId, pageIndex, indexArray, isOver);
return resResult(STATUS.SUCCESS, Object.assign(result, {
param: { activityId },
param: { activityId, pageIndex },
items: items
}));
}
game-server/app/servers/gm/handler/gmOrderHandler.ts
+1 -1
View File
@@ -6,7 +6,7 @@ import _ = require('underscore');
import { dicRMB } from '../../../pubUtils/dictionary/DicRMB';
import { getActivityById } from '../../../services/activity/activityService';
import { UserOrderModel } from '../../../db/UserOrder';
import { makeOrder, settleOrder, settleOrderAli, settleOrderWx } from '../../../services/orderService';
import { settleOrder, settleOrderAli, settleOrderWx } from '../../../services/orderService';
import { getActivityProducts, getParamStr } from '../../../services/gmService';
import { ActivityGroupModel } from '../../../db/ActivityGroup';
import { Receiver } from '../../../db/GMMail';
game-server/app/servers/order/handler/orderHandler.ts
+1 -1
View File
@@ -7,7 +7,7 @@ import _ = require('underscore');
import { applyOrderWX, checkOrderWX } from '../../../services/pay/weixinPay';
import { applyOrderALI, checkOrderALI } from '../../../services/pay/aliPay';
import { applyOrder37 } from '../../../services/pay/37Pay';
import { makeOrder, settleOrder, settleOrderAli, settleOrderWx } from '../../../services/orderService';
import { settleOrder, settleOrderAli, settleOrderWx } from '../../../services/orderService';
import { addRechargeMoney } from '../../../services/activity/rechargeMoneyService';
import { addVipRechargeMoney } from '../../../services/activity/vipRechargeMoneyService';
import { checkActivityTask } from '../../../services/taskService';
game-server/app/services/activity/firstGiftService.ts
+44 -26
View File
@@ -1,38 +1,38 @@
import { ACTIVITY_TYPE } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityFirstGiftModel, ActivityFirstGiftModelType } from '../../db/ActivityFirstGift';
import { RoleModel } from '../../db/Role';
import { RoleModel, RoleType } from '../../db/Role';
import { ServerlistModel } from '../../db/Serverlist';
import { FirstGiftData } from '../../domain/activityField/firstGiftField';
import { getActivityById } from './activityService';
/**
* 获取活动数据
*
* @param {number} serverId 区Id
* @param {number} type 活动类型 ACTIVITY_TYPE
* @param {string} roleId 角色Id
*
*/
// /**
// * 获取活动数据
// *
// * @param {number} serverId 区Id
// * @param {number} type 活动类型 ACTIVITY_TYPE
// * @param {string} roleId 角色Id
// *
// */
export async function firstGiftActivity(serverId: number, roleId: string) {
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(activityGroupId, ACTIVITY_TYPE.FIRST_GIFT, 1)
// export async function firstGiftActivity(serverId: number, roleId: string) {
// let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
// let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(activityGroupId, ACTIVITY_TYPE.FIRST_GIFT, 1)
if (activityArray.length == 0) {
return null;
}
let activityData = activityArray[0];
let playerRecord: ActivityFirstGiftModelType = await ActivityFirstGiftModel.findData(activityData.activityId, roleId);
if (!playerRecord || playerRecord.isOver) {
return null;
}
// if (activityArray.length == 0) {
// return null;
// }
// let activityData = activityArray[0];
// let playerRecord: ActivityFirstGiftModelType = await ActivityFirstGiftModel.findData(activityData.activityId, roleId);
// if (!playerRecord || playerRecord.isOver) {
// return null;
// }
let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new FirstGiftData(activityData, createTime);
playerData.setPlayerRecords(playerRecord);
return playerData;
}
// let { createTime } = await RoleModel.findByRoleId(roleId);
// let playerData = new FirstGiftData(activityData, createTime);
// playerData.setPlayerRecords(playerRecord);
// return playerData;
// }
/**
* 玩家活动数据
@@ -44,10 +44,28 @@ export async function firstGiftActivity(serverId: number, roleId: string) {
*/
export async function getPlayerFirstGiftData(activityId: number, serverId: number, roleId: string) {
let activityData = await getActivityById(activityId);
let playerRecord: ActivityFirstGiftModelType = await ActivityFirstGiftModel.findData(activityId, roleId);
let playerRecord = await ActivityFirstGiftModel.findData(activityId, roleId);
let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new FirstGiftData(activityData, createTime);
playerData.setPlayerRecords(playerRecord);
return playerData;
}
/**
* 记录玩家首充记录
* @param {RoleType} role 玩家数据
* @param {number} serverId 区id
*/
export async function recordFirstGift(role: RoleType, serverId: number) {
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.FIRST_GIFT, new Date())
for (let obj of activityArray) {
let playerData = new FirstGiftData(obj, role.createTime);
for(let { pageIndex, targetMoney } of playerData.list) {
if(role.totalPay >= targetMoney) {
await ActivityFirstGiftModel.begin(obj.activityId, role.roleId, pageIndex );
}
}
}
}
game-server/app/services/orderService.ts
+6 -10
View File
@@ -28,6 +28,7 @@ import { getRoleOnlineInfo } from './redisService';
import { PayCallback37Data } from '../domain/sdk';
import { reportTAEvent, reportTAUserSet } from './sdkService';
import { savePayLog } from '../pubUtils/logUtil';
import { recordFirstGift } from './activity/firstGiftService';
/**
@@ -49,16 +50,6 @@ export async function makeOrder(orderInfo: UserOrderModelType, sid: string) {
let rewardResult: any = { code: 0, data: null };
//首冲礼包
{
let { activityGroupId } = await ServerlistModel.findByServerId(orderInfo.serverId);
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.FIRST_GIFT, new Date())
for (let obj of activityArray) {
await ActivityFirstGiftModel.begin(obj.activityId, roleId);
}
}
switch (productType) {
case ACTIVITY_TYPE.SIGN_IN_VIP:
{
@@ -144,6 +135,11 @@ export async function makeOrder(orderInfo: UserOrderModelType, sid: string) {
rewardResult = STATUS.ERROR_TYPE;
break;
}
if(rewardResult.code == 0) {
await recordFirstGift(roleInfo, orderInfo.serverId);
}
pinus.app.get('channelService').pushMessageByUids('onPlayerDataChange', resResult(STATUS.SUCCESS, {
totalPay: roleInfo.totalPay
}), [{ uid: roleId, sid }]);