Procházet zdrojové kódy

后台-人工已退商户列表 服务费金额显示问题

lcl před 3 roky
rodič
revize
a26eeb0844

+ 5 - 5
Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -265,7 +265,7 @@ namespace MySystem.Areas.Admin.Controllers
                 string SeoKeyword = "0";
                 string SeoKeyword = "0";
                 if (!string.IsNullOrEmpty(pos.SeoKeyword))
                 if (!string.IsNullOrEmpty(pos.SeoKeyword))
                 {
                 {
-                    if (pos.BrandId != 2 && pos.BrandId != 7 && pos.BrandId != 10 && pos.BrandId != 11)
+                    if (pos.BrandId != 2 && pos.BrandId != 7 && pos.BrandId != 10 && pos.BrandId != 11 && pos.BrandId != 12)
                     {
                     {
                         SeoKeyword = (decimal.Parse(pos.SeoKeyword) / 100).ToString();
                         SeoKeyword = (decimal.Parse(pos.SeoKeyword) / 100).ToString();
                     }
                     }
@@ -301,7 +301,7 @@ namespace MySystem.Areas.Admin.Controllers
                     var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == KqSnNo) ?? new PosMachinesTwo();
                     var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == KqSnNo) ?? new PosMachinesTwo();
                     if (!string.IsNullOrEmpty(pos.SeoKeyword))
                     if (!string.IsNullOrEmpty(pos.SeoKeyword))
                     {
                     {
-                        if (pos.BrandId != 2 && pos.BrandId != 7 && pos.BrandId != 10 && pos.BrandId != 11)
+                        if (pos.BrandId != 2 && pos.BrandId != 7 && pos.BrandId != 10 && pos.BrandId != 11 && pos.BrandId != 12)
                         {
                         {
                             ReturnAmount += decimal.Parse(pos.SeoKeyword) / 100;
                             ReturnAmount += decimal.Parse(pos.SeoKeyword) / 100;
                         }
                         }
@@ -379,7 +379,7 @@ namespace MySystem.Areas.Admin.Controllers
                 string SeoKeyword = "0";
                 string SeoKeyword = "0";
                 if (!string.IsNullOrEmpty(pos.SeoKeyword))
                 if (!string.IsNullOrEmpty(pos.SeoKeyword))
                 {
                 {
-                    if (pos.BrandId != 2 && pos.BrandId != 7 && pos.BrandId != 10 && pos.BrandId != 11)
+                    if (pos.BrandId != 2 && pos.BrandId != 7 && pos.BrandId != 10 && pos.BrandId != 11 && pos.BrandId != 12)
                     {
                     {
                         SeoKeyword = (decimal.Parse(pos.SeoKeyword) / 100).ToString();
                         SeoKeyword = (decimal.Parse(pos.SeoKeyword) / 100).ToString();
                     }
                     }
@@ -560,7 +560,7 @@ namespace MySystem.Areas.Admin.Controllers
                     var BrandId = item["BrandId"].ToString();
                     var BrandId = item["BrandId"].ToString();
                     var PosSn = item["PosSn"].ToString();
                     var PosSn = item["PosSn"].ToString();
                     var SeoKeyword = item["SeoKeyword"].ToString();
                     var SeoKeyword = item["SeoKeyword"].ToString();
-                    if (BrandId != "2" && BrandId != "7")
+                    if (BrandId != "2" && BrandId != "7" && BrandId != "10" && BrandId != "11" && BrandId != "12")
                     {
                     {
                         SeoKeyword = (decimal.Parse(SeoKeyword) / 100).ToString();
                         SeoKeyword = (decimal.Parse(SeoKeyword) / 100).ToString();
                     }
                     }
@@ -650,7 +650,7 @@ namespace MySystem.Areas.Admin.Controllers
                     var BrandId = item["BrandId"].ToString();
                     var BrandId = item["BrandId"].ToString();
                     var PosSn = item["PosSn"].ToString();
                     var PosSn = item["PosSn"].ToString();
                     var SeoKeyword = item["SeoKeyword"].ToString();
                     var SeoKeyword = item["SeoKeyword"].ToString();
-                    if (BrandId != "2" && BrandId != "7")
+                    if (BrandId != "2" && BrandId != "7" && BrandId != "10" && BrandId != "11" && BrandId != "12")
                     {
                     {
                         SeoKeyword = (decimal.Parse(SeoKeyword) / 100).ToString();
                         SeoKeyword = (decimal.Parse(SeoKeyword) / 100).ToString();
                     }
                     }