激活奖励显示数据补充

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1283,21 +1283,30 @@ namespace MySystem.Areas.Admin.Controllers
                 }
                 string DepositGets = "未领取";
                 string DepositUsers = "";
-                ActiveReward rewards = db.ActiveReward.FirstOrDefault(m => m.KqSnNo == pos.PosSn && m.RewardAmount != 40) ?? new ActiveReward();
-                if (rewards.Id > 0)
+                string aDepositGets = "";
+                // ActiveReward rewards = db.ActiveReward.FirstOrDefault(m => m.KqSnNo == pos.PosSn && m.RewardAmount != 40) ?? new ActiveReward();
+                // if (rewards.Id > 0)
+                // {
+                //     Users user = db.Users.FirstOrDefault(m => m.Id == rewards.UserId) ?? new Users();
+                //     DepositGets = "已领取";
+                //     DepositUsers = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName;
+                // }
+                // string ActiveTimes = rewards.CreateDate == null ? "" : rewards.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                var rewards = db.ActiveReward.Where(m => m.KqSnNo == pos.PosSn).ToList();
+                foreach (var item in rewards)
                 {
-                    Users user = db.Users.FirstOrDefault(m => m.Id == rewards.UserId) ?? new Users();
-                    DepositGets = "已领取";
-                    DepositUsers = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName;
+                    Users user = db.Users.FirstOrDefault(m => m.Id == item.UserId) ?? new Users();
+                    var time = item.CreateDate == null ? "" : item.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                    aDepositGets += "已领取：" + item.RewardAmount + "，创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，领取时间：" + time + "\n";
                 }
-                string ActiveTimes = rewards.CreateDate == null ? "" : rewards.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
                 var storeInfo = db.StoreHouse.FirstOrDefault(m => m.Id == pos.StoreId) ?? new StoreHouse();
                 string results = "该机具为故障机" + "\n";
                 results += "所在仓库：" + storeInfo.StoreNo + "\n";
                 results += "仓库名称：" + storeInfo.StoreName + "\n";
                 results += "服务费返现实际返现对象：" + DepositUsers + "\n";
                 results += "服务费：" + Deposits + "\n";
-                results += "是否返现：" + DepositGets + "，领取时间：" + ActiveTimes + "\n";
+                // results += "是否返现：" + DepositGets + "，领取时间：" + ActiveTimes + "\n";
+                results += "是否返现：" + DepositGets + "\n";
                 return results;
             }
             string merInfo = "";
@@ -1370,31 +1379,32 @@ namespace MySystem.Areas.Admin.Controllers
             string DepositToUser = "";
             decimal headAmount = 0;
             decimal footAmount = 0;
