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

后台：虚拟充值，修复多购买次数后弹窗不消失bug

Browse Source
This commit is contained in:
luying
2022-02-21 14:31:22 +08:00
parent d2c4cefc6a
commit a52715b852
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/gmService.ts
+19 -5
View File
@@ -28,7 +28,7 @@ import { TreasureHuntData } from "../domain/activityField/treasureHuntField";
import { RefreshShopData } from "../domain/activityField/refreshShopField"; import { RefreshShopData } from "../domain/activityField/refreshShopField";
import { RoleType } from "../db/Role"; import { RoleType } from "../db/Role";
import { MonopolyData } from "../domain/activityField/monopolyField"; import { MonopolyData } from "../domain/activityField/monopolyField";
import { ActivityPopUpShopModel } from "../db/ActivityPopUpShop"; import { ActivityPopUpShopModel, ActivityPopUpShopModelType } from "../db/ActivityPopUpShop";
// —————————————— 跑马灯 —————————————— // // —————————————— 跑马灯 —————————————— //
// 初始 // 初始
@@ -297,10 +297,24 @@ export async function getParamStr(activity: ActivityModelType, productID: string
let allTaskData: any[] = JSON.parse(activity.data); let allTaskData: any[] = JSON.parse(activity.data);
let task = allTaskData.find(cur => cur.productID == productID); let task = allTaskData.find(cur => cur.productID == productID);
if(!task) break; if(!task) break;
let beginTime = new Date();
let endTime = moment(new Date()).add(task.duration, 'h').toDate(); let playerRecords = await ActivityPopUpShopModel.findAllOpenData(role.serverId, activity.activityId, role.roleId);
let playerRecord = await ActivityPopUpShopModel.addTaskPushMessage(role.serverId, activity.activityId, role.roleId, task.id, task.taskType, task.condition, beginTime, endTime); let playerRecord: ActivityPopUpShopModelType;
param['beginTimeStamp'] = playerRecord.beginTime; for(let record of playerRecords) {
let playerData = new PopUpShopData(task, activity.activityId);
playerData.setPlayerRecords(record);
if (record && playerData.buyCount < task.count) {
playerRecord = record; break;
}
}
console.log('####', playerRecord, task)
if(!playerRecord) {
let beginTime = new Date();
let endTime = moment(new Date()).add(task.duration, 'h').toDate();
playerRecord = await ActivityPopUpShopModel.addTaskPushMessage(role.serverId, activity.activityId, role.roleId, task.id, task.taskType, task.condition, beginTime, endTime);
}
param['beginTimeStamp'] = playerRecord.beginTime.getTime();
break; break;
case ACTIVITY_TYPE.REFRESH_SHOP: case ACTIVITY_TYPE.REFRESH_SHOP:
let { activityGroupId } = await ServerlistModel.findByServerId(role.serverId); let { activityGroupId } = await ServerlistModel.findByServerId(role.serverId);