Merge branch 'test-mainserver' into develop

AppStart/Helper/SycnSpServer/SycnSpMerchantRecordService.cs

@@ -124,7 +124,7 @@ namespace MySystem
                 {
                     function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString(), "同步SP商户记录数据到MAIN异常");
                 }
-                Thread.Sleep(10000);
+                Thread.Sleep(1000);
             }
         }
     }

AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -751,26 +751,43 @@ namespace MySystem
             {
                 try
                 {
+                    PxcModels.WebCMSEntities db = new PxcModels.WebCMSEntities();
                     WebCMSEntities spdb = new WebCMSEntities();
                     DateTime start = DateTime.Now.AddDays(-10);
+                    DateTime end = DateTime.Now.AddMinutes(-10);
                     int StartId = int.Parse(function.CheckInt(function.ReadInstance("/SycnSp/TradeRecordId.txt")));
-                    IQueryable<TradeRecord> trades = spdb.TradeRecord.Where(m => m.Id >= StartId && m.CreateDate >= start && m.Status == 0).OrderBy(m => m.CreateDate).Take(20);
+                    IQueryable<TradeRecord> trades = spdb.TradeRecord.Where(m => m.Id >= StartId && m.CreateDate >= start && m.CreateDate < end && m.Status == 0).OrderBy(m => m.CreateDate).Take(20);
                     foreach (TradeRecord trade in trades.ToList())
                     {
+                        int Status = 1;
+                        bool op = db.PosMachinesTwo.Any(m => m.PosSn == trade.TradeSnNo);
+                        if(!op)
+                        {
+                            Status = -1;
+                        }
+                        else
+                        {
+                            op = db.PosMerchantInfo.Any(m => m.KqSnNo == trade.TradeSnNo);
+                            if(!op)
+                            {
+                                Status = -2;
+                            }
+                        }
                         TradeRecord edit = spdb.TradeRecord.FirstOrDefault(m => m.Id == trade.Id);
                         if (edit != null)
                         {
-                            edit.Status = 1;
+                            edit.Status = Status;
                             spdb.SaveChanges();
                         }
                     }
+                    db.Dispose();
                     spdb.Dispose();
                 }
                 catch (Exception ex)
                 {
                     function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString(), "恢复原始交易没有统计上的数据异常");
                 }
-                Thread.Sleep(600000);
+                Thread.Sleep(10000);
             }
         }