-            ActiveReward reward = db.ActiveReward.FirstOrDefault(m => m.KqSnNo == pos.PosSn && m.RewardAmount != 40) ?? new ActiveReward();
-            if (reward.Id > 0)
-            {
-                Users user = db.Users.FirstOrDefault(m => m.Id == reward.UserId) ?? new Users();
-                DepositGet = "已领取";
-                DepositUser = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName;
-                var fAmount = db.ActiveReward.FirstOrDefault(m => m.KqSnNo == pos.PosSn && m.ActType == 0);
-                if (fAmount != null)
-                {
-                    headAmount = fAmount.RewardAmount;
-                }
-                var lAmount = db.ActiveReward.FirstOrDefault(m => m.KqSnNo == pos.PosSn && m.ActType == 1);
-                if (lAmount != null)
-                {
-                    footAmount = lAmount.RewardAmount;
-                }
-            }
-            string DepositGet6 = "未领取";
-            string DepositUser6 = "";
-            ActiveReward lisreward = db.ActiveReward.FirstOrDefault(m => m.KqSnNo == pos.PosSn && m.BrandId == 6 && m.RewardAmount == 40) ?? new ActiveReward();
-            if (lisreward.Id > 0)
+            string aDepositGet = "";
+            // ActiveReward reward = db.ActiveReward.FirstOrDefault(m => m.KqSnNo == pos.PosSn && m.RewardAmount != 40) ?? new ActiveReward();
+            // if (reward.Id > 0)
+            // {
+            //     Users user = db.Users.FirstOrDefault(m => m.Id == reward.UserId) ?? new Users();
+            //     DepositGet = "已领取";
+            //     DepositUser = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName;
+            //     var fAmount = db.ActiveReward.FirstOrDefault(m => m.KqSnNo == pos.PosSn && m.ActType == 0);
+            //     if (fAmount != null)
+            //     {
+            //         headAmount = fAmount.RewardAmount;
+            //     }
+            //     var lAmount = db.ActiveReward.FirstOrDefault(m => m.KqSnNo == pos.PosSn && m.ActType == 1);
+            //     if (lAmount != null)
+            //     {
+            //         footAmount = lAmount.RewardAmount;
+            //     }
+            // }
+            // string DepositGet6 = "未领取";
+            // string DepositUser6 = "";
+            var reward = db.ActiveReward.Where(m => m.KqSnNo == pos.PosSn).ToList();
+            foreach (var item in reward)
             {
-                Users user = db.Users.FirstOrDefault(m => m.Id == lisreward.UserId) ?? new Users();
-                DepositGet6 = "已领取";
-                DepositUser6 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName;
+                Users user = db.Users.FirstOrDefault(m => m.Id == item.UserId) ?? new Users();
+                var time = item.CreateDate == null ? "" : item.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                aDepositGet += "已领取：" + item.RewardAmount + "，创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，领取时间：" + time + "\n";
             }
             string FluxGet6 = "未领取";
             string FluxUser6 = "";
@@ -1447,8 +1457,8 @@ namespace MySystem.Areas.Admin.Controllers
             string CreateDate = pos.CreateDate == null ? "" : pos.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             string TransferTime = pos.TransferTime == null ? "" : pos.TransferTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
             string RecycEndDate = pos.RecycEndDate == null ? "" : pos.RecycEndDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
-            string ActiveTime = reward.CreateDate == null ? "" : reward.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
-            string ActiveTime6 = lisreward.CreateDate == null ? "" : lisreward.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
+            // string ActiveTime = reward.CreateDate == null ? "" : reward.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
+            // string ActiveTime6 = lisreward.CreateDate == null ? "" : lisreward.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             string result = "";
             result += "机器持有人顶级：创客编号：" + posTopUser.MakerCode + "，姓名：" + posTopUser.RealName + "\n";
             result += "\n";
@@ -1484,15 +1494,16 @@ namespace MySystem.Areas.Admin.Controllers
             result += "申请循环后的SN：" + applyorder.SnNos + "\n";
             result += "是否发货：" + SendStatus + "，发货时间：" + SendDate + "\n";
             result += "服务费：" + Deposit + "\n";
-            result += "是否返现：" + DepositGet + "，领取时间：" + ActiveTime + "\n";
-            result += "返现金额：" + headAmount + " " + " " + footAmount + "\n";
+            // result += "是否返现：" + DepositGet + "，领取时间：" + ActiveTime + "\n";
+            result += "是否返现：" + aDepositGet + "\n";
+            // result += "返现金额：" + headAmount + " " + " " + footAmount + "\n";
             result += "服务费返现应返现对象：" + DepositToUser + "\n";
-            result += "服务费返现实际返现对象：" + DepositUser + "\n";
-            if (pos.BrandId == 6)
-            {
-                result += "立刷10000奖励：" + DepositGet6 + "，领取时间：" + ActiveTime6 + "\n";
-                result += "立刷10000奖励发放人：" + DepositUser6 + "\n";
-            }
+            // result += "服务费返现实际返现对象：" + DepositUser + "\n";
+            // if (pos.BrandId == 6)
+            // {
+            //     result += "立刷10000奖励：" + DepositGet6 + "，领取时间：" + ActiveTime6 + "\n";
+            //     result += "立刷10000奖励发放人：" + DepositUser6 + "\n";
+            // }
             result += "流量费：" + FluxGet6 + "\n";
             result += "流量费发放对象：" + FluxUser6 + "\n";
             result += "开机奖20：" + OpenUser20 + "\n";