修复达标奖

Startup.cs

@@ -137,7 +137,8 @@ namespace MySystem
             initMainServer();
             if(Library.ConfigurationManager.EnvironmentFlag == 1)
             {
-                TestHaoDaService.Instance.Start(); //好哒测试
+                // TestHaoDaService.Instance.Start(); //好哒测试
+                MerchantStandardService.Instance.Start();
             }
             if(Library.ConfigurationManager.EnvironmentFlag == 2)
             {
@@ -163,8 +164,9 @@ namespace MySystem
                 ActiveRewardService.Instance.StartLeaderReward();
                 ActiveRewardService.Instance.StartOperateReward();
                 
-                // MerchantStandardService.Instance.Start(); //商户缴纳服务费次月活动交易额大于等于1W，奖励进件创客50元
-                // MerchantStandardService.Instance.StartThree(); //商户缴纳服务费次月起连续不间断三个月，每月活动交易额大于1W，奖励进件创客100元
+                MerchantStandardService.Instance.Start(); //商户缴纳服务费次月活动交易额大于等于1W，奖励进件创客50元
+                MerchantStandardService.Instance.StartThree(); //商户缴纳服务费次月起连续不间断三个月，每月活动交易额大于1W，奖励进件创客100元
+                MerchantStandardService.Instance.StartActive();
             }
         }
 

Util/HaoDa/MerchantStandardService.cs

@@ -46,15 +46,15 @@ namespace MySystem
             DateTime end = DateTime.Parse(DateTime.Now.ToString("yyyy-MM") + "-01 00:00:00");
             string month = DateTime.Now.ToString("yyyyMM");
             function.WriteLog(DateTime.Now.ToString() + "-start", "达标奖励日志");
-            var orders = db.MerchantDepositOrder.Where(m => m.Status > 0 && m.Version == 0 && m.UpdateDate >= start && m.UpdateDate < end);
+            var orders = db.MerchantDepositOrder.Where(m => m.Status > 0 && m.Version == 0 && m.UpdateDate >= start && m.UpdateDate < end).ToList();
             foreach(var order in orders)
             {
                 function.WriteLog("MerchantId:" + order.MerchantId, "达标奖励日志");
                 decimal TradeMoney = 0;
-                bool has = db.MerchantAmountSummay.Any(m => m.MerchantId == order.MerchantId && m.TradeMonth == month);
+                bool has = db.MerchantAmountSummay.Any(m => m.MerchantId == order.MerchantId && m.IsAct == 1 && m.TradeMonth == month);
                 if(has)
                 {
-                    TradeMoney = db.MerchantAmountSummay.Where(m => m.MerchantId == order.MerchantId && m.TradeMonth == month).Sum(m => m.TradeAmount);
+                    TradeMoney = db.MerchantAmountSummay.Where(m => m.MerchantId == order.MerchantId && m.IsAct == 1 && m.TradeMonth == month).Sum(m => m.TradeAmount);
                 }
                 function.WriteLog("TradeMoney:" + TradeMoney, "达标奖励日志");
                 if(TradeMoney >= 10000)
@@ -103,28 +103,28 @@ namespace MySystem
         { 
             WebCMSEntities db = new WebCMSEntities();
             DateTime start = DateTime.Parse(DateTime.Now.AddMonths(-3).ToString("yyyy-MM") + "-01 00:00:00");
-            DateTime end = DateTime.Parse(DateTime.Now.ToString("yyyy-MM") + "-01 00:00:00");
+            DateTime end = DateTime.Parse(DateTime.Now.AddMonths(-2).ToString("yyyy-MM") + "-01 00:00:00");
             string month = DateTime.Now.AddMonths(-2).ToString("yyyyMM");
             string month2 = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
             string month3 = DateTime.Now.ToString("yyyyMM");
-            var orders = db.MerchantDepositOrder.Where(m => m.Status > 0 && m.Version == 1 && m.UpdateDate >= start && m.UpdateDate < end);
+            var orders = db.MerchantDepositOrder.Where(m => m.Status > 0 && m.Version == 1 && m.UpdateDate >= start && m.UpdateDate < end).ToList();
             foreach(var order in orders)
             {
                 decimal TradeMoney = 0, TradeMoney2 = 0, TradeMoney3 = 0;
-                bool has = db.MerchantAmountSummay.Any(m => m.MerchantId == order.MerchantId && m.TradeMonth == month);
+                bool has = db.MerchantAmountSummay.Any(m => m.MerchantId == order.MerchantId && m.IsAct == 1 && m.TradeMonth == month);
                 if(has)
                 {
-                    TradeMoney = db.MerchantAmountSummay.Where(m => m.MerchantId == order.MerchantId && m.TradeMonth == month).Sum(m => m.TradeAmount);
+                    TradeMoney = db.MerchantAmountSummay.Where(m => m.MerchantId == order.MerchantId && m.IsAct == 1 && m.TradeMonth == month).Sum(m => m.TradeAmount);
                 }
-                has = db.MerchantAmountSummay.Any(m => m.MerchantId == order.MerchantId && m.TradeMonth == month2);
+                has = db.MerchantAmountSummay.Any(m => m.MerchantId == order.MerchantId && m.IsAct == 1 && m.TradeMonth == month2);
                 if(has)
                 {
-                    TradeMoney2 = db.MerchantAmountSummay.Where(m => m.MerchantId == order.MerchantId && m.TradeMonth == month2).Sum(m => m.TradeAmount);
+                    TradeMoney2 = db.MerchantAmountSummay.Where(m => m.MerchantId == order.MerchantId && m.IsAct == 1 && m.TradeMonth == month2).Sum(m => m.TradeAmount);
                 }
-                has = db.MerchantAmountSummay.Any(m => m.MerchantId == order.MerchantId && m.TradeMonth == month3);
+                has = db.MerchantAmountSummay.Any(m => m.MerchantId == order.MerchantId && m.IsAct == 1 && m.TradeMonth == month3);
                 if(has)
                 {
-                    TradeMoney3 = db.MerchantAmountSummay.Where(m => m.MerchantId == order.MerchantId && m.TradeMonth == month3).Sum(m => m.TradeAmount);
+                    TradeMoney3 = db.MerchantAmountSummay.Where(m => m.MerchantId == order.MerchantId && m.IsAct == 1 && m.TradeMonth == month3).Sum(m => m.TradeAmount);
                 }
                 if(TradeMoney >= 10000 && TradeMoney2 >= 10000 && TradeMoney3 >= 10000)
                 {