Browse Source

Merge branch 'master' of http://39.108.190.163:3000/zx66/FCS

lyl 6 years ago
parent
commit
5e7f6fdb7a
1 changed files with 24 additions and 28 deletions
  1. 24 28
      FCS.Crawler/Content/Jobs/FootJobs/ZCLotteryGames/GamesJob.cs

+ 24 - 28
FCS.Crawler/Content/Jobs/FootJobs/ZCLotteryGames/GamesJob.cs

@@ -197,38 +197,34 @@ namespace FCS.Crawler.ZCLotteryGames
             {
                 var new_group_game=gamesList.Where(a => a.GroupingId == item.GroupingId).ToList();
                 var group_game = Gamelist.Where(a => a.GroupingId == item.GroupingId).ToList();
-                if (new_group_game.Count >= group_game.Count)
+               
+                foreach (var item1 in new_group_game)
                 {
-                    foreach (var item1 in new_group_game)
+                    switch (group_game.Where(a => a.GroupingId == item.GroupingId && a.HomeTeamId == item1.HomeTeamId && a.VisitingTeamId == item1.VisitingTeamId && a.StartDateTime == item1.StartDateTime && a.Status == item1.Status).ToList().Count)
                     {
-                        switch (group_game.Where(a => a.GroupingId == item.GroupingId && a.HomeTeamId == item1.HomeTeamId && a.VisitingTeamId == item1.VisitingTeamId && a.StartDateTime == item1.StartDateTime && a.Status == item1.Status).ToList().Count)
-                        {
-                            case 0:
-                                gamesList_new.Add(item1);
-                                break;
-                            case 1:
-                                var gamedetail = group_game.Where(a => a.GroupingId == item.GroupingId && a.HomeTeamId == item1.HomeTeamId && a.VisitingTeamId == item1.VisitingTeamId && a.StartDateTime == item1.StartDateTime && a.Status == item1.Status).FirstOrDefault();
-                                var new_game = item1;
-                                new_game.Id = gamedetail.Id;
-                                gamesList_new.Add(new_game);
-                                listint.Add(gamedetail.PK);
-                                break;
-                            default:
-                                var gamedetail1 = group_game.Where(a => a.GroupingId == item.GroupingId && a.HomeTeamId == item1.HomeTeamId && a.VisitingTeamId == item1.VisitingTeamId && a.StartDateTime == item1.StartDateTime && a.Status == item1.Status).ToList();
-                                var new_game1 = item1;
-                                new_game1.Id = gamedetail1.OrderByDescending(a=>a.CreateDateTime).FirstOrDefault().Id;
-                                gamesList_new.Add(new_game1);
-                                foreach (var item2 in gamedetail1)
-                                {
-                                    listint.Add(item2.PK);
-                                }
-                                break;
-                        }
+                        case 0:
+                            gamesList_new.Add(item1);
+                            break;
+                        case 1:
+                            var gamedetail = group_game.Where(a => a.GroupingId == item.GroupingId && a.HomeTeamId == item1.HomeTeamId && a.VisitingTeamId == item1.VisitingTeamId && a.StartDateTime == item1.StartDateTime && a.Status == item1.Status).FirstOrDefault();
+                            var new_game = item1;
+                            new_game.Id = gamedetail.Id;
+                            gamesList_new.Add(new_game);
+                            listint.Add(gamedetail.PK);
+                            break;
+                        default:
+                            var gamedetail1 = group_game.Where(a => a.GroupingId == item.GroupingId && a.HomeTeamId == item1.HomeTeamId && a.VisitingTeamId == item1.VisitingTeamId && a.StartDateTime == item1.StartDateTime && a.Status == item1.Status).ToList();
+                            var new_game1 = item1;
+                            new_game1.Id = gamedetail1.OrderByDescending(a=>a.CreateDateTime).FirstOrDefault().Id;
+                            gamesList_new.Add(new_game1);
+                            foreach (var item2 in gamedetail1)
+                            {
+                                listint.Add(item2.PK);
+                            }
+                            break;
                     }
                 }
-                else {
-                    gamesList_new.AddRange(new_group_game);    
-                }
+                
                 foreach (var item1 in group_game)
                 {
                     listint.Add(item1.PK);