押金入库不判断日志算了

AppStart/GetHaoDaFTPInfoService.cs

@@ -180,54 +180,51 @@ namespace MySystem
                                 if (DataListInfo.Length > 10) MerKind = DataListInfo[10]; //商户类型
                                 if (DataListInfo.Length > 11) DepositActCode = DataListInfo[11]; //押金活动编号
                             }
-                            if (ActDate == Date.Replace("d_", ""))
+                            if (!SnNos.Contains(SnNo) && !ChkSnNos.Contains(SnNo))
                             {
-                                if (!SnNos.Contains(SnNo) && !ChkSnNos.Contains(SnNo))
+                                index += 1;
+                                function.WriteLog(DateTime.Now.ToString() + ":" + SnNo, "好哒押金数据入库");
+                                ChkSnNos.Add(SnNo);
+                                db.HdDepositTmp.Add(new MpMainModels2.HdDepositTmp()
                                 {
-                                    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();
-                                    }
+                                    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
+                            }
+                            else
+                            {
+                                MpMainModels2.HdDepositTmp edit = db.HdDepositTmp.FirstOrDefault(m => m.SnNo == SnNo);
+                                if (edit != null)
                                 {
-                                    MpMainModels2.HdDepositTmp edit = db.HdDepositTmp.FirstOrDefault(m => m.SnNo == SnNo);
-                                    if (edit != null)
+                                    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)
                                     {
-                                        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();
-                                        }
+                                        db.SaveChanges();
                                     }
                                 }
                             }