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-09 18:52:54 +08:00
parent 4ed8f286f1
commit ff45e0f096
10 changed files with 54 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/activity/handler/popUpShopHandler.ts
+7 -5
View File
@@ -8,6 +8,7 @@ import { PopUpShopData } from '../../../domain/activityField/popUpShopField';
import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
import { RewardParam } from '../../../domain/activityField/rewardField';
import { handleCost } from '../../../services/rewardService';
import moment = require('moment');
export default function (app: Application) {
return new PopUpShopHandler(app);
@@ -39,18 +40,19 @@ export class PopUpShopHandler {
/**
* @description 购买礼包
* @param {{ activityId: number, id: number}} msg
* @param {{ activityId: number, id: number, beginTime: Date}} msg
* @param {BackendSession} session
* @memberof PopUpShopHandler
*/
async buyGift(msg: { activityId: number, id: number }, session: BackendSession) {
const { activityId, id } = msg;
async buyGift(msg: { activityId: number, id: number, beginTime: Date }, session: BackendSession) {
const { activityId, id, beginTime } = 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 beginDate = moment(beginTime).toDate();
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
if (!activityData) {
return resResult(STATUS.ACTIVITY_MISSING);
@@ -72,7 +74,7 @@ export class PopUpShopHandler {
return resResult(STATUS.ACTIVITY_NEED_PAY);
}
let playerRecords: ActivityPopUpShopModelType = await ActivityPopUpShopModel.findOpenDataByTaskId(serverId, activityId, roleId, id, playerData.taskType);
let playerRecords: ActivityPopUpShopModelType = await ActivityPopUpShopModel.findDataByBeginTime(serverId, activityId, roleId, id, playerData.taskType, beginDate);
if (!playerRecords) {
return resResult(STATUS.ACTIVITY_POP_UP_SHOP_EXPIRE);
}
@@ -96,7 +98,7 @@ export class PopUpShopHandler {
let rewardParamArr: Array<RewardParam> = stringToRewardParam(playerData.reward);
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
await ActivityPopUpShopModel.addRecord(serverId, activityId, roleId, id, playerData.taskType, 1);
await ActivityPopUpShopModel.addRecord(serverId, activityId, roleId, id, playerData.taskType, 1, beginDate);
playerData.buyCount += 1;
return resResult(STATUS.SUCCESS, Object.assign(result, {
game-server/app/servers/order/handler/orderHandler.ts
+8 -8
View File
@@ -24,12 +24,12 @@ export class orderHandler {
/**
* @description 获取订单号
* @param {{productID:string, payType:number ,activityId: number }} msg
* @param {{productID:string, payType:number ,activityId: number, paramStr: string }} msg
* @param {BackendSession} session
* @memberof orderHandler
*/
async applyOrder(msg: { productID: string, payType: number, activityId: number }, session: BackendSession) {
const { productID, payType, activityId } = msg;
async applyOrder(msg: { productID: string, payType: number, activityId: number, paramStr: string }, session: BackendSession) {
const { productID, payType, activityId, paramStr } = msg;
const roleId = session.get('roleId');
const serverId = session.get('serverId');
@@ -83,7 +83,7 @@ export class orderHandler {
console.log('未知支付类型');
return resResult(STATUS.NO_PAY_TYPE);
}
await UserOrderModel.applyOrder(serverId, roleId, productID, localOrderID, orderID, price, payType, activityId);
await UserOrderModel.applyOrder(serverId, roleId, productID, localOrderID, orderID, price, payType, activityId, paramStr, message);
return resResult(STATUS.SUCCESS, { orderInfo: sdkOrderInfo, productInfo, localOrderID });
}
@@ -201,12 +201,12 @@ export class orderHandler {
/**
* @description 支付测试
* @param {{productID:string, magicWord:string }} msg
* @param {{productID:string, magicWord:string, paramStr: string }} msg
* @param {BackendSession} session
* @memberof orderHandler
*/
async debugOrder(msg: { productID: string, magicWord: string }, session: BackendSession) {
const { magicWord, productID, } = msg;
async debugOrder(msg: { productID: string, magicWord: string, paramStr: string }, session: BackendSession) {
const { magicWord, productID, paramStr } = msg;
if (magicWord !== DEBUG_MAGIC_WORD) {
return resResult(STATUS.TOKEN_ERR);
}
@@ -243,7 +243,7 @@ export class orderHandler {
}
let activityData = activityArray[0];
let activityId = activityData.activityId;
await UserOrderModel.applyOrder(serverId, roleId, productID, localOrderID, orderID, price, payType, activityId);
await UserOrderModel.applyOrder(serverId, roleId, productID, localOrderID, orderID, price, payType, activityId, paramStr, message);
//订单成功
let orderInfo = await UserOrderModel.success(roleId, localOrderID);
game-server/app/services/orderService.ts
+2 -2
View File
@@ -85,9 +85,9 @@ export async function makeOrder(localOrderID: string, sid: string, orderInfo: Us
rewardResult = await makeDailyRMBGiftsReward(roleId, roleInfo.roleName, sid, orderInfo.serverId, roleInfo.funcs, orderInfo.activityId, orderInfo.productID)
break;
}
case ACTIVITY_TYPE.POP_UP_SHOP:
case ACTIVITY_TYPE.POP_UP_SHOP://弹出礼包
{
rewardResult = await makePopUpShopReward(roleId, roleInfo.roleName, sid, orderInfo.serverId, roleInfo.funcs, orderInfo.activityId, orderInfo.productID)
rewardResult = await makePopUpShopReward(roleId, roleInfo.roleName, sid, orderInfo.serverId, roleInfo.funcs, orderInfo.activityId, orderInfo.productID, orderInfo.paramStr)
break;
}
case ACTIVITY_TYPE.GROWTH_FUND_MAIN_VIP: //主线成长基金（高阶）
game-server/app/services/popUpShopService.ts
+9 -3
View File
@@ -67,7 +67,13 @@ export async function getPlayerPopUpShopData(activityId: number, serverId: numbe
*
*/
export async function makePopUpShopReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
activityId: number, productID: string) {
activityId: number, productID: string, paramStr: string) {
if (!paramStr) {
return STATUS.ORDER_PARAM_ERROR;
}
let paramObj = JSON.parse(paramStr);
let beginTime = moment(paramObj.beginTime).toDate();
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
if (!activityData) {
return STATUS.ACTIVITY_MISSING;
@@ -81,7 +87,7 @@ export async function makePopUpShopReward(roleId: string, roleName: string, sid:
return STATUS.ACTIVITY_NO_PRODUCT;
}
let playerData = new PopUpShopData(allTaskData[taskIndex], activityId);
let playerRecord: ActivityPopUpShopModelType = await ActivityPopUpShopModel.findOpenDataByTaskId(serverId, activityId, roleId, playerData.id, playerData.taskType);
let playerRecord: ActivityPopUpShopModelType = await ActivityPopUpShopModel.findDataByBeginTime(serverId, activityId, roleId, playerData.id, playerData.taskType, beginTime);
if (!playerRecord) {
return STATUS.APPLY_ORDER_ERROR;
}
@@ -95,7 +101,7 @@ export async function makePopUpShopReward(roleId: string, roleName: string, sid:
if (playerRecord.buyCount >= playerData.count) {
return STATUS.ACTIVITY_REWARDED;
}
playerRecord = await ActivityPopUpShopModel.addRecord(serverId, activityId, roleId, playerData.id, playerData.taskType, 1);
playerRecord = await ActivityPopUpShopModel.addRecord(serverId, activityId, roleId, playerData.id, playerData.taskType, 1, beginTime);
playerData.setPlayerRecords(playerRecord);
let rewardParamArr: Array<RewardParam> = stringToRewardParam(playerData.reward);