调整

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -4699,33 +4699,36 @@ namespace MySystem.Areas.Admin.Controllers
                     var depositRreturn = db.MerchantDepositReturns.Where(m => m.MerchantId == mer.Id).OrderByDescending(m => m.CreateDate).FirstOrDefault() ?? new MerchantDepositReturns();
                     var IsOk = "";//是否达标
                     var timeInfo = "";
-                    if (mer.StandardMonths == 10)
-                    {
-                        IsOk = "已达标";
-                    }
-                    else if (mer.StandardStatus == -2)
+                    if (mer.StandardStatus == -2)
                     {
                         IsOk = "人工已退";
                     }
-                    else if (mer.StandardMonths >= 0 && mer.StandardStatus == -1)
-                    {
-                        IsOk = "达标失败";
-                    }
-                    else if (mer.StandardStatus == 1 && depositRreturn.Status == 1)
-                    {
-                        IsOk = "已返还";
-                    }
-                    else if (mer.StandardStatus == 101)
-                    {
-                        IsOk = "待领取达标奖";
-                    }
-                    else if (mer.StandardStatus == 1 && depositRreturn.Status == 0)
-                    {
-                        IsOk = "达标奖发放中";
-                    }
                     else
                     {
-                        IsOk = "未达标";
+                        if (mer.StandardMonths < 10)
+                        {
+                            IsOk = "未达标";
+                        }
+                        if (mer.StandardMonths == 10)
+                        {
+                            IsOk = "已达标";
+                        }
+                        if (mer.StandardMonths >= 0 && mer.StandardStatus == -1)
+                        {
+                            IsOk = "达标失败";
+                        }
+                        if (mer.StandardStatus == 1 && depositRreturn.Status == 1)
+                        {
+                            IsOk = "已返还";
+                        }
+                        if (mer.StandardStatus == 101)
+                        {
+                            IsOk = "待领取达标奖";
+                        }
+                        if (mer.StandardStatus == 1 && depositRreturn.Status == 0)
+                        {
+                            IsOk = "达标奖发放中";
+                        }
                     }
                     result += IsFirst + "\n";
                     result += IsOk + "\n";