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

活动：大额累计充值活动

Browse Source
This commit is contained in:
qiaoxin
2021-06-02 18:21:21 +08:00
parent f708599855
commit f3cd916e28
10 changed files with 351 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
game-server/app/servers/activity/handler/vipRechargeMoneyHandler.ts Normal file
View File

@@ -0,0 +1,110 @@
import { Application, BackendSession } from 'pinus';
import { resResult } from '../../../pubUtils/util';
import { STATUS, } from '../../../consts';
import { getPlayerVipRechargeMoneyData, } from '../../../services/vipRechargeMoneyService';
import { VipRechargeMoneyItem } from '../../../domain/activityField/vipRechargeMoneyField';
import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
import { RewardParam } from '../../../domain/activityField/rewardField';
import { ActivityVipRechargeMoneyModel } from '../../../db/ActivityVipRechargeMoney';
import { UserOrderModel } from '../../../db/UserOrder';
import { dicRMB } from '../../../pubUtils/dictionary/DicRMB';
import moment = require('moment');
export default function (app: Application) {
return new VipRechargeMoneyHandler(app);
}
export class VipRechargeMoneyHandler {
constructor(private app: Application) {
}
/************************vip累计充值奖励****************************/
/**
* @description 获取活动数据
* @param {BackendSession} session
* @memberof VipRechargeMoneyHandler
*/
async getVipRechargeMoneyActivity(msg: { activityId: number }, session: BackendSession) {
const { activityId } = msg;
const roleId = session.get('roleId');
const serverId = session.get('serverId');
let playerData = await getPlayerVipRechargeMoneyData(activityId, serverId, roleId);
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
return resResult(STATUS.SUCCESS, playerData);
}
/**
* @description 获取奖励
* @param {BackendSession} session
* @memberof VipRechargeMoneyHandler
*/
async getVipRechargeMoneyReward(msg: { activityId: number, id: number }, session: BackendSession) {
const { activityId, id } = msg;
const roleId = session.get('roleId');
const serverId = session.get('serverId');
const sid = session.get('sid');
const roleName = session.get('roleName');
const funcs: number[] = session.get('funcs');
let playerData = await getPlayerVipRechargeMoneyData(activityId, serverId, roleId);
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
let item: VipRechargeMoneyItem = playerData.findItem(id);
if (!item) {
return resResult(STATUS.ACTIVITY_DATA_ERROR);
}
if (playerData.totalRMB < item.condition) {
return resResult(STATUS.ACTIVITY_TASK_UNCOMPLETED);
}
if (item.receiveCount >= item.countMax) {
return resResult(STATUS.ACTIVITY_MAX_COUNT);
}
await ActivityVipRechargeMoneyModel.addRecord(serverId, activityId, roleId, id);
let rewardParamArr: Array<RewardParam> = stringToRewardParam(item.reward);
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
item.receiveCount += 1;
return resResult(STATUS.SUCCESS, Object.assign(result, {
param: { activityId, id },
item: item
}));
}
/**
* @description 获取订单记录
* @param {BackendSession} session
* @memberof VipRechargeMoneyHandler
*/
async getOrderList(msg: { begin: number, count: number }, session: BackendSession) {
const { begin, count } = msg;
const roleId = session.get('roleId');
const serverId = session.get('serverId');
const sid = session.get('sid');
const roleName = session.get('roleName');
const funcs: number[] = session.get('funcs');
if (begin > 0 && count > 0) {
let orders = await UserOrderModel.findOrderList(serverId, roleId, begin - 1, count)
for (let order of orders) {
let productInfo = dicRMB.get(order.productID)
if (productInfo) {
order['message'] = productInfo.message;
}
order['time'] = moment(order.createdAt).valueOf();
delete order.createdAt;
delete order.productID;
delete order._id;
}
return resResult(STATUS.SUCCESS, { orders });
}
return resResult(STATUS.WRONG_PARMS);
}
}

3
game-server/app/servers/order/handler/orderHandler.ts
View File

