活动：招财进宝宝箱5点未领取发放邮箱

game-server/app/servers/activity/handler/dailyCoinHandler.ts

@@ -121,13 +121,13 @@ export class DailyCoinHandler {
         //免费期间
         let time = moment(new Date()).valueOf();
         let result = await addReward(roleId, roleName, sid, serverId, newReward, ITEM_CHANGE_REASON.DAILY_COIN_EXCHANGE);
-        let record = await ActivityDailyCoinModel.addExchangeRecord(serverId, activityId, roleId, playerData.roundIndex, count, addCoin, `${count}&${consumeGold}&${addCoin}&${time}`);
-        let extraReward = playerData.setAllBoxStatus(record);
 
-        let exchangeCount = playerData.exchangeCount + count;
+        let extraReward = playerData.addExchangeCount(count);
+        await ActivityDailyCoinModel.addExchangeRecord(serverId, activityId, roleId, playerData.roundIndex, count, addCoin, `${count}&${consumeGold}&${addCoin}&${time}`, playerData.hasNotReceivedBox());
+
         return resResult(STATUS.SUCCESS, Object.assign(result, {
             param: { activityId, count, extraReward },
-            item: { exchangeCount, recordMsg: `${count}&${consumeGold}&${addCoin}&${time}`, rateArray },
+            item: { exchangeCount: playerData.exchangeCount, recordMsg: `${count}&${consumeGold}&${addCoin}&${time}`, rateArray },
         }));
     }
 
@@ -155,8 +155,8 @@ export class DailyCoinHandler {
         let rewardArray = stringToRewardParam(box.reward)
         let result = await addReward(roleId, roleName, sid, serverId, rewardArray, ITEM_CHANGE_REASON.ACT_DAILY_COIN_RECEIVE_BOX);
 
-        let record = await ActivityDailyCoinModel.receiveBox(serverId, activityId, roleId, playerData.roundIndex, cellIndex);
-        let item = playerData.setBoxStatus(cellIndex, record);
+        let item = playerData.receiveBox(cellIndex);
+        await ActivityDailyCoinModel.receiveBox(serverId, activityId, roleId, playerData.roundIndex, cellIndex, playerData.hasNotReceivedBox());
 
         return resResult(STATUS.SUCCESS, Object.assign(result, {
             item,

game-server/app/services/activity/dailyCoinService.ts

@@ -1,9 +1,13 @@
-import { ACTIVITY_TYPE } from '../../consts';
+import { ACTIVITY_TYPE, MAIL_TYPE, REFRESH_TIME } from '../../consts';
 import { ActivityModel, ActivityModelType } from '../../db/Activity';
 import { ActivityDailyCoinModel, ActivityDailyCoinModelType } from '../../db/ActivityDailyCoin';
 import { RoleModel } from '../../db/Role';
-import { ServerlistModel } from '../../db/Serverlist';
+import { ServerlistModel, ServerlistType } from '../../db/Serverlist';
 import { DailyCoinData } from '../../domain/activityField/dailyCoinField';
+import { RewardInter } from '../../pubUtils/interface';
+import { stringWithTypeToRewardInter } from '../../pubUtils/roleUtil';
+import { getZeroPointD, getZeroPointOfTimeD } from '../../pubUtils/timeUtil';
+import { sendMailByContent } from '../mailService';
 import { getRoleCreateTime, getServerCreateTime } from '../redisService';
 import { getActivitiesByType, getActivityById } from './activityService';
 
@@ -27,6 +31,40 @@ export async function getPlayerDailyCoinData(activityId: number, serverId: numbe
     return playerData;
 }
 
+export async function sendUnReceivedActivityDailyCoin(servers: ServerlistType[]) {
+    let today = new Date().setHours(REFRESH_TIME, 0, 0, 0);
+    let yesterday = today - 86400000;
+    let unreceivedRecord = await ActivityDailyCoinModel.findUnreceivedBox(new Date(yesterday), new Date(today));
+    for(let { serverId } of servers) {
+        let serverTime = await getServerCreateTime(serverId);
+        let activities = await getActivitiesByType(serverId, ACTIVITY_TYPE.DAILY_COIN);
+        for(let activityData of activities) {
+            for(let playerRecord of unreceivedRecord) {
+                if(playerRecord.activityId != activityData.activityId) continue;
+                if(playerRecord.serverId != serverId) continue;
+                await sendUnReceivedRecor(activityData, playerRecord, serverTime);
+            }
+        }
+    }
+}
+
+async function sendUnReceivedRecor(activityData: ActivityModelType, playerRecord: ActivityDailyCoinModelType, serverTime: number) {
+    let createTime = await getRoleCreateTime(playerRecord.roleId);
+
+    let playerData = new DailyCoinData(activityData, createTime, serverTime);
+    playerData.setPlayerRecords(playerRecord);
+    let unreceivedRecord = playerData.getUnReceivedBox();
+    if(unreceivedRecord.length > 0) {
+        let rewards: RewardInter[] = [], boxIds: number[] = [];
+        for(let { cellIndex, reward } of unreceivedRecord) {
+            rewards.push(...stringWithTypeToRewardInter(reward));
+            boxIds.push(cellIndex);
+        }
+        await sendMailByContent(MAIL_TYPE.DAILY_COIN, playerRecord.roleId, { goods: rewards });
+        await ActivityDailyCoinModel.repaireBox(playerRecord._id, boxIds);
+    }
+}
+
 export function mergeData(data: any[]) {
     let newDate = [];
     for (let item of data) {

game-server/app/services/guildActivity/guildActivityService.ts

@@ -1,4 +1,4 @@
-import { ServerlistModel } from "../../db/Serverlist";
+import { ServerlistModel, ServerlistType } from "../../db/Serverlist";
 import { RoleModel } from "../../db/Role";
 import { GUILDACTIVITY } from "../../pubUtils/dicParam";
 import { gameData, getGuildAuctionRewards, getCityActivityRewards } from "../../pubUtils/data";
@@ -54,8 +54,7 @@ export function getRaceActivityObj() {
 /**
  * 定时任务，获得前一天的活跃玩家中位数武将战力
  */
-export async function setPreDayActiveData() {
-    let servers = await ServerlistModel.findByEnv(pinus.app.get('env'));
+export async function setPreDayActiveData(servers: ServerlistType[]) {
 
     for (let server of servers) {
         let roles = await RoleModel.getActivePlayers(server.id);

game-server/app/services/timeTaskService.ts

@@ -38,6 +38,7 @@ import { sendMessageToServer } from './pushService';
 import { resResult } from '../pubUtils/util';
 import { checkPopUpConditionWhenGuildActivityEnd } from './activity/popUpShopService';
 import { pushRefreshTime } from './connectorService';
+import { sendUnReceivedActivityDailyCoin } from './activity/dailyCoinService';
 
 const PER_SECOND = 1 * 1000;
 const PER_DAY = 24 * 60 * 60;
@@ -99,9 +100,11 @@ export async function init() {
 
 // 每日刷新
 export async function everydayRefresh() {
+    let servers = await ServerlistModel.findByEnv(pinus.app.get('env'));
     pushRefreshTime();
-    setPreDayActiveData();
+    setPreDayActiveData(servers);
     sendUngotDividendJob();
+    sendUnReceivedActivityDailyCoin(servers);
 }