|
|
@@ -1504,16 +1504,10 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
string start = "";
|
|
|
string end = "";
|
|
|
|
|
|
- string condition = "";
|
|
|
- string con = "";
|
|
|
- string cons = "";
|
|
|
+ string condition = " and Status>-1 and AuthFlag >0";
|
|
|
+ string con = " and Status>-1";
|
|
|
+ string cons = " and Status>=-1";
|
|
|
string sort = "Id desc";
|
|
|
- if (!string.IsNullOrEmpty(BrandSelect.ToString()) || !string.IsNullOrEmpty(MakerCode) || !string.IsNullOrEmpty(CreateDateData))
|
|
|
- {
|
|
|
- condition = " and Status>-1 and AuthFlag >0";
|
|
|
- con = " and Status>-1";
|
|
|
- cons = " and Status>=-1";
|
|
|
- }
|
|
|
//创客编号
|
|
|
if (!string.IsNullOrEmpty(MakerCode))
|
|
|
{
|
|
|
@@ -1529,16 +1523,51 @@ 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;
|
|
|
+ // 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);
|
|
|
+ var Info = function.ReadInstance("/WritePage/UsersChildrenTrade/UsersChildrenTrades.txt");
|
|
|
+ if (string.IsNullOrEmpty(Info.ToString()))
|
|
|
+ {
|
|
|
+ function.WritePage("/WritePage/UsersChildrenTrade/", "UsersChildrenTrades.txt", consId + "," + coneId + "," + conssId + "," + conseId);
|
|
|
+ con += " and Id >=" + consId + " and Id <=" + coneId;
|
|
|
+ cons += " and Id >=" + conssId + " and Id <=" + conseId;
|
|
|
+ }
|
|
|
+ string[] datas = Info.Split(",");
|
|
|
+ con += " and Id >=" + Convert.ToInt32(datas[0]) + " and Id <=" + Convert.ToInt32(datas[1]);
|
|
|
+ cons += " and Id >=" + Convert.ToInt32(datas[2]) + " and Id <=" + Convert.ToInt32(datas[3]);
|
|
|
}
|
|
|
//时间为空
|
|
|
- if (string.IsNullOrEmpty(CreateDateData))
|
|
|
- {
|
|
|
- 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;
|
|
|
+ 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;
|
|
|
+ }
|
|
|
+ string[] datas = Info.Split(",");
|
|
|
+ con += " and Id >=" + Convert.ToInt32(datas[0]);
|
|
|
+ cons += " and Id >=" + Convert.ToInt32(datas[1]);
|
|
|
}
|
|
|
if (!string.IsNullOrEmpty(BrandSelect.ToString()) && BrandId > 0)
|
|
|
{
|
|
|
@@ -1677,23 +1706,23 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
}
|
|
|
|
|
|
//TODO: 统计激活绑定数(个人)
|
|
|
- dt = OtherMySqlConn.dtable("SELECT COUNT(0) count FROM PosMachinesTwo WHERE BindingState=1 AND BuyUserId= '" + ParentId + "'" + cons);
|
|
|
- if (dt.Rows.Count > 0)
|
|
|
- {
|
|
|
- PBCount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
|
|
|
- }
|
|
|
- dt = OtherMySqlConn.dtable("SELECT SUM(DirectDebitCapNum) sum FROM UserTradeDaySummary WHERE SeoTitle='self' AND UserId= '" + ParentId + "'" + con);
|
|
|
+ // dt = OtherMySqlConn.dtable("SELECT COUNT(0) count FROM PosMachinesTwo WHERE BindingState=1 AND BuyUserId= '" + ParentId + "'" + cons);
|
|
|
+ // if (dt.Rows.Count > 0)
|
|
|
+ // {
|
|
|
+ // PBCount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
|
|
|
+ // }
|
|
|
+ dt = OtherMySqlConn.dtable("SELECT SUM(ActiveBuddyMerStatus) sum FROM UserTradeMonthSummary WHERE SeoTitle='self' AND UserId= '" + ParentId + "'" + cons);
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
PACount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
|
|
|
}
|
|
|
//TODO: 统计激活绑定数(团队)
|
|
|
- dt = OtherMySqlConn.dtable("SELECT COUNT(0) count FROM PosMachinesTwo WHERE BindingState=1 AND BuyUserId IN (SELECT Id FROM Users WHERE ParentNav LIKE '%," + ParentId + ",%' OR Id=" + ParentId + ")" + cons);
|
|
|
- if (dt.Rows.Count > 0)
|
|
|
- {
|
|
|
- TBCount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
|
|
|
- }
|
|
|
- dt = OtherMySqlConn.dtable("SELECT SUM(NonDirectDebitCapNum) sum FROM UserTradeDaySummary WHERE SeoTitle='team' AND UserId= '" + ParentId + "'" + con);
|
|
|
+ // dt = OtherMySqlConn.dtable("SELECT COUNT(0) count FROM PosMachinesTwo WHERE BindingState=1 AND BuyUserId IN (SELECT Id FROM Users WHERE ParentNav LIKE '%," + ParentId + ",%' OR Id=" + ParentId + ")" + cons);
|
|
|
+ // if (dt.Rows.Count > 0)
|
|
|
+ // {
|
|
|
+ // TBCount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
|
|
|
+ // }
|
|
|
+ dt = OtherMySqlConn.dtable("SELECT SUM(ActiveBuddyMerStatus) sum FROM UserTradeMonthSummary WHERE SeoTitle='team' AND UserId= '" + ParentId + "'" + cons);
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
TACount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
|
|
|
@@ -1818,14 +1847,14 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
condition += " and UserId =" + UserId;
|
|
|
}
|
|
|
//开始时间
|
|
|
- if (!string.IsNullOrEmpty(sTradeDate))
|
|
|
+ if (!string.IsNullOrEmpty(sTradeDate) && !string.IsNullOrEmpty(eTradeDate))
|
|
|
{
|
|
|
- condition += " and TradeDate >=" + Convert.ToInt32(sTradeDate);
|
|
|
- cons += " and DATE_FORMAT(BindingTime,'%Y%m%d') >=" + Convert.ToInt32(sTradeDate);
|
|
|
- con += " and TradeDate >=" + Convert.ToInt32(sTradeDate);
|
|
|
+ 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);
|
|
|
}
|
|
|
//结束时间
|
|
|
- if (!string.IsNullOrEmpty(eTradeDate))
|
|
|
+ else
|
|
|
{
|
|
|
condition += " and TradeDate <=" + Convert.ToInt32(eTradeDate);
|
|
|
cons += " and DATE_FORMAT(BindingTime,'%Y%m%d') <=" + Convert.ToInt32(eTradeDate);
|
|
|
@@ -1918,34 +1947,34 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
YAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
|
|
|
}
|
|
|
- dt = OtherMySqlConn.dtable("SELECT SUM(NonDirectDebitCapNum) sum FROM UserTradeDaySummary WHERE SeoTitle='team' AND UserId= '" + UserId + "'" + cons);
|
|
|
- if (dt.Rows.Count > 0)
|
|
|
- {
|
|
|
- BCount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
|
|
|
- }
|
|
|
- dt = OtherMySqlConn.dtable("SELECT SUM(NonDirectDebitCapNum) sum FROM UserTradeDaySummary WHERE SeoTitle='team' AND UserId= '" + UserId + "'" + cons);
|
|
|
+ // dt = OtherMySqlConn.dtable("SELECT SUM(ActiveBuddyMerStatus) sum FROM UserTradeMonthSummary WHERE SeoTitle='team' AND UserId= '" + UserId + "'" + cons);
|
|
|
+ // if (dt.Rows.Count > 0)
|
|
|
+ // {
|
|
|
+ // BCount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
|
|
|
+ // }
|
|
|
+ dt = OtherMySqlConn.dtable("SELECT SUM(ActiveBuddyMerStatus) sum FROM UserTradeMonthSummary WHERE SeoTitle='team' AND UserId= '" + UserId + "'" + con);
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
ACount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
|
|
|
}
|
|
|
//TODO: 统计激活绑定数(个人)
|
|
|
- dt = OtherMySqlConn.dtable("SELECT COUNT(0) count FROM PosMachinesTwo WHERE BindingState=1 AND BuyUserId= '" + UserId + "'" + cons);
|
|
|
- if (dt.Rows.Count > 0)
|
|
|
- {
|
|
|
- PBCount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
|
|
|
- }
|
|
|
- dt = OtherMySqlConn.dtable("SELECT SUM(DirectDebitCapNum) sum FROM UserTradeDaySummary WHERE SeoTitle='self' AND UserId= '" + UserId + "'" + con);
|
|
|
+ // dt = OtherMySqlConn.dtable("SELECT COUNT(0) count FROM PosMachinesTwo WHERE BindingState=1 AND BuyUserId= '" + UserId + "'" + cons);
|
|
|
+ // if (dt.Rows.Count > 0)
|
|
|
+ // {
|
|
|
+ // PBCount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
|
|
|
+ // }
|
|
|
+ dt = OtherMySqlConn.dtable("SELECT SUM(ActiveBuddyMerStatus) sum FROM UserTradeMonthSummary WHERE SeoTitle='self' AND UserId= '" + UserId + "'" + con);
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
PACount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
|
|
|
}
|
|
|
//TODO: 统计激活绑定数(团队)
|
|
|
- dt = OtherMySqlConn.dtable("SELECT COUNT(0) count FROM PosMachinesTwo WHERE BindingState=1 AND BuyUserId IN (SELECT Id FROM Users WHERE ParentNav LIKE '%," + UserId + ",%' OR Id=" + UserId + ")" + cons);
|
|
|
- if (dt.Rows.Count > 0)
|
|
|
- {
|
|
|
- TBCount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
|
|
|
- }
|
|
|
- dt = OtherMySqlConn.dtable("SELECT SUM(NonDirectDebitCapNum) sum FROM UserTradeDaySummary WHERE SeoTitle='team' AND UserId= '" + UserId + "'" + con);
|
|
|
+ // dt = OtherMySqlConn.dtable("SELECT COUNT(0) count FROM PosMachinesTwo WHERE BindingState=1 AND BuyUserId IN (SELECT Id FROM Users WHERE ParentNav LIKE '%," + UserId + ",%' OR Id=" + UserId + ")" + cons);
|
|
|
+ // if (dt.Rows.Count > 0)
|
|
|
+ // {
|
|
|
+ // TBCount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
|
|
|
+ // }
|
|
|
+ dt = OtherMySqlConn.dtable("SELECT SUM(ActiveBuddyMerStatus) sum FROM UserTradeMonthSummary WHERE SeoTitle='team' AND UserId= '" + UserId + "'" + con);
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
TACount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
|