From 93437fb143b4d699ee9c41662d765d2b01cf4fb0 Mon Sep 17 00:00:00 2001
From: zhangxk <zhangxiaokang@bantus.cn>
Date: Mon, 18 Sep 2023 18:40:28 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E9=87=8D=E9=98=B3=E9=9B=86?=
 =?UTF-8?q?=E4=BC=9A):=20=E6=B7=BB=E5=8A=A0=E8=B4=AD=E4=B9=B0=E6=B6=88?=
 =?UTF-8?q?=E8=80=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/servers/activity/handler/chongyangHandler.ts     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/game-server/app/servers/activity/handler/chongyangHandler.ts b/game-server/app/servers/activity/handler/chongyangHandler.ts
index 8b3cc9196..7c7b336b8 100644
--- a/game-server/app/servers/activity/handler/chongyangHandler.ts
+++ b/game-server/app/servers/activity/handler/chongyangHandler.ts
@@ -4,8 +4,8 @@ import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
 import { getPlayerChongYangData, getPlayerChongYangDataShow } from '../../../services/activity/chongyangService';
 import { ActivityChongYangRecModel } from '../../../db/ActivityChongYangRec';
 import { RewardInter } from '../../../pubUtils/interface';
-import { stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { addItems } from '../../../services/role/rewardService';
+import { stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
+import { addItems, handleCost } from '../../../services/role/rewardService';
 import { getZeroPoint } from '../../../pubUtils/timeUtil';
 
 
@@ -109,6 +109,9 @@ export class ChongYangHandler {
         // 检测解锁
         if (dayIndex > playerData.dayIndexUnlock) return resResult(STATUS.ACTIVITY_CHONGYANG_LOCK);
 
+        // 扣材料
+        let costResult = await handleCost(roleId, sid, stringToConsumeParam(scene.buyCost), ITEM_CHANGE_REASON.ACT_ENTERTAIN_BUY_COST);
+        if (!costResult) return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH);
         // 保存数据
         let playerRecord = await ActivityChongYangRecModel.buyCnt(serverId, activityId, playerData.roundIndex, roleId, { dayIndex, buyCnt: count }, scene.isPushBuyRecord);
         if (!playerRecord) return resResult(STATUS.ACTIVITY_CHONGYANG_GAMECODE_NOT_FOUND);
@@ -136,7 +139,7 @@ export class ChongYangHandler {
         // 检测解锁
         if (dayIndex > playerData.dayIndexUnlock) return resResult(STATUS.ACTIVITY_CHONGYANG_LOCK);
         // 检测通关
-        let isHasPass = playerData.gameRecords.find(cur => cur.dayIndex == dayIndex && cur.isSuccess && !cur.isSkip && (getZeroPoint()*1000 <= cur.time.getTime()));
+        let isHasPass = playerData.gameRecords.find(cur => cur.dayIndex == dayIndex && cur.isSuccess && !cur.isSkip && (getZeroPoint() * 1000 <= cur.time.getTime()));
         if (!isHasPass) return resResult(STATUS.ACTIVITY_CHONGYANG_GAMESWEEP_LOCK);
 
         let rewards: RewardInter[] = [];