|
@@ -2033,39 +2033,39 @@ namespace MySystem
|
|
|
int AfterLevel = 0;
|
|
|
decimal TradeAmount = 0;
|
|
|
//创客团队交易额
|
|
|
- bool check = rdb.TradeDaySummary.Any(m => m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team");
|
|
|
+ bool check = rdb.TradeDaySummary.Any(m => m.Id >= 23901364 && m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team");
|
|
|
if (check)
|
|
|
{
|
|
|
- TradeAmount += rdb.TradeDaySummary.Where(m => m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team").Sum(m => m.HelpNonDirectTradeAmt + m.HelpNonDirectDebitTradeAmt + m.NotHelpNonDirectTradeAmt + m.NotHelpNonDirectDebitTradeAmt + m.ProfitNonDirectTradeAmt + m.ProfitNonDirectDebitTradeAmt);
|
|
|
- }
|
|
|
- check = rdb.TradeDaySummary2.Any(m => m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team");
|
|
|
+ TradeAmount += rdb.TradeDaySummary.Where(m => m.Id >= 23901364 && m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team").Sum(m => m.HelpNonDirectTradeAmt + m.HelpNonDirectDebitTradeAmt + m.NotHelpNonDirectTradeAmt + m.NotHelpNonDirectDebitTradeAmt + m.ProfitNonDirectTradeAmt + m.ProfitNonDirectDebitTradeAmt);
|
|
|
+ }
|
|
|
+ check = rdb.TradeDaySummary2.Any(m => m.Id >= 3015208 && m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team");
|
|
|
if (check)
|
|
|
{
|
|
|
- TradeAmount += rdb.TradeDaySummary2.Where(m => m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team").Sum(m => m.ProfitTradeAmt + m.ProfitDebitTradeAmt);
|
|
|
+ TradeAmount += rdb.TradeDaySummary2.Where(m => m.Id >= 3015208 && m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team").Sum(m => m.ProfitTradeAmt + m.ProfitDebitTradeAmt);
|
|
|
}
|
|
|
//助利宝团队交易额
|
|
|
TradeAmount += HelpProfitTradeSummaryDbconn.Instance.GetTrade(user.Id, TradeMonth, "team");
|
|
|
//码牌团队交易额(直联)
|
|
|
- check = mpmaindb.UserAmountSummary.Any(m => m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team" && m.IsAct == 1);
|
|
|
+ check = mpmaindb.UserAmountSummary.Any(m => m.Id >= 1658104 && m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team" && m.IsAct == 1);
|
|
|
if (check)
|
|
|
{
|
|
|
- TradeAmount += mpmaindb.UserAmountSummary.Where(m => m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team" && m.IsAct == 1).Sum(m => m.TotalAmount) * 4;
|
|
|
+ TradeAmount += mpmaindb.UserAmountSummary.Where(m => m.Id >= 1658104 && m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team" && m.IsAct == 1).Sum(m => m.TotalAmount) * 4;
|
|
|
}
|
|
|
- check = mpmaindb.UserAmountSummary.Any(m => m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team" && m.IsAct == 0);
|
|
|
+ check = mpmaindb.UserAmountSummary.Any(m => m.Id >= 1658104 && m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team" && m.IsAct == 0);
|
|
|
if (check)
|
|
|
{
|
|
|
- TradeAmount += mpmaindb.UserAmountSummary.Where(m => m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team" && m.IsAct == 0).Sum(m => m.TotalAmount);
|
|
|
+ TradeAmount += mpmaindb.UserAmountSummary.Where(m => m.Id >= 1658104 && m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team" && m.IsAct == 0).Sum(m => m.TotalAmount);
|
|
|
}
|
|
|
//码牌团队交易额(银联)
|
|
|
- check = mpmaindb2.UserAmountSummary.Any(m => m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team" && m.IsAct == 1);
|
|
|
+ check = mpmaindb2.UserAmountSummary.Any(m => m.Id >= 1108304 && m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team" && m.IsAct == 1);
|
|
|
if (check)
|
|
|
{
|
|
|
- TradeAmount += mpmaindb2.UserAmountSummary.Where(m => m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team" && m.IsAct == 1).Sum(m => m.TotalAmount) * 4;
|
|
|
+ TradeAmount += mpmaindb2.UserAmountSummary.Where(m => m.Id >= 1108304 && m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team" && m.IsAct == 1).Sum(m => m.TotalAmount) * 4;
|
|
|
}
|
|
|
- check = mpmaindb2.UserAmountSummary.Any(m => m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team" && m.IsAct == 0);
|
|
|
+ check = mpmaindb2.UserAmountSummary.Any(m => m.Id >= 1108304 && m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team" && m.IsAct == 0);
|
|
|
if (check)
|
|
|
{
|
|
|
- TradeAmount += mpmaindb2.UserAmountSummary.Where(m => m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team" && m.IsAct == 0).Sum(m => m.TotalAmount);
|
|
|
+ TradeAmount += mpmaindb2.UserAmountSummary.Where(m => m.Id >= 1108304 && m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team" && m.IsAct == 0).Sum(m => m.TotalAmount);
|
|
|
}
|
|
|
//广电卡扶持期按1万/张计入职级
|
|
|
List<int> BrandIds = new List<int>();
|
|
@@ -2074,10 +2074,10 @@ namespace MySystem
|
|
|
BrandIds.Add(24);
|
|
|
BrandIds.Add(25);
|
|
|
BrandIds.Add(26);
|
|
|
- check = rdb.UserTradeMonthSummary.Any(m => m.UserId == user.Id && m.SeoTitle == "team" && BrandIds.Contains(m.BrandId));
|
|
|
+ check = rdb.UserTradeMonthSummary.Any(m => m.Id >= 1837032 && m.UserId == user.Id && m.SeoTitle == "team" && BrandIds.Contains(m.BrandId));
|
|
|
if (check)
|
|
|
{
|
|
|
- int ActCount = rdb.UserTradeMonthSummary.Where(m => m.UserId == user.Id && m.SeoTitle == "team" && BrandIds.Contains(m.BrandId)).Sum(m => m.ActiveBuddyMerStatus);
|
|
|
+ int ActCount = rdb.UserTradeMonthSummary.Where(m => m.Id >= 1837032 && m.UserId == user.Id && m.SeoTitle == "team" && BrandIds.Contains(m.BrandId)).Sum(m => m.ActiveBuddyMerStatus);
|
|
|
if(rdb.UserSimActSummary.Any(m => m.UserId == user.Id && m.Kind == 1))
|
|
|
{
|
|
|
ActCount -= rdb.UserSimActSummary.Where(m => m.UserId == user.Id).Sum(m => m.ActCount); //减去注销的用户
|