@@ -10,6 +10,7 @@ import { makeOrder } from '../../../services/orderService';
import { addRechargeMoney } from '../../../services/rechargeMoneyService';
import { ActivityModel, ActivityModelType } from '../../../db/Activity';
import { ServerlistModel } from '../../../db/Serverlist';
import { addVipRechargeMoney } from '../../../services/vipRechargeMoneyService';
export default function (app: Application) {
return new orderHandler(app);
@@ -188,6 +189,7 @@ export class orderHandler {
}), [{ uid: roleId, sid: sid }]);
//活动统计
await addRechargeMoney(roleId, serverId, price);
await addVipRechargeMoney(roleId, serverId, price)
console.log('结算完成', localOrderID)
return resResult(STATUS.SUCCESS, result.data);
}
@@ -257,6 +259,7 @@ export class orderHandler {
}), [{ uid: roleId, sid: sid }]);
//活动统计
await addRechargeMoney(roleId, serverId, price);
await addVipRechargeMoney(roleId, serverId, price);
console.log(`测试支付完成!!!!!!!!!!!!! serverId:${serverId}, productID:${productID}, productType:${productType}, roleId:${roleId}, localOrderID:${localOrderID}, payType:${payType}`)
return resResult(STATUS.SUCCESS, result.data);
}

70
game-server/app/services/vipRechargeMoneyService.ts Normal file
View File

@@ -0,0 +1,70 @@
import { ACTIVITY_TYPE, TASK_TYPE } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityVipRechargeMoneyModel, ActivityVipRechargeMoneyModelType } from '../db/ActivityVipRechargeMoney';
import { VipRechargeMoneyData, VipRechargeMoneyItem } from '../domain/activityField/vipRechargeMoneyField';
import moment = require('moment');
import { ServerlistModel } from '../db/Serverlist';
/**
* 获取活动数据
*
* @param {number} serverId 区Id
* @param {number} type 活动类型 ACTIVITY_TYPE
* @param {string} roleId 角色Id
*
*/
export async function vipRechargeMoneyActivity(serverId: number, roleId: string) {
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.VIP_RECHARGE_MONEY, new Date())
if (activityArray.length == 0) {
return null;
}
let activityData = activityArray[0];
let playerRecord: ActivityVipRechargeMoneyModelType = await ActivityVipRechargeMoneyModel.findData(serverId, roleId, activityData.activityId);
let playerData = new VipRechargeMoneyData(activityData);
playerData.setPlayerRecords(playerRecord);
return playerData;
}
/**
* 玩家活动数据
*
* @param {number} serverId 区Id
* @param {number} activityId 活动Id
* @param {string} roleId 角色Id
*
*/
export async function getPlayerVipRechargeMoneyData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
if (!activityData) {
return null;
}
let playerRecord: ActivityVipRechargeMoneyModelType = await ActivityVipRechargeMoneyModel.findData(serverId, roleId, activityId);
let playerData = new VipRechargeMoneyData(activityData);
playerData.setPlayerRecords(playerRecord);
return playerData;
}
/**
* 统计充值金额
*
* @param {number} serverId 区Id
* @param {string} roleId 角色Id
* @param {string} RMB 金额
*
*/
export async function addVipRechargeMoney(roleId: string, serverId: number, RMB: number) {
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.VIP_RECHARGE_MONEY, new Date())
if (activityArray.length == 0) {
return null;
}
let activityData = activityArray[0];
await ActivityVipRechargeMoneyModel.addRMB(serverId, roleId, activityData.activityId, RMB);
}

1
shared/consts/constModules/activityConst.ts
View File

