调整交易统计,广告位添加提示调整

Areas/Admin/Controllers/BsServer/ColController.cs

@@ -172,12 +172,12 @@ namespace MySystem.Areas.Admin.Controllers
                 EnName = new PublicFunction().TranslateZHToEn(col.ColName);
                 EnName = EnName.Replace(" ", "").Replace("'", "").ToLower();
             }
-            //判断英文名是否存在
+            //判断中文名是否存在
             string CheckCol = code.Substring(0, 3);
-            Col check = bsdb.Col.FirstOrDefault(m => m.ColId.StartsWith(CheckCol) && m.ColEnName == EnName);
+            Col check = bsdb.Col.FirstOrDefault(m => m.ColId.StartsWith(CheckCol) && m.ColName == col.ColName);
             if (check != null)
             {
-                return "英文名已存在";
+                return "中文名已存在";
             }
             Col add = bsdb.Col.Add(new Col()
             {
@@ -267,13 +267,13 @@ namespace MySystem.Areas.Admin.Controllers
                 EnName = new PublicFunction().TranslateZHToEn(col.ColName);
                 EnName = EnName.Replace(" ", "").Replace("'", "").ToLower();
             }
-            //判断英文名是否存在
-            string CheckCol = PColId.Substring(0, 3);
-            Col check = bsdb.Col.FirstOrDefault(m => m.ColId.StartsWith(CheckCol) && m.ColEnName == EnName && m.ColEnName != OldEnName);
-            if (check != null)
-            {
-                return "英文名已存在";
-            }
+            // //判断英文名是否存在
+            // string CheckCol = PColId.Substring(0, 3);
+            // Col check = bsdb.Col.FirstOrDefault(m => m.ColId.StartsWith(CheckCol) && m.ColEnName == EnName && m.ColEnName != OldEnName);
+            // if (check != null)
+            // {
+            //     return "英文名已存在";
+            // }
             Col editData = bsdb.Col.FirstOrDefault(c => c.ColId == col.ColId);
             if (editData != null)
             {

Areas/Admin/Controllers/MainServer/MerchantColController.cs

@@ -152,11 +152,11 @@ namespace MySystem.Areas.Admin.Controllers
                 EnName = new PublicFunction().TranslateZHToEn(col.ColName);
                 EnName = EnName.Replace(" ", "").Replace("'", "").ToLower();
             }
-            //判断英文名是否存在
-            MerchantCol check = db.MerchantCol.FirstOrDefault(m => m.MerchantId == MerchantId && m.ColEnName == EnName);
+            //判断中文名是否存在
+            MerchantCol check = db.MerchantCol.FirstOrDefault(m => m.MerchantId == MerchantId && m.ColName == col.ColName);
             if (check != null)
             {
-                return "英文名已存在";
+                return "中文名已存在";
             }
             //构造英文名路径，用于url地址
             string ColEnNav = EnName;
@@ -256,12 +256,12 @@ namespace MySystem.Areas.Admin.Controllers
                 EnName = new PublicFunction().TranslateZHToEn(col.ColName);
                 EnName = EnName.Replace(" ", "").Replace("'", "").ToLower();
             }
-            //判断英文名是否存在
-            MerchantCol check = db.MerchantCol.FirstOrDefault(m => m.MerchantId == MerchantId && m.ColEnName == EnName && m.ColEnName != OldEnName);
-            if (check != null)
-            {
-                return "英文名已存在";
-            }
+            // //判断英文名是否存在
+            // MerchantCol check = db.MerchantCol.FirstOrDefault(m => m.MerchantId == MerchantId && m.ColEnName == EnName && m.ColEnName != OldEnName);
+            // if (check != null)
+            // {
+            //     return "英文名已存在";
+            // }
             //构造英文名路径，用于url地址
             string ColEnNav = EnName;
             if (!string.IsNullOrEmpty(PColId))

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -1884,7 +1884,7 @@ namespace MySystem.Areas.Admin.Controllers
                 YAmtyl = Convert.ToDecimal(function.CheckNum(dt.Rows[0][17].ToString()));
             }
 
-            dt = CustomerSqlConn.dtable("SELECT Sum(ProfitTradeAmt + ProfitDebitTradeAmt),Sum(if (QueryCount = 0,ProfitTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitTradeAmt - ProfitDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitCapNum,0)),Sum(if (QueryCount = 1,ProfitTradeAmt,0)) from TradeDaySummary2 where SeoTitle = 'self'" + condition, MysqlConn.ReadSqlConnStr);
+            dt = CustomerSqlConn.dtable("SELECT Sum(ProfitTradeAmt + ProfitDebitTradeAmt),Sum(if (QueryCount = 0,ProfitTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitTradeAmt - ProfitDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitCapNum,0)),Sum(if (QueryCount = 1,ProfitTradeAmt,0)) from TradeDaySummary2 where SeoTitle = 'self' and UserId =" + ParentId + "" + con, MysqlConn.ReadSqlConnStr);
             if (dt.Rows.Count > 0)
             {
                 TotalAmtyls = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
@@ -1930,7 +1930,7 @@ namespace MySystem.Areas.Admin.Controllers
                 YAmtyl1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][17].ToString()));
             }
 
-            dt = CustomerSqlConn.dtable("SELECT Sum(ProfitTradeAmt + ProfitDebitTradeAmt),Sum(if (QueryCount = 0,ProfitTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitTradeAmt - ProfitDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitCapNum,0)),Sum(if (QueryCount = 1,ProfitTradeAmt,0)) from TradeDaySummary2 where SeoTitle = 'team'" + condition, MysqlConn.ReadSqlConnStr);
+            dt = CustomerSqlConn.dtable("SELECT Sum(ProfitTradeAmt + ProfitDebitTradeAmt),Sum(if (QueryCount = 0,ProfitTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitTradeAmt - ProfitDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitCapNum,0)),Sum(if (QueryCount = 1,ProfitTradeAmt,0)) from TradeDaySummary2 where SeoTitle = 'team' and UserId =" + ParentId + "" + con, MysqlConn.ReadSqlConnStr);
             if (dt.Rows.Count > 0)
             {
                 TotalAmtyl1s = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
@@ -2127,7 +2127,7 @@ namespace MySystem.Areas.Admin.Controllers
             TotalPosAmount = TotalAmtfc + TotalAmtwd + TotalAmtyl + TotalAmtyl2;
 
             //统计激活数(个人、团队)
-            dt = OtherMySqlConn.dtable("SELECT SUM(if(SeoTitle='team',ActiveBuddyMerStatus,0)) FROM UserTradeMonthSummary WHERE UserId= " + UserId + "" + cons);
+            dt = CustomerSqlConn.dtable("SELECT SUM(if(SeoTitle='team',ActiveBuddyMerStatus,0)) FROM UserTradeMonthSummary WHERE UserId= " + UserId + "" + cons, MysqlConn.ReadSqlConnStr);
             if (dt.Rows.Count > 0)
             {
                 TACount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));