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-05-31 18:07:41 +08:00
parent d2a8bbeb5d
commit 75403c4540
6 changed files with 162 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/activity/handler/dailyRMBGiftsHandler.ts
+51 -10
View File
@@ -2,6 +2,10 @@ import { Application, BackendSession } from 'pinus';
import { resResult } from '../../../pubUtils/util';
import { STATUS, } from '../../../consts';
import { getPlayerDailyGiftsData, makeDailyRMBGiftsReward } from '../../../services/dailyRMBGiftsService';
import { RewardParam } from '../../../domain/activityField/rewardField';
import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
import { ActivityDailyRMBGiftsModel } from '../../../db/ActivityDailyRMBGifts';
import moment = require('moment');
export default function (app: Application) {
return new DailyRMBGiftsHandler(app);
@@ -26,19 +30,19 @@ export class DailyRMBGiftsHandler {
const serverId = session.get('serverId');
let playerData = await getPlayerDailyGiftsData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_THIRTY_DAYS_END);
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
return resResult(STATUS.SUCCESS, { playerData });
}
/**
* @description 一次性购买7天后，获取当天的礼包
* @param {{ activityId: number}} msg
* @param {{ activityId: number, id:number}} msg
* @param {BackendSession} session
* @memberof DailyRMBGiftsHandler
*/
async getDailyRMBGiftsReward(msg: { activityId: number }, session: BackendSession) {
const { activityId } = msg;
async getDailyRMBGiftsReward(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');
@@ -46,13 +50,50 @@ export class DailyRMBGiftsHandler {
const funcs: number[] = session.get('funcs');
let playerData = await getPlayerDailyGiftsData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_THIRTY_DAYS_END);
let item = playerData.findTodayItem();
let productID = item.productID;
let resulet = await makeDailyRMBGiftsReward(roleId, roleName, sid, serverId, funcs,
activityId, productID)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
return resResult(STATUS.SUCCESS, resulet);
if (id > 0) {//领取单个--免费奖励
let item = playerData.findItem(id);
if (!item) {
return resResult(STATUS.ACTIVITY_DATA_ERROR);
}
if (item.isReceive) {
return resResult(STATUS.ACTIVITY_REWARDED);
}
if (item.price > 0) {
return resResult(STATUS.ACTIVITY_NEED_PAY);
}
let rewardParamArr: Array<RewardParam> = stringToRewardParam(item.reward);
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
await ActivityDailyRMBGiftsModel.receiveRecord(serverId, activityId, roleId, moment(playerData.beginTime).toDate(), [item.id]);
item.isReceive = true;
return resResult(STATUS.SUCCESS, Object.assign(result, {
param: { activityId, id },
items: [item]
}));
} else {//一键领取全天的奖励
if (!playerData.isBuy) {
return resResult(STATUS.ACTIVITY_UNOPENED);
}
let items = playerData.unReceiveItem();
if (items.length == 0) {
return resResult(STATUS.ACTIVITY_REWARDED);
}
let rewardArray = [];
let ids = []
for (let item of items) {
ids.push(item.id)
let rewardParamArr: Array<RewardParam> = stringToRewardParam(item.reward);
rewardArray = rewardArray.concat(rewardParamArr);
item.isReceive = true;
}
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardArray)
await ActivityDailyRMBGiftsModel.receiveRecord(serverId, activityId, roleId, moment(playerData.beginTime).toDate(), ids);
return resResult(STATUS.SUCCESS, Object.assign(result, {
param: { activityId },
items: items
}));
}
}
}
game-server/app/services/dailyRMBGiftsService.ts
+21 -9
View File
@@ -1,4 +1,4 @@
import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../consts';
import { ACTIVITY_TYPE, REFRESH_TIME, STATUS, TASK_TYPE } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityDailyRMBGiftsModel, ActivityDailyRMBGiftsModelType } from '../db/ActivityDailyRMBGifts';
import { DailyRMBGiftsData, DailyRMBGiftsItem } from '../domain/activityField/dailyRMBGiftsField';
@@ -46,14 +46,15 @@ export async function getPlayerDailyGiftsData(activityId: number, serverId: numb
let playerOrders: UserOrderModelType[] = await UserOrderModel.findPlayerOrder(productID, roleId, activityId, 1);
let buyTime = moment(new Date()).startOf('d').toDate()
let endTime = moment(new Date()).endOf('d').toDate()
let endTime = null;
if (playerOrders.length > 0) {
buyTime = playerOrders[0].createdAt;//购买时候的日期
endTime = moment(buyTime).add(7, 'd').endOf('d').toDate()
}
let playerRecords: ActivityDailyRMBGiftsModelType[] = await ActivityDailyRMBGiftsModel.findRecord(serverId, activityId, roleId, buyTime);
let playerRecord: ActivityDailyRMBGiftsModelType = await ActivityDailyRMBGiftsModel.findRecord(serverId, activityId, roleId, moment(playerData.beginTime).toDate());
let unReceiveRecord: ActivityDailyRMBGiftsModelType[] = await ActivityDailyRMBGiftsModel.findBuyRecord(serverId, activityId, roleId, moment(playerData.beginTime).toDate());
playerData.setPlayerRecords(playerRecords, endTime);
playerData.setPlayerRecords(playerRecord, unReceiveRecord.length);
return playerData;
}
@@ -69,23 +70,34 @@ export async function getPlayerDailyGiftsData(activityId: number, serverId: numb
export async function makeDailyRMBGiftsReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
activityId: number, productID: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
if (activityData.type !== ACTIVITY_TYPE.RECHARGE_MONEY) {
return STATUS.ACTIVITY_TYPE_ERROR;
if (activityData.type !== ACTIVITY_TYPE.DAILY_RMB_GIFTS) {
return {
code: STATUS.ACTIVITY_TYPE_ERROR,
}
}
let playerData = new DailyRMBGiftsData(activityData);
let bigGiftProductID = playerData.productID;
if (bigGiftProductID == productID) {//一次性购买7天礼包
let buyTime = moment(new Date()).startOf('d').toDate()
let endTime = moment(buyTime).add(7, 'd').endOf('d').toDate()
for (let i = 0; i < playerData.day; i++) {
let beginTime = playerData.beginTime + 24 * 60 * 60 * 1000 * i;
// let beginTime = moment(new Date()).startOf('d').add(i, 'day').add(REFRESH_TIME, 'h').toDate();
await ActivityDailyRMBGiftsModel.buyRecord(serverId, activityId, roleId, moment(beginTime).toDate(), true);
}
let endTime = moment(playerData.endTime).add(playerData.day, 'd').toDate()
return {
code: 0,
data: Object.assign({}, { item: { endTime, receiveCount: 0 } })
}
} else {
let item = playerData.findProduct(productID);
if (!item) {
return {
code: STATUS.ACTIVITY_NO_PRODUCT,
}
}
let rewardParamArr: Array<RewardParam> = stringToRewardParam(item.reward);
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
item.isBuy = true;
await ActivityDailyRMBGiftsModel.receiveRecord(serverId, activityId, roleId, moment(playerData.beginTime).toDate(), [item.id]);
item.isReceive = true;
return {
code: 0,
game-server/app/services/orderService.ts
+3 -2
View File
@@ -1,7 +1,7 @@
import { UserOrderModel, UserOrderModelType } from '../db/UserOrder';
import { ActivitySignInModel, ActivitySignInModelType } from '../db/ActivitySignIn';
import { SignInData, SignInItem } from '../domain/activityField/signInField';
import { ACTIVITY_TYPE, ORDER_STATE } from '../consts';
import { ACTIVITY_TYPE, ORDER_STATE, STATUS } from '../consts';
import { dicRMB } from '../pubUtils/dictionary/DicRMB';
import { makeYuanbaoShopReward } from './yuanbaoService';
import { RoleModel } from '../db/Role';
@@ -78,7 +78,7 @@ export async function makeOrder(localOrderID: string, sid: string, orderInfo: Us
rewardResult = await makeMonthlyTicketReward(roleId, roleInfo.roleName, sid, orderInfo.serverId, roleInfo.funcs, orderInfo.activityId, orderInfo.productID)
break;
}
case ACTIVITY_TYPE.RECHARGE_MONEY:
case ACTIVITY_TYPE.DAILY_RMB_GIFTS:
{
rewardResult = await makeDailyRMBGiftsReward(roleId, roleInfo.roleName, sid, orderInfo.serverId, roleInfo.funcs, orderInfo.activityId, orderInfo.productID)
break;
@@ -104,6 +104,7 @@ export async function makeOrder(localOrderID: string, sid: string, orderInfo: Us
break;
}
default:
rewardResult = STATUS.ERROR_TYPE;
break;
}
return rewardResult