押金数据入库判断日期

AppStart/GetHaoDaFTPInfoService.cs

@@ -121,7 +121,7 @@ namespace MySystem
         {
             // 要下载的文件路径
             string filePath = "/haoda-deposit/deposit_" + Date + ".csv";
-            
+
             try
             {
                 // 创建FtpWebRequest对象
@@ -143,7 +143,7 @@ namespace MySystem
                     List<string> SnNos = db.HdDepositTmp.Select(m => m.SnNo).ToList();
                     List<string> ChkSnNos = new List<string>();
                     var DataInfo = fileContents.TrimEnd('\n').Split('\n', 2);
-                    if(DataInfo.Length > 1)
+                    if (DataInfo.Length > 1)
                     {
                         int index = 0;
                         var DataList = DataInfo[1].Split('\n');
@@ -163,7 +163,7 @@ namespace MySystem
                             string PassDate = ""; //审核通过时期
                             string MerKind = ""; //商户类型
                             string DepositActCode = ""; //押金活动编号
-                            if(Date.StartsWith("d_"))
+                            if (Date.StartsWith("d_"))
                             {
                                 MerName = DataListInfo[5]; //商户名称
                                 PassDate = DataListInfo[6]; //审核通过时期
@@ -177,55 +177,57 @@ namespace MySystem
                                 Name = DataListInfo[7]; //发放人姓名
                                 MerName = DataListInfo[8]; //商户名称
                                 PassDate = DataListInfo[9]; //审核通过时期
-                                if(DataListInfo.Length > 10) MerKind = DataListInfo[10]; //商户类型
-                                if(DataListInfo.Length > 11) DepositActCode = DataListInfo[11]; //押金活动编号
+                                if (DataListInfo.Length > 10) MerKind = DataListInfo[10]; //商户类型
+                                if (DataListInfo.Length > 11) DepositActCode = DataListInfo[11]; //押金活动编号
                             }
-
-                            if(!SnNos.Contains(SnNo) && !ChkSnNos.Contains(SnNo))
+                            if (ActDate == Date.Replace("d_", ""))
                             {
-                                index += 1;
-                                function.WriteLog(DateTime.Now.ToString() + ":" + SnNo, "好哒押金数据入库");
-                                ChkSnNos.Add(SnNo);
-                                db.HdDepositTmp.Add(new MpMainModels2.HdDepositTmp()
-                                {
-                                    SnNo = SnNo,
-                                    MerKind = MerKind,
-                                    PassDate = PassDate,
-                                    MerName = MerName,
-                                    SendMan = Name,
-                                    PrizeDate = PrizeDate,
-                                    PrizeAmount = decimal.Parse(function.CheckNum(PrizeAmt)),
-                                    DepositAmount = decimal.Parse(function.CheckNum(Deposit)),
-                                    ActDate = ActDate,
-                                    DeviceKind = PosKind,
-                                    DepositActCode = DepositActCode,
-                                    MerNo = MerNo,
-                                });
-                                if(index % 50 == 0)
+                                if (!SnNos.Contains(SnNo) && !ChkSnNos.Contains(SnNo))
                                 {
-                                    db.SaveChanges();
+                                    index += 1;
+                                    function.WriteLog(DateTime.Now.ToString() + ":" + SnNo, "好哒押金数据入库");
+                                    ChkSnNos.Add(SnNo);
+                                    db.HdDepositTmp.Add(new MpMainModels2.HdDepositTmp()
+                                    {
+                                        SnNo = SnNo,
+                                        MerKind = MerKind,
+                                        PassDate = PassDate,
+                                        MerName = MerName,
+                                        SendMan = Name,
+                                        PrizeDate = PrizeDate,
+                                        PrizeAmount = decimal.Parse(function.CheckNum(PrizeAmt)),
+                                        DepositAmount = decimal.Parse(function.CheckNum(Deposit)),
+                                        ActDate = ActDate,
+                                        DeviceKind = PosKind,
+                                        DepositActCode = DepositActCode,
+                                        MerNo = MerNo,
+                                    });
+                                    if (index % 50 == 0)
+                                    {
+                                        db.SaveChanges();
+                                    }
                                 }
-                            }
-                            else
-                            {
-                                MpMainModels2.HdDepositTmp edit = db.HdDepositTmp.FirstOrDefault(m => m.SnNo == SnNo);
-                                if(edit != null)
+                                else
                                 {
-                                    edit.Status = 0;
-                                    edit.MerKind = MerKind;
-                                    edit.PassDate = PassDate;
-                                    edit.MerName = MerName;
-                                    edit.SendMan = Name;
-                                    edit.PrizeDate = PrizeDate;
-                                    edit.PrizeAmount = decimal.Parse(function.CheckNum(PrizeAmt));
-                                    edit.DepositAmount = decimal.Parse(function.CheckNum(Deposit));
-                                    edit.ActDate = ActDate;
-                                    edit.DeviceKind = PosKind;
-                                    edit.DepositActCode = DepositActCode;
-                                    edit.MerNo = MerNo;
-                                    if(index % 50 == 0)
+                                    MpMainModels2.HdDepositTmp edit = db.HdDepositTmp.FirstOrDefault(m => m.SnNo == SnNo);
+                                    if (edit != null)
                                     {
-                                        db.SaveChanges();
+                                        edit.Status = 0;
+                                        edit.MerKind = MerKind;
+                                        edit.PassDate = PassDate;
+                                        edit.MerName = MerName;
+                                        edit.SendMan = Name;
+                                        edit.PrizeDate = PrizeDate;
+                                        edit.PrizeAmount = decimal.Parse(function.CheckNum(PrizeAmt));
+                                        edit.DepositAmount = decimal.Parse(function.CheckNum(Deposit));
+                                        edit.ActDate = ActDate;
+                                        edit.DeviceKind = PosKind;
+                                        edit.DepositActCode = DepositActCode;
+                                        edit.MerNo = MerNo;
+                                        if (index % 50 == 0)
+                                        {
+                                            db.SaveChanges();
+                                        }
                                     }
                                 }
                             }
@@ -253,7 +255,7 @@ namespace MySystem
                 WebCMSEntities db = new WebCMSEntities();
                 MpMainModels2.WebCMSEntities mpdb2 = new MpMainModels2.WebCMSEntities();
                 List<MpMainModels2.HdDepositTmp> deposits = mpdb2.HdDepositTmp.Where(m => m.Status == 0).ToList();
-                if(deposits.Count > 0)
+                if (deposits.Count > 0)
                 {
                     foreach (var deposit in deposits)
                     {
@@ -270,21 +272,21 @@ namespace MySystem
                         string MerKind = deposit.MerKind; //商户类型
                         string DepositActCode = deposit.DepositActCode; //商户类型
 
-                        if(!db.ActivateRecord.Any(m => m.SnNo == SnNo && m.MerNo == MerNo))
+                        if (!db.ActivateRecord.Any(m => m.SnNo == SnNo && m.MerNo == MerNo))
                         {
                             MpMainModels2.MerchantAddInfo meradd = mpdb2.MerchantAddInfo.FirstOrDefault(m => m.MchtNo == MerNo) ?? new MpMainModels2.MerchantAddInfo();
                             MpMainModels2.MerchantInfo merchant = mpdb2.MerchantInfo.FirstOrDefault(m => m.Id == meradd.Id) ?? new MpMainModels2.MerchantInfo();
 
-                            if(!string.IsNullOrEmpty(meradd.CertMerchantName)) MerName = meradd.CertMerchantName;
+                            if (!string.IsNullOrEmpty(meradd.CertMerchantName)) MerName = meradd.CertMerchantName;
 
                             string ActDateString = ActDate.Substring(0, 4) + "-" + ActDate.Substring(4, 2) + "-" + ActDate.Substring(6, 2);
-                            
+
                             string ProductType = "0";
-                            if(PosKind == "好哒语音王Y512") ProductType = "18";
-                            if(PosKind == "4G收款王M820") ProductType = "19";
-                            if(PosKind == "4G收款王M826") ProductType = "20";
-                            if(PosKind == "好哒S312") ProductType = "21";
-                            if(PosKind == "好哒扫码通M837") ProductType = "29";
+                            if (PosKind == "好哒语音王Y512") ProductType = "18";
+                            if (PosKind == "4G收款王M820") ProductType = "19";
+                            if (PosKind == "4G收款王M826") ProductType = "20";
+                            if (PosKind == "好哒S312") ProductType = "21";
+                            if (PosKind == "好哒扫码通M837") ProductType = "29";
 
                             BindRecord mer = db.BindRecord.Add(new BindRecord()
                             {
@@ -363,7 +365,7 @@ namespace MySystem
                         }
 
                         MpMainModels2.HdDepositTmp edit = mpdb2.HdDepositTmp.FirstOrDefault(m => m.SnNo == SnNo);
-                        if(edit != null)
+                        if (edit != null)
                         {
                             edit.Status = 1;
                             mpdb2.SaveChanges();
@@ -448,7 +450,7 @@ namespace MySystem
             // 要下载的文件路径
             string filePath = "/haoda-trade/" + Date + ".csv";
             function.WriteLog(DateTime.Now.ToString() + ":" + Date + ":" + filePath, "好哒交易数据入库2");
-            
+
             try
             {
                 // 创建FtpWebRequest对象
@@ -470,7 +472,7 @@ namespace MySystem
                     List<string> orderNos = db.HdOrderTmp.Select(m => m.OrderNo).ToList();
                     List<string> chkOrderNos = new List<string>();
                     var DataInfo = fileContents.TrimEnd('\n').Split('\n', 2);
-                    if(DataInfo.Length > 1)
+                    if (DataInfo.Length > 1)
                     {
                         var DataList = DataInfo[1].Split('\n');
                         int index = 0;
@@ -501,7 +503,7 @@ namespace MySystem
                             TradeDate = DataListInfo[8];
                             TradeCycle = DataListInfo[9];
 
-                            if(!orderNos.Contains(OrderNo) && !chkOrderNos.Contains(OrderNo))
+                            if (!orderNos.Contains(OrderNo) && !chkOrderNos.Contains(OrderNo))
                             {
                                 index += 1;
                                 function.WriteLog(DateTime.Now.ToString() + ":" + OrderNo, "好哒交易数据入库2");
@@ -519,7 +521,7 @@ namespace MySystem
                                     SnNo = BaseNo,
                                     MerNo = MerchantNo,
                                 });
-                                if(index % 50 == 0)
+                                if (index % 50 == 0)
                                 {
                                     db.SaveChanges();
                                 }
@@ -559,12 +561,12 @@ namespace MySystem
             {
                 // if(DateTime.Now.Hour < 9)
                 // {
-                    GetTradeData();
+                GetTradeData();
                 //     Thread.Sleep(2000);
                 // }
                 // else
                 // {
-                    Thread.Sleep(10000);
+                Thread.Sleep(10000);
                 // }
             }
         }
@@ -574,7 +576,7 @@ namespace MySystem
             {
                 MpMainModels2.WebCMSEntities db = new MpMainModels2.WebCMSEntities();
                 List<MpMainModels2.HdOrderTmp> orders = db.HdOrderTmp.Where(m => m.Status == 0).Take(200).ToList();
-                if(orders.Count > 0)
+                if (orders.Count > 0)
                 {
                     foreach (var order in orders)
                     {
@@ -603,14 +605,14 @@ namespace MySystem
                         {
                             function.WriteLog("找到商户", "获取好哒FTP文件交易数据");
                             var merchantInfo = db.MerchantInfo.FirstOrDefault(m => m.Id == merchantAddInfo.Id) ?? new MpMainModels2.MerchantInfo();
-                            if(merchantInfo.IsAct == 0)
+                            if (merchantInfo.IsAct == 0)
                             {
                                 merchantInfo.IsAct = 1;
                             }
-                            
+
                             function.WriteLog("订单号不存在，开始入库", "获取好哒FTP文件交易数据");
                             var query = db.ConsumerOrders.FirstOrDefault(m => m.OrderNo == OrderNo);
-                            if(query == null)
+                            if (query == null)
                             {
                                 decimal FeeRate = decimal.Parse(function.CheckNum(merchantAddInfo.FeeRate)) * 100;
                                 query = db.ConsumerOrders.Add(new MpMainModels2.ConsumerOrders()
@@ -631,7 +633,7 @@ namespace MySystem
                                 }).Entity;
                             }
                             MpMainModels2.HdOrderTmp edit = db.HdOrderTmp.FirstOrDefault(m => m.OrderNo == OrderNo);
-                            if(edit != null)
+                            if (edit != null)
                             {
                                 edit.Status = 1;
                             }
@@ -641,7 +643,7 @@ namespace MySystem
                             //推送MQ给创业帮
                             if (merchantAddInfo.BrandId == 1)
                             {
-                                if(!string.IsNullOrEmpty(merchantAddInfo.CybMakerCode))
+                                if (!string.IsNullOrEmpty(merchantAddInfo.CybMakerCode))
                                 {
                                     SortedList<string, string> obj = new SortedList<string, string>();
                                     obj.Add("create_time", TradeDate);
@@ -654,14 +656,14 @@ namespace MySystem
                                     PushHelper.Instance.Do(obj);
                                 }
                                 OrderMessageHelper.SendOrderMsg(query);
-                                
+
                             }
 
                             PosPushDataNewHelper.Trade(query, DeviceKind);
 
-                            if(DeviceKind.Contains("好哒二维码"))
+                            if (DeviceKind.Contains("好哒二维码"))
                             {
-                                if(!db.HdQrCodeTmp.Any(m => m.SnNo == BaseNo && m.MerNo == MerchantNo))
+                                if (!db.HdQrCodeTmp.Any(m => m.SnNo == BaseNo && m.MerNo == MerchantNo))
                                 {
                                     db.HdQrCodeTmp.Add(new MpMainModels2.HdQrCodeTmp()
                                     {
@@ -683,7 +685,7 @@ namespace MySystem
                         else
                         {
                             MpMainModels2.HdOrderTmp edit = db.HdOrderTmp.FirstOrDefault(m => m.OrderNo == OrderNo);
-                            if(edit != null)
+                            if (edit != null)
                             {
                                 edit.Status = -1;
                             }