lcl 4 ヶ月 前
コミット
4334439326
3 ファイル変更24 行追加18 行削除
  1. BIN
      .DS_Store
  2. 22 17
      AppStart/WifiTradeHelper.cs
  3. 2 1
      Startup.cs

BIN
.DS_Store


+ 22 - 17
AppStart/WifiTradeHelper.cs

@@ -28,15 +28,10 @@ public class WifiTradeHelper
         {
             try
             {
-                if(DateTime.Now.Day == 1 && DateTime.Now.Hour < 6)
+                if(DateTime.Now.Day < 25 && DateTime.Now.Hour < 20)
                 {
                     string Month = DateTime.Now.ToString("yyyyMM");
-                    string chk = function.ReadInstance("/wifi/trade" + Month + ".txt");
-                    if(string.IsNullOrEmpty(chk))
-                    {
-                        function.WritePage("/wifi/", "trade" + Month + ".txt", DateTime.Now.ToString());
-                        DoSomething(Month);
-                    }
+                    DoSomething(Month);
                 }
                 Thread.Sleep(3600000);
             }
@@ -49,9 +44,15 @@ public class WifiTradeHelper
 
     public void DoSomething(string Month)
     {
+        string chk = function.ReadInstance("/wifi/trade" + Month + ".txt");
+        if(!string.IsNullOrEmpty(chk))
+        {
+            return;
+        }
+        function.WritePage("/wifi/", "trade" + Month + ".txt", DateTime.Now.ToString());
         WebCMSEntities db = new WebCMSEntities();
         MySystem.ReadModels.WebCMSEntities rdb = new MySystem.ReadModels.WebCMSEntities();
-        DateTime end = DateTime.Parse(Month + "-01 00:00:00").AddMonths(1);
+        DateTime end = DateTime.Parse(Month + "-01 00:00:00");
         List<string> SnNos = new List<string>();
         List<MySystem.ReadModels.WifiTradeRecord> trades = rdb.WifiTradeRecord.Where(m => m.Duration >= m.DoMonths && m.CreateDate < end).ToList();
         List<MySystem.ReadModels.Users> users = rdb.Users.Where(m => m.AuthFlag == 1).ToList();
@@ -61,8 +62,10 @@ public class WifiTradeHelper
         List<TradeDaySummary> statTrade = new List<TradeDaySummary>();
         List<TradeDaySummaryBefore> statTradeBefore = new List<TradeDaySummaryBefore>();
         List<TradeDaySummaryAfter> statTradeAfter = new List<TradeDaySummaryAfter>();
+        function.WriteLog(trades.Count.ToString(), "WIFI发放交易额日志");
         foreach(MySystem.ReadModels.WifiTradeRecord trade in trades)
         {
+            function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(trade), "WIFI发放交易额日志");
             if(trade.Unit == "m" && trade.Duration > 0 && !SnNos.Contains(trade.SnNo))
             {
                 decimal TradeAmt = trade.TradeAmount / trade.Duration;
@@ -85,15 +88,15 @@ public class WifiTradeHelper
                     edit.LastMonth = Month.Replace("-", "");
 
                     //推送wifi交易给java
-                    PosPushDataNewHelper.Trade(new MySystem.SpModels.TradeRecord()
-                    {
-                        TradeSnNo = edit.SnNo,
-                        MerNo = edit.Remark,
-                        TradeAmount = TradeAmt,
-                        TradeSerialNo = Guid.NewGuid().ToString(),
-                        CreateDate = DateTime.Parse(DateTime.Now.AddMonths(-1).ToString("yyyy-MM") + "-01 00:00:00"),
-                        ProductType = edit.BrandId.ToString(),
-                    });
+                    // PosPushDataNewHelper.Trade(new MySystem.SpModels.TradeRecord()
+                    // {
+                    //     TradeSnNo = edit.SnNo,
+                    //     MerNo = edit.Remark,
+                    //     TradeAmount = TradeAmt,
+                    //     TradeSerialNo = Guid.NewGuid().ToString(),
+                    //     CreateDate = DateTime.Parse(DateTime.Now.AddMonths(-1).ToString("yyyy-MM") + "-01 00:00:00"),
+                    //     ProductType = edit.BrandId.ToString(),
+                    // });
                 }
                 SnNos.Add(trade.SnNo);
             }
@@ -133,6 +136,8 @@ public class WifiTradeHelper
         }
         db.SaveChanges();
         db.Dispose();
+
+        function.WritePage("/wifi/", "trade" + Month + "-end.txt", DateTime.Now.ToString());
     }
 
 

+ 2 - 1
Startup.cs

@@ -253,7 +253,7 @@ namespace MySystem
                 // PosCouponExchangeHelper.Instance.Start(); //电签券兑换大机券
                 // ToBigHelper.Instance.Start(); //机具通对资格
                 // TradeFilterService.Instance.Start(); //营训奖励拦截
-                // WifiTradeHelper.Instance.Start(); //每月1号统计上月wifi交易 
+                WifiTradeHelper.Instance.Start(); //每月1号统计上月wifi交易 
 
                 // PosCouponPrizeService.Instance.AddPrize(595246);
 
@@ -263,6 +263,7 @@ namespace MySystem
                 // PosCouponPrizeTest.Instance.Start();
             // }
 
+
             //必须打开的
 
             // UserMonthFeeHelper.Instance.Start(); //每月创客服务费