活动：每日充值

2022-03-04 09:47:24 +08:00
parent 17b5071d66
commit 8649cb82b7
8 changed files with 171 additions and 131 deletions
@@ -89,7 +89,7 @@ export class LuckyTurntableHandler {
        if(!canReceive) return resResult(STATUS.BOX_CAN_NOT_RECEIVE);

        let box = playerData.findBox(boxCount);
-        let rewardArray = stringToRewardParam(box.reward)
+        let rewardArray = stringToRewardParam(box.rewards)
        let result = await addReward(roleId, roleName, sid, serverId, rewardArray, ITEM_CHANGE_REASON.BUY_LIMIT_PACKAGE);
        await ActivityTurntableModel.receiveBox(serverId, activityId, roleId, boxCount);

@@ -1,11 +1,12 @@
 import { Application, BackendSession, HandlerService, } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
-import { getPlayerRechargeMoneyData } from '../../../services/activity/rechargeMoneyService';
-import { RechargeMoneyItem } from '../../../domain/activityField/rechargeMoneyField';
+import { getPlayerRechargeMoneyData, getPlayerRechargeMoneyDataShow } from '../../../services/activity/rechargeMoneyService';
+import { RechargeMoneyPool } from '../../../domain/activityField/rechargeMoneyField';
 import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { RewardParam } from '../../../domain/activityField/rewardField';
 import { ActivityRechargeMoneyModel } from '../../../db/ActivityRechargeMoney';
+import { addItems } from '../../../services/rewardService';


 export default function (app: Application) {
@@ -29,9 +30,8 @@ export class RechargeMoneyHandler {
        const roleId = session.get('roleId');
        const serverId = session.get('serverId');

-        let playerData = await getPlayerRechargeMoneyData(activityId, serverId, roleId);
+        let playerData = await getPlayerRechargeMoneyDataShow(activityId, serverId, roleId);
        if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
-        delete playerData.recordArray;

        return resResult(STATUS.SUCCESS, playerData);
    }
@@ -41,7 +41,7 @@ export class RechargeMoneyHandler {
   * @param {BackendSession} session
   * @memberof RechargeMoneyHandler
   */
-    async getRechargeMoneyReward(msg: { activityId: number }, session: BackendSession) {
+    async pull(msg: { activityId: number }, session: BackendSession) {
        const { activityId } = msg;
        const roleId = session.get('roleId');
        const serverId = session.get('serverId');
@@ -52,30 +52,26 @@ export class RechargeMoneyHandler {
        let playerData = await getPlayerRechargeMoneyData(activityId, serverId, roleId);
        if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);

-        if (playerData.totalCount <= playerData.receiveCount) {
-            return resResult(STATUS.ACTIVITY_RECHARGE_MONEY_NO_REWARD);
+        if (playerData.ticketCnt <= 0) {
+            return resResult(STATUS.ACTIVITY_RECHARGE_TICKET_NOT_ENOUGH);
        }

-        let item: RechargeMoneyItem = playerData.randomReward();
+        let item = playerData.pull();
        if (!item) {
-            return resResult(STATUS.ACTIVITY_RECHARGE_MONEY_ERROR);
+            return resResult(STATUS.ACTIVITY_RECHARGE_TICKET_NOT_ENOUGH);
        }

-        let recordArray = playerData.recordArray.filter(obj => { return obj && !obj.rewardTime })
-        let rechargeItem = recordArray[0];
-        // console.log('recordArray', JSON.stringify(recordArray));
-        await ActivityRechargeMoneyModel.addRecord(rechargeItem._id, item.id, item.reward)
-        let rewardParamArr: Array<RewardParam> = stringToRewardParam(item.reward);
-        let result = await addReward(roleId, roleName, sid, serverId, rewardParamArr, ITEM_CHANGE_REASON.RECHARGE_REWARD)
-        if (playerData.isLast()) {
-            let _ids = playerData.recordArray.map(a => a._id)
-            await ActivityRechargeMoneyModel.setEndState(serverId, roleId, _ids);
-        }
+        let notGetRecord = playerData.recordArr[0];
+        console.log('notGetRecord', JSON.stringify(notGetRecord));
+        await ActivityRechargeMoneyModel.addRecord(notGetRecord._id, item.id, `${item.gid}&${item.count}`);
+        let goods = await addItems(roleId, roleName, sid, [{ id: item.gid, count: item.count }], ITEM_CHANGE_REASON.RECHARGE_REWARD)

-        item.rewardTime = new Date();
-        return resResult(STATUS.SUCCESS, Object.assign(result, {
+        item.setHasGet(true);
+
+        return resResult(STATUS.SUCCESS, {
+            goods,
            param: { activityId },
            item: item
-        }));
+        });
    }
 }
@@ -5,7 +5,7 @@ import { getPlayerGrowthFundData, } from './growthFundService';
 import { getPlayerLimitPackageData, } from './limitPackageService';
 import { getPlayerYuanbaoShopData, } from './yuanbaoService';
 import { getPlayerMonthlyTicketData, } from './monthlyTicketService';
-import { getPlayerRechargeMoneyData, } from './rechargeMoneyService';
+import { getPlayerRechargeMoneyDataShow, } from './rechargeMoneyService';
 import { getPlayerThirtyDaysData, playerThirtyDaysActivityDays, } from './thirtyDaysService';
 import { getPlayerVipRechargeMoneyData, } from './vipRechargeMoneyService';
 import { getPlayerActivityData, } from './selfServiceShopActivityService';
@@ -106,7 +106,7 @@ export async function getActivity(serverId: number, roleId: string, activityId:
            }
        case ACTIVITY_TYPE.RECHARGE_MONEY://累计充值RMB活动 21
            {
-                activityData = await getPlayerRechargeMoneyData(activityId, serverId, roleId);
+                activityData = await getPlayerRechargeMoneyDataShow(activityId, serverId, roleId);
                break;
            }
        case ACTIVITY_TYPE.DAILY_RMB_GIFTS://每日特惠RMB购买，一次性购买7天礼包 22
@@ -1,41 +1,9 @@
-import { ACTIVITY_TYPE } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../../db/Activity';
 import { ActivityRechargeMoneyModel, ActivityRechargeMoneyModelType } from '../../db/ActivityRechargeMoney';
 import { RechargeMoneyData } from '../../domain/activityField/rechargeMoneyField';
 import moment = require('moment');
-import { ServerlistModel } from '../../db/Serverlist';
 import { RoleModel } from '../../db/Role';
 import { getActivityById } from './activityService';

-/**
-   * 获取活动数据
-   *
-   * @param {number} serverId 区Id
-   * @param {number} type 活动类型 ACTIVITY_TYPE
-   * @param {string} roleId 角色Id
-   *
-   */
-
-export async function rechargeMoneyActivity(serverId: number, roleId: string) {
-    let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
-    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.RECHARGE_MONEY, new Date())
-
-    let activityData = activityArray[0];
-    let playerRecord: ActivityRechargeMoneyModelType[] = await ActivityRechargeMoneyModel.findData(serverId, roleId);
-    let { createTime } = await RoleModel.findByRoleId(roleId);
-    let playerData = new RechargeMoneyData(activityData, createTime);
-    playerData.setPlayerRecords(playerRecord);
-    delete playerData.recordArray;
-    return playerData;
-
-    // let playerDataArray = [];
-    // for (let activityData of activityArray) {
-    //     let playerData = await getPlayerRechargeMoneyData(activityData.activityId, serverId, roleId);
-    //     playerDataArray.push(playerData)
-    // }
-    // return playerDataArray
-}
-
 /**
   * 玩家活动数据
   *
@@ -46,15 +14,23 @@ export async function rechargeMoneyActivity(serverId: number, roleId: string) {
   */
 export async function getPlayerRechargeMoneyData(activityId: number, serverId: number, roleId: string) {
    let activityData = await getActivityById(activityId);
-    let playerRecord: ActivityRechargeMoneyModelType[] = await ActivityRechargeMoneyModel.findData(serverId, roleId);
-
    let { createTime } = await RoleModel.findByRoleId(roleId);
    let playerData = new RechargeMoneyData(activityData, createTime);
+    let beginTime = moment(playerData.beginTime).startOf('d').toDate();
+    let endTime = moment(new Date()).endOf('d').toDate();
+    let playerRecord: ActivityRechargeMoneyModelType[] = await ActivityRechargeMoneyModel.findDataByTime(serverId, roleId, beginTime, endTime);
+
    playerData.setPlayerRecords(playerRecord);
    return playerData;
 }

-
+export async function getPlayerRechargeMoneyDataShow(activityId: number, serverId: number, roleId: string) {
+    let playerData = await getPlayerRechargeMoneyData(activityId, serverId, roleId);
+    if(playerData && playerData.canShow && playerData.canShow()) {
+        return playerData.getShowResult();
+    }
+    return null
+}

 /**
   * 统计充值金额