测试功能调整

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1164,14 +1164,14 @@ namespace MySystem.Areas.Admin.Controllers
             if (leader10.Id > 0)
             {
                 Users user = db.Users.FirstOrDefault(m => m.Id == leader10.UserId) ?? new Users();
-                Leader10 = "金额：" + leader10.ChangeAmount + "，创客编号：" + user.MakerCode + "，姓名：" + user.RealName;
+                Leader10 = "金额：" + leader10.ChangeAmount + "，创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，发奖时间：" + user.RealName;
                 // Leader10 = "金额：" + leader10.ChangeAmount + "，创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
             }
             var yyzx5 = db.UserAccountRecord.FirstOrDefault(m => m.QueryCount == pos.Id && m.ChangeType == 121) ?? new UserAccountRecord();
             if (yyzx5.Id > 0)
             {
                 Users user = db.Users.FirstOrDefault(m => m.Id == yyzx5.UserId) ?? new Users();
-                YYZX5 = "金额：" + yyzx5.ChangeAmount + "，创客编号：" + user.MakerCode + "，姓名：" + user.RealName;
+                YYZX5 = "金额：" + yyzx5.ChangeAmount + "，创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，发奖时间：" + yyzx5.CreateDate;
                 // YYZX5 = "金额：" + yyzx5.ChangeAmount + "，创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
             }
             MachineApply apply = db.MachineApply.FirstOrDefault(m => m.SwapSnExpand.Contains(pos.PosSn)) ?? new MachineApply();
@@ -2485,14 +2485,7 @@ namespace MySystem.Areas.Admin.Controllers
                 var endtime = Convert.ToDateTime(pos.RecycEndDate).ToString("yyyy-MM-dd hh:mm:ss");
                 result += "循环开始时间：" + stattime + "\n";
                 result += "循环结束时间：" + endtime + "\n";
-                if (pos.PosSnType == 0)
-                {
-                    result += "来源机具：" + pos.SourcePosSn + "\n";
-                }
-                else
-                {
-                    result += "来源机具券：" + pos.SourcePosSn  + "\n";
-                }
+                result += "来源机具/券：" + pos.SourcePosSn + "\n";
             }
             return result;
 
@@ -2753,6 +2746,10 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "机具未激活";
             }
+            if (pos.BindingTime <= pos.TransferTime)
+            {
+                return "补录机，不能补发开机奖";
+            }
             // if (pos.BindingTime < DateTime.Now.AddDays(-30))
             // {
             //     return "绑定已超过30天";
@@ -2919,10 +2916,10 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                     }
                     string result = "";
-                    if (!PrizeFlag.Contains("20"))
-                    {
-                        result += "20元奖励未发，请检查上级是否满足条件\n";
-                    }
+                    // if (!PrizeFlag.Contains("20"))
+                    // {
+                    //     result += "20元奖励未发，请检查上级是否满足条件\n";
+                    // }
                     // if (!PrizeFlag.Contains("10"))
                     // {
                     //     result += "10元奖励未发，请检查上级是否满足条件\n";
@@ -3954,11 +3951,11 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 var brand = item.Name;
                 //已过期
-                var overdue = pos.Count(m => m.RecycEndDate < DateTime.Now && m.BrandId == item.Id);
+                var overdue = pos.Count(m => m.RecycEndDate < DateTime.Now && m.BrandId == item.Id && m.PosSnType == 0);
                 //可申请
-                var use = pos.Count(m => m.IsPurchase == 0 && m.RecycEndDate > DateTime.Now && m.BrandId == item.Id);
+                var use = pos.Count(m => m.IsPurchase == 0 && m.RecycEndDate > DateTime.Now && m.BrandId == item.Id && m.PosSnType == 0);
                 //已使用
-                var used = pos.Count(m => m.IsPurchase == 1 && m.BrandId == item.Id);
+                var used = pos.Count(m => m.IsPurchase == 1 && m.BrandId == item.Id && m.PosSnType == 0);
 
                 info += "品牌：" + brand + "，已过期：" + overdue + "，可申请：" + use + "，已使用：" + used + "\n";
             }
@@ -4016,11 +4013,13 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 string OldSnNum = OldSnList[i];
                 MachineForSnNo oldForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == OldSnNum) ?? new MachineForSnNo();
-                PosMachinesTwo oldpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == oldForSnNo.SnId && m.Status == -1) ?? new PosMachinesTwo();
-                if (oldpos.Id == 0)
+                PosMachinesTwo oldpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == oldForSnNo.SnId) ?? new PosMachinesTwo();
+                var store = db.StoreHouse.FirstOrDefault(m => m.Id == oldpos.StoreId) ?? new StoreHouse();
+                if (store.UserId != 142237)//判断是否是属于坏机仓的机具
                 {
-                    error += "以下操作失败" + OldSnNum + ',' + "该机具不是坏机或不存在" + '\n';
+                    error += "以下操作失败" + OldSnNum + ',' + "该机具不在坏机仓或不存在" + '\n';
                 }
+                oldpos.Status = 1;
                 oldpos.QueryCount = 0;
                 oldpos.UpdateDate = null;
                 oldpos.ActivityList = null;
@@ -4069,7 +4068,7 @@ namespace MySystem.Areas.Admin.Controllers
             return "success";
         }
         #endregion
-        
+
         #region 划拨创客机具券
 
         public IActionResult TransferPosCoupon(string right)
@@ -4107,7 +4106,7 @@ namespace MySystem.Areas.Admin.Controllers
                 return "划拨创客" + ToMakerCode + "不存在";
             }
             int LeaderUserId = 0;
-            if(!string.IsNullOrEmpty(LeaderMakerCode))
+            if (!string.IsNullOrEmpty(LeaderMakerCode))
             {
                 UserForMakerCode leaderuser = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == LeaderMakerCode) ?? new UserForMakerCode();
                 Users LeaderUserItem = db.Users.FirstOrDefault(m => m.Id == leaderuser.UserId) ?? new Users();
@@ -4120,19 +4119,23 @@ namespace MySystem.Areas.Admin.Controllers
 
             var query = PosCouponCodes + "\n" + FromMakerCode + "," + ToMakerCode;
             string[] PosCouponList = PosCouponCodes.Replace("\r", "").Replace("\n", ",").Split(',');
-            foreach(string PosCouponCode in PosCouponList)
+            foreach (string PosCouponCode in PosCouponList)
             {
                 PosCoupons item = db.PosCoupons.FirstOrDefault(m => m.ExchangeCode == PosCouponCode);
+                if (item.UserId != fUserId.Id)
+                {
+                    return "机具券" + PosCouponCode + "不在创客" + FromMakerCode + "名下";
+                }
                 if (item == null)
                 {
                     return "机具券" + PosCouponCode + "不存在";
                 }
-                if(item.IsUse == 1)
+                if (item.IsUse == 1)
                 {
                     return "机具券" + PosCouponCode + "已使用";
                 }
                 item.UserId = tUserId.Id;
-                if(LeaderUserId > 0 && item.LeaderUserId == 0)
+                if (LeaderUserId > 0 && item.LeaderUserId == 0)
                 {
                     item.LeaderUserId = LeaderUserId;
                 }