|
|
@@ -352,9 +352,9 @@ namespace MySystem
|
|
|
}
|
|
|
selfStat.MerCount += MerCount;
|
|
|
int Month = selfStat.QueryCount;
|
|
|
- if(Month > 24)
|
|
|
+ if(Month > 36)
|
|
|
{
|
|
|
- Month = 24;
|
|
|
+ Month = 36;
|
|
|
}
|
|
|
selfStat.MaxAmount += EveryMonthFixedVal()[Month] * MerCount;
|
|
|
}
|
|
|
@@ -482,6 +482,18 @@ namespace MySystem
|
|
|
obj.Add(22, 3000M);
|
|
|
obj.Add(23, 2000M);
|
|
|
obj.Add(24, 1000M);
|
|
|
+ obj.Add(25, 900M);
|
|
|
+ obj.Add(26, 800M);
|
|
|
+ obj.Add(27, 700M);
|
|
|
+ obj.Add(28, 600M);
|
|
|
+ obj.Add(29, 500M);
|
|
|
+ obj.Add(30, 400M);
|
|
|
+ obj.Add(31, 300M);
|
|
|
+ obj.Add(32, 200M);
|
|
|
+ obj.Add(33, 150M);
|
|
|
+ obj.Add(34, 100M);
|
|
|
+ obj.Add(35, 50M);
|
|
|
+ obj.Add(36, 0M);
|
|
|
return obj;
|
|
|
}
|
|
|
|
|
|
@@ -558,7 +570,7 @@ namespace MySystem
|
|
|
int Month = MonthCount;
|
|
|
List<int> MerCounts = new List<int>(); //每月台数,包含当月
|
|
|
List<decimal> MaxTradeAmounts = new List<decimal>(); //每月最大固定额度
|
|
|
- List<HelpProfitAmountSummary> Summarys = db.HelpProfitAmountSummary.Where(m => m.UserId == UserId && Convert.ToInt32(m.TradeMonth) <= Convert.ToInt32(TradeMonth)).OrderByDescending(m => m.TradeMonth).Take(24).ToList();
|
|
|
+ List<HelpProfitAmountSummary> Summarys = db.HelpProfitAmountSummary.Where(m => m.UserId == UserId && Convert.ToInt32(m.TradeMonth) <= Convert.ToInt32(TradeMonth)).OrderByDescending(m => m.TradeMonth).Take(36).ToList();
|
|
|
int MonthNum = 0;
|
|
|
foreach(HelpProfitAmountSummary Summary in Summarys)
|
|
|
{
|