xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐞 fix(订单): 各种类型的订单在支付之前校验次数

Browse Source
This commit is contained in:
luying
2023-04-06 13:32:40 +08:00
parent f7ccc14f74
commit 08d5ebedeb
18 changed files with 224 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,16 +3,16 @@ import { ACTIVITY_TYPE, DEBUG_PRICE, MAIL_TYPE, ORDER_STATE, PAY_TYPE, PUSH_ROUT
import { dicRMB } from '../pubUtils/dictionary/DicRMB';
import { makeYuanbaoShopReward } from './activity/yuanbaoService';
import { RoleModel } from '../db/Role';
import { makeMonthlyTicketReward } from './activity/monthlyTicketService';
import { checkMonthlyTicket, makeMonthlyTicketReward } from './activity/monthlyTicketService';
import { checkSignInCanBuy, makeSignInVIP } from './activity/signInService';
import { makeDailyRMBGiftsReward } from './activity/dailyRMBGiftsService';
import { checkDailyRMBGifts, makeDailyRMBGiftsReward } from './activity/dailyRMBGiftsService';
import { checkPopUpShopCanBuy, makePopUpShopReward } from './activity/popUpShopService';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { makeGrowthFund } from './activity/growthFundService';
import { checkGrowthFund, makeGrowthFund } from './activity/growthFundService';
import { checkLimitPackageCanBuy, makeLimitPackageReward } from './activity/limitPackageService';
import { makeShop } from './activity/treasureHuntService';
import { makeSelfServerShop } from './activity/selfServiceShopActivityService';
import { makeRefreshShopReward } from './activity/refreshShopService';
import { checkTreasureHuntShop, makeShop } from './activity/treasureHuntService';
import { checkSelfServiceShop, makeSelfServerShop } from './activity/selfServiceShopActivityService';
import { checkRefreshShop, makeRefreshShopReward } from './activity/refreshShopService';
import { ActivityMonopolyModel, ActivityMonopolyModelType } from '../db/ActivityMonopoly';
import { ActivityMonopolyLandModel, ActivityMonopolyLandModelType } from '../db/ActivityMonopolyLand';
import { parseGoodStr, resResult } from '../pubUtils/util';
@@ -26,7 +26,7 @@ import { PayCallback37Data } from '../domain/sdk';
import { reportTAEvent, reportTAUserSet } from './sdkService';
import { savePayLog } from '../pubUtils/logUtil';
import { recordFirstGift } from './activity/firstGiftService';
import { makeTaskPass } from './activity/taskPassService';
import { checkTaskPass, makeTaskPass } from './activity/taskPassService';
import { addGuildPay } from './activity/guildPayService';
import { sendMessageToUserWithSuc } from './pushService';
import { checkParamPrice, needRebate } from '../pubUtils/sdkUtil';
@@ -69,6 +69,48 @@ export async function checkOrderCanBuy(roleId: string, serverId: number, activit
{
return await checkMonthlyFund(roleId, serverId, activityData, productID);
}
case ACTIVITY_TYPE.DAILY_RMB_GIFTS:
{
return await checkDailyRMBGifts(roleId, serverId, activityData, productID);
}
case ACTIVITY_TYPE.MONTHLY_TICKET_1:
case ACTIVITY_TYPE.MONTHLY_TICKET_2:
{
return await checkMonthlyTicket(roleId, serverId, activityData);
}
case ACTIVITY_TYPE.GROWTH_FUND_MAIN_VIP: //主线成长基金（高阶）
case ACTIVITY_TYPE.GROWTH_FUND_TOWER_VIP://镇念塔成长基金（高阶）
case ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE_VIP://精英成长基金（高阶）
{
return await checkGrowthFund(roleId, serverId, activityData, productID);
}
case ACTIVITY_TYPE.SELF_SERVICE_SHOP:
{
return await checkSelfServiceShop(roleId, serverId, activityData, productID);
}
case ACTIVITY_TYPE.TASK_PASS:
{
return await checkTaskPass(roleId, serverId, activityData, productID);
}
case ACTIVITY_TYPE.REFRESH_SHOP://通用的刷新商店（分页，可刷新，限制购买次数，支持rmb与资源兑换）
{
if (paramStr) {//大富翁商店结算
let paramObj = JSON.parse(paramStr);
let activityId = paramObj.activityId;//大富翁活动id； orderInfo.activityId是大富翁中的商店活动id
if (activityId) {
let playerMonopolyData: ActivityMonopolyModelType = await ActivityMonopolyModel.findData(serverId, activityId, roleId);
let playerLandData: ActivityMonopolyLandModelType = await ActivityMonopolyLandModel.findDataByPosition(serverId, activityId, roleId, playerMonopolyData.curPosition);
let roundIndex = playerLandData.stopCount;
return await checkRefreshShop(roleId, serverId, activityData, productID, roundIndex);
}
}
//正常商店结算
return await checkRefreshShop(roleId, serverId, activityData, productID, 0);
}
case ACTIVITY_TYPE.TREASURE_HUNT://寻宝奇兵活动-每日物资商店
{
return await checkTreasureHuntShop(roleId, serverId, activityData, productID);
}
}
return true
}