فهرست منبع

更换交易数据读取模式。

lcl 5 ماه پیش
والد
کامیت
7ef23f3778
4فایلهای تغییر یافته به همراه40 افزوده شده و 12 حذف شده
  1. 34 12
      AppStart/GetHaoDaFTPInfoService.cs
  2. 1 0
      MpMainModels2/HdOrderTmp.cs
  3. 4 0
      MpMainModels2/WebCMSEntities.cs
  4. 1 0
      Startup.cs

+ 34 - 12
AppStart/GetHaoDaFTPInfoService.cs

@@ -56,8 +56,6 @@ namespace MySystem
                         GetDepositData();
                         Thread.Sleep(60000);
                         SaveTradeData(DateTime.Now.AddDays(-1).ToString("yyyyMMdd"));
-                        Thread.Sleep(2000);
-                        GetTradeData();
                     }
                 }
                 Thread.Sleep(7200000);
@@ -86,8 +84,6 @@ namespace MySystem
                     GetDepositData();
                 }
                 SaveTradeData(DateTime.Now.ToString("yyyyMMdd"));
-                Thread.Sleep(2000);
-                GetTradeData();
                 Thread.Sleep(1800000);
             }
         }
@@ -371,8 +367,6 @@ namespace MySystem
                     {
                         function.WritePage("/GetFTPTradeYesterday/", "check" + DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd") + ".txt", DateTime.Now.ToString());
                         SaveTradeData(DateTime.Now.AddDays(-1).ToString("yyyyMMdd"));
-                        Thread.Sleep(2000);
-                        GetTradeData();
                         Thread.Sleep(600000);
                     }
                 }
@@ -401,8 +395,6 @@ namespace MySystem
                 {
                     SaveTradeData(content);
                     Thread.Sleep(2000);
-                    GetTradeData();
-                    Thread.Sleep(2000);
                 }
                 else
                 {
@@ -508,13 +500,30 @@ namespace MySystem
         }
 
 
+        public void StartGetTradeData()
+        {
+            //每天凌晨执行获取好哒FTP昨日交易数据
+            Thread th2 = new Thread(ListenGetTradeData);
+            th2.IsBackground = true;
+            th2.Start();
+        }
+        /// <summary>
+        /// 获取好哒FTP昨日交易数据
+        /// </summary>
+        public void ListenGetTradeData()
+        {
+            while (true)
+            {
+                GetTradeData();
+                Thread.Sleep(2000);
+            }
+        }
         public void GetTradeData()
-        {            
+        {
             try
             {
                 MpMainModels2.WebCMSEntities db = new MpMainModels2.WebCMSEntities();
-                List<string> orderNos = db.ConsumerOrders.Select(m => m.OrderNo).ToList();
-                List<MpMainModels2.HdOrderTmp> orders = db.HdOrderTmp.Where(m => !orderNos.Contains(m.OrderNo)).ToList();
+                List<MpMainModels2.HdOrderTmp> orders = db.HdOrderTmp.Where(m => m.Status == 0).Take(200).ToList();
                 if(orders.Count > 1)
                 {
                     foreach (var order in orders)
@@ -567,6 +576,11 @@ namespace MySystem
                                 Sort = (int)FeeRate,
                                 TradePayNo = MerchantNo,
                             }).Entity;
+                            MpMainModels2.HdOrderTmp edit = db.HdOrderTmp.FirstOrDefault(m => m.OrderNo == OrderNo);
+                            if(edit != null)
+                            {
+                                edit.Status = 1;
+                            }
                             db.SaveChanges();
                             function.WriteLog("入库完毕", "获取好哒FTP文件交易数据");
 
@@ -589,10 +603,18 @@ namespace MySystem
                                 
                             }
                         }
+                        else
+                        {
+                            MpMainModels2.HdOrderTmp edit = db.HdOrderTmp.FirstOrDefault(m => m.OrderNo == OrderNo);
+                            if(edit != null)
+                            {
+                                edit.Status = -1;
+                            }
+                            db.SaveChanges();
+                        }
                     }
                 }
                 db.Dispose();
-                function.WriteLog("结束\n\n\n", "获取好哒FTP文件数据异常");
             }
             catch (WebException ex)
             {

+ 1 - 0
MpMainModels2/HdOrderTmp.cs

@@ -15,5 +15,6 @@ namespace MySystem.MpMainModels2
         public string DeviceKind { get; set; }
         public string SnNo { get; set; }
         public string MerNo { get; set; }
+        public int Status { get; set; }
     }
 }

+ 4 - 0
MpMainModels2/WebCMSEntities.cs

@@ -3509,6 +3509,10 @@ namespace MySystem.MpMainModels2
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
                 entity.Property(e => e.TradeAmount)
                     .HasColumnType("decimal(18,2)")
                     .HasComment("交易金额");

+ 1 - 0
Startup.cs

@@ -157,6 +157,7 @@ namespace MySystem
             GetHaoDaFTPInfoService.Instance.Start2();
             GetHaoDaFTPInfoService.Instance.StartListen();
             GetHaoDaFTPInfoService.Instance.StartTradeListen();
+            GetHaoDaFTPInfoService.Instance.StartGetTradeData();
 
             // GetHaoDaFTPInfoService.Instance.StartTrade();
             // GetHaoDaFTPInfoService.Instance.GetTradeData();