@@ -31,6 +31,7 @@ export enum ACTIVITY_TYPE {
TREASURE_HUNT = 23, // 寻宝骑兵活动
POP_UP_SHOP = 24, // 弹出商店
NEW_PLAYER_SIGN_IN = 25, // 新手签到活动
VIP_RECHARGE_MONEY = 26, // vip累计充值RMB活动
// FOURTEEN_DAY = 25, // 14天乐活动(虚)
// FOURTEEN_DAILY_DISCOUNT_GIFT = 26, // 14天乐活动,每日特惠礼包
// FOURTEEN_TASK_GROWTH = 27, // 14天乐成长任务活动

11
shared/db/ActivityThirtyDays.ts
View File

@@ -27,6 +27,10 @@ export default class Activity_Thirty_Days extends BaseModel {
isReceive: boolean; // 是否领取过奖励
@prop({ required: true })
data: string; // 数据信息
@prop({ required: true })
isPush: boolean; // 推送过消息
//添加领取记录
public static async addRecord(serverId: number, activityId: number, roleId: string, pageIndex: number, cellIndex: number, tab: number) {
@@ -56,6 +60,13 @@ export default class Activity_Thirty_Days extends BaseModel {
return result;
}
//推送标记
public static async pushMessage(serverId: number, activityId: number, roleId: string, pageIndex: number, cellIndex: number, tab: number, type: number) {
let result: ActivityThirtyDaysModelType = await ActivityThirtyDaysModel.findOneAndUpdate({ serverId, roleId, activityId, pageIndex, cellIndex, tab, type },
{ $set: { isPush: true, } }, { upsert: true, new: true }).lean(true);
return result;
}
//根据活动id查询活动数据
public static async findData(serverId: number, activityId: number, roleId: string, lean = true) {
let result: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.find({ serverId, roleId, activityId }).lean(lean);

63
shared/db/ActivityVipRechargeMoney.ts Normal file
View File

@@ -0,0 +1,63 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
class RewardRecord {
@prop({ required: true })
id: number; // 奖励id
@prop({ required: true })
time: Date; // 领取时间
}
/**
* Vip累计充值活动
*/
@index({ roleId: 1 })
export default class Activity_Vip_Recharge_Money extends BaseModel {
@prop({ required: true })
serverId: number; // 区号
@prop({ required: true })
activityId: number; // 活动id
@prop({ required: true })
roleId: string; // 用户id
@prop({ required: true })
RMB: number; // 充值金额
@prop({ required: true })
record: RewardRecord[]; // 领取奖励记录
@prop({ required: true })
isEnd: boolean; // 结束
//添加领取记录
public static async addRecord(serverId: number, activityId: number, roleId: string, id: number) {
let result: ActivityVipRechargeMoneyModelType = await ActivityVipRechargeMoneyModel.findOneAndUpdate({ serverId, activityId, roleId },
{ $push: { record: { id, time: new Date() } } },
{ upsert: true, new: true }).lean(true);
return result;
}
//活动结束
public static async setEndState(serverId: number, activityId: number, roleId: string) {
await ActivityVipRechargeMoneyModel.findOneAndUpdate({ serverId, activityId, roleId },
{ $set: { isEnd: true } }).lean(true);
}
//查询
public static async findData(serverId: number, roleId: string, activityId: number) {
let result: ActivityVipRechargeMoneyModelType = await ActivityVipRechargeMoneyModel.findOne({ serverId, roleId, activityId }).lean(true);
return result;
}
//统计支付金额
public static async addRMB(serverId: number, roleId: string, activityId: number, RMB: number) {
let result: ActivityVipRechargeMoneyModelType = await ActivityVipRechargeMoneyModel.findOneAndUpdate({ serverId, roleId, activityId },
{ $inc: { RMB } },
{ upsert: true, new: true }).lean(true);
return result;
}
}
export const ActivityVipRechargeMoneyModel = getModelForClass(Activity_Vip_Recharge_Money);
export interface ActivityVipRechargeMoneyModelType extends Pick<DocumentType<Activity_Vip_Recharge_Money>, keyof Activity_Vip_Recharge_Money> { }
export type ActivityVipRechargeMoneyModelTypeParam = Partial<ActivityVipRechargeMoneyModelType>; // 将所有字段变成可选项

7
shared/db/UserOrder.ts
View File

@@ -93,6 +93,13 @@ export default class UserOrder extends BaseModel {
return result;
}
//查询订单详情
public static async findOrderList(serverId: number, roleId: string, begin: number, count: number) {
let result: UserOrderModelType[] = await UserOrderModel.find({ serverId, roleId, state: ORDER_STATE.RESULT_SUCCESS }, { price: 1, createdAt: 1, productID: 1 }).skip(begin).limit(count).sort({ createdAt: -1 }).lean(true);
return result;
}
//新增订单
public static async applyOrder(serverId: number, roleId: string, productID: string, localOrderID: string, orderID: string, price: number, payType: number, activityId: number, message: string = '') {
let result: UserOrderModelType = await UserOrderModel.findOneAndUpdate({ serverId, roleId, productID, localOrderID, orderID, payType, activityId },

2
shared/domain/activityField/thirtyDaysField.ts
View File

@@ -120,7 +120,7 @@ export class ThirtyDaysData extends ActivityBase {
consumePoint: number = 0;//消耗掉的点数
//未完成的任务
public findUncompleteTaskByType(type: number) {
public findUncompleteTaskByType(type: number): ThirtyDaysItem[] {
let task = [];
for (let i = 0; i < this.list.length; i++) {
let items = this.list[i].item;

70
shared/domain/activityField/vipRechargeMoneyField.ts Normal file
View File

@@ -0,0 +1,70 @@
import moment = require('moment');
import { random } from 'underscore';
import { ActivityModelType } from '../../db/Activity';
import { ActivityVipRechargeMoneyModelType } from '../../db/ActivityVipRechargeMoney';
import { ActivityBase } from './activityField';
// 奖励
export class VipRechargeMoneyItem {
id: number; //商品id
vipLevel: number //vip等级
vipName: string; //vip名称
name: string; //商品名称
reward: string; //奖励
condition: number; //充值条件
imageName: string;
content: string; //描述
countMax: number; //最大领取次数
receiveCount: number; //领取次数
constructor(data: any) {
this.id = data.id;
this.vipLevel = data.vipLevel;
this.vipName = data.vipName;
this.name = data.name;
this.reward = data.reward;
this.condition = data.condition;
this.imageName = data.imageName;
this.countMax = data.countMax;
this.content = data.content;
this.receiveCount = 0;
}
}
// 累计充值数据
export class VipRechargeMoneyData extends ActivityBase {
list: Array<VipRechargeMoneyItem> = [];//记录
totalRMB: number = 0; //累计充值金额
public findItem(id: number): VipRechargeMoneyItem {
let index = this.list.findIndex(obj => { return obj.id === id });
return (index !== -1) ? this.list[index] : null;
}
//解析玩家购买记录
public setPlayerRecords(data: ActivityVipRechargeMoneyModelType) {
if (!data) {
return;
}
this.totalRMB = data.RMB;
let records = data.record ? data.record : [];
for (let item of this.list) {
let recordArray = records.filter(obj => { return obj.id == item.id });
item.receiveCount = recordArray.length;
}
}
public initData(data: string) {
let dataObj = JSON.parse(data);
let arr = dataObj;
for (let obj of arr) {
this.list.push(new VipRechargeMoneyItem(obj))
}
}
constructor(activityData: ActivityModelType) {
super(activityData)
this.initData(activityData.data)
}
}

18
shared/pubUtils/taskUtil.ts
View File

@@ -557,15 +557,27 @@ export async function accomplishTask(serverId: number, roleId: string, taskType:
thirtyDaysActivity.setPlayerRecords(playerRecords);
let taskArray = thirtyDaysActivity.findUncompleteTaskByType(taskType);
for (let task of taskArray) {
let taskRecord = await ActivityThirtyDaysModel.findDataByCellIndex(serverId, thirtyDaysActivity.activityId, roleId, task.dayIndex, task.cellIndex, task.tab, task.taskType)
let taskRecord = await ActivityThirtyDaysModel.findDataByCellIndex(serverId, thirtyDaysActivity.activityId, roleId, task.pageIndex, task.cellIndex, task.tab, task.taskType)
let recordData = taskRecord && taskRecord.data ? JSON.parse(taskRecord.data) : null
let { addCount, record } = isComplete(roleId, task.taskType, task.taskParam, count, parma, recordData);
if (addCount) {
await ActivityThirtyDaysModel.addTaskCount(serverId, thirtyDaysActivity.activityId, roleId, task.pageIndex, task.cellIndex, task.tab, task.taskType, addCount);
let playerRecord = await ActivityThirtyDaysModel.addTaskCount(serverId, thirtyDaysActivity.activityId, roleId, task.pageIndex, task.cellIndex, task.tab, task.taskType, addCount);
//推送
if (task.condition <= playerRecord.totalCount) {//已经完成
playerRecord = await ActivityThirtyDaysModel.pushMessage(serverId, thirtyDaysActivity.activityId, roleId, task.pageIndex, task.cellIndex, task.tab, task.taskType);
task.totalCount = playerRecord.totalCount;
task.isComplete = true;
pushMessage = pushMessage.concat(Object.assign(task, { activityId: thirtyDaysActivity.activityId }));
} else {//没有完成
task.totalCount = playerRecord.totalCount;
task.isComplete = true;
pushMessage = pushMessage.concat(Object.assign(task, { activityId: thirtyDaysActivity.activityId }));
}
}
if (record) {
await ActivityThirtyDaysModel.addTaskRecord(serverId, thirtyDaysActivity.activityId, roleId, task.dayIndex, task.cellIndex, task.tab, task.taskType, JSON.stringify(record));
await ActivityThirtyDaysModel.addTaskRecord(serverId, thirtyDaysActivity.activityId, roleId, task.pageIndex, task.cellIndex, task.tab, task.taskType, JSON.stringify(record));
}
}
}
}