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

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) {
-        let result: ActivityModelType[] = await ActivityModel.find({ serverId, type }).lean(lean);
+    public static async findActivityByType(serverId: number, type: number, sort: number) {
+        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) {