修改

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -1498,6 +1498,7 @@ namespace MySystem.Areas.Admin.Controllers
         public JsonResult ChildrenData(Users data, int BrandSelect, string MakerCode, string CreateDateData, int ParentId = 0, int page = 1, int limit = 30)
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
+            WebCMSEntities db = new WebCMSEntities();
             Fields.Add("MakerCode", "1"); //创客编号
 
             int BrandId = BrandSelect;
@@ -1523,47 +1524,17 @@ namespace MySystem.Areas.Admin.Controllers
                 string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
                 start = datelist[0].Replace("-", "");
                 end = datelist[1].Replace("-", "");
-                // con += " and TradeDate>='" + start + "' and TradeDate<='" + end + "'";
-                // cons += " and DATE_FORMAT(BindingTime,'%Y%m%d') >=" + start + " and DATE_FORMAT(BindingTime,'%Y%m%d') <=" + end;
-
-                WebCMSEntities dbs = new WebCMSEntities();
-                //con
-                var consId = dbs.TradeDaySummary.Where(m => Convert.ToInt32(m.TradeDate) >= Convert.ToInt32(start)).Min(m => m.Id);
-                var coneId = dbs.TradeDaySummary.Where(m => Convert.ToInt32(m.TradeDate) <= Convert.ToInt32(end)).Max(m => m.Id);
-                //cons
-                var conssId = dbs.UserTradeMonthSummary.Where(m => Convert.ToInt32(m.SeoKeyword) >= Convert.ToInt32(start)).Min(m => m.Id);
-                var conseId = dbs.UserTradeMonthSummary.Where(m => Convert.ToInt32(m.SeoKeyword) <= Convert.ToInt32(end)).Max(m => m.Id);
-                con += "  and Id >=" + consId + " and Id <=" + coneId;
-                cons += "  and Id >=" + conssId + " and Id <=" + conseId;
+                con += " and TradeDate>='" + start + "' and TradeDate<='" + end + "'";
+                cons += " and DATE_FORMAT(BindingTime,'%Y%m%d') >=" + start + " and DATE_FORMAT(BindingTime,'%Y%m%d') <=" + end;
+
             }
             //时间为空
             else
             {
-                // start = DateTime.Now.ToString("yyyyMM") + "01";
-                // end = DateTime.Now.AddMonths(1).ToString("yyyyMM") + "01";
-                // con += " and TradeDate>='" + start + "' and TradeDate<'" + end + "'";
-                // cons += " and DATE_FORMAT(BindingTime,'%Y%m%d') >=" + start + " and DATE_FORMAT(BindingTime,'%Y%m%d') <" + end;
-
-                WebCMSEntities dbs = new WebCMSEntities();
-                start = DateTime.Now.AddMonths(-1).ToString("yyyyMMdd");
-                //con
-                var consId = dbs.TradeDaySummary.Where(m => Convert.ToInt32(m.TradeDate) >= Convert.ToInt32(start)).Min(m => m.Id);
-                //cons
-                var conssId = dbs.TradeDaySummary.Where(m => Convert.ToInt32(m.TradeDate) >= Convert.ToInt32(start)).Min(m => m.Id);
-                var Info = function.ReadInstance("/WritePage/UsersChildrenTrade/UsersChildrenTrade.txt");
-                if (string.IsNullOrEmpty(Info.ToString()))
-                {
-                    function.WritePage("/WritePage/UsersChildrenTrade/", "UsersChildrenTrade.txt", consId + "," + conssId);
-                    con += " and Id >=" + consId;
-                    cons += " and Id >=" + conssId;
-                }
-                else
-                {
-                    string[] datas = Info.Split(",");
-                    con += " and Id >=" + Convert.ToInt32(datas[0]);
-                    cons += " and Id >=" + Convert.ToInt32(datas[1]);
-
-                }
+                start = DateTime.Now.ToString("yyyyMM") + "01";
+                end = DateTime.Now.AddMonths(1).ToString("yyyyMM") + "01";
+                con += " and TradeDate>='" + start + "' and TradeDate<'" + end + "'";
+                cons += " and DATE_FORMAT(BindingTime,'%Y%m%d') >=" + start + " and DATE_FORMAT(BindingTime,'%Y%m%d') <" + end;
             }
             if (!string.IsNullOrEmpty(BrandSelect.ToString()) && BrandId > 0)
             {
@@ -1637,7 +1608,6 @@ namespace MySystem.Areas.Admin.Controllers
             int TBCount = 0;
             int TACount = 0;
 
-            WebCMSEntities db = new WebCMSEntities();
             Dictionary<string, object> other = new Dictionary<string, object>();
             DataTable dt = OtherMySqlConn.dtable("select Sum(HelpDirectTradeAmt + HelpDirectDebitTradeAmt) from TradeDaySummary where SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
@@ -1826,6 +1796,8 @@ namespace MySystem.Areas.Admin.Controllers
 
         public Dictionary<string, object> GetMonthTradeForBrand(int UserId, string sTradeDate, string eTradeDate, int BrandId)
         {
+            WebCMSEntities db = new WebCMSEntities();
+
             string condition = " and Status>-1";
             string cons = " and Status>=-1";
             string con = " and Status>=-1";
@@ -1845,47 +1817,16 @@ namespace MySystem.Areas.Admin.Controllers
             //开始时间
             if (!string.IsNullOrEmpty(sTradeDate) && !string.IsNullOrEmpty(eTradeDate))
             {
-                // condition += " and TradeDate >=" + Convert.ToInt32(sTradeDate) + " and TradeDate <=" + Convert.ToInt32(eTradeDate);
-                // cons += " and DATE_FORMAT(BindingTime,'%Y%m%d') >=" + Convert.ToInt32(sTradeDate) + " and DATE_FORMAT(BindingTime,'%Y%m%d') <=" + Convert.ToInt32(eTradeDate);
-                // con += " and TradeDate >=" + Convert.ToInt32(sTradeDate) + " and TradeDate <=" + Convert.ToInt32(eTradeDate);
-
-                WebCMSEntities dbs = new WebCMSEntities();
-                //con
-                var consId = dbs.TradeDaySummary.Where(m => Convert.ToInt32(m.TradeDate) >= Convert.ToInt32(sTradeDate)).Min(m => m.Id);
-                var coneId = dbs.TradeDaySummary.Where(m => Convert.ToInt32(m.TradeDate) <= Convert.ToInt32(eTradeDate)).Max(m => m.Id);
-                //cons
-                var conssId = dbs.UserTradeMonthSummary.Where(m => Convert.ToInt32(m.SeoKeyword) >= Convert.ToInt32(sTradeDate)).Min(m => m.Id);
-                var conseId = dbs.UserTradeMonthSummary.Where(m => Convert.ToInt32(m.SeoKeyword) <= Convert.ToInt32(eTradeDate)).Max(m => m.Id);
-                condition += "  and Id >=" + consId + " and Id <=" + coneId;
-                con += "  and Id >=" + conssId + " and Id <=" + conseId;
+                condition += " and TradeDate >=" + Convert.ToInt32(sTradeDate) + " and TradeDate <=" + Convert.ToInt32(eTradeDate);
+                cons += " and DATE_FORMAT(BindingTime,'%Y%m%d') >=" + Convert.ToInt32(sTradeDate) + " and DATE_FORMAT(BindingTime,'%Y%m%d') <=" + Convert.ToInt32(eTradeDate);
+                con += " and TradeDate >=" + Convert.ToInt32(sTradeDate) + " and TradeDate <=" + Convert.ToInt32(eTradeDate);
             }
             //结束时间
             else
             {
-                // condition += " and TradeDate <=" + Convert.ToInt32(eTradeDate);
-                // cons += " and DATE_FORMAT(BindingTime,'%Y%m%d') <=" + Convert.ToInt32(eTradeDate);
-                // con += " and TradeDate <=" + Convert.ToInt32(eTradeDate);
-
-                WebCMSEntities dbs = new WebCMSEntities();
-                var start = DateTime.Now.AddMonths(-1).ToString("yyyyMMdd");
-                //condition
-                var conId = dbs.TradeDaySummary.Where(m => Convert.ToInt32(m.TradeDate) >= Convert.ToInt32(start)).Min(m => m.Id);
-                //con
-                var consId = dbs.UserTradeMonthSummary.Where(m => Convert.ToInt32(m.SeoKeyword) >= Convert.ToInt32(start)).Min(m => m.Id);
-                var Info = function.ReadInstance("/WritePage/UsersChildrenTrade/UsersChildrenTrade.txt");
-                if (string.IsNullOrEmpty(Info.ToString()))
-                {
-                    function.WritePage("/WritePage/UsersChildrenTrade/", "UsersChildrenTrade.txt", conId + "," + consId);
-                    condition += " and Id >=" + conId;
-                    con += " and Id >=" + consId;
-                }
-                else
-                {
-                    string[] datas = Info.Split(",");
-                    condition += " and Id >=" + Convert.ToInt32(datas[0]);
-                    con += " and Id >=" + Convert.ToInt32(datas[1]);
-
-                }
+                condition += " and TradeDate <=" + Convert.ToInt32(eTradeDate);
+                cons += " and DATE_FORMAT(BindingTime,'%Y%m%d') <=" + Convert.ToInt32(eTradeDate);
+                con += " and TradeDate <=" + Convert.ToInt32(eTradeDate);
             }
 
             //扶持期
@@ -1911,7 +1852,6 @@ namespace MySystem.Areas.Admin.Controllers
             int TBCount = 0;
             int TACount = 0;
 
-            WebCMSEntities db = new WebCMSEntities();
             Dictionary<string, object> obj = new Dictionary<string, object>();
             DataTable dt = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt + HelpNonDirectDebitTradeAmt) from TradeDaySummary where SeoTitle='team'" + condition);
             if (dt.Rows.Count > 0)