活动：首冲活动添加查询是否结束相关逻辑

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

@@ -1,7 +1,7 @@
 import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 import { FIRST_GIFT_STATE, STATUS } from '../../../consts';
-import { firstGiftActivity, getPlayerFirstGiftData } from '../../../services/firstGiftService';
+import { getPlayerFirstGiftData } from '../../../services/firstGiftService';
 import { RoleModel } from '../../../db/Role';
 import { addReward, stringToRewardParam, useGiftPackage } from '../../../services/giftPackageService';
 import { ActivityFirstGiftModel } from '../../../db/ActivityFirstGift';
@@ -16,18 +16,19 @@ export class FirstGiftHandler {
 
     /************************首充礼包****************************/
 
-    /**
+    /**首冲活动按玩家注册时间
+     * 不充，首充活动就一直在那里
     * @description 获取首充礼包数据
-    * @param {{ }} msg
+    * @param {{ activityId: number, }} msg
     * @param {BackendSession} session
     * @memberof FirstGiftHandler
     */
-    async getFirstGiftActivity(msg: {}, session: BackendSession) {
+    async getFirstGiftActivity(msg: { activityId: number }, session: BackendSession) {
-        const { } = msg;
+        const { activityId } = msg;
         const roleId = session.get('roleId');
         const serverId = session.get('serverId');
 
-        let playerData = await firstGiftActivity(serverId, roleId);
+        let playerData = await getPlayerFirstGiftData(activityId, serverId, roleId);
         if (!playerData) {
             return resResult(STATUS.ACTIVITY_MISSING);
         }
@@ -58,12 +59,9 @@ export class FirstGiftHandler {
         if (!playerData) {
             return resResult(STATUS.ACTIVITY_MISSING);
         }
-        if (playerData.state === FIRST_GIFT_STATE.NOT_OPEN) {
+        if (playerData.state === FIRST_GIFT_STATE.CLOSED) {
             return resResult(STATUS.ACTIVITY_FIRST_GIFT_NOT_OPEN);
-        } else if (playerData.state === FIRST_GIFT_STATE.CLOSED) {
-            return resResult(STATUS.ACTIVITY_FIRST_GIFT_END);
         }
-
         let items = playerData.canReceiveItems();
         if (items.length === 0) {
             return resResult(STATUS.ACTIVITY_REWARDED);
@@ -77,7 +75,9 @@ export class FirstGiftHandler {
         }
         let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardArray);
 
-        await ActivityFirstGiftModel.addRecord(activityId, roleId, indexArray);
+        let isOver = playerData.isComplete();
+
+        await ActivityFirstGiftModel.addRecord(activityId, roleId, indexArray, isOver);
 
         return resResult(STATUS.SUCCESS, Object.assign(result, {
             param: { activityId },

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

@@ -55,10 +55,7 @@ export class ThirtyDaysHandler {
 
         let todayIndex = await playerThirtyDaysActivityDays(roleId);//玩家当前的天数
 
-        let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.THIRTY_DAYS, true)
+        let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.THIRTY_DAYS, 1)
-        activityArray = activityArray.sort((a, b) => {
-            return a.activityId - b.activityId
-        });
 
         let activityDays = 0;
         for (let i = 0; i < activityArray.length; i++) {

game-server/app/services/dailyRMBGiftsService.ts

@@ -18,10 +18,8 @@ import { addReward, stringToRewardParam } from './giftPackageService';
    */
 
 export async function thirtyDaysActivity(type: number, serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, true)
+    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, 1)
-    activityArray = activityArray.sort((a, b) => {
+
-        return a.activityId - b.activityId
-    });
     let allPlayerActivity = [];
     for (let i = 0; i < activityArray.length; i++) {
         let activityData = activityArray[i];

game-server/app/services/firstGiftService.ts

@@ -1,7 +1,7 @@
 import { ACTIVITY_TYPE, TASK_TYPE } from '../consts';
 import { ActivityModel, ActivityModelType } from '../db/Activity';
 import { ActivityFirstGiftModel, ActivityFirstGiftModelType } from '../db/ActivityFirstGift';
-import { FirstGiftData, FirstGiftItem } from '../domain/activityField/firstGiftField';
+import { FirstGiftData } from '../domain/activityField/firstGiftField';
 
 /**
    * 获取活动数据
@@ -13,16 +13,20 @@ import { FirstGiftData, FirstGiftItem } from '../domain/activityField/firstGiftF
    */
 
 export async function firstGiftActivity(serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.FIRST_GIFT, true)
+    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.FIRST_GIFT, 1)
-    activityArray = activityArray.sort((a, b) => {
+
-        return a.activityId - b.activityId
-    });
     if (activityArray.length == 0) {
         return null;
     }
     let activityData = activityArray[0];
-    let playerData = await getPlayerFirstGiftData(activityData.activityId, serverId, roleId);
+    let playerRecord: ActivityFirstGiftModelType = await ActivityFirstGiftModel.findData(activityData.activityId, roleId);
-    return playerData
+    if (playerRecord.isOver) {
+        return true;
+    }
+
+    let playerData = new FirstGiftData(activityData);
+    playerData.setPlayerRecords(playerRecord);
+    return playerData;
 }
 
 /**

game-server/app/services/growthFundService.ts

@@ -22,10 +22,8 @@ import { GrowthFundData, GrowthFundItem } from '../domain/activityField/growthFu
   GROWTH_FUND_MAIN_ELITE_VIP = 11, // 精英成长基金（高阶）
 */
 export async function growthFundActivity(type: number, serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, true)
+    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, 1)
-    activityArray = activityArray.sort((a, b) => {
+
-        return a.activityId - b.activityId
-    });
     for (let i = 0; i < activityArray.length; i++) {
         let activityData = activityArray[i];
         let playerData = await getPlayerGrowthFundData(activityData.activityId, serverId, roleId);

game-server/app/services/orderService.ts

@@ -9,6 +9,8 @@ import { makeMonthlyTicketReward } from './monthlyTicketService';
 import { makeSignInVIP } from './signInService';
 import { makeDailyRMBGiftsReward } from './dailyRMBGiftsService';
 import { makePopUpShopReward } from './popUpShopService';
+import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityFirstGiftModel } from '../db/ActivityFirstGift';
 
 
 
@@ -39,6 +41,15 @@ export async function makeOrder(localOrderID: string, sid: string) {
 
     const roleInfo = await RoleModel.findByRoleId(roleId);
 
+    //首冲礼包
+    {
+        let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(orderInfo.serverId, ACTIVITY_TYPE.FIRST_GIFT, new Date())
+        for (let obj of activityArray) {
+            await ActivityFirstGiftModel.begin(obj.activityId, roleId);
+        }
+    }
+
+
     switch (productType) {
         case ACTIVITY_TYPE.SIGN_IN_VIP:
             {

game-server/app/services/thirtyDaysService.ts

@@ -18,10 +18,8 @@ import { deltaDays } from '../pubUtils/util';
    */
 
 export async function thirtyDaysActivity(type: number, serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, true)
+    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, 1)
-    activityArray = activityArray.sort((a, b) => {
+
-        return a.activityId - b.activityId
-    });
     let allPlayerActivity = [];
     for (let i = 0; i < activityArray.length; i++) {
         let activityData = activityArray[i];

game-server/app/services/yuanbaoService.ts

@@ -15,10 +15,7 @@ import { addReward, stringToRewardParam } from './giftPackageService';
    */
 
 export async function yuanbaoActivity(serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.YUAN_BAO_SHOP, true)
+    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.YUAN_BAO_SHOP, -1)
-    activityArray = activityArray.sort((a, b) => {
-        return b.activityId - a.activityId
-    });
     if (activityArray.length == 0) {
         return null;
     }

shared/consts/constModules/activityConst.ts

@@ -63,9 +63,8 @@ export enum SELF_SERVICE_SHOP_CELL_TYPE {
  * 活动首充礼包的状态
  */
 export enum FIRST_GIFT_STATE {
-    NOT_OPEN = 0, // 未开启
+    CLOSED = 0, // 未开启
     OPEN = 1, // 开启中
-    CLOSED = 2, //结束
 }
 
 /**

shared/db/Activity.ts

@@ -29,8 +29,8 @@ export default class Activity extends BaseModel {
     }
 
     //根据活动类型查询活动数据
-    public static async findActivityByType(serverId: number, type: number, lean = true) {
+    public static async findActivityByType(serverId: number, type: number, sort: number) {
-        let result: ActivityModelType[] = await ActivityModel.find({ serverId, type }).lean(lean);
+        let result: ActivityModelType[] = await ActivityModel.find({ serverId, type }).sort({ activityId: sort }).lean(true);
         return result;
     }
 

shared/db/ActivityFirstGift.ts

@@ -13,12 +13,13 @@ export default class ActivityFirstGift extends BaseModel {
     roleId: string;			        // 用户Id
     @prop({ required: true })
     days: Array<number>;		    // 领取过的奖励
-
+    @prop({ required: true })
+    isOver: boolean;		    // 是否全部领取结束
 
     //添加领取记录
-    public static async addRecord(activityId: number, roleId: string, indexArray: number[]) {
+    public static async addRecord(activityId: number, roleId: string, indexArray: number[], isOver: boolean) {
         let result: ActivityFirstGiftModelType = await ActivityFirstGiftModel.findOneAndUpdate({ roleId, activityId, },
-            { $push: { days: { $each: indexArray } } }, { upsert: true, new: true }).lean(true);
+            { $push: { days: { $each: indexArray } }, $set: { isOver: isOver } }, { new: true }).lean(true);
         return result;
     }
 

shared/domain/activityField/firstGiftField.ts

@@ -24,9 +24,8 @@ export class FirstGiftItem {
 
 // 30天任务活动数据
 export class FirstGiftData extends ActivityBase {
-    state: number = FIRST_GIFT_STATE.NOT_OPEN;//活动状态
+    state: number = FIRST_GIFT_STATE.CLOSED;//活动状态
     list: Array<FirstGiftItem> = [];//奖励
-    days: number = 0;//展示天数
 
     //全部领取完成
     public isComplete() {
@@ -47,9 +46,9 @@ export class FirstGiftData extends ActivityBase {
         return null;
     }
 
-    //奖励内容
+    //可以领取的奖励
     public canReceiveItems(): FirstGiftItem[] {
-        return this.list.filter(obj => { return obj && !obj.isReceive });
+        return this.list.filter(obj => { return obj && !obj.isReceive && obj.index <= this.todayIndex });
     }
 
     //解析玩家任务领取记录
@@ -59,7 +58,7 @@ export class FirstGiftData extends ActivityBase {
             return;
         }
         this.todayIndex = deltaDays(data.createdAt, new Date) + 1;
-        this.state = (this.todayIndex <= this.days) ? FIRST_GIFT_STATE.OPEN : FIRST_GIFT_STATE.CLOSED;
+        this.state = FIRST_GIFT_STATE.OPEN
 
         let daysNum = data.days ? data.days : [];
         for (let obj of this.list) {
@@ -71,7 +70,6 @@ export class FirstGiftData extends ActivityBase {
 
     public initData(data: string) {
         let dataObj = JSON.parse(data);
-        this.days = dataObj.days;
 
         let arr = dataObj.data;
         for (let obj of arr) {