修改抓取激活数据逻辑

AppStart/GetHaoDaFTPInfoService.cs

@@ -52,15 +52,15 @@ namespace MySystem
                     if (string.IsNullOrEmpty(check))
                     {
                         function.WritePage("/GetFTPDepositYesterday/", "check" + DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd") + ".txt", DateTime.Now.ToString());
-                        // GetDepositData(DateTime.Now.AddDays(-1).ToString("yyyyMMdd"));
-                        // Thread.Sleep(60000);
+                        GetDepositData(DateTime.Now.AddDays(-1).ToString("yyyyMMdd"));
+                        Thread.Sleep(60000);
                         GetTradeData(DateTime.Now.AddDays(-1).ToString("yyyyMMdd"));
                         Thread.Sleep(600000);
                     }
                 }
                 if (DateTime.Now.Hour > 10)
                 {
-                    GetDepositData(DateTime.Now.AddDays(-1).ToString("yyyyMMdd"));
+                    GetDepositData("d_" + DateTime.Now.ToString("yyyyMMdd"));
                 }
                 Thread.Sleep(1800000);
             }
@@ -128,11 +128,24 @@ namespace MySystem
                             string PosKind = DataListInfo[2]; //机具型号
                             string ActDate = DataListInfo[3]; //激活时间
                             string Deposit = DataListInfo[4]; //押金金额
-                            string PrizeAmt = DataListInfo[5]; //奖励金额
-                            string PrizeDate = DataListInfo[6]; //奖励发放时间
-                            string Name = DataListInfo[7]; //发放人姓名
-                            string MerName = DataListInfo[8]; //商户名称
-                            string PassDate = DataListInfo[9]; //审核通过时期
+                            string PrizeAmt = "0"; //奖励金额
+                            string PrizeDate = "None"; //奖励发放时间
+                            string Name = ""; //发放人姓名
+                            string MerName = ""; //商户名称
+                            string PassDate = ""; //审核通过时期
+                            if(Date.StartsWith("d_"))
+                            {
+                                MerName = DataListInfo[5]; //商户名称
+                                PassDate = DataListInfo[6]; //审核通过时期
+                            }
+                            else
+                            {
+                                PrizeAmt = DataListInfo[5]; //奖励金额
+                                PrizeDate = DataListInfo[6]; //奖励发放时间
+                                Name = DataListInfo[7]; //发放人姓名
+                                MerName = DataListInfo[8]; //商户名称
+                                PassDate = DataListInfo[9]; //审核通过时期
+                            }
 
                             string ActDateString = ActDate.Substring(0, 4) + "-" + ActDate.Substring(4, 2) + "-" + ActDate.Substring(6, 2);
                             if(DateTime.Parse(ActDateString) >= DateTime.Parse(DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd")))