Merge branch 'DuGuYang' into develop

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;
@@ -3315,7 +3315,25 @@ namespace MySystem.Areas.Admin.Controllers
             Users user = db.Users.FirstOrDefault(m => m.Id == pos.BuyUserId);
             if (user != null)
             {
-                RedisDbconn.Instance.AddList("OpenRewardQueue", Id.ToString());
+                if (pos.IsFirst == 1 && pos.BindingTime > DateTime.Now.AddDays(-30) && pos.CardType < 100)
+                {
+                    RedisDbconn.Instance.AddList("OpenRewardQueue", pos.Id.ToString());
+                }
+                else
+                {
+                    return "操作失败" + pos.PosSn + ',' + "不满足发放条件首台绑定30天内非营训机" + '\n';
+                }
+
+                if (pos.IsFirst == 1 && pos.ActivationState == 1 && pos.BindingTime.Value.AddDays(30) <= DateTime.Now && pos.BindingTime.Value.AddDays(60) > DateTime.Now && pos.CreditTrade >= 10000 && pos.CardType < 100)
+                {
+                    RedisDbconn.Instance.AddList("LeaderRewardQueue", pos.Id.ToString());
+                }
+                else
+                {
+                    return "操作失败" + pos.PosSn + ',' + "不满足发放条件首台绑定30天到60天交易超过10000元内非营训机" + '\n';
+                }
+                // RedisDbconn.Instance.AddList("OpenRewardQueue", Id.ToString());
+                // RedisDbconn.Instance.AddList("LeaderRewardQueue", Id.ToString());
                 return "操作成功，请稍后查询";
             }
             db.Dispose();
@@ -3999,7 +4017,25 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     if (posInfo.Id > 0)
                     {
-                        RedisDbconn.Instance.AddList("OpenRewardQueue", posInfo.Id.ToString());
+                        if (posInfo.IsFirst == 1 && posInfo.BindingTime > DateTime.Now.AddDays(-30) && posInfo.CardType < 100)
+                        {
+                            RedisDbconn.Instance.AddList("OpenRewardQueue", posInfo.Id.ToString());
+                        }
+                        else
+                        {
+                            return "操作失败" + posInfo.PosSn + ',' + "不满足发放条件首台绑定30天内非营训机" + '\n';
+                        }
+
+                        if (posInfo.IsFirst == 1 && posInfo.ActivationState == 1 && posInfo.BindingTime.Value.AddDays(30) <= DateTime.Now && posInfo.BindingTime.Value.AddDays(60) > DateTime.Now && posInfo.CreditTrade >= 10000 && posInfo.CardType < 100)
+                        {
+                            RedisDbconn.Instance.AddList("LeaderRewardQueue", posInfo.Id.ToString());
+                        }
+                        else
+                        {
+                            return "操作失败" + posInfo.PosSn + ',' + "不满足发放条件首台绑定30天到60天交易超过10000元内非营训机" + '\n';
+                        }
+                        // RedisDbconn.Instance.AddList("OpenRewardQueue", posInfo.Id.ToString());
+                        // RedisDbconn.Instance.AddList("LeaderRewardQueue", posInfo.Id.ToString());
                     }
 
                 }