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/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);