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-20 11:19:20 +08:00
parent ca19f04282
commit 3823174971
5 changed files with 91 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
game-server/app/servers/activity/handler/popUpShopHandler.ts
View File

@@ -1,7 +1,13 @@
import { Application, BackendSession } from 'pinus';
import { resResult } from '../../../pubUtils/util';
import { STATUS, } from '../../../consts';
import { getPlayerPopUpShopData, makeDailyRMBGiftsReward } from '../../../services/popUpShopService';
import { resResult, splitString } from '../../../pubUtils/util';
import { ACTIVITY_RESOURCES_TYPE, CURRENCY_BY_TYPE, CURRENCY, STATUS, CURRENCY_TYPE, } from '../../../consts';
import { getPlayerPopUpShopData } from '../../../services/popUpShopService';
import { ActivityModel, ActivityModelType } from '../../../db/Activity';
import { ActivityPopUpShopModel, ActivityPopUpShopModelType } from '../../../db/ActivityPopUpShop';
import { PopUpShopData } from '../../../domain/activityField/PopUpSHopField';
import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
import { RewardParam } from '../../../domain/activityField/rewardField';
import { handleCost } from '../../../services/rewardService';
export default function (app: Application) {
return new PopUpShopHandler(app);
@@ -33,26 +39,58 @@ export class PopUpShopHandler {
/**
* @description 购买礼包
* @param {{ activityId: number}} msg
* @param {{ activityId: number, taskId: number, id: number}} msg
* @param {BackendSession} session
* @memberof PopUpShopHandler
*/
async buyGift(msg: { activityId: number }, session: BackendSession) {
const { activityId } = msg;
async buyGift(msg: { activityId: number, taskId: number, id: number }, session: BackendSession) {
const { activityId, taskId, 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 getPlayerPopUpShopData(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)
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
if (!activityData) {
return resResult(STATUS.ACTIVITY_MISSING);
}
let playerRecords: ActivityPopUpShopModelType = await ActivityPopUpShopModel.findOpenDataByTaskId(serverId, activityId, roleId, taskId);
if (!playerRecords) {
return resResult(STATUS.ACTIVITY_POP_UP_SHOP_EXPIRE);
}
let allTaskData: any[] = JSON.parse(activityData.data);
let taskIndex = allTaskData.findIndex(obj => { return obj && obj.taskId == taskId });
if (taskIndex == -1) {
return resResult(STATUS.ACTIVITY_DATA_ERROR);
}
return resResult(STATUS.SUCCESS, {});
let playerData = new PopUpShopData(allTaskData[taskIndex]);
let itemData = playerData.findItem(id);
if (!itemData) {
return resResult(STATUS.ACTIVITY_DATA_ERROR);
}
if (itemData.price) {
return resResult(STATUS.ACTIVITY_NEED_PAY);
}
if (itemData.consume) {
return resResult(STATUS.ACTIVITY_NEED_PAY);
}
//元宝消费
let arr = splitString(itemData.consume, '&')
if (arr[0] != ACTIVITY_RESOURCES_TYPE.GOODS || arr[1] != CURRENCY_BY_TYPE.get(CURRENCY_TYPE.GOLD)) {
return resResult(STATUS.ACTIVITY_GOLD_RESOURCE);
}
let price = arr[2];//数量
let resourceResult = await handleCost(roleId, sid, [{ id: CURRENCY_BY_TYPE.get(CURRENCY_TYPE.GOLD), count: price }]);
if (!resourceResult) return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH);
let rewardParamArr: Array<RewardParam> = stringToRewardParam(itemData.reward);
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
return resResult(STATUS.SUCCESS, result);
}
}

6
game-server/app/services/orderService.ts
View File

@@ -8,6 +8,7 @@ import { RoleModel } from '../db/Role';
import { makeMonthlyTicketReward } from './monthlyTicketService';
import { makeSignInVIP } from './signInService';
import { makeDailyRMBGiftsReward } from './dailyRMBGiftsService';
import { makePopUpShopReward } from './popUpShopService';
@@ -70,6 +71,11 @@ export async function makeOrder(localOrderID: string, sid: string) {
let resule = await makeDailyRMBGiftsReward(roleId, roleInfo.roleName, sid, orderInfo.serverId, roleInfo.funcs, orderInfo.activityId, orderInfo.productID)
break;
}
case ACTIVITY_TYPE.POP_UP_SHOP:
{
let resule = await makePopUpShopReward(roleId, roleInfo.roleName, sid, orderInfo.serverId, roleInfo.funcs, orderInfo.activityId, orderInfo.productID)
break;
}
default:
return '未知商品类型';
}

34
game-server/app/services/popUpShopService.ts
View File

@@ -66,17 +66,27 @@ export async function getPlayerPopUpShopData(activityId: number, serverId: numbe
* @param {string} productID 商品ID
*
*/
export async function makeDailyRMBGiftsReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
export async function makePopUpShopReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
activityId: number, productID: string) {
// let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
// let playerData = new popUpSHopField(activityData);
// let bigGiftProductID = playerData.productID;
// if (bigGiftProductID == productID) {//一次性购买7天礼包
// return { goods: [], addHeros: [] }
// } else {
// let item = playerData.findProduct(productID);
// let rewardParamArr: Array<RewardParam> = stringToRewardParam(item.reward);
// let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
// return result
// }
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
if (!activityData) {
return null;
}
let allTaskData: any[] = JSON.parse(activityData.data);
let taskIndex = allTaskData.findIndex(obj => { return obj && obj.data.productID == productID });
if (taskIndex == -1) {
return null;
}
let playerData = new PopUpShopData(allTaskData[taskIndex]);
let taskId = playerData.taskId;
let item = playerData.findItemByProductID(productID);
let playerRecords: ActivityPopUpShopModelType = await ActivityPopUpShopModel.addRecord(serverId, activityId, roleId, taskId, item.id);
if (!playerRecords) {
return null;
}
let rewardParamArr: Array<RewardParam> = stringToRewardParam(item.reward);
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
return result
}

3
shared/consts/statusCode.ts
View File

@@ -356,6 +356,9 @@ export const STATUS = {
ACTIVITY_RECHARGE_MONEY_NO_REWARD: { code: 50019, simStr: '没有可领取的奖励' },
ACTIVITY_SIGNIN_VIP_CONDITION: { code: 50020, simStr: '开启条件不足' },
ACTIVITY_SIGNIN_EXPIRE: { code: 50021, simStr: '签到过期，补签' },
ACTIVITY_POP_UP_SHOP_EXPIRE: { code: 50022, simStr: '弹出商店过期' },
ACTIVITY_NEED_PAY: { code: 50023, simStr: '客户端调错接口了' },
ACTIVITY_GOLD_RESOURCE: { code: 50024, simStr: '元宝资源' },
// GM后台相关状态 60000 - 69999
GM_ERR_PASSWORD: { code: 60001, simStr: '账号或密码错误' },
GM_MISS_API: { code: 60002, simStr: '未找到该接口' },

10
shared/domain/activityField/popUpShopField.ts
View File

@@ -7,6 +7,8 @@ import { ActivityBase } from './activityField';
// 商品数据
export class PopUpShopItem {
id: number; // 第几个，从1开始
consume: string; //消耗资源(这里优先rmb的price价格，其次资源消耗)
price: number; // 商品价格
productID: string; // 商品id支付时使用
reward: string; //任务奖励，格式:1&3&1(类型&id&数量) 类型定义:1.英雄，2.物品
countMax: number = 0; //可购买的最大次数，0表示不限制
@@ -18,7 +20,9 @@ export class PopUpShopItem {
this.id = data.id;
this.reward = data.reward;
this.countMax = data.countMax;
this.productID = data.productID;
this.consume = data.consume ? data.consume : '';
this.price = data.price ? data.price : 0;
this.productID = data.productID ? data.productID : '';
this.name = data.name;
}
}
@@ -29,6 +33,10 @@ export class PopUpShopData {
taskId: number = 0;//id
list: Array<PopUpShopItem> = [];//每件商品信息
public findItemByProductID(productID: string) {
let index = this.list.findIndex(obj => { return obj && obj.productID === productID });
return (index != -1) ? this.list[index] : null
}
public findItem(id: number) {
let index = this.list.findIndex(obj => { return obj && obj.id === id });