活动：目标点数兑换奖励过期判断

shared/domain/activityField/thirtyDaysField.ts

@@ -16,18 +16,23 @@ export class ThirtyDaysPointItem {
 
     isReceive: boolean = false;          //是否领取过奖励
 
+    isExpired: boolean = false;         //奖励是否已经过期
 
     constructor(data: any) {
         this.cellIndex = data.cellIndex;
         this.consumePoint = data.consumePoint;
         this.reward = data.reward;
         this.expiredReward = data.expiredReward;
-
     }
 
     public heroReward(): CreateHeroParam[] {
+        let data = this.reward;
+        if (this.isExpired && this.expiredReward && this.expiredReward != '') {//过期奖励
+            data = this.expiredReward;
+        }
+
         let rewardArray = [];
-        let rewardData = this.reward.split('|').filter(obj => { return obj && obj != '' });
+        let rewardData = data.split('|').filter(obj => { return obj && obj != '' });
         for (let objStr of rewardData) {
             let reward = parseHeroStrWithType(objStr);
             rewardArray.push(reward);
@@ -36,8 +41,12 @@ export class ThirtyDaysPointItem {
     }
 
     public goodReward(): RewardInter[] {
+        let data = this.reward;
+        if (this.isExpired && this.expiredReward && this.expiredReward != '') {//过期奖励
+            data = this.expiredReward;
+        }
         let rewardArray = [];
-        let rewardData = this.reward.split('|').filter(obj => { return obj && obj != '' });
+        let rewardData = data.split('|').filter(obj => { return obj && obj != '' });
         for (let objStr of rewardData) {
             let reward = parseGoodStrWithType(objStr);
             rewardArray.push(reward);
@@ -62,7 +71,6 @@ export class ThirtyDaysItem {
     isComplete: boolean = false;          //是否完成任务
     isReceive: boolean = false;          //是否领取过奖励
 
-
     constructor(data: any, pageIndex: number) {
         this.pageIndex = pageIndex;
         this.cellIndex = data.cellIndex;
@@ -150,6 +158,42 @@ export class ThirtyDaysData extends ActivityBase {
         return true;
     }
 
+    //查询过期但未标记的点数奖励
+    public needMark(): Array<ThirtyDaysPointItem> {
+        let data = this.pointRewardList.sort((a, b) => { return a.cellIndex - b.cellIndex });
+        let point = this.totalPoint;
+        let expiredData = [];
+        for (let item of data) {
+            if (point < item.consumePoint) {
+                if (!item.isExpired)
+                    expiredData.push(item);
+            } else {
+                point -= item.consumePoint;
+            }
+        }
+        return expiredData
+    }
+
+    //查询过期的点数奖励
+    public expiredPointItem(): Array<ThirtyDaysPointItem> {
+        let data = this.pointRewardList.sort((a, b) => { return a.cellIndex - b.cellIndex });
+        let point = this.totalPoint;
+        let expiredData = [];
+        for (let item of data) {
+            if (point < item.consumePoint) {
+                expiredData.push(item);
+            } else {
+                point -= item.consumePoint;
+            }
+        }
+        return expiredData
+    }
+
+    //还未兑换的点数奖励
+    public notReceivedPointItem(): Array<ThirtyDaysPointItem> {
+        return this.pointRewardList.filter(obj => { return obj && !obj.isReceive })
+    }
+
     //点数兑换的奖励内容
     public findThirtyDaysPointItem(cellIndex: number): ThirtyDaysPointItem {
         let index = this.pointRewardList.findIndex(obj => { return obj && obj.cellIndex == cellIndex })
@@ -175,7 +219,8 @@ export class ThirtyDaysData extends ActivityBase {
             let index = data.findIndex(record => { return obj.cellIndex == record.cellIndex })
             if (index != -1) {
                 this.consumePoint += obj.consumePoint;
-                obj.isReceive = data[index].isReceive;
+                obj.isReceive = data[index].isReceive === true;
+                obj.isExpired = data[index].isExpired === true;
             }
         }
     }
@@ -186,9 +231,11 @@ export class ThirtyDaysData extends ActivityBase {
         for (let record of data) {
             let itemData = this.findThirtyDaysItem(record.pageIndex, record.cellIndex)
             if (itemData) {
-                this.totalPoint += itemData.point;
-                itemData.isReceive = record.isReceive;
+                itemData.isReceive = record.isReceive === true;
                 itemData.isComplete = record.totalCount >= itemData.taskParamArray[0];
+                if (itemData.isReceive) {
+                    this.totalPoint += itemData.point;
+                }
             }
         }
     }