From 81e5b8440c575e29caf0aea3fd2f332f35bc4e73 Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期二, 14 八月 2018 17:27:37 +0800
Subject: [PATCH] [2155]丹药商店删除购买按钮

---
 System/SystemSetting/ActivitiesPushMgr.cs |   41 +++++++++++++++++++++++++++++++----------
 1 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/System/SystemSetting/ActivitiesPushMgr.cs b/System/SystemSetting/ActivitiesPushMgr.cs
index cc63db6..1dc3b54 100644
--- a/System/SystemSetting/ActivitiesPushMgr.cs
+++ b/System/SystemSetting/ActivitiesPushMgr.cs
@@ -63,6 +63,8 @@
         {
             SetRankStartPushInfo();
             SetRankEndPushInfo();
+            RemovePushByActiveClose(PushInfoType.RankStart);
+            RemovePushByActiveClose(PushInfoType.RankEnd);
         }
 
         private void SetRankStartPushInfo()
@@ -115,6 +117,33 @@
             }
         }
 
+        private void RemovePushByActiveClose(PushInfoType type)
+        {
+            switch (type)
+            {
+                case PushInfoType.RankStart:
+                    for (int i = 0; i < rankTypelist.Count; i++)
+                    {
+                        int rankStartId = WholePeopleRankStart + rankTypelist[i];
+                        if (impactRank.IsActivityClose(rankTypelist[i]))
+                        {
+                            RemovePushInfo(rankStartId);
+                        }
+                    }
+                    break;
+                case PushInfoType.RankEnd:
+                    for (int i = 0; i < rankTypelist.Count; i++)
+                    {
+                        int rankEndId = WholePeopleRankEnd + rankTypelist[i];
+                        if (impactRank.IsActivityClose(rankTypelist[i]))
+                        {
+                            RemovePushInfo(rankEndId);
+                        }
+                    }
+                    break;
+            }
+        }
+
         private void RemovePushByTime(PushInfoType type,int time)
         {
             int remainHour = time - TimeUtility.ServerNow.Hour;
@@ -126,11 +155,7 @@
                     for (int i = 0; i < rankTypelist.Count; i++)
                     {
                         int rankStartId = WholePeopleRankStart + rankTypelist[i];
-                        if (impactRank.IsActivityClose(rankTypelist[i]))
-                        {
-                            RemovePushInfo(rankStartId);
-                        }
-                        else
+                        if (!impactRank.IsActivityClose(rankTypelist[i]))
                         {
                             int day = impactRank.GetOpenDay(rankTypelist[i]);
                             if (day <= 0 && remainSecond <= 120)
@@ -144,11 +169,7 @@
                     for (int i = 0; i < rankTypelist.Count; i++)
                     {
                         int rankEndId = WholePeopleRankEnd + rankTypelist[i];
-                        if (impactRank.IsActivityClose(rankTypelist[i]))
-                        {
-                            RemovePushInfo(rankEndId);
-                        }
-                        else
+                        if (!impactRank.IsActivityClose(rankTypelist[i]))
                         {
                             int day = impactRank.GetSurplusDay(rankTypelist[i]);
                             if (day <= 1 && remainSecond <= 120)

--
Gitblit v1.8.0