活动：弹出礼包
This commit is contained in:
luying
@@ -12,7 +12,7 @@ import { getPlayerActivityData, } from './selfServiceShopActivityService';
|
||||
import { ActivitySelfServiceGoodsModel } from '../../db/ActivitySelfServiceGoods';
|
||||
import moment = require('moment');
|
||||
import { getPlayerTreasureHuntData, getTreasureHuntData } from './treasureHuntService';
|
||||
import { getPlayerPopUpShopData } from './popUpShopService';
|
||||
import { getPopUpShopDataShow } from './popUpShopService';
|
||||
import { getPlayerSevenDaysData } from './sevenDaysService';
|
||||
import { getPlayerDailyMealData } from './dailyMealService';
|
||||
import { getPlayerDailyCoinData } from './dailyCoinService';
|
||||
@@ -36,9 +36,10 @@ import { getPlayerLuckyTurntableDataShow } from './luckyTurntableService';
|
||||
import { getTimeLimitRankDataShow } from './timeLimitRankService';
|
||||
import { ActivityTaskPointModel } from '../../db/ActivityTaskPoint';
|
||||
import { getRoleOnlineInfo } from '../redisService';
|
||||
import { addTaskPassPoint } from './taskPassService';
|
||||
import { addTaskPassPoint, getTaskPassDataShow } from './taskPassService';
|
||||
import { getGuildChannelSid } from '../chatService';
|
||||
import { getGuildPayDataShow } from './guildPayService';
|
||||
import { PopUpShopItemShow } from '../../domain/activityField/popUpShopField';
|
||||
|
||||
/**
|
||||
* 获取活动数据
|
||||
@@ -127,7 +128,7 @@ export async function getActivity(serverId: number, roleId: string, guildCode: s
|
||||
}
|
||||
case ACTIVITY_TYPE.POP_UP_SHOP://弹出商店 24
|
||||
{
|
||||
activityData = await getPlayerPopUpShopData(activityId, serverId, roleId);
|
||||
activityData = await getPopUpShopDataShow(activityId, serverId, roleId);
|
||||
break;
|
||||
}
|
||||
case ACTIVITY_TYPE.VIP_RECHARGE_MONEY://vip累计充值活动 26
|
||||
@@ -202,6 +203,11 @@ export async function getActivity(serverId: number, roleId: string, guildCode: s
|
||||
activityData = await getTimeLimitRankDataShow(activityId);
|
||||
break;
|
||||
}
|
||||
case ACTIVITY_TYPE.TASK_PASS: // 限时排行
|
||||
{
|
||||
activityData = await getTaskPassDataShow(activityId, serverId, roleId);
|
||||
break;
|
||||
}
|
||||
case ACTIVITY_TYPE.GUILD_PAY:
|
||||
{
|
||||
activityData = await getGuildPayDataShow(serverId, activityId, roleId, guildCode);
|
||||
@@ -366,6 +372,7 @@ interface pushActivityParamInter {
|
||||
payMemberCnt?: number; // 军团充值活动，你的军团充值的人数
|
||||
payMember?: string; // 军团充值活动，充值人员名字，添加到payRecord里面
|
||||
payRecord?: string[]; // 军团全部充值人名字
|
||||
popUpShopItems?: PopUpShopItemShow[]; // 弹出礼包
|
||||
}
|
||||
|
||||
export interface pushActivityInter {
|
||||
|
||||
@@ -1,33 +1,14 @@
|
||||
import { ACTIVITY_TYPE, ITEM_CHANGE_REASON, STATUS } from '../../consts';
|
||||
import { ACTIVITY_TYPE, ITEM_CHANGE_REASON, POP_UP_SHOP_CONDITION_TYPE, STATUS } from '../../consts';
|
||||
import { ActivityModel, ActivityModelType } from '../../db/Activity';
|
||||
import { PopUpShopData, } from '../../domain/activityField/popUpShopField';
|
||||
import { PopShopItem, PopUpConditionParamInter, PopUpShopData, PopUpShopPackage, PopUpShopItemShow, } from '../../domain/activityField/popUpShopField';
|
||||
import { RewardParam } from '../../domain/activityField/rewardField';
|
||||
import { addReward, stringToRewardParam } from './giftPackageService';
|
||||
import { ActivityPopUpShopModel, ActivityPopUpShopModelType } from '../../db/ActivityPopUpShop';
|
||||
import { ActivityPopUpShopModel, ActivityPopUpShopModelType, PopUpShopItem } from '../../db/ActivityPopUpShop';
|
||||
import { ServerlistModel } from '../../db/Serverlist';
|
||||
import moment = require('moment');
|
||||
import { getActivityById } from './activityService';
|
||||
|
||||
/**
|
||||
* 获取活动数据
|
||||
*
|
||||
* @param {number} serverId 区Id
|
||||
* @param {number} type 活动类型 ACTIVITY_TYPE
|
||||
* @param {string} roleId 角色Id
|
||||
*
|
||||
*/
|
||||
|
||||
export async function popUpShopActivity(serverId: number, roleId: string) {
|
||||
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
|
||||
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.POP_UP_SHOP, new Date())
|
||||
|
||||
if (activityArray.length == 0) {
|
||||
return null;
|
||||
}
|
||||
let activityData = activityArray[0];
|
||||
let playerData = await getPlayerPopUpShopData(activityData.activityId, serverId, roleId);
|
||||
return playerData
|
||||
}
|
||||
import { getActivitiesByType, getActivityById, pushActivities, pushActivityInter, pushSingleActivity } from './activityService';
|
||||
import { RoleModel, RoleType } from '../../db/Role';
|
||||
import { HeroType } from '../../db/Hero';
|
||||
|
||||
/**
|
||||
* 玩家活动数据
|
||||
@@ -37,28 +18,74 @@ export async function popUpShopActivity(serverId: number, roleId: string) {
|
||||
* @param {string} roleId 角色Id
|
||||
*
|
||||
*/
|
||||
export async function getPlayerPopUpShopData(activityId: number, serverId: number, roleId: string) {
|
||||
let activityData = await getActivityById(activityId);
|
||||
let playerRecords: ActivityPopUpShopModelType[] = await ActivityPopUpShopModel.findAllOpenData(serverId, activityId, roleId);
|
||||
export async function getPopUpShopData(activityId: number, serverId: number, roleId: string, role?: RoleType) {
|
||||
if(!role) role = await RoleModel.findByRoleId(roleId, 'roleId totalPay');
|
||||
|
||||
let allPlayerShop = [];
|
||||
let allTaskData = JSON.parse(activityData.data);
|
||||
for (let record of playerRecords) {
|
||||
if (record.isPush) {//没有购买
|
||||
let index = allTaskData.findIndex(obj => { return obj && obj.id === record.id && obj.taskType === record.type })
|
||||
if (index != -1) {
|
||||
let playerData = new PopUpShopData(allTaskData[index], activityData.activityId);
|
||||
playerData.setPlayerRecords(record)
|
||||
if (playerData.buyCount < allTaskData[index].count) {
|
||||
allPlayerShop.push(playerData)
|
||||
let activityData = await getActivityById(activityId);
|
||||
let playerRecords = await ActivityPopUpShopModel.findAllEffectData(serverId, activityId, roleId);
|
||||
let latestRecords = await ActivityPopUpShopModel.findAllLastData(serverId, activityId, roleId);
|
||||
|
||||
let playerData = new PopUpShopData(activityData);
|
||||
playerData.setPlayerRecords(playerRecords, latestRecords, role.totalPay);
|
||||
|
||||
return playerData;
|
||||
}
|
||||
|
||||
export async function getPopUpShopDataShow(activityId: number, serverId: number, roleId: string, role?: RoleType) {
|
||||
let playerData = await getPopUpShopData(activityId, serverId, roleId, role);
|
||||
if(playerData && playerData.canShow && playerData.canShow()) {
|
||||
return playerData.getShowResult();
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
export async function checkPopUpConditionInCreateHero(serverId, roleId, heroes: HeroType[]) {
|
||||
let conditions = heroes.map(hero => ({ conditionType: POP_UP_SHOP_CONDITION_TYPE.GET_HERO_BY_QUALITY, param: { quality: hero.quality } }));
|
||||
return await checkPopUpConditions(serverId, roleId, conditions);
|
||||
}
|
||||
|
||||
export async function checkPopUpCondition(serverId: number, roleId: string, conditionType: POP_UP_SHOP_CONDITION_TYPE, param: PopUpConditionParamInter) {
|
||||
return await checkPopUpConditions(serverId, roleId, [{ conditionType, param }]);
|
||||
}
|
||||
|
||||
// 弹出礼包任务
|
||||
export async function checkPopUpConditions(serverId: number, roleId: string, conditions: { conditionType: POP_UP_SHOP_CONDITION_TYPE, param: PopUpConditionParamInter }[]) {
|
||||
let activities = await getActivitiesByType(serverId, ACTIVITY_TYPE.POP_UP_SHOP);
|
||||
let pushData: pushActivityInter[] = [];
|
||||
for(let { activityId, type: activityType } of activities) {
|
||||
|
||||
let playerData = await getPopUpShopData(activityId, serverId, roleId);
|
||||
let pushItems: PopUpShopItemShow[] = [];
|
||||
for(let { conditionType, param } of conditions) {
|
||||
for(let pkg of playerData.packages) {
|
||||
console.log('##### 3', pkg.id, pkg.checkPackageCanPush(conditionType))
|
||||
if( !pkg.checkPackageCanPush(conditionType)) { // 筛选推送
|
||||
continue;
|
||||
}
|
||||
let items = pkg.getItemsByCondition(param);
|
||||
console.log('##### 4', items, items.length)
|
||||
if(items.length > 0) {
|
||||
let popUpShopRec = await ActivityPopUpShopModel.createRecord({
|
||||
serverId, activityId, roleId, id: pkg.id,
|
||||
...pkg.getEffectTime(),
|
||||
items: items.map(item => new PopUpShopItem(item))
|
||||
});
|
||||
let result = pkg.pushPackage(popUpShopRec);
|
||||
pushItems.push(...result);
|
||||
}
|
||||
}
|
||||
}
|
||||
console.log('##### 5', pushItems.length)
|
||||
if(pushItems.length > 0) {
|
||||
pushData.push({ activityId, activityType, param: { popUpShopItems: pushItems } });
|
||||
}
|
||||
}
|
||||
allPlayerShop['canShow'] = () => true;
|
||||
return allPlayerShop;
|
||||
console.log('##### 6', pushData.length)
|
||||
await pushActivities(pushData, roleId);
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 结算购买礼包的奖励
|
||||
*
|
||||
@@ -69,49 +96,32 @@ export async function getPlayerPopUpShopData(activityId: number, serverId: numbe
|
||||
*
|
||||
*/
|
||||
export async function makePopUpShopReward(roleId: string, roleName: string, sid: string, serverId: number,
|
||||
activityId: number, productID: string, paramStr: string) {
|
||||
activityId: number, productID: string, paramStr: string, roleInfo: RoleType) {
|
||||
if (!paramStr) {
|
||||
return STATUS.ORDER_PARAM_ERROR;
|
||||
}
|
||||
let paramObj = JSON.parse(paramStr);
|
||||
let beginTime = moment(paramObj.beginTimeStamp).toDate();
|
||||
let code = paramObj.code;
|
||||
|
||||
let activityData: ActivityModelType = await getActivityById(activityId);
|
||||
if (!activityData) {
|
||||
let playerData = await getPopUpShopData(activityId, serverId, roleId, roleInfo);
|
||||
if (!playerData) {
|
||||
return STATUS.ACTIVITY_MISSING;
|
||||
}
|
||||
if (activityData.type !== ACTIVITY_TYPE.POP_UP_SHOP) {
|
||||
if (playerData.type !== ACTIVITY_TYPE.POP_UP_SHOP) {
|
||||
return STATUS.ACTIVITY_TYPE_ERROR;
|
||||
}
|
||||
let allTaskData: any[] = JSON.parse(activityData.data);
|
||||
let taskIndex = allTaskData.findIndex(obj => { return obj && obj.productID == productID });
|
||||
if (taskIndex == -1) {
|
||||
return STATUS.ACTIVITY_NO_PRODUCT;
|
||||
}
|
||||
let playerData = new PopUpShopData(allTaskData[taskIndex], activityId);
|
||||
let playerRecord: ActivityPopUpShopModelType = await ActivityPopUpShopModel.findDataByBeginTime(serverId, activityId, roleId, playerData.id, playerData.taskType, beginTime);
|
||||
|
||||
let playerRecord: ActivityPopUpShopModelType = await ActivityPopUpShopModel.addRecord(serverId, activityId, roleId, code, productID);
|
||||
if (!playerRecord) {
|
||||
return STATUS.APPLY_ORDER_ERROR;
|
||||
}
|
||||
let curDate = new Date();
|
||||
if (curDate < playerRecord.beginTime || curDate > playerRecord.endTime) {
|
||||
return STATUS.ACTIVITY_POP_UP_SHOP_CLOSED;
|
||||
}
|
||||
if (playerRecord.totalCount < playerData.condition) {
|
||||
return STATUS.ACTIVITY_TASK_UNCOMPLETED;
|
||||
}
|
||||
if (playerRecord.buyCount >= playerData.count) {
|
||||
return STATUS.ACTIVITY_REWARDED;
|
||||
}
|
||||
playerRecord = await ActivityPopUpShopModel.addRecord(serverId, activityId, roleId, playerData.id, playerData.taskType, 1, beginTime);
|
||||
playerData.setPlayerRecords(playerRecord);
|
||||
let item = playerData.updateRecord(playerRecord, productID);
|
||||
|
||||
let rewardParamArr: Array<RewardParam> = stringToRewardParam(playerData.reward);
|
||||
let rewardParamArr: Array<RewardParam> = stringToRewardParam(item.reward);
|
||||
let result = await addReward(roleId, roleName, sid, serverId, rewardParamArr, ITEM_CHANGE_REASON.POP_UP_BUY_GIFT)
|
||||
|
||||
|
||||
return {
|
||||
code: 0,
|
||||
data: Object.assign(result, { item: playerData, activityId: activityData.activityId })
|
||||
data: Object.assign(result, { item: item, activityId })
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user