活动：新将好礼接口

shared/consts/constModules/activityConst.ts

@@ -49,6 +49,7 @@ export enum ACTIVITY_TYPE {
     REFRESH_TASK = 34, // 通用的刷新任务（分页，可刷新，限制领取次数）
     MONOPOLY = 35, //大富翁游戏
     COMMON_SIGN_IN = 36, //通用签到
+    NEW_HERO_GIFTS = 37, //新将好礼(很多红包，用积分兑换一遍结束)
 }
 
 /**

shared/db/ActivityNewHeroGift.ts

@@ -0,0 +1,64 @@
+import BaseModel from './BaseModel';
+import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
+
+/**
+  * 购买记录
+*/
+
+export class Record {
+    @prop({ required: true })
+    index: number; //下标记录
+    @prop({ required: true })
+    point: number; //消耗点数
+    @prop({ required: true })
+    time: Date; //兑换时间
+}
+
+
+/**
+  * 活动系统 -  新将好礼(很多红包，用积分兑换一遍结束),点数兑换奖品记录
+*/
+@index({ roleId: 1 })
+
+export default class Activity_New_Hero_Gift extends BaseModel {
+    @prop({ required: true })
+    serverId: number;				// 服id
+    @prop({ required: true })
+    activityId: number;				// 活动Id
+    @prop({ required: true })
+    roleId: string;			        // 用户Id
+    @prop({ required: true })
+    totalPoint: number;			    // 获得总点数
+    @prop({ required: true })
+    records: Record[];		        // 兑换红包消耗点数记录
+
+    //兑换记录
+    public static async addPoint(serverId: number, activityId: number, roleId: string, addPoint: number) {
+        let result: ActivityNewHeroGiftModelType = await ActivityNewHeroGiftModel.findOneAndUpdate({ serverId, roleId, activityId, },
+            { $inc: { totalPoint: addPoint } }, { upsert: true, new: true }).lean(true);
+        return result;
+    }
+
+    //兑换记录
+    public static async addReceiveRecord(serverId: number, activityId: number, roleId: string, index: number, point: number) {
+        let result: ActivityNewHeroGiftModelType = await ActivityNewHeroGiftModel.findOneAndUpdate({ serverId, roleId, activityId, },
+            { $push: { records: { index, point, time: new Date() } } }, { upsert: true, new: true }).lean(true);
+        return result;
+    }
+
+    //根据活动id查询活动数据
+    public static async findData(serverId: number, activityId: number, roleId: string,) {
+        let result: ActivityNewHeroGiftModelType = await ActivityNewHeroGiftModel.findOne({ serverId, roleId, activityId }).lean(true);
+        return result;
+    }
+
+    //删除活动领取记录
+    public static async deleteActivity(serverId: number, activityId: number, roleId: string) {
+        await ActivityNewHeroGiftModel.deleteMany({ serverId, roleId, activityId });
+    }
+}
+
+export const ActivityNewHeroGiftModel = getModelForClass(Activity_New_Hero_Gift);
+
+export interface ActivityNewHeroGiftModelType extends Pick<DocumentType<Activity_New_Hero_Gift>, keyof Activity_New_Hero_Gift> { }
+export type ActivityNewHeroGiftModelTypeParam = Partial<ActivityNewHeroGiftModelType>; // 将所有字段变成可选项

shared/domain/activityField/newHeroGiftField.ts

@@ -0,0 +1,70 @@
+import { ActivityModelType } from '../../db/Activity';
+import { ActivityNewHeroGiftModelType } from '../../db/ActivityNewHeroGift';
+import { ActivityBase } from './activityField';
+
+// 礼包的内容
+export class NewHeroGiftItem {
+    index: number;             // 下标
+    reward: string;         //任务奖励，格式:1&3&1(类型&id&数量) 类型定义:1.英雄，2.物品
+    countMax: number = 0;   //可购买的最大次数，0表示不限制
+    name: string;           //名字
+    consumePoint: number;   //消耗点数
+
+    buyCount: number = 0;   //兑换过的次数
+
+    constructor(data: any) {
+        this.index = data.index;
+        this.reward = data.reward;
+        this.countMax = data.countMax;
+        this.name = data.name;
+        this.consumePoint = data.consumePoint;
+        this.buyCount = 0;
+    }
+}
+
+// 新将礼包数据
+export class NewHeroGiftData extends ActivityBase {
+    name: string = '';//活动名称
+    list: Array<NewHeroGiftItem> = [];//礼包列表
+    totalPoint: number = 0;//获得总点数
+    consumeTotalPoint: number = 0;//消耗总点数
+
+    public findItem(index: number) {
+        let itemIndex = this.list.findIndex(obj => { return obj && obj.index === index });
+        return (itemIndex != -1) ? this.list[itemIndex] : null;
+    }
+
+    //解析玩家购买记录
+    public setPlayerRecords(data: ActivityNewHeroGiftModelType) {
+        if (!data) {
+            return;
+        }
+        this.totalPoint = data.totalPoint ? data.totalPoint : 0;
+        let records = data.records ? data.records : [];
+        for (let item of this.list) {
+            let buyRecords = records.filter(obj => { return obj && obj.index === item.index });
+            item.buyCount = buyRecords.length;
+        }
+        for (let obj of records) {
+            this.consumeTotalPoint += obj.point;
+        }
+    }
+
+
+    public initData(data: string) {
+        let dataObj = JSON.parse(data);
+        this.name = dataObj.name;
+        this.totalPoint = 0;
+        this.consumeTotalPoint = 0;
+
+        let arr = dataObj.data;
+        for (let obj of arr) {
+            this.list.push(new NewHeroGiftItem(obj))
+        }
+    }
+
+    constructor(activityData: ActivityModelType) {
+        super(activityData)
+        this.initData(activityData.data)
+    }
+}

shared/domain/activityField/refreshTaskField.ts

@@ -59,6 +59,7 @@ export class RefreshTaskData extends ActivityBase {
     list: Array<RefreshTaskPage> = [];
     nextRefreshTime: number;//下次刷新时间
     roundIndex: number = 1;//周期数从1开始
+    addPointActivityId: number = 0;//获得的点数，关联其他活动id(新将礼物)
 
     consumePoint: number = 0;//消耗点数兑换奖品
     reward: string = ''//消耗点数的奖品内容
@@ -112,6 +113,7 @@ export class RefreshTaskData extends ActivityBase {
         this.interval = dataObj.interval;
         this.consumePoint = dataObj.consumePoint;
         this.reward = dataObj.reward;
+        this.addPointActivityId = dataObj.addPointActivityId ? dataObj.addPointActivityId : 0;
         this.totalPoint = 0;
         this.exchangePoint = 0;