Merge branch 'feature-dgy-新增服务费调整功能' into feature-dgy-后台测试

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -5636,9 +5636,12 @@ namespace MySystem.Areas.Admin.Controllers
                     if (posInfo.BrandId == 1 || posInfo.BrandId == 3)
                     {
                         if (Deposit == "0") Deposit = "0";
-                        if (Deposit == "99") Deposit = "99";
-                        if (Deposit == "199") Deposit = "199";
-                        else return "失败，无" + Deposit + "服务费相关设置权限";
+                        else if (Deposit == "99") Deposit = "99";
+                        else if (Deposit == "199") Deposit = "199";
+                        else 
+                        {
+                            return "失败，无" + Deposit + "服务费相关设置权限";
+                        }
                         var info = PublicChangePosFee.SetJKDeposit(SnId.ToString(), Deposit);
                         if (info != "设置成功")
                         {
@@ -5649,10 +5652,13 @@ namespace MySystem.Areas.Admin.Controllers
                     if (posInfo.BrandId == 2)
                     {
                         if (Deposit == "0") Deposit = "470";
-                        if (Deposit == "99") Deposit = "471";
-                        if (Deposit == "199") Deposit = "472";
-                        if (Deposit == "299") Deposit = "473";
-                        else return "失败，无" + Deposit + "服务费相关设置权限";
+                        else if (Deposit == "99") Deposit = "471";
+                        else if (Deposit == "199") Deposit = "472";
+                        else if (Deposit == "299") Deposit = "473";
+                        else 
+                        {
+                            return "失败，无" + Deposit + "服务费相关设置权限";
+                        }
                         var info = PublicChangePosFee.SetJKDeposit(SnId.ToString(), Deposit);
                         if (info != "设置成功")
                         {
@@ -5663,9 +5669,12 @@ namespace MySystem.Areas.Admin.Controllers
                     if (posInfo.BrandId == 4 || posInfo.BrandId == 5)
                     {
                         if (Deposit == "99") Deposit = "100";
-                        if (Deposit == "199") Deposit = "200";
-                        if (Deposit == "299") Deposit = "300";
-                        else return "失败，无" + Deposit + "服务费相关设置权限";
+                        else if (Deposit == "199") Deposit = "200";
+                        else if (Deposit == "299") Deposit = "300";
+                        else 
+                        {
+                            return "失败，无" + Deposit + "服务费相关设置权限";
+                        }
                         var info = PublicChangePosFee.SetJKDeposit(SnId.ToString(), Deposit);
                         if (info != "设置成功")
                         {
@@ -5676,9 +5685,12 @@ namespace MySystem.Areas.Admin.Controllers
                     if (posInfo.BrandId == 6)
                     {
                         if (Deposit == "0") Deposit = "0";
-                        if (Deposit == "99") Deposit = "99";
-                        if (Deposit == "199") Deposit = "199";
-                        else return "失败，无" + Deposit + "服务费相关设置权限";
+                        else if (Deposit == "99") Deposit = "99";
+                        else if (Deposit == "199") Deposit = "199";
+                        else 
+                        {
+                            return "失败，无" + Deposit + "服务费相关设置权限";
+                        }
                         var info = PublicChangePosFee.SetJKDeposit(SnId.ToString(), Deposit);
                         if (info != "设置成功")
                         {
@@ -5689,10 +5701,13 @@ namespace MySystem.Areas.Admin.Controllers
                     if (posInfo.BrandId == 7)
                     {
                         if (Deposit == "0") Deposit = "0";
-                        if (Deposit == "99") Deposit = "99";
-                        if (Deposit == "199") Deposit = "199";
-                        if (Deposit == "249") Deposit = "249";
-                        else return "失败，无" + Deposit + "服务费相关设置权限";
+                        else if (Deposit == "99") Deposit = "99";
+                        else if (Deposit == "199") Deposit = "199";
+                        else if (Deposit == "249") Deposit = "249";
+                        else 
+                        {
+                            return "失败，无" + Deposit + "服务费相关设置权限";
+                        }
                         var info = PublicChangePosFee.SetJKDeposit(SnId.ToString(), Deposit);
                         if (info != "设置成功")
                         {
@@ -5703,9 +5718,12 @@ namespace MySystem.Areas.Admin.Controllers
                     if (posInfo.BrandId == 8 || posInfo.BrandId == 9)
                     {
                         if (Deposit == "99") Deposit = "100";
-                        if (Deposit == "199") Deposit = "200";
-                        if (Deposit == "299") Deposit = "300";
-                        else return "失败，无" + Deposit + "服务费相关设置权限";
+                        else if (Deposit == "199") Deposit = "200";
+                        else if (Deposit == "299") Deposit = "300";
+                        else 
+                        {
+                            return "失败，无" + Deposit + "服务费相关设置权限";
+                        }
                         var info = PublicChangePosFee.SetJKDeposit(SnId.ToString(), Deposit);
                         if (info != "设置成功")
                         {
@@ -5716,10 +5734,13 @@ namespace MySystem.Areas.Admin.Controllers
                     if (posInfo.BrandId == 10 || posInfo.BrandId == 11)
                     {
                         if (Deposit == "0") Deposit = "0";
-                        if (Deposit == "99") Deposit = "99";
-                        if (Deposit == "199") Deposit = "199";
-                        if (Deposit == "299") Deposit = "299";
-                        else return "失败，无" + Deposit + "服务费相关设置权限";
+                        else if (Deposit == "99") Deposit = "99";
+                        else if (Deposit == "199") Deposit = "199";
+                        else if (Deposit == "299") Deposit = "299";
+                        else 
+                        {
+                            return "失败，无" + Deposit + "服务费相关设置权限";
+                        }
                         var info = PublicChangePosFee.SetJKDeposit(SnId.ToString(), Deposit);
                         if (info != "设置成功")
                         {
@@ -5730,10 +5751,13 @@ namespace MySystem.Areas.Admin.Controllers
                     if (posInfo.BrandId == 12 || posInfo.BrandId == 13)
                     {
                         if (Deposit == "0") Deposit = "0";
-                        if (Deposit == "99") Deposit = "99";
-                        if (Deposit == "199") Deposit = "199";
-                        if (Deposit == "299") Deposit = "299";
-                        else return "失败，无" + Deposit + "服务费相关设置权限";
+                        else if (Deposit == "99") Deposit = "99";
+                        else if (Deposit == "199") Deposit = "199";
+                        else if (Deposit == "299") Deposit = "299";
+                        else 
+                        {
+                            return "失败，无" + Deposit + "服务费相关设置权限";
+                        }
                         var info = PublicChangePosFee.SetJKDeposit(SnId.ToString(), Deposit);
                         if (info != "设置成功")
                         {