Merge branch 'feature-dgy-激活奖励查询调整' into feature-dgy-后台测试

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1354,22 +1354,22 @@ namespace MySystem.Areas.Admin.Controllers
             }
             Users touser = db.Users.FirstOrDefault(m => m.Id == pos.BuyUserId) ?? new Users();
             DepositToUser = "创客编号：" + touser.MakerCode + "，姓名：" + touser.RealName;
-            string OpenUser10 = "未领取";
-            string OpenUser20 = "未领取";
+            string OpenUserInfo = "";
             string Leader10 = "未领取";
             string YYZX5 = "未领取";
             var OpenRewardDetail = db.OpenRewardDetail.Where(m => m.SnNo == pos.PosSn).ToList();
-            OpenRewardDetail openreward = OpenRewardDetail.FirstOrDefault(m => m.CreditRewardAmount == 20) ?? new OpenRewardDetail();
-            if (openreward.Id > 0)
+            if (OpenRewardDetail.Count > 0)
             {
-                Users user = db.Users.FirstOrDefault(m => m.Id == openreward.UserId) ?? new Users();
-                OpenUser20 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，发放时间：" + openreward.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                OpenUserInfo = "\n" + "已领取" + "\n";
+                foreach (var items in OpenRewardDetail)
+                {
+                    Users user = db.Users.FirstOrDefault(m => m.Id == items.UserId) ?? new Users();
+                    OpenUserInfo += items.CreditRewardAmount + "，创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，发放时间：" + items.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") + "\n";
+                }
             }
-            openreward = OpenRewardDetail.FirstOrDefault(m => m.CreditRewardAmount == 10) ?? new OpenRewardDetail();
-            if (openreward.Id > 0)
+            else
             {
-                Users user = db.Users.FirstOrDefault(m => m.Id == openreward.UserId) ?? new Users();
-                OpenUser10 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName;
+                OpenUserInfo = "未领取";
             }
             var leader10 = db.UserAccountRecord.FirstOrDefault(m => m.QueryCount == pos.Id && m.ChangeType == 116) ?? new UserAccountRecord();
             if (leader10.Id > 0)
@@ -1443,7 +1443,7 @@ namespace MySystem.Areas.Admin.Controllers
             // }
             result += "流量费：" + FluxGet6 + "\n";
             result += "流量费发放对象：" + FluxUser6 + "\n";
-            result += "开机奖20：" + OpenUser20 + "\n";
+            result += "开机奖：" + OpenUserInfo + "\n";
             result += "盟主奖：" + Leader10 + "\n";
             result += "运营中心奖：" + YYZX5 + "\n";
             